--- gvpe/src/vpn_tcp.C	2007/11/13 02:12:08	1.19
+++ gvpe/src/vpn_tcp.C	2007/12/02 00:45:42	1.22
@@ -59,7 +59,8 @@
   }
 };
 
-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 ()
@@ -70,7 +71,9 @@
 
 } tcp_si;
 
-struct tcp_connection : ev::io {
+struct tcp_connection : ev::io
+{
+  int tos;
   tstamp last_activity;
   const sockinfo si;
   vpn &v;
@@ -106,7 +109,7 @@
 
 void tcp_si_map::cleaner_cb (ev::timer &w, int revents)
 {
-  tstamp to = ev::ev_now () - ::conf.keepalive - 30 - 60;
+  tstamp to = ev_now () - ::conf.keepalive - 30 - 60;
 
   for (iterator i = begin (); i != end(); )
     if (i->second->last_activity >= to)
@@ -203,7 +206,7 @@
 void
 tcp_connection::tcpv4_ev (ev::io &w, int revents)
 {
-  last_activity = ev::ev_now ();
+  last_activity = ev_now ();
 
   if (revents & EV_WRITE)
     {
@@ -348,7 +351,7 @@
 bool
 tcp_connection::send_packet (vpn_packet *pkt, int tos)
 {
-  last_activity = ev::ev_now ();
+  last_activity = ev_now ();
 
   if (state == IDLE)
     {
@@ -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;
@@ -455,9 +463,10 @@
 tcp_connection::tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
 : v(v_), si(si_), ev::io(this, &tcp_connection::tcpv4_ev)
 {
-  last_activity = ev::ev_now ();
+  last_activity = ev_now ();
   r_pkt = 0;
   w_pkt = 0;
+  tos = -1;
   fd = fd_;
 #if ENABLE_HTTP_PROXY
   proxy_req = 0;