--- gvpe/src/vpn_tcp.C	2003/04/07 01:28:56	1.5
+++ gvpe/src/vpn_tcp.C	2003/10/16 02:41:21	1.10
@@ -1,5 +1,6 @@
 /*
     vpn_tcp.C -- handle the tcp part of the protocol.
+    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,19 +30,16 @@
 
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/poll.h>
 #include <sys/wait.h>
-#include <netinet/in.h>
 #include <sys/uio.h>
-#include <arpa/inet.h>
 #include <errno.h>
 #include <time.h>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include <map>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/poll.h>
+
+#include "netcompat.h"
 
 #include "vpn.h"
 
@@ -171,9 +169,10 @@
       u16 plen = htons (w_pkt->len);
 
       iovec vec[2];
-      vec[0].iov_base = ((u8 *)&plen) + w_ofs;
+      //TODO: char* is the right type? hardly...
+      vec[0].iov_base = (char *)((u8 *)&plen) + w_ofs;
       vec[0].iov_len = 2 - w_ofs;
-      vec[1].iov_base = &((*w_pkt)[0]);
+      vec[1].iov_base = (char *)&((*w_pkt)[0]);
       vec[1].iov_len = w_len - 2;
 
       len = writev (fd, vec, 2);
@@ -322,7 +321,7 @@
 
           if (i < 12)
             {
-              slog (L_ERR, _("%s: unable to do proxy-forwarding, short response"),
+              slog (L_ERR, _("(%s): unable to do proxy-forwarding, short response"),
                     (const char *)si);
               error ();
             }
@@ -330,7 +329,7 @@
                    || r[5] != '1' // http-major
                    || r[9] != '2') // response
             {
-              slog (L_ERR, _("%s: malformed or unexpected proxy response (%.12s)"),
+              slog (L_ERR, _("(%s): malformed or unexpected proxy response (%.12s)"),
                     (const char *)si, r);
               error ();
             }
@@ -403,7 +402,9 @@
         {
           // 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);
+#endif
 
           w_pkt = pkt;
           w_ofs = 0;