embox

1
--- lib60870-2.3.1/lib60870-C/src/hal/socket/linux/socket_linux.c	2023-12-30 18:33:29.350127569 +0300
2
+++ ../build/extbld/third_party/lib/libiec60870/lib60870-2.3.1/lib60870-C/src/hal/socket/linux/socket_linux.c	2023-12-30 18:34:54.860864218 +0300
3
@@ -126,7 +126,7 @@
4
 
5
                 if (sock) {
6
                     self->fds[i].fd = sock->fd;
7
-                    self->fds[i].events = POLL_IN;
8
+                    self->fds[i].events = POLLIN;
9
                 }
10
             }
11
         }
12
@@ -279,7 +279,7 @@
13
 
14
         int optionReuseAddr = 1;
15
         setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *) &optionReuseAddr, sizeof(int));
16
-
17
+/*
18
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
19
         int tcpUserTimeout = 10000;
20
         int result = setsockopt(fd, SOL_TCP,  TCP_USER_TIMEOUT, &tcpUserTimeout, sizeof(tcpUserTimeout));
21
@@ -291,7 +291,7 @@
22
 #else
23
 #warning "TCP_USER_TIMEOUT not supported by linux kernel"
24
 #endif
25
-
26
+*/
27
         if (bind(fd, (struct sockaddr *) &serverAddress, sizeof(serverAddress)) >= 0) {
28
             serverSocket = (ServerSocket) GLOBAL_MALLOC(sizeof(struct sServerSocket));
29
             serverSocket->fd = fd;
30
@@ -402,7 +402,7 @@
31
         if (self) {
32
             self->fd = sock;
33
             self->connectTimeout = 5000;
34
-
35
+/*
36
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
37
             int tcpUserTimeout = 10000;
38
             int result = setsockopt(sock, SOL_TCP,  TCP_USER_TIMEOUT, &tcpUserTimeout, sizeof(tcpUserTimeout));
39
@@ -412,6 +412,7 @@
40
                     printf("SOCKET: failed to set TCP_USER_TIMEOUT (errno=%i)\n", errno);
41
             }
42
 #endif
43
+*/
44
         }
45
         else {
46
             /* out of memory */
47