andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix byte order when retrieve address from filedescriptor

Browse Source 
Motivation:

When create address from filedescriptor we may use incorrect byte order and so end up with an incorrect InetAddress.

Modification:

Not manually shift bytes

Result:

Correct address in all cases.
This commit is contained in:
Norman Maurer 2015-02-23 21:01:20 +01:00
parent e3edec25c5
commit 01bc2d6d80
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
transport-native-epoll/src/main/c/io_netty_channel_epoll_Native.c
View File

@ -197,17 +197,13 @@ static inline void initInetSocketAddressArray(JNIEnv* env, struct sockaddr_stora
port = ntohs(s->sin_port);
// Encode address and port into the array
unsigned char a[8];
a[0] = s->sin_addr.s_addr >> 24;
a[1] = s->sin_addr.s_addr >> 16;
a[2] = s->sin_addr.s_addr >> 8;
a[3] = s->sin_addr.s_addr;
a[4] = port >> 24;
a[5] = port >> 16;
a[6] = port >> 8;
a[7] = port;
(*env)->SetByteArrayRegion(env, bArray, offset, 8, (jbyte*) &a);
unsigned char a[4];
a[0] = port >> 24;
a[1] = port >> 16;
a[2] = port >> 8;
a[3] = port;
(*env)->SetByteArrayRegion(env, bArray, offset, 4, (jbyte*) &s->sin_addr.s_addr);
(*env)->SetByteArrayRegion(env, bArray, offset + 4, 4, (jbyte*) &a);
} else {
struct sockaddr_in6* s = (struct sockaddr_in6*) &addr;
port = ntohs(s->sin6_port);