Changes in / [709c3bc:21477e9] in code

File:

• icbd.c (modified) (7 diffs)

icbd.c

@@ -56 +56 @@
 void getpeerinfo(struct icb_session *);
 void icbd_accept(int, short, void *);
-void icbd_paused(int, short, void *);
 void icbd_drop(struct icb_session *, char *);
 void icbd_ioerr(struct bufferevent *, short, void *);
@@ -72 +71 @@
 RB_GENERATE(icbd_sessions, icb_session, node, icbd_session_cmp);
 
-struct icbd_listener {
-        struct event ev, pause;
-};
-
 int
 main(int argc, char *argv[])
@@ -151 +146 @@
         for (ch = 0; ch < argc; ch++) {
                 struct addrinfo hints, *res, *res0;
-                struct icbd_listener *l;
+                struct event *ev;
                 char *addr, *port;
                 int error, s, on = 1;
@@ -201 +196 @@
                         (void)listen(s, TCP_BACKLOG);
 
-                        if ((l = calloc(1, sizeof *l)) == NULL)
+                        if ((ev = calloc(1, sizeof *ev)) == NULL)
                                 err(EX_UNAVAILABLE, NULL);
-                        event_set(&l->ev, s, EV_READ | EV_PERSIST, icbd_accept, l);
-                        if (event_add(&l->ev, NULL) < 0) {
+                        event_set(ev, s, EV_READ | EV_PERSIST, icbd_accept, ev);
+                        if (event_add(ev, NULL) < 0) {
                                 syslog(LOG_ERR, "event_add: %m");
                                 return (EX_UNAVAILABLE);
                         }
-                        evtimer_set(&l->pause, icbd_paused, l);
 
                         nsocks++;
@@ -261 +255 @@
 void
 icbd_accept(int fd, short event __attribute__((__unused__)),
-    void *arg)
-{
-        struct icbd_listener *l = arg;
+    void *arg __attribute__((__unused__)))
+{
         struct sockaddr_storage ss;
-        struct timeval p = { 1, 0 };
         struct icb_session *is;
         socklen_t ss_len = sizeof ss;
@@ -271 +263 @@
 
         ss.ss_len = ss_len;
-        s = accept(fd, (struct sockaddr *)&ss, &ss_len);
-        if (s == -1) {
-                switch (errno) {
-                case EINTR:
-                case EWOULDBLOCK:
-                case ECONNABORTED:
-                        return;
-                case EMFILE:
-                case ENFILE:
-                        event_del(&l->ev);
-                        evtimer_add(&l->pause, &p);
-                        return;
-                default:
-                        syslog(LOG_ERR, "accept: %m");
-                        return;
-                }
-        }
-
+        if ((s = accept(fd, (struct sockaddr *)&ss, &ss_len)) < 0) {
+                syslog(LOG_ERR, "accept: %m");
+                return;
+        }
         if (ss.ss_family == AF_INET)
                 if (setsockopt(s, IPPROTO_IP, IP_TOS, &tos, sizeof tos) < 0)
@@ -322 +300 @@
         /* start icb conversation */
         icb_start(is);
-}
-
-void
-icbd_paused(int fd __attribute__((__unused__)),
-        short events __attribute__((__unused__)), void *arg)
-{
-        struct icbd_listener *l = arg;
-        event_add(&l->ev, NULL);
 }