From e55783fb4bc8b9a3071b28812f77b0d7abc8a516 Mon Sep 17 00:00:00 2001 From: bsrdjan Date: Fri, 20 Mar 2020 19:19:53 +0100 Subject: [PATCH] ConnectionInfo update for 750 PL6, related to #128 --- src/Client.cc | 8 ++++++-- test/connection.spec.js | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Client.cc b/src/Client.cc index 2353cc2..996d1be 100644 --- a/src/Client.cc +++ b/src/Client.cc @@ -655,12 +655,13 @@ Napi::Value Client::ConnectionInfo(const Napi::CallbackInfo &info) return wrapError(&errorInfo); } + infoObj.Set(Napi::String::New(env, "dest"), wrapString(connInfo.dest, 64)); infoObj.Set(Napi::String::New(env, "host"), wrapString(connInfo.host, 100)); infoObj.Set(Napi::String::New(env, "partnerHost"), wrapString(connInfo.partnerHost, 100)); infoObj.Set(Napi::String::New(env, "sysNumber"), wrapString(connInfo.sysNumber, 2)); infoObj.Set(Napi::String::New(env, "sysId"), wrapString(connInfo.sysId, 8)); infoObj.Set(Napi::String::New(env, "client"), wrapString(connInfo.client, 3)); - infoObj.Set(Napi::String::New(env, "user"), wrapString(connInfo.user, 8)); + infoObj.Set(Napi::String::New(env, "user"), wrapString(connInfo.user, 12)); infoObj.Set(Napi::String::New(env, "language"), wrapString(connInfo.language, 2)); infoObj.Set(Napi::String::New(env, "trace"), wrapString(connInfo.trace, 1)); infoObj.Set(Napi::String::New(env, "isoLanguage"), wrapString(connInfo.isoLanguage, 2)); @@ -675,7 +676,10 @@ Napi::Value Client::ConnectionInfo(const Napi::CallbackInfo &info) infoObj.Set(Napi::String::New(env, "cpicConvId"), wrapString(connInfo.cpicConvId, 8)); infoObj.Set(Napi::String::New(env, "progName"), wrapString(connInfo.progName, 128)); infoObj.Set(Napi::String::New(env, "partnerBytesPerChar"), wrapString(connInfo.partnerBytesPerChar, 1)); - // infoObj.Set(Napi::String::New(env, "reserved"), wrapString(connInfo.reserved, 84)); + infoObj.Set(Napi::String::New(env, "partnerSystemCodepage"), wrapString(connInfo.partnerSystemCodepage, 4)); + infoObj.Set(Napi::String::New(env, "partnerIP"), wrapString(connInfo.partnerIP, 15)); + infoObj.Set(Napi::String::New(env, "partnerIPv6"), wrapString(connInfo.partnerIP, 45)); + // infoObj.Set(Napi::String::New(env, "reserved"), wrapString(connInfo.reserved, 17)); } client->UnlockMutex(); diff --git a/test/connection.spec.js b/test/connection.spec.js index abf4101..3e3beb5 100755 --- a/test/connection.spec.js +++ b/test/connection.spec.js @@ -91,6 +91,7 @@ it("connectionInfo should return connection information when connected", functio let connectionInfo = client.connectionInfo; expect(Object.keys(connectionInfo).sort()).toEqual( [ + "dest", "host", "partnerHost", "sysNumber", @@ -110,7 +111,10 @@ it("connectionInfo should return connection information when connected", functio "kernelRel", "cpicConvId", "progName", - "partnerBytesPerChar" + "partnerBytesPerChar", + "partnerSystemCodepage", + "partnerIP", + "partnerIPv6", //'reserved' ].sort() );