Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adding httpClientSessionInitv2 which through an argument will give the internal return code #499

Open
wants to merge 1 commit into
base: v3.x/staging
Choose a base branch
from
Open

Adding httpClientSessionInitv2 which through an argument will give the internal return code #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@
- Bugfix: removed "ByteOutputStream" debug message, which was part of the `zwe` command output (#491)
- Bugfix: HEAPPOOLS and HEAPPOOLS64 no longer need to be set to OFF for configmgr (#497)
- Enhancement: module registry (#405)
- Enhancement: Adding more arguments to httpClientSessionInit to allow passing back internal rc and
removing the reference from changelog in `3.0.0`. (#499).

## `3.0.0`
- Feature: added javascript `zos.getStatvfs(path)` function to obtain file system information (#482).
- Add support for LE 64-bit in isgenq.c (#422).
- Bugfix: IARV64 results must be checked for 0x7FFFF000 (#474)
- Adding more arguments to httpClientSessionInit to allow passing back rc (#467).
- Bugfix: SLH should not ABEND when MEMLIMIT is reached (additional NULL check)
- Bugfix: support cross-memory server parameters longer than 128 characters
(zowe/zss#684)
Expand Down
23 changes: 17 additions & 6 deletions c/httpclient.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,9 +647,20 @@ void httpClientSessionDestroy(HttpClientSession *session) {
/**
* After this call, an stcbase'd caller should 'register' the socket
*/

int httpClientSessionInit(HttpClientContext *ctx, HttpClientSession **outSession) {
int rc = 0;
int ret = 0;

rc = httpClientSessionInitv2(ctx, outSession, &ret); // 'ret' is a dummy arugment just to call v2

return rc;
}

int httpClientSessionInitv2(HttpClientContext *ctx, HttpClientSession **outSession, int *rc) {
int sts = 0;
int bpxrc = 0, bpxrsn = 0;
int bpxrsn = 0;
int *bpxrc = rc;

HttpClientSession *session = NULL;
ShortLivedHeap *slh = NULL;
Expand All @@ -660,13 +671,13 @@ int httpClientSessionInit(HttpClientContext *ctx, HttpClientSession **outSession
break;
}

Socket *socket = tcpClient2(ctx->serverAddress, 1000 * ctx->recvTimeoutSeconds, &bpxrc, &bpxrsn);
if ((bpxrc != 0) || (NULL == socket)) {
Socket *socket = tcpClient2(ctx->serverAddress, 1000 * ctx->recvTimeoutSeconds, bpxrc, &bpxrsn);
if ((*bpxrc != 0) || (NULL == socket)) {
#ifdef __ZOWE_OS_ZOS
HTTP_CLIENT_TRACE_VERBOSE("%s (rc=%d, rsn=0x%x, addr=0x%08x, port=%d)\n", HTTP_CLIENT_MSG_CONNECT_FAILED, bpxrc,
HTTP_CLIENT_TRACE_VERBOSE("%s (rc=%d, rsn=0x%x, addr=0x%08x, port=%d)\n", HTTP_CLIENT_MSG_CONNECT_FAILED, *bpxrc,
bpxrsn, ctx->serverAddress->v4Address, ctx->serverAddress->port);
#else
HTTP_CLIENT_TRACE_VERBOSE("%s (rc=%d, rsn=0x%x, addr=0x%08x, port=%d)\n", HTTP_CLIENT_MSG_CONNECT_FAILED, bpxrc,
HTTP_CLIENT_TRACE_VERBOSE("%s (rc=%d, rsn=0x%x, addr=0x%08x, port=%d)\n", HTTP_CLIENT_MSG_CONNECT_FAILED, *bpxrc,
bpxrsn, ctx->serverAddress->internalAddress.v4Address, ctx->serverAddress->port);
#endif
sts = HTTP_CLIENT_CONNECT_FAILED;
Expand All @@ -684,7 +695,7 @@ int httpClientSessionInit(HttpClientContext *ctx, HttpClientSession **outSession
int rc = tlsSocketInit(ctx->tlsEnvironment, &socket->tlsSocket, socket->sd, false);
if (rc != 0) {
HTTP_CLIENT_TRACE_VERBOSE("failed to init tls socket, rc=%d, (%s)", rc, tlsStrError(rc));
socketClose(socket, &bpxrc, &bpxrsn);
socketClose(socket, bpxrc, &bpxrsn);
sts = HTTP_CLIENT_TLS_ERROR;
break;
}
Expand Down
3 changes: 2 additions & 1 deletion c/qjsnet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ static int httpGet(bool isTLS,
int status = 0;
char buffer[2048];
LoggingContext *loggingContext = getLoggingContext();
int rc = 0;

do{
clientSettings.host = host;
Expand Down Expand Up @@ -216,7 +217,7 @@ static int httpGet(bool isTLS,
if (httpTrace){
printf("successfully initialized http client\n");
}
status = httpClientSessionInit(httpClientContext, &session);
status = httpClientSessionInitv2(httpClientContext, &session, &rc);
if (status){
if (httpTrace){
printf("error initing session: %d\n", status);
Expand Down
2 changes: 2 additions & 0 deletions h/httpclient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ void httpClientSessionDestroy(HttpClientSession *session);

int httpClientSessionInit(HttpClientContext *ctx, HttpClientSession **outSession);

int httpClientSessionInitv2(HttpClientContext *ctx, HttpClientSession **outSession, int *rc);

int httpClientSessionStageRequest(HttpClientContext *ctx,
HttpClientSession *session,
char *method, /* required, e.g. GET, PUT, POST */
Expand Down
Loading