technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Renamed a couple of members of nxt_unit_request_t.

Browse Source 
This is a preparatory patch that renames the 'local' and 'local_length'
members of the nxt_unit_request_t structure to 'local_addr' and
'local_addr_length' in preparation for the adding of 'local_port' and
'local_port_length' members.

Suggested-by: Zhidao HONG <z.hong@f5.com>
Signed-off-by: Andrew Clayton <a.clayton@nginx.com>
This commit is contained in:
Andrew Clayton
2022-09-29 20:59:43 +01:00
committed by Andrew Clayton
parent 57fc9201cb
commit b00983369b
10 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/java/nxt_jni_Request.c
View File

@@ -461,8 +461,8 @@ nxt_java_Request_getLocalAddr(JNIEnv *env, jclass cls, jlong req_ptr)
r = nxt_jlong2ptr(req_ptr);
return nxt_java_newString(env, nxt_unit_sptr_get(&r->local),
r->local_length);
return nxt_java_newString(env, nxt_unit_sptr_get(&r->local_addr),
r->local_addr_length);
}
@@ -474,11 +474,11 @@ nxt_java_Request_getLocalName(JNIEnv *env, jclass cls, jlong req_ptr)
r = nxt_jlong2ptr(req_ptr);
local = nxt_unit_sptr_get(&r->local);
colon = memchr(local, ':', r->local_length);
local = nxt_unit_sptr_get(&r->local_addr);
colon = memchr(local, ':', r->local_addr_length);
if (colon == NULL) {
colon = local + r->local_length;
colon = local + r->local_addr_length;
}
return nxt_java_newString(env, local, colon - local);
@@ -494,20 +494,20 @@ nxt_java_Request_getLocalPort(JNIEnv *env, jclass cls, jlong req_ptr)
r = nxt_jlong2ptr(req_ptr);
local = nxt_unit_sptr_get(&r->local);
colon = memchr(local, ':', r->local_length);
local = nxt_unit_sptr_get(&r->local_addr);
colon = memchr(local, ':', r->local_addr_length);
if (colon == NULL) {
return 80;
}
tmp = local[r->local_length];
tmp = local[r->local_addr_length];
local[r->local_length] = '\0';
local[r->local_addr_length] = '\0';
res = strtol(colon + 1, NULL, 10);
local[r->local_length] = tmp;
local[r->local_addr_length] = tmp;
return res;
}