🍕 tcp_client、tcp_server 禁用 NAGLE 算法 (#47)

Author: znyinyyniu

src/builtin/tcp_client.c

@@ -21,7 +21,7 @@ int main(int argc, char const *argv[])
         return fd;
     }
 
-    inet_aton("192.168.111.33", addr.addr);
+    inet_aton("172.16.16.11", addr.addr);
     addr.family = AF_INET;
     addr.port = htons((u16)time());
 
@@ -36,13 +36,18 @@ int main(int argc, char const *argv[])
     if (ret < EOK)
         goto rollback;
 
-    inet_aton("192.168.111.1", addr.addr);
+    ret = setsockopt(fd, SOL_SOCKET, SO_TCP_NODELAY, &val, 4);
+    printf("socket nodelay %d\n", ret);
+    if (ret < EOK)
+        goto rollback;
+
+    inet_aton("172.16.16.1", addr.addr);
     addr.family = AF_INET;
     addr.port = htons(7777);
     ret = connect(fd, (sockaddr_t *)&addr, sizeof(sockaddr_in_t));
     printf("socket connect %d\n", ret);
 
-    sleep(10000);
+    sleep(1000);
 
     int len = sprintf(tx_buf, "hello tcp server %d", time());
     send(fd, tx_buf, len, 0);

src/builtin/tcp_server.c

@@ -46,6 +46,14 @@ int main(int argc, char const *argv[])
     }
     printf("socket acccept %d\n", client);
 
+    int opt=1;
+    ret=setsockopt(client,SOL_SOCKET,SO_TCP_NODELAY,&opt,4);
+    if (ret < 0)
+    {
+        printf("set nodelay error.\n");
+        goto rollback;
+    }
+
     int len = sprintf(tx_buf, "hello tcp client %d", time());
     send(client, tx_buf, len, 0);
 

src/utils/network.conf

@@ -1,3 +1,3 @@
 ipaddr=172.16.16.11
-netmask=255.255.0.0
+netmask=255.255.255.0
 gateway=172.16.16.1

tests/net/tcp_client.py

@@ -3,7 +3,7 @@
 
 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-s.connect(('192.168.111.33', 6666))
+s.connect(('172.16.16.11', 6666))
 
 data = s.recv(1024)
 print(data.decode())