Fix multi-timeouts also in tungre.

[greproxy] / tungre.cpp

diff --git a/tungre.cpp b/tungre.cpp
index b9ad8f143b743b9e021422fbadf3efdf00001003..fb39982e9f8c216016b9ca2e4784718812497167 100644 (file)
--- a/tungre.cpp
+++ b/tungre.cpp
@@ -9,6 +9,7 @@
 #include "reorderer.h"
 #include "tunprotocol.h"
 #include "rsdecoder.h"
+#include "pacer.h"
 
 using namespace std;
 
@@ -26,17 +27,22 @@ int main(int argc, char **argv)
        in6_addr myaddr = get_addr(argv[1]);
        in6_addr remoteaddr = get_addr(argv[2]);
        GREProtocol gre(myaddr, remoteaddr);
+       Pacer gre_pacer(&gre, 40000, 6);
        TUNProtocol tun("tungre");
 
-       Reorderer tun_reorderer(&tun);
+       Pacer tun_pacer(&tun, 40000, 6);
+       Reorderer tun_reorderer(&tun_pacer);
        RSDecoder tun_decoder(&tun_reorderer);
 
        fd_set fds;
        FD_ZERO(&fds);
        for ( ;; ) {
+               timeval tv = { 1, 0 };
                FD_SET(gre.fd(), &fds);
                FD_SET(tun.fd(), &fds);
-               int ret = select(1024, &fds, NULL, NULL, NULL);
+               tun_reorderer.possibly_adjust_tv(&tv);
+               tun_pacer.possibly_adjust_tv(&tv);
+               int ret = select(1024, &fds, NULL, NULL, &tv);
                if (ret == -1) {
                        perror("select");
                        continue;
@@ -46,7 +52,8 @@ int main(int argc, char **argv)
                        gre.read_packet(&tun_decoder);
                }
                if (FD_ISSET(tun.fd(), &fds)) {
-                       tun.read_packet(&gre);
+                       tun.read_packet(&gre_pacer);
                }
+               tun_pacer.possibly_flush_packets();
        }
 }