diff options
Diffstat (limited to 'native/jni/native-lib')
-rw-r--r-- | native/jni/native-lib/Makefile.am | 2 | ||||
-rw-r--r-- | native/jni/native-lib/cpio.c | 2 | ||||
-rw-r--r-- | native/jni/native-lib/cpnet.c | 10 | ||||
-rw-r--r-- | native/jni/native-lib/cpnet.h | 9 |
4 files changed, 10 insertions, 13 deletions
diff --git a/native/jni/native-lib/Makefile.am b/native/jni/native-lib/Makefile.am index c8eb0367d..beab77e57 100644 --- a/native/jni/native-lib/Makefile.am +++ b/native/jni/native-lib/Makefile.am @@ -3,9 +3,7 @@ libclasspathnative_la_SOURCES = cpnet.c \ cpnet.h \ cpio.c \ cpio.h \ - cpnative.c \ cpnative.h \ - cpmath.h \ cpproc.h \ cpproc.c diff --git a/native/jni/native-lib/cpio.c b/native/jni/native-lib/cpio.c index 2e41afd67..955fdccc8 100644 --- a/native/jni/native-lib/cpio.c +++ b/native/jni/native-lib/cpio.c @@ -334,7 +334,7 @@ int cpio_setFileReadonly (const char *filename) if (stat(filename, &statbuf) < 0) return errno; - if (chmod(filename, statbuf.st_mode & ~(S_IRUSR | S_IRGRP | S_IROTH)) < 0) + if (chmod(filename, statbuf.st_mode & ~(S_IWRITE | S_IWGRP | S_IWOTH)) < 0) return errno; return 0; diff --git a/native/jni/native-lib/cpnet.c b/native/jni/native-lib/cpnet.c index 53472e21b..32bd1265e 100644 --- a/native/jni/native-lib/cpnet.c +++ b/native/jni/native-lib/cpnet.c @@ -180,8 +180,6 @@ jint cpnet_connect(JNIEnv *env UNUSED, jint fd, cpnet_address *addr) int ret; /* TODO: implement socket time out */ - struct sockaddr_in *theaddr = (struct sockaddr_in *)addr->data; - ret = connect(fd, (struct sockaddr *)addr->data, addr->len); if (ret != 0) return errno; @@ -697,3 +695,11 @@ jint cpnet_getHostByAddr (JNIEnv *env UNUSED, cpnet_address *addr, char *hostnam return 0; } + +void cpnet_freeAddresses(JNIEnv * env, cpnet_address **addr, jint addresses_count) +{ + jint i; + + for (i = 0; i < addresses_count; i++) + cpnet_freeAddress(env, addr[i]); +} diff --git a/native/jni/native-lib/cpnet.h b/native/jni/native-lib/cpnet.h index 1b7583a5a..0c7c215f8 100644 --- a/native/jni/native-lib/cpnet.h +++ b/native/jni/native-lib/cpnet.h @@ -94,6 +94,7 @@ JNIEXPORT jint cpnet_getAvailableBytes (JNIEnv *env, jint fd, jint *availableByt JNIEXPORT jint cpnet_getHostname (JNIEnv *env, char *hostname, jint hostname_len); JNIEXPORT jint cpnet_getHostByName (JNIEnv *env, const char *hostname, cpnet_address ***adresses, jint *addresses_count); JNIEXPORT jint cpnet_getHostByAddr (JNIEnv *env, cpnet_address *addr, char *hostname, jint hostname_len); +JNIEXPORT void cpnet_freeAddresses(JNIEnv * env, cpnet_address **addr, jint addresses_count); static inline cpnet_address *cpnet_newIPV4Address(JNIEnv * env) { @@ -130,14 +131,6 @@ static inline void cpnet_freeAddress(JNIEnv * env, cpnet_address *addr) JCL_free(env, addr); } -static void cpnet_freeAddresses(JNIEnv * env, cpnet_address **addr, jint addresses_count) -{ - jint i; - - for (i = 0; i < addresses_count; i++) - cpnet_freeAddress(env, addr[i]); -} - static inline void cpnet_addressSetPort(cpnet_address *addr, jint port) { struct sockaddr_in *ipaddr = (struct sockaddr_in *)&(addr->data[0]); |