Author: Kev <klmitch@mit.edu>

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

diff --git a/ircd/os_bsd.c b/ircd/os_bsd.c
index 7163e0f06f2a0adce2a59c611004ca6a6bb519a4..9a052d2f5ea6092b22fabb75afa0d33c68dc643a 100644 (file)
--- a/ircd/os_bsd.c
+++ b/ircd/os_bsd.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>
@@ -58,8 +59,8 @@
  */
 int os_get_rusage(struct Client *cptr, int uptime, EnumFn enumerator)
 {
-  char buf[256];
 #ifdef HAVE_GETRUSAGE
+  char buf[256];
   struct rusage rus;
   time_t secs;
 
@@ -112,6 +113,7 @@ int os_get_rusage(struct Client *cptr, int uptime, EnumFn enumerator)
 
 #else /* HAVE_GETRUSAGE */
 #if HAVE_TIMES
+  char buf[256];
   struct tms tmsbuf;
   time_t secs, mins;
   int hzz = 1, ticpermin;
@@ -216,6 +218,12 @@ int os_set_sockbufs(int fd, unsigned int size)
                           (const char*) &opt, sizeof(opt)));
 }
 
+int os_set_tos(int fd,int tos)
+{
+  unsigned int opt = tos;
+  return (0 == setsockopt(fd, IPPROTO_IP, IP_TOS, &opt, sizeof(opt)));
+}
+
 int os_disable_options(int fd)
 {
 #if defined(IP_OPTIONS) && defined(IPPROTO_IP)
@@ -352,13 +360,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)