Make tor build on windows again. More work still needed

svn:r1247

diff --git a/Win32Build/or/or.dsp b/Win32Build/or/or.dsp
index 77bbf8916bd5518bc371626e8deda9e1d45461e7..7378ac7d8a3ba4b5dc8f96a45afe2d90dc1faa5c 100644 (file)
--- a/Win32Build/or/or.dsp
+++ b/Win32Build/or/or.dsp
@@ -74,7 +74,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"d:\openssl\lib\vc"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib libeay32.lib ssleay32.lib /nologo /subsystem:console /debug /machine:I386 /out:"Debug/tor.exe" /pdbtype:sept /libpath:"d:\openssl\lib\vc"\r
 \r
 !ENDIF \r
 \r
@@ -111,19 +111,15 @@ SOURCE=..\..\src\or\connection.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\or\connection_ap.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\src\or\connection_edge.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\or\connection_exit.c\r
+SOURCE=..\..\src\or\connection_or.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\or\connection_or.c\r
+SOURCE=..\..\src\or\cpuworker.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -135,6 +131,10 @@ SOURCE=..\..\src\or\directory.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\or\dirserv.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\or\dns.c\r
 # End Source File\r
 # Begin Source File\r
@@ -155,7 +155,11 @@ SOURCE=..\..\src\or\onion.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\src\or\routers.c\r
+SOURCE=..\..\src\or\router.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\src\or\routerlist.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -163,6 +167,10 @@ SOURCE=..\..\src\or\tor_main.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\tortls.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\common\util.c\r
 # End Source File\r
 # End Group\r
@@ -203,6 +211,10 @@ SOURCE=..\..\src\common\torint.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\src\common\tortls.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\src\or\tree.h\r
 # End Source File\r
 # Begin Source File\r

diff --git a/Win32Build/tor/tor.ncb b/Win32Build/tor/tor.ncb
index 535305ac99a72d848c7998344902ca674d46b893..fadbcf1e5058f360893f04ab0c00d52a26c2f873 100644 (file)
Binary files a/Win32Build/tor/tor.ncb and b/Win32Build/tor/tor.ncb differ

diff --git a/Win32Build/tor/tor.opt b/Win32Build/tor/tor.opt
index 8ae08d42887fefb60b0496e21633cdd1c0ff4324..0b4de68766b9a5a268c1e2595e391d73055cfd77 100644 (file)
Binary files a/Win32Build/tor/tor.opt and b/Win32Build/tor/tor.opt differ

