[ViewVC] Diff of: svn/branches/newio/src/s

Comparing branches/newio/src/s_bsd.c (file contents):
Revision 2391 by michael, Thu Jul 11 20:57:08 2013 UTC vs.
Revision 2392 by michael, Sat Jul 13 22:13:28 2013 UTC

+#include <netinet/ip.h>
+#include <netinet/tcp.h>
+#include "list.h"
-–
+#include "fdlist.h"
+#include "s_bsd.h"
+#include "client.h"
+#include "dbuf.h"
-–
+#include "event.h"
+#include "irc_string.h"
+#include "ircd.h"
+#include "listener.h"
+#include "memory.h"
+#include "s_user.h"
+#include "msgq.h"
-+
+#include "ioengine.h"
+dlink_list connection_list;
+  if (res > -1)
-<
+    *length_out = res;
->
+    *length_out = (unsigned int)res;
+    return IO_SUCCESS;
+  if ((res = send(fd, buf, length, 0)) > -1)
-<
+    *count_out = (unsigned) res;
->
+    *count_out = (unsigned int)res;
+    return IO_SUCCESS;
+  return is_blocked(errno) ? IO_BLOCKED : IO_FAILURE;
-+
+/** Attempt to write on a non-blocking UDP socket.
-+
+ * @param[in] fd File descriptor to write to.
-+
+ * @param[in] buf Output buffer to send from.
-+
+ * @param[in] length Number of bytes to write.
-+
+ * @param[out] count_out Receives number of bytes actually written.
-+
+ * @param[in] flags Flags for call to sendto().
-+
+ * @param[in] peer Destination address of the message.
-+
+ * @return An IOResult value indicating status.
-+
+ */
-+
+IOResult os_sendto_nonb(int fd, const char *buf, unsigned int length,
-+
+                        unsigned int *count_out, unsigned int flags,
-+
+                        struct irc_ssaddr *peer)
-+
+{
-+
+  int res = 0, size = 0;
-+
-+
+  assert(buf);
-+
-+
+  if ((res = sendto(fd, buf, length, flags, (struct sockaddr *)&peer, peer->ss_len)) > -1)
-+
+  {
-+
+    if (count_out)
-+
+      *count_out = (unsigned int)res;
-+
+    return IO_SUCCESS;
-+
+  }
-+
-+
+  if (count_out)
-+
+    *count_out = 0;
-+
+  return is_blocked(errno) ? IO_BLOCKED : IO_FAILURE;
-+
+}
-+
-+
+/** Start a non-blocking connection.
-+
+ * @param[in] fd Disconnected file descriptor.
-+
+ * @param[in] sin Target address for connection.
-+
+ * @return IOResult code indicating status.
-+
+ */
-+
+IOResult os_connect_nonb(int fd, const struct irc_ssaddr *addr)
-+
+{
-+
+  int size;
-+
-+
+  size = sockaddr_from_irc(&addr, sin, fd);
-+
+  if (connect(fd, (struct sockaddr*) &addr, size))
-+
+    return (errno == EINPROGRESS) ? IO_BLOCKED : IO_FAILURE;
-+
+  return IO_SUCCESS;
-+
+}
-+
-+
+int
-+
+os_accept(int fd, struct irc_ssaddr *addr)
-+
+{
-+
+  int new_fd = 0;
-+
+  socklen_t addrlen = sizeof(struct irc_ssaddr);
-+
-+
+  new_fd = accept(fd, (struct sockaddr *)addr, &addrlen);
-+
+  if (new_fd < 0)
-+
+    return -1;
-+
-+
+#ifdef IPV6
-+
+  remove_ipv6_mapping(addr);
-+
+#else
-+
+  addr->ss_len = addrlen;
-+
+#endif
-+
+  setup_socket(new_fd);
-+
+  return new_fd;
-+
+}
-+
-+
+int
-+
+os_socket(int family, int sock_type, int proto)
-+
+{
-+
+  int fd;
-+
-+
+  fd = socket(family, sock_type, proto);
-+
+  if (fd < 0)
-+
+    return -1;
-+
+  setup_socket(fd);
-+
+  return fd;
-+
+}
-+
+/*
+ * report_error - report an error from an errno.
+ * Record error to log and also send a copy to all *LOCAL* opers online.
+/*
-–
+ * comm_checktimeouts() - check the socket timeouts
-–
+ *
-–
+ * All this routine does is call the given callback/cbdata, without closing
-–
+ * down the file descriptor. When close handlers have been implemented,
-–
+ * this will happen.
-–
+ */
-–
+void
-–
+comm_checktimeouts(void *notused)
-–
+{
-–
+  int i;
-–
+  fde_t *F;
-–
+  PF *hdl;
-–
+  void *data;
-–
-–
+  for (i = 0; i < FD_HASH_SIZE; i++)
-–
+    for (F = fd_hash[i]; F != NULL; F = fd_next_in_loop)
-–
+    {
-–
+      assert(F->flags.open);
-–
+      fd_next_in_loop = F->hnext;
-–
-–
+      /* check flush functions */
-–
+      if (F->flush_handler && F->flush_timeout > 0 &&
-–
+          F->flush_timeout < CurrentTime)
-–
+      {
-–
+        hdl = F->flush_handler;
-–
+        data = F->flush_data;
-–
+        comm_setflush(F, 0, NULL, NULL);
-–
+        hdl(F, data);
-–
+      }
-–
-–
+      /* check timeouts */
-–
+      if (F->timeout_handler && F->timeout > 0 &&
-–
+          F->timeout < CurrentTime)
-–
+      {
-–
+        /* Call timeout handler */
-–
+        hdl = F->timeout_handler;
-–
+        data = F->timeout_data;
-–
+        comm_settimeout(F, 0, NULL, NULL);
-–
+        hdl(F, data);
-–
+      }
-–
+    }
-–
+}
-–
-–
+/*
+ * void comm_connect_tcp(int fd, const char *host, unsigned short port,
+ *                       struct sockaddr *clocal, int socklen,
+ *                       CNCB *callback, void *data, int aftype, int timeout)
+  return comm_err_str[error];
-–
+/*
-–
+ * comm_open() - open a socket
-–
+ *
-–
+ * This is a highly highly cut down version of squid's comm_open() which
-–
+ * for the most part emulates socket(), *EXCEPT* it fails if we're about
-–
+ * to run out of file descriptors.
-–
+ */
-–
+int
-–
+comm_open(fde_t *F, int family, int sock_type, int proto, const char *note)
-–
+{
-–
+  int fd;
-–
-–
+  /* First, make sure we aren't going to run out of file descriptors */
-–
+  if (number_fd >= hard_fdlimit)
-–
+  {
-–
+    errno = ENFILE;
-–
+    return -1;
-–
+  }
-–
-–
+  /*
-–
+   * Next, we try to open the socket. We *should* drop the reserved FD
-–
+   * limit if/when we get an error, but we can deal with that later.
-–
+   * XXX !!! -- adrian
-–
+   */
-–
+  fd = socket(family, sock_type, proto);
-–
+  if (fd < 0)
-–
+    return -1; /* errno will be passed through, yay.. */
-–
-–
+  setup_socket(fd);
-–
-–
+  /* update things in our fd tracking */
-–
+  fd_open(F, fd, 1, note);
-–
+  return 0;
-–
+}
-–
-–
+/*
-–
+ * comm_accept() - accept an incoming connection
-–
+ *
-–
+ * This is a simple wrapper for accept() which enforces FD limits like
-–
+ * comm_open() does. Returned fd must be either closed or tagged with
-–
+ * fd_open (this function no longer does it).
-–
+ */
-–
+int
-–
+comm_accept(struct Listener *lptr, struct irc_ssaddr *pn)
-–
+{
-–
+  int newfd;
-–
+  socklen_t addrlen = sizeof(struct irc_ssaddr);
-–
-–
+  if (number_fd >= hard_fdlimit)
-–
+  {
-–
+    errno = ENFILE;
-–
+    return -1;
-–
+  }
-–
-–
+  /*
-–
+   * Next, do the accept(). if we get an error, we should drop the
-–
+   * reserved fd limit, but we can deal with that when comm_open()
-–
+   * also does it. XXX -- adrian
-–
+   */
-–
+  newfd = accept(lptr->fd.fd, (struct sockaddr *)pn, &addrlen);
-–
+  if (newfd < 0)
-–
+    return -1;
-–
-–
+#ifdef IPV6
-–
+  remove_ipv6_mapping(pn);
-–
+#else
-–
+  pn->ss_len = addrlen;
-–
+#endif
-–
-–
+  execute_callback(setup_socket_cb, newfd);
-–
-–
+  /* .. and return */
-–
+  return newfd;
-–
+}
-–
+/*
+ * remove_ipv6_mapping() - Removes IPv4-In-IPv6 mapping from an address
+ * OSes with IPv6 mapping listening on both

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines (old)
->
+Changed lines (new)

Comparing branches/newio/src/s_bsd.c (file contents): Revision 2391 by michael, Thu Jul 11 20:57:08 2013 UTC vs. Revision 2392 by michael, Sat Jul 13 22:13:28 2013 UTC

Diff Legend

Comparing branches/newio/src/s_bsd.c (file contents):
Revision 2391 by michael, Thu Jul 11 20:57:08 2013 UTC vs.
Revision 2392 by michael, Sat Jul 13 22:13:28 2013 UTC