NET: fixed failing tests

core/src/main/c/share/net.c

@@ -184,7 +184,7 @@ JNIEXPORT jint JNICALL Java_com_questdb_network_Net_configureNoLinger
     return setsockopt((int) fd, SOL_SOCKET, SO_LINGER, &sl, sizeof(sl));
 }
 
-JNIEXPORT jint JNICALL Java_com_questdb_network_Net_connect
+JNIEXPORT jlong JNICALL Java_com_questdb_network_Net_connect
         (JNIEnv *e, jclass cl, jlong fd, jlong sockAddr) {
     return connect((int) fd, (const struct sockaddr *) sockAddr, sizeof(struct sockaddr));
 }

core/src/main/c/share/net.h

@@ -64,9 +64,9 @@ JNIEXPORT jint JNICALL Java_com_questdb_network_Net_configureNonBlocking
 /*
  * Class:     com_questdb_network_Net
  * Method:    connect
- * Signature: (JJ)I
+ * Signature: (JJ)J
  */
-JNIEXPORT jint JNICALL Java_com_questdb_network_Net_connect
+JNIEXPORT jlong JNICALL Java_com_questdb_network_Net_connect
         (JNIEnv *, jclass, jlong, jlong);
 
 /*

core/src/main/c/windows/net.c

@@ -160,9 +160,9 @@ JNIEXPORT jboolean JNICALL Java_com_questdb_network_Net_bindUdp
     return FALSE;
 }
 
-JNIEXPORT jint JNICALL Java_com_questdb_network_Net_connect
+JNIEXPORT jlong JNICALL Java_com_questdb_network_Net_connect
         (JNIEnv *e, jclass cl, jlong fd, jlong sockAddr) {
-    jint res = connect((SOCKET) fd, (const struct sockaddr *) sockAddr, sizeof(struct sockaddr));
+    jlong res = connect((SOCKET) fd, (const struct sockaddr *) sockAddr, sizeof(struct sockaddr));
     if (res < 0) {
         SaveLastError();
     }

core/src/main/java/com/questdb/network/Net.java

@@ -86,7 +86,7 @@ public final class Net {
 
     public static native int configureNonBlocking(long fd);
 
-    public native static int connect(long fd, long sockaddr);
+    public native static long connect(long fd, long sockaddr);
 
     public static native void freeMsgHeaders(long msgHeaders);
 

core/src/main/java/com/questdb/network/NetworkFacade.java

@@ -43,7 +43,7 @@ public interface NetworkFacade {
 
     int configureNonBlocking(long fd);
 
-    int connect(long fd, long sockaddr);
+    long connect(long fd, long sockaddr);
 
     void freeSockAddr(long socketAddress);
 

core/src/main/java/com/questdb/network/NetworkFacadeImpl.java

@@ -72,7 +72,7 @@ public class NetworkFacadeImpl implements NetworkFacade {
     }
 
     @Override
-    public int connect(long fd, long sockaddr) {
+    public long connect(long fd, long sockaddr) {
         return Net.connect(fd, sockaddr);
     }
 

core/src/test/java/com/questdb/network/NetTest.java

@@ -23,6 +23,7 @@
 
 package com.questdb.network;
 
+import com.questdb.std.Os;
 import com.questdb.std.str.StringSink;
 import com.questdb.test.tools.TestUtils;
 import org.junit.Assert;
@@ -169,10 +170,20 @@ public class NetTest {
         long sockAddr = Net.sockaddr("127.0.0.1", port);
         Assert.assertEquals(0, Net.connect(clientFd, sockAddr));
         Assert.assertEquals(0, Net.setSndBuf(clientFd, 256));
-        Assert.assertEquals(256, Net.getSndBuf(clientFd));
+        // Linux kernel doubles the value we set, so we handle this case separately
+        // http://man7.org/linux/man-pages/man7/socket.7.html
+        if (Os.type == Os.LINUX) {
+            Assert.assertEquals(4608, Net.getSndBuf(clientFd));
+        } else {
+            Assert.assertEquals(256, Net.getSndBuf(clientFd));
+        }
 
         Assert.assertEquals(0, Net.setRcvBuf(clientFd, 512));
-        Assert.assertEquals(512, Net.getRcvBuf(clientFd));
+        if (Os.type == Os.LINUX) {
+            Assert.assertEquals(2304, Net.getRcvBuf(clientFd));
+        } else {
+            Assert.assertEquals(512, Net.getRcvBuf(clientFd));
+        }
         Net.close(clientFd);
         Net.close(fd);
         haltLatch.await(10, TimeUnit.SECONDS);