Update mud

src/main.c

@@ -239,6 +239,7 @@ int main (int argc, char **argv)
     long port = 5000;
 
     char *bind_list = NULL;
+    char *bind_backup = NULL;
     long bind_port = 5000;
 
     char *dev = NULL;
@@ -262,6 +263,7 @@ int main (int argc, char **argv)
         { "host",           &host,           option_str    },
         { "port",           &port,           option_long   },
         { "bind",           &bind_list,      option_str    },
+        { "bind-backup",    &bind_backup,    option_str    },
         { "bind-port",      &bind_port,      option_long   },
         { "dev",            &dev,            option_str    },
         { "mtu",            &mtu,            option_long   },
@@ -357,69 +359,58 @@ int main (int argc, char **argv)
     if (time_tolerance > 0)
         mud_set_time_tolerance_sec(mud, time_tolerance);
 
-    if (host && port && bind_list) {
-        char tmp[1024];
-        char *name = &tmp[0];
-
-        size_t size = str_cpy(tmp, bind_list, sizeof(tmp)-1);
-
-        for (size_t i=0; i<size; i++) {
-            if (tmp[i]!=',')
-                continue;
-
-            tmp[i] = 0;
-
-            if (mud_peer(mud, name, host, port))
+    if (host && port) {
+        if (bind_backup) {
+            if (mud_peer(mud, bind_backup, host, port, 1)) {
+                perror("mud_peer (backup)");
                 return 1;
-
-            name = &tmp[i+1];
+            }
         }
 
-        if (name[0] && mud_peer(mud, name, host, port))
-            return 1;
+        if (bind_list) {
+            char tmp[1024];
+            char *name = &tmp[0];
+
+            str_cpy(tmp, bind_list, sizeof(tmp)-1);
+
+            while (*name) {
+                char *p = name;
+
+                while (*p && *p!=',')
+                    p++;
+
+                if (*p)
+                    *p++ = 0;
+
+                if (mud_peer(mud, name, host, port, 0)) {
+                    perror("mud_peer");
+                    return 1;
+                }
+
+                name = p;
+            }
+        }
     }
 
     int mud_fd = mud_get_fd(mud);
 
+    fd_set_nonblock(mud_fd);
+
     state_send(gt.state_fd, "INITIALIZED", tun_name);
 
     fd_set rfds;
     FD_ZERO(&rfds);
 
-    int started = 0;
-
-    struct {
-        unsigned char *buf;
-    } send, recv;
-
-    send.buf = malloc(2*mtu);
-    recv.buf = malloc(mtu);
-
-    size_t send_size = 0;
-    size_t send_limit = 0;
-    int send_tc = 0;
-    int send_next_tc = 0;
+    unsigned char buf[8*1024];
 
     while (!gt.quit) {
         FD_SET(tun_fd, &rfds);
+        FD_SET(mud_fd, &rfds);
 
         if (icmp_fd!=-1)
             FD_SET(icmp_fd, &rfds);
 
-        if (mud_can_pull(mud)) {
-            FD_SET(mud_fd, &rfds);
-        } else {
-            FD_CLR(mud_fd, &rfds);
-        }
-
-        struct timeval timeout = {
-            .tv_usec = 100000,
-        };
-
-        if (mud_can_push(mud) || send_size)
-            timeout.tv_usec = 1000;
-
-        if _0_(select(mud_fd+1, &rfds, NULL, NULL, &timeout)==-1) {
+        if _0_(select(mud_fd+1, &rfds, NULL, NULL, NULL)==-1) {
             if (errno==EINTR)
                 continue;
             perror("select");
@@ -427,7 +418,6 @@ int main (int argc, char **argv)
         }
 
         if (icmp_fd!=-1 && FD_ISSET(icmp_fd, &rfds)) {
-            uint8_t buf[1024];
             struct sockaddr_storage ss;
             socklen_t sl = sizeof(ss);
             ssize_t r = recvfrom(icmp_fd, buf, sizeof(buf), 0, (struct sockaddr *)&ss, &sl);
@@ -439,141 +429,97 @@ int main (int argc, char **argv)
                         int new_mtu = (data[6]<<8)|data[7];
                         if (new_mtu) {
                             gt_log("received MTU from ICMP: %i\n", new_mtu);
-                            mud_set_mtu(mud, new_mtu-50);
+                            mud_set_mtu(mud, new_mtu-50); // XXX
                         }
                     }
                 }
             }
         }
 
-        if (mud_is_up(mud)) {
-            if (!started) {
-                state_send(gt.state_fd, "STARTED", tun_name);
-                started = 1;
-            }
-        } else {
-            if (started) {
-                state_send(gt.state_fd, "STOPPED", tun_name);
-                started = 0;
-            }
-        }
-
         if (FD_ISSET(tun_fd, &rfds)) {
-            while (send_size<mtu) {
-                const ssize_t r = tun_read(tun_fd, send.buf+send_size, mtu);
+            size_t size = 0;
 
-                if (r<=0) {
-                    gt.quit |= !r;
+            while (sizeof(buf)-size>mtu) {
+                const ssize_t r = tun_read(tun_fd, &buf[size], sizeof(buf)-size);
+
+                if (r<=0)
                     break;
-                }
 
                 struct ip_common ic;
 
-                if (ip_get_common(&ic, send.buf+send_size, mtu) || ic.size!=r) {
-                    gt_log("packet dropped: malformed\n");
-                    continue;
-                }
+                if (ip_get_common(&ic, &buf[size], r) || ic.size!=r)
+                    break;
 
-                send_size += r;
-
-                if (send_size<=mtu) {
-                    send_limit = send_size;
-                    if ((ic.tc&0xFC)>(send_tc&0xFC))
-                        send_tc = ic.tc;
-                } else {
-                    if ((ic.tc&0xFC)>(send_next_tc&0xFC))
-                        send_next_tc = ic.tc;
-                }
-            }
-        }
-
-        if (send_limit) {
-            int r = mud_send(mud, send.buf, send_limit, send_tc);
-
-            if (r==send_limit) {
-                if (send_size>send_limit)
-                    memmove(send.buf, &send.buf[send_limit], send_size-send_limit);
-                send_size -= send_limit;
-                send_limit = send_size;
-                send_tc = send_next_tc;
-                send_next_tc = 0;
-            } else if (r==-1) {
-                if (errno==EMSGSIZE) {
-                    long new_mtu = mud_get_mtu(mud);
-                    if (new_mtu!=mtu) {
-                        size_t total = send_size;
-
-                        if (tun_set_mtu(tun_name, new_mtu)==-1) {
-                            perror("tun_set_mtu");
-                            gt.quit |= 1;
-                            break;
-                        }
-
-                        gt_log("MTU changed: %li\n", new_mtu);
-
-                        mtu = new_mtu;
-                        send_size = 0;
-                        send_limit = 0;
-                        send_tc = 0;
-                        send_next_tc = 0;
-
-                        while (send_size<total) {
-                            struct ip_common ic;
-
-                            if (ip_get_common(&ic, send.buf+send_size, mtu))
-                                break;
-
-                            send_size += ic.size;
-
-                            if (send_size<=mtu) {
-                                send_limit = send_size;
-                                if ((ic.tc&0xFC)>(send_tc&0xFC))
-                                    send_tc = ic.tc;
-                            } else {
-                                if ((ic.tc&0xFC)>(send_next_tc&0xFC))
-                                    send_next_tc = ic.tc;
-                            }
-                        }
-                    }
-                } else if (errno!=EAGAIN) {
-                    perror("mud_send");
-                }
-            }
-        }
-
-        if (mud_push(mud)==-1 && errno!=EAGAIN)
-            perror("mud_push");
-
-        if (FD_ISSET(mud_fd, &rfds)) {
-            if (mud_pull(mud)==-1 && errno!=EAGAIN)
-                perror("mud_pull");
-        }
-
-        while (!gt.quit) {
-            const int size = mud_recv(mud, recv.buf, mtu);
-
-            if (size<=0) {
-                if (size==-1 && errno!=EAGAIN)
-                    perror("mud_recv");
-                break;
+                size += r;
             }
 
             int p = 0;
 
             while (p<size) {
-                struct ip_common ic;
+                int tc = 0;
+                int q = p;
 
-                if (ip_get_common(&ic, recv.buf+p, size-p) || ic.size>size-p)
-                    break;
+                while (q<size) {
+                    struct ip_common ic;
 
-                const ssize_t r = tun_write(tun_fd, recv.buf+p, ic.size);
+                    if (ip_get_common(&ic, &buf[q], size-q) || ic.size>size-q) {
+                        size = q;
+                        break;
+                    }
 
-                if (r<=0) {
-                    gt.quit |= !r;
+                    if (q+ic.size>p+mtu)
+                        break;
+
+                    q += ic.size;
+
+                    if (tc<(ic.tc&0xFC))
+                        tc = ic.tc&0xFC;
+                }
+
+                int r = mud_send(mud, &buf[p], q-p, tc);
+
+                if (r==-1 && errno==EMSGSIZE) {
+                    int new_mtu = mud_get_mtu(mud);
+
+                    if (new_mtu!=mtu) {
+                        mtu = new_mtu;
+
+                        gt_log("MTU changed: %li\n", mtu);
+
+                        if (tun_set_mtu(tun_name, mtu)==-1)
+                            perror("tun_set_mtu");
+                    }
+                } else {
+                    if (r==-1 && errno!=EAGAIN)
+                        perror("mud_send");
+
+                    p = q;
+                }
+            }
+        }
+
+        if (FD_ISSET(mud_fd, &rfds)) {
+            while (1) {
+                const int size = mud_recv(mud, buf, sizeof(buf));
+
+                if (size<=0) {
+                    if (size==-1 && errno!=EAGAIN)
+                        perror("mud_recv");
                     break;
                 }
 
-                p += ic.size;
+                int p = 0;
+
+                while (p<size) {
+                    struct ip_common ic;
+
+                    if (ip_get_common(&ic, &buf[p], size-p) || ic.size>size-p)
+                        break;
+
+                    tun_write(tun_fd, &buf[p], ic.size);
+
+                    p += ic.size;
+                }
             }
         }
     }