Forward port SOCKSENDBUF, SOCKRECVBUF features from 2.10.11.

[ircu2.10.12-pk.git] / ircd / os_generic.c

diff --git a/ircd/os_generic.c b/ircd/os_generic.c
index 7e36564125fe8b2efd0dcb52ae46147603b796b4..2dbde7e727a5124b58c24421423325da583ba403 100644 (file)
--- a/ircd/os_generic.c
+++ b/ircd/os_generic.c
@@ -19,10 +19,11 @@
  * $Id$
  *
  */
+#include "config.h"
+
 #define _XOPEN_SOURCE  /* make limits.h #define IOV_MAX */
 
 #include "ircd_osdep.h"
-#include "config.h"
 #include "msgq.h"
 
 #include <assert.h>
@@ -43,6 +44,10 @@
 #include <unistd.h>
 #endif
 
+#ifndef IOV_MAX
+#define IOV_MAX 16     /* minimum required */
+#endif
+
 #ifdef HPUX
 #include <sys/syscall.h>
 #define getrusage(a,b) syscall(SYS_GETRUSAGE, a, b)
@@ -206,13 +211,24 @@ int os_set_reuseaddr(int fd)
                           (const char*) &opt, sizeof(opt)));
 }
 
-int os_set_sockbufs(int fd, unsigned int size)
+int os_set_sockbufs(int fd, unsigned int ssize, unsigned int rsize)
 {
-  unsigned int opt = size;
+  unsigned int sopt = ssize;
+  unsigned int ropt = rsize;
   return (0 == setsockopt(fd, SOL_SOCKET, SO_RCVBUF, 
-                          (const char*) &opt, sizeof(opt)) &&
+                          (const char*) &ropt, sizeof(ropt)) &&
           0 == setsockopt(fd, SOL_SOCKET, SO_SNDBUF, 
-                          (const char*) &opt, sizeof(opt)));
+                          (const char*) &sopt, sizeof(sopt)));
+}
+
+int os_set_tos(int fd,int tos)
+{
+#if defined(IP_TOS) && defined(IPPROTO_IP)
+  unsigned int opt = tos;
+  return (0 == setsockopt(fd, IPPROTO_IP, IP_TOS, &opt, sizeof(opt)));
+#else
+  return 1;
+#endif
 }
 
 int os_disable_options(int fd)
@@ -350,13 +366,11 @@ IOResult os_sendv_nonb(int fd, struct MsgQ* buf, unsigned int* count_in,
   return IO_FAILURE;
 }
 
-int os_connect_nonb(int fd, const struct sockaddr_in* sin)
+IOResult os_connect_nonb(int fd, const struct sockaddr_in* sin)
 {
-  if (connect(fd, (struct sockaddr*) sin, sizeof(struct sockaddr_in))) {
-    if (errno != EINPROGRESS)
-      return 0;
-  }
-  return 1;
+  if (connect(fd, (struct sockaddr*) sin, sizeof(struct sockaddr_in)))
+    return (errno == EINPROGRESS) ? IO_BLOCKED : IO_FAILURE;
+  return IO_SUCCESS;
 }
       
 int os_get_sockname(int fd, struct sockaddr_in* sin_out)