Changeset 484 for branches

Timestamp:

02/28/09 23:49:41 (3 years ago)

Author:

eagle

Message:

seems to work on WinXP now :)

Location:

branches/win/trunk

Files:

• configure (modified) (10 diffs)
• src/ocat.c (modified) (2 diffs)
• src/ocat.h (modified) (4 diffs)
• src/ocat_wintuntap.c (modified) (5 diffs)
• src/ocateth.c (modified) (2 diffs)
• src/ocattun.c (modified) (6 diffs)

branches/win/trunk/configure

@@ -1 +1 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for onioncat 0.1.10-480:481M.
+# Generated by GNU Autoconf 2.63 for onioncat 0.1.10-483M.
 #
 # Report bugs to <rahra@cypherpunk.at>.
@@ -597 +597 @@
 PACKAGE_NAME='onioncat'
 PACKAGE_TARNAME='onioncat'
-PACKAGE_VERSION='0.1.10-480:481M'
-PACKAGE_STRING='onioncat 0.1.10-480:481M'
+PACKAGE_VERSION='0.1.10-483M'
+PACKAGE_STRING='onioncat 0.1.10-483M'
 PACKAGE_BUGREPORT='rahra@cypherpunk.at'
 
@@ -1290 +1290 @@
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures onioncat 0.1.10-480:481M to adapt to many kinds of systems.
+\`configure' configures onioncat 0.1.10-483M to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1356 +1356 @@
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of onioncat 0.1.10-480:481M:";;
+     short | recursive ) echo "Configuration of onioncat 0.1.10-483M:";;
    esac
   cat <<\_ACEOF
@@ -1449 +1449 @@
 if $ac_init_version; then
   cat <<\_ACEOF
-onioncat configure 0.1.10-480:481M
+onioncat configure 0.1.10-483M
 generated by GNU Autoconf 2.63
 
@@ -1463 +1463 @@
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by onioncat $as_me 0.1.10-480:481M, which was
+It was created by onioncat $as_me 0.1.10-483M, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
@@ -2179 +2179 @@
 # Define the identity of the package.
  PACKAGE='onioncat'
- VERSION='0.1.10-480:481M'
+ VERSION='0.1.10-483M'
 
 
@@ -2326 +2326 @@
 
 cat >>confdefs.h <<\_ACEOF
-#define SVN_REVISION "480:481M"
+#define SVN_REVISION "483M"
 _ACEOF
 
@@ -5619 +5619 @@
 # values after options handling.
 ac_log="
-This file was extended by onioncat $as_me 0.1.10-480:481M, which was
+This file was extended by onioncat $as_me 0.1.10-483M, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
@@ -5682 +5682 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-onioncat config.status 0.1.10-480:481M
+onioncat config.status 0.1.10-483M
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

branches/win/trunk/src/ocat.c

@@ -169 +169 @@
    log_msg(LOG_NOTICE, "waiting for system cleanup...");
    // close tunnel interface
+#ifdef __CYGWIN__
+   (void) win_close_tun();
+#else
    log_debug("closing tunfd %d (and %d)", CNF(tunfd[0]), CNF(tunfd[1]));
    oe_close(CNF(tunfd[0]));
    if (CNF(tunfd[0]) != CNF(tunfd[1]))
       oe_close(CNF(tunfd[1]));
+#endif
 
    // close and delete all peers
@@ -373 +377 @@
 
 #ifndef WITHOUT_TUN
-#ifdef __CYGWIN__
-   if (win_open_tun(CNF(tunname), sizeof(CNF(tunname))) == -1)
-   {
-      log_msg(LOG_ALERT, "opening TAP driver failed. exiting");
+   // create TUN device
+   if ((CNF(tunfd[0]) = CNF(tunfd[1]) = tun_alloc(CNF(tunname), sizeof(CNF(tunname)), CNF(ocat_addr))) == -1)
+   {
+      log_msg(LOG_CRIT, "error opening TUN/TAP device");
       exit(1);
    }
-#else
-   // create TUN device
-   CNF(tunfd[0]) = CNF(tunfd[1]) = tun_alloc(CNF(tunname), CNF(ocat_addr));
-#endif
 #endif
 

branches/win/trunk/src/ocat.h

@@ -156 +156 @@
 //! Standard buffer size 1024 bytes
 #define SIZE_1K 1024
+#define SIZE_256 256
 
 #define DEQUEUER_WAKEUP 3
@@ -266 +267 @@
    char *tun_dev;
    //! tunnel interface name
-   char tunname[IFNAMSIZ];
+   char tunname[SIZE_256];
    int ipv4_enable;
    struct in_addr ocat_addr4;
@@ -501 +502 @@
 /* ocattun.c */
 #ifndef WITHOUT_TUN
-int tun_alloc(char *, struct in6_addr);
+int tun_alloc(char *, int, struct in6_addr);
 #endif
 
@@ -600 +601 @@
 /* ocat_wintuntap.c */
 int win_open_tun(char *, int);
+int win_close_tun(void);
 int win_read_tun(char *, int);
 int win_write_tun(const char *, int);

branches/win/trunk/src/ocat_wintuntap.c

@@ -135 +135 @@
 int win_open_tun(char *dev, int s)
 {
-   char deviceId[256], deviceName[256], tapPath[256];
+   char deviceId[SIZE_256], deviceName[SIZE_256], tapPath[SIZE_256];
    TapData_t *tapData = &tapData_;
    unsigned long len = 0;
@@ -183 +183 @@
    // % netsh interface ipv6 add route  fd87:d87e:eb43::/48 "LAN-Verbindung 2"
 
-   strlcpy(dev, deviceId, s);
+   strlcpy(dev, deviceName, s);
    return 0;
 }
@@ -202 +202 @@
 int win_write_tun(const char *jb, int len)
 {
-    TapData_t *tapData = &tapData_;
-    DWORD written, err;
-    BOOL result;
-    
-    result = GetOverlappedResult(tapData->fd, &tapData->write_overlapped,
-                                  &written, FALSE);
-
-    if (!result && GetLastError() == ERROR_IO_INCOMPLETE)
-        WaitForSingleObject(tapData->write_event, INFINITE);
-
-    if (!WriteFile(tapData->fd, jb, len, &written, &tapData->write_overlapped))
-    {
+   TapData_t *tapData = &tapData_;
+   DWORD written, err;
+    
+   log_debug("WriteFile %d bytes", len);
+   if (!GetOverlappedResult(tapData->fd, &tapData->write_overlapped, &written, FALSE))
+   {
+      err = GetLastError();
+      log_debug("GetOverlappedResult failed. Error = %ld", err);
+      if (err == ERROR_IO_INCOMPLETE)
+      {
+         log_debug("IO_COMPLETE, WaitForSingleObject");
+         if ((err = WaitForSingleObject(tapData->write_event, INFINITE)) == WAIT_FAILED)
+            log_msg(LOG_ERR, "WaitForSingleObject failed. Error = %ld", GetLastError());
+         else
+            log_debug("WaitForSingleObject returen %08lx", err);
+      }
+   }
+
+   if (!WriteFile(tapData->fd, jb, len, &written, &tapData->write_overlapped))
+   {
       if ((err = GetLastError()) != ERROR_IO_PENDING)
       {   
-       fprintf(stderr, "error writing %ld \n", err);
-       return -1;
+         log_msg(LOG_ERR, "error writing %ld", err);
+         return -1;
       }
       else
-         fprintf(stderr, "io pending\n");
-    }
-
-    return written;
-    
+         log_debug("IO_PENDING");
+   }
+
+   return written;
 }
 
@@ -234 +241 @@
    DWORD len, err;
     
-   log_debug("ReadFile");
+   log_debug("ReadFile max. %d bytes", n);
    if (!ReadFile(tapData->fd, buf, n, &len, &tapData->read_overlapped))
    {
@@ -240 +247 @@
       if ((err = GetLastError()) == ERROR_IO_PENDING)
       {
-         log_debug("ReadFile pending...");
-
-         if ((err = WaitForSingleObject(tapData->read_event, INFINITE)) == WAIT_FAILED)
-            log_msg(LOG_ERR, "WaitForSingleObject failed. Error = %ld", GetLastError());
-         else
-            log_debug("WaitForSingleObject returen %08lx", err);
+         for (err = WAIT_TIMEOUT; err == WAIT_TIMEOUT;)
+         {
+            log_debug("ReadFile pending...");
+            if ((err = WaitForSingleObject(tapData->read_event, SELECT_TIMEOUT * 1000)) == WAIT_FAILED)
+               log_msg(LOG_ERR, "WaitForSingleObject failed. Error = %ld", GetLastError());
+            log_debug("WaitForSingleObject returned %08lx", err);
+         }
 
          if (!GetOverlappedResult(tapData->fd, &tapData->read_overlapped, &len, FALSE))

branches/win/trunk/src/ocateth.c

@@ -282 +282 @@
    free_ckbuf(ckb);
 
+#ifdef __CYGWIN__
+   log_debug("writing %d bytes ndp solicitation to TAP driver", sizeof(buf) - 4);
+   // FIXME: there's no error checking
+   win_write_tun(buf + 4, sizeof(buf) - 4);
+#else
    log_debug("writing %d bytes ndp solicitation to tunfd %d", sizeof(buf), CNF(tunfd[1]));
    if (write(CNF(tunfd[1]), buf, sizeof(buf)) < sizeof(buf))
       log_msg(LOG_ERR, "short write to tun fd %d", CNF(tunfd[1]));
+#endif
 
    return 0;
@@ -377 +383 @@
    free_ckbuf(ckb);
 
+#ifdef __CYGWIN__
+   log_debug("writing %d bytes to TAP driver", rlen);
+   // FIXME: there's no error checking
+   win_write_tun(buf + 4, rlen - 4);
+#else
    log_debug("writing %d bytes to tunfd %d", rlen, CNF(tunfd[1]));
    if (write(CNF(tunfd[1]), buf, rlen) < rlen)
       log_msg(LOG_ERR, "short write");
+#endif
 
    return 0;

branches/win/trunk/src/ocattun.c

@@ -1 @@
-/* Copyright 2008 Bernhard R. Fischer, Daniel Haslinger.
+/* Copyright 2008-2009 Bernhard R. Fischer.
  *
  * This file is part of OnionCat.
@@ -33 +33 @@
 #define IFCBUF 1024
 
-int tun_alloc(char *dev, struct in6_addr addr)
+int tun_alloc(char *dev, int dev_s, struct in6_addr addr)
 {
    struct ifreq ifr;
@@ -42 +42 @@
    struct in_addr netmask = {CNF(ocat_addr4_mask)};
 
+   inet_ntop(AF_INET6, &addr, astr, INET6_ADDRSTRLEN);
+   inet_ntop(AF_INET, &CNF(ocat_addr4), astr4, INET_ADDRSTRLEN);
+
+#ifdef __CYGWIN__
+   if ((fd = win_open_tun(dev, dev_s)) == -1)
+      return -1;
+
+      // set IPv6 address
+      // 181    // % netsh interface ipv6 add address "LAN-Verbindung 2" fd87:d87e:eb43:0:84:2100:0:8421
+      // 182    // add route
+      // 183    // % netsh interface ipv6 add route  fd87:d87e:eb43::/48 "LAN-Verbindung 2"
+
+   snprintf(buf, sizeof(buf), "netsh interface ipv6 add address \"%s\" %s", dev, astr);
+   log_debug("setting IP on tun: \"%s\"", buf);
+   if (system(buf) == -1)
+      log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
+
+   snprintf(buf, sizeof(buf), "netsh interface ipv6 add route %s/%d \"%s\"", astr, TOR_PREFIX_LEN, dev);
+   log_debug("setting IP routing: \"%s\"", buf);
+   if (system(buf) == -1)
+      log_msg(LOG_ERR, "could not exec \"%s\": \"%s\"", buf, strerror(errno));
+
+   return 0;
+#endif
+
         log_debug("opening tun \"%s\"", tun_dev_);
    if ((fd = open(tun_dev_, O_RDWR)) < 0)
-      log_msg(LOG_EMERG, "could not open tundev %s: %s", tun_dev_, strerror(errno)), exit(1);
-   inet_ntop(AF_INET6, &addr, astr, INET6_ADDRSTRLEN);
-   inet_ntop(AF_INET, &CNF(ocat_addr4), astr4, INET_ADDRSTRLEN);
+   {
+      log_msg(LOG_EMERG, "could not open tundev %s: %s", tun_dev_, strerror(errno));
+      return -1;
+   }
 
 #ifdef __linux__
@@ -135 +161 @@
       log_msg(LOG_EMERG, "could not ioctl:TUNSIFHEAD: %s", strerror(errno)), exit(1);
 
-#endif
+#endif /* __linux__ */
 
 
@@ -176 +202 @@
    if (CNF(use_tap))
    {
-       snprintf(buf, sizeof(buf), "ifconfig %s up", dev);
+      snprintf(buf, sizeof(buf), "ifconfig %s up", dev);
       log_msg(LOG_INFO, "bringing up TAP device \"%s\"", buf);
       if (system(buf) == -1)
@@ -185 +211 @@
 }              
  
-#endif
-
+#endif /* WITHOUT_TUN */
+