--- gvpe/src/vpn_tcp.C	2007/12/01 23:35:31	1.20
+++ gvpe/src/vpn_tcp.C	2007/12/04 17:17:20	1.23
@@ -59,18 +59,21 @@
   }
 };
 
-struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
+struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo>
+{
   void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
 
   tcp_si_map ()
-  : cleaner(this, &tcp_si_map::cleaner_cb)
   {
+    cleaner.set<tcp_si_map, &tcp_si_map::cleaner_cb> (this);
     cleaner.start (::conf.keepalive / 2, ::conf.keepalive / 2);
   }
 
 } tcp_si;
 
-struct tcp_connection : ev::io {
+struct tcp_connection : ev::io
+{
+  int tos;
   tstamp last_activity;
   const sockinfo si;
   vpn &v;
@@ -411,7 +414,11 @@
           // how this maps to the underlying tcp packets we don't know
           // and we don't care. at least we tried ;)
 #if defined(SOL_IP) && defined(IP_TOS)
-          setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
+          if (tos != this->tos)
+            {
+              this->tos = tos;
+              setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
+            }
 #endif
 
           w_pkt = pkt;
@@ -440,7 +447,8 @@
   if (fd >= 0)
     {
       close (fd);
-      fd = -1;
+      tos = -1;
+      fd  = -1;
     }
 
   delete r_pkt; r_pkt = 0;
@@ -453,11 +461,14 @@
 }
 
 tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
-: v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
+: v(v_), si(si_)
 {
+  set<tcp_connection, &tcp_connection::tcpv4_ev> (this);
+
   last_activity = ev_now ();
   r_pkt = 0;
   w_pkt = 0;
+  tos = -1;
   fd = fd_;
 #if ENABLE_HTTP_PROXY
   proxy_req = 0;