From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sun, 8 Feb 2015 20:59:06 +0000 (+0100)
Subject: Unbreak pacing in tungre.
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ed84bfc7a5e30f49b35d9a864c6618cb58beb789;p=greproxy

Unbreak pacing in tungre.
---

diff --git a/tungre.cpp b/tungre.cpp
index ea736fb..55bd973 100644
--- a/tungre.cpp
+++ b/tungre.cpp
@@ -37,9 +37,11 @@ int main(int argc, char **argv)
 	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_pacer.possibly_adjust_tv(&tv);
+		int ret = select(1024, &fds, NULL, NULL, &tv);
 		if (ret == -1) {
 			perror("select");
 			continue;
@@ -51,5 +53,6 @@ int main(int argc, char **argv)
 		if (FD_ISSET(tun.fd(), &fds)) {
 			tun.read_packet(&gre_pacer);
 		}
+		tun_pacer.possibly_flush_packets();
 	}
 }