diff --git a/src/common/fakepoll.c b/src/common/fakepoll.c
index 4465b5101e7c6f9c1e62e7c135852852d6e25f52..8b9242e05061eb119276de9ef85cb57193436232 100644 (file)
--- a/src/common/fakepoll.c
+++ b/src/common/fakepoll.c
@@ -32,7 +32,7 @@
 int
 tor_poll(struct pollfd *ufds, unsigned int nfds, int timeout)
 {
-        int idx, maxfd, fd;
+        unsigned int idx, maxfd, fd;
         int r;
 #ifdef MS_WINDOWS
         int any_fds_set = 0;

diff --git a/src/common/log.c b/src/common/log.c
index 947029079abb279a0448d21c6270dd48ac858900..77e53449fe3acf662bbf0bcfe24856d35c3dd755 100644 (file)
--- a/src/common/log.c
+++ b/src/common/log.c
@@ -3,6 +3,9 @@
 /* $Id$ */
 
 #include "../or/or.h"
+#ifdef MS_WINDOWS
+#define vsnprintf _vsnprintf
+#endif
 
 struct logfile_t;
 typedef struct logfile_t {
@@ -35,7 +38,7 @@ static INLINE void format_msg(char *buf, size_t buf_len,
 {
   time_t t;
   struct timeval now;
-  int n;
+  size_t n;
 
   buf_len -= 2; /* subtract 2 characters so we have room for \n\0 */
 

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 860fb1043833df8c1ffcb69cf1c6e56f5dd4ca7c..1531ea211e224e08bb35d6225c120135129574ff 100644 (file)
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -493,7 +493,7 @@ tor_tls_get_peer_cert_nickname(tor_tls *tls, char *buf, int buflen)
   lenout = X509_NAME_get_text_by_NID(name, nid, buf, buflen);
   if (lenout == -1)
     goto error;
-  if (strspn(buf, LEGAL_NICKNAME_CHARACTERS) != lenout) {
+  if (((int)strspn(buf, LEGAL_NICKNAME_CHARACTERS)) < lenout) {
     log_fn(LOG_WARN, "Peer certificate nickname has illegal characters.");
     goto error;
   }

diff --git a/src/common/util.c b/src/common/util.c
index 7cbbca4778aeb29b88c65f3f7b176e91d6b84fde..3c629561327f2aa1c1600c393ed377672476286d 100644 (file)
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -283,7 +283,7 @@ time_t tor_timegm (struct tm *tm) {
 /* a wrapper for write(2) that makes sure to write all count bytes.
  * Only use if fd is a blocking fd. */
 int write_all(int fd, const char *buf, size_t count) {
-  int written = 0;
+  size_t written = 0;
   int result;
 
   while(written != count) {
@@ -298,7 +298,7 @@ int write_all(int fd, const char *buf, size_t count) {
 /* a wrapper for read(2) that makes sure to read all count bytes.
  * Only use if fd is a blocking fd. */
 int read_all(int fd, char *buf, size_t count) {
-  int numread = 0;
+  size_t numread = 0;
   int result;
 
   while(numread != count) {
@@ -507,6 +507,7 @@ file_status_t file_status(const char *fname)
    0.  Else returns -1. */
 int check_private_dir(const char *dirname, int create)
 {
+  int r;
   struct stat st;
   if (stat(dirname, &st)) {
     if (errno != ENOENT) {
@@ -519,7 +520,12 @@ int check_private_dir(const char *dirname, int create)
       return -1;
     }
     log(LOG_INFO, "Creating directory %s", dirname);
-    if (mkdir(dirname, 0700)) {
+#ifdef MS_WINDOWS
+       r = mkdir(dirname);
+#else
+       r = mkdir(dirname, 0700);
+#endif
+    if (r) {
       log(LOG_WARN, "Error creating directory %s: %s", dirname,
           strerror(errno));
       return -1;
@@ -531,6 +537,7 @@ int check_private_dir(const char *dirname, int create)
     log(LOG_WARN, "%s is not a directory", dirname);
     return -1;
   }
+#ifndef MS_WINDOWS
   if (st.st_uid != getuid()) {
     log(LOG_WARN, "%s is not owned by this UID (%d)", dirname, (int)getuid());
     return -1;
@@ -545,6 +552,7 @@ int check_private_dir(const char *dirname, int create)
       return 0;
     }
   }
+#endif
   return 0;
 }
 
@@ -787,7 +795,7 @@ void finish_daemon(void)
 }
 #else
 /* defined(MS_WINDOWS) */
-void start_daemon(void) {}
+void start_daemon(char *cp) {}
 void finish_daemon(void) {}
 #endif
 
@@ -855,3 +863,22 @@ int switch_id(char *user, char *group) {
   return -1;
 }
 
+int tor_inet_aton(const char *c, struct in_addr* addr)
+{
+#ifndef MS_WINDOWS
+  /* XXXX WWWW Should be HAVE_INET_ATON */
+  return inet_aton(c, addr);
+#else
+  uint32_t r;
+  assert(c && addr);
+  if (strcmp(c, "255.255.255.255") == 0) {
+       addr->s_addr = 0xFFFFFFFFu;
+       return 1;
+  }
+  r = inet_addr(c);
+  if (r == INADDR_NONE)
+       return 0;
+  addr->s_addr = r;
+  return 1;
+#endif
+}
\ No newline at end of file

diff --git a/src/common/util.h b/src/common/util.h
index 850b9015ac061eae20015f2432e16c380fd36bbf..02cde56046d7a4f544d54ae2deb3671a36a96a35 100644 (file)
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -102,6 +102,9 @@ void finish_daemon(void);
 void write_pidfile(char *filename);
 int switch_id(char *user, char *group);
 
+struct in_addr;
+int tor_inet_aton(const char *cp, struct in_addr *addr);
+
 /* For stupid historical reasons, windows sockets have an independent set of
  * errnos which they use as the fancy strikes them.
  */

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 55a4bced99334571d1b74606ab2022f06df2c4d5..1ddf9d349dce80d93e0242a502758a67dabe465b 100644 (file)
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -433,7 +433,7 @@ int fetch_from_buf_socks(buf_t *buf, socks_request_t *req) {
           log_fn(LOG_WARN,"socks5: offered methods don't include 'no auth'. Rejecting.");
           req->replylen = 2; /* 2 bytes of response */
           req->reply[0] = 5; /* socks5 reply */
-          req->reply[1] = 0xFF; /* reject all methods */
+          req->reply[1] = '\xFF'; /* reject all methods */
           return -1;
         }
         buf_remove_from_front(buf,2+nummethods);/* remove packet from buf */

diff --git a/src/or/circuit.c b/src/or/circuit.c
index 395550517921f4bec0554bbd56b2869431fc75ca..e0e7aa607c8599da3f9c44d30a9195c2a7650777 100644 (file)
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -6,7 +6,7 @@
 
 extern or_options_t options; /* command-line and config-file options */
 
-static int relay_crypt(circuit_t *circ, cell_t *cell, char cell_direction,
+static int relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,
                 crypt_path_t **layer_hint, char *recognized);
 static connection_t *relay_lookup_conn(circuit_t *circ, cell_t *cell, int cell_direction);
 static void circuit_free_cpath_node(crypt_path_t *victim);
@@ -488,7 +488,7 @@ int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ,
 }
 
 /* wrap this into receive_relay_cell one day */
-static int relay_crypt(circuit_t *circ, cell_t *cell, char cell_direction,
+static int relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,
                        crypt_path_t **layer_hint, char *recognized) {
   crypt_path_t *thishop;
   relay_header_t rh;

diff --git a/src/or/connection.c b/src/or/connection.c
index 7dc177d4dce41effb8f4de9f7e16ea58c3065d26..1c7e3cf219b4c41a4b3121a8a197c0e767920132 100644 (file)
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -258,7 +258,7 @@ int connection_create_listener(char *bindaddress, uint16_t bindport, int type) {
     return -1;
   }
 
-  setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
+  setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void*) &one, sizeof(one));
 
   if(bind(s,(struct sockaddr *)&bindaddr,sizeof(bindaddr)) < 0) {
     log_fn(LOG_WARN,"Could not bind to port %u: %s",bindport,strerror(errno));
@@ -418,21 +418,24 @@ int retry_all_connections(void) {
 
   if(options.ORPort) {
     listener_close_if_present(CONN_TYPE_OR_LISTENER);
-    if(connection_create_listener(options.ORBindAddress, options.ORPort,
+    if(connection_create_listener(options.ORBindAddress, 
+                                         (uint16_t) options.ORPort,
                                   CONN_TYPE_OR_LISTENER) < 0)
       return -1;
   }
 
   if(options.DirPort) {
     listener_close_if_present(CONN_TYPE_DIR_LISTENER);
-    if(connection_create_listener(options.DirBindAddress, options.DirPort,
+    if(connection_create_listener(options.DirBindAddress, 
+                                         (uint16_t) options.DirPort,
                                   CONN_TYPE_DIR_LISTENER) < 0)
       return -1;
   }
 
   if(options.SocksPort) {
     listener_close_if_present(CONN_TYPE_AP_LISTENER);
-    if(connection_create_listener(options.SocksBindAddress, options.SocksPort,
+    if(connection_create_listener(options.SocksBindAddress, 
+                                         (uint16_t) options.SocksPort,
                                   CONN_TYPE_AP_LISTENER) < 0)
       return -1;
   }

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index fb4b4242789316d8b27239f4d157417e00e10f1d..aa861be847b6b0af346dfa460fb79c7c6034bd5c 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1003,7 +1003,7 @@ static uint32_t client_dns_lookup_entry(const char *address)
 
   assert(address);
 
-  if (inet_aton(address, &in)) {
+  if (tor_inet_aton(address, &in)) {
     log_fn(LOG_DEBUG, "Using static address %s (%08lX)", address,
            (unsigned long)ntohl(in.s_addr));
     return ntohl(in.s_addr);
@@ -1039,7 +1039,7 @@ static void client_dns_set_entry(const char *address, uint32_t val)
   assert(address);
   assert(val);
 
-  if (inet_aton(address, &in))
+  if (tor_inet_aton(address, &in))
     return;
   search.address = (char*) address;
   now = time(NULL);

diff --git a/src/or/or.h b/src/or/or.h
index 47a3474815e59116a6817f0b6b52c6244141dfea..383fc979942ef0e6d4e6a7626ff3acdfa3df46ee 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -85,6 +85,7 @@
 #ifdef MS_WINDOWS
 #include <io.h>
 #include <process.h>
+#include <direct.h>
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #define snprintf _snprintf
@@ -349,7 +350,7 @@ struct connection_t {
                           * This is always in the range 0..1<<15-1.*/
 
   /* bandwidth and receiver_bucket only used by ORs in OPEN state: */
-  uint32_t bandwidth; /* connection bandwidth. */
+  int bandwidth; /* connection bandwidth. */
   int receiver_bucket; /* when this hits 0, stop receiving. Every second we
                         * add 'bandwidth' to this, capping it at 10*bandwidth.
                         */

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index f47d8295828137a7f08f9201ae4271f2ec205e05..4ade31c6f26705c49a04fbe5be77cd138d49a171 100644 (file)
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -541,6 +541,36 @@ int router_exit_policy_rejects_all(routerinfo_t *router) {
     == ADDR_POLICY_REJECTED;
 }
 
+static time_t parse_time(const char *cp)
+{
+  struct tm st_tm;
+  /* XXXX WWWW should be HAVE_STRPTIME */
+#ifndef MS_WINDOWS
+  if (!strptime(cp, "%Y-%m-%d %H:%M:%S", &st_tm)) {
+    log_fn(LOG_WARN, "Published time was unparseable"); return 0;
+  }
+#else 
+  unsigned int year=0, month=0, day=0, hour=100, minute=100, second=100;
+  if (scanf("%u-%u-%u %u:%u:%u", cp, &year, &month, 
+               &day, &hour, &minute, &second) < 6) {
+       log_fn(LOG_WARN, "Published time was unparseable"); return 0;
+  }
+  if (year < 2000 || month < 1 || month > 12 || day < 1 || day > 31 ||
+         hour > 24 || minute > 61 || second > 62) {
+       log_fn(LOG_WARN, "Published time was nonsensical"); return 0;
+  }
+  st_tm.tm_year = year;
+  st_tm.tm_mon = month;
+  st_tm.tm_mday = day;
+  st_tm.tm_hour = hour;
+  st_tm.tm_min = minute;
+  st_tm.tm_sec = second;
+#endif
+  return tor_timegm(&st_tm);
+
+}
+
+
 /* Helper function: parse a directory from 's' and, when done, store the
  * resulting routerlist in *dest, freeing the old value if necessary.
  * If pkey is provided, we check the directory signature with pkey.
@@ -555,7 +585,6 @@ router_get_routerlist_from_directory_impl(const char *str,
   char signed_digest[128];
   routerlist_t *new_dir = NULL;
   char *versions = NULL;
-  struct tm published;
   time_t published_on;
   char *good_nickname_lst[1024];
   int n_good_nicknames = 0;
@@ -604,10 +633,9 @@ router_get_routerlist_from_directory_impl(const char *str,
   }
   assert(tok->n_args == 1);
   
-  if (!strptime(tok->args[0], "%Y-%m-%d %H:%M:%S", &published)) {
-    log_fn(LOG_WARN, "Published time was unparseable"); goto err;
+  if (!(published_on = parse_time(tok->args[0]))) {
+     goto err;
   }
-  published_on = tor_timegm(&published);
 
   if (!(tok = find_first_by_keyword(tokens, K_RECOMMENDED_SOFTWARE))) {
     log_fn(LOG_WARN, "Missing recommended-software line from directory.");
@@ -781,7 +809,6 @@ routerinfo_t *router_get_entry_from_string(const char *s,
   char digest[128];
   smartlist_t *tokens = NULL, *exit_policy_tokens = NULL;
   directory_token_t *tok;
-  struct tm published;
   int t, i;
   int ports_set, bw_set;
 
@@ -876,11 +903,8 @@ routerinfo_t *router_get_entry_from_string(const char *s,
     log_fn(LOG_WARN, "Missing published time"); goto err;
   }
   assert(tok->n_args == 1);
-  if (!strptime(tok->args[0], "%Y-%m-%d %H:%M:%S", &published)) {
-    log_fn(LOG_WARN, "Published time was unparseable"); goto err;
-  }
-  router->published_on = tor_timegm(&published);
-
+  if (!(router->published_on = parse_time(tok->args[0]))) 
+         goto err;
 
   if (!(tok = find_first_by_keyword(tokens, K_ONION_KEY))) {
     log_fn(LOG_WARN, "Missing onion key"); goto err;
@@ -1056,7 +1080,7 @@ router_add_exit_policy(routerinfo_t *router, directory_token_t *tok) {
 
   if (strcmp(address, "*") == 0) {
     newe->addr = 0;
-  } else if (inet_aton(address, &in) != 0) {
+  } else if (tor_inet_aton(address, &in) != 0) {
     newe->addr = ntohl(in.s_addr);
   } else {
     log_fn(LOG_WARN, "Malformed IP %s in exit policy; rejecting.",
@@ -1074,7 +1098,7 @@ router_add_exit_policy(routerinfo_t *router, directory_token_t *tok) {
     if (!*endptr) {
       /* strtol handled the whole mask. */
       newe->msk = ~((1<<(32-bits))-1);
-    } else if (inet_aton(mask, &in) != 0) {
+    } else if (tor_inet_aton(mask, &in) != 0) {
       newe->msk = ntohl(in.s_addr);
     } else {
       log_fn(LOG_WARN, "Malformed mask %s on exit policy; rejecting.",
@@ -1087,11 +1111,11 @@ router_add_exit_policy(routerinfo_t *router, directory_token_t *tok) {
     newe->prt_max = 65535;
   } else {
     endptr = NULL;
-    newe->prt_min = strtol(port, &endptr, 10);
+    newe->prt_min = (uint16_t) strtol(port, &endptr, 10);
     if (*endptr == '-') {
       port = endptr+1;
       endptr = NULL;
-      newe->prt_max = strtol(port, &endptr, 10);
+      newe->prt_max = (uint16_t) strtol(port, &endptr, 10);
       if (*endptr) {
       log_fn(LOG_WARN, "Malformed port %s on exit policy; rejecting.",
              port);

diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3170f9e3e5e2e0348447eb92701f3dc6c26a4b66..29524513baa8f177accc29f319b6cbc9409d33fd 100644 (file)
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -145,3 +145,6 @@
 
 /* Version number of package */
 #define VERSION "0.0.2pre6"
+
+/* XXXX WWWW */
+#define CONFDIR ""
\ No newline at end of file