Compile without warnings on windows

svn:r2491

diff --git a/src/or/router.c b/src/or/router.c
index 5374631072895be64d5bb19822b23c17e4784b65..df0f4289773f0aa231441ebdc191219b7375b9f0 100644 (file)
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -349,7 +349,7 @@ int init_keys(void) {
   /* 6b. [authdirserver only] add own key to approved directories. */
   crypto_pk_get_digest(get_identity_key(), digest);
   if (!router_digest_is_trusted_dir(digest)) {
-    add_trusted_dir_server(options.Address, options.DirPort, digest);
+    add_trusted_dir_server(options.Address, (uint16_t)options.DirPort, digest);
   }
   /* 7. [authdirserver only] load old directory, if it's there */
   sprintf(keydir,"%s/cached-directory", datadir);

diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index b58950a68fc613a2d218098b68e5b9c3f2224969..4e96d28da0d1b90b89d2e3a5a5274f7dd5247481 100644 (file)
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -799,9 +799,9 @@ routerinfo_t *router_parse_entry_from_string(const char *s,
       log_fn(LOG_WARN,"Wrong # of arguments to \"ports\"");
       goto err;
     }
-    router->or_port = tor_parse_long(tok->args[0],10,0,65535,NULL,NULL);
-    router->socks_port = tor_parse_long(tok->args[1],10,0,65535,NULL,NULL);
-    router->dir_port = tor_parse_long(tok->args[2],10,0,65535,NULL,NULL);
+    router->or_port = (uint16_t) tor_parse_long(tok->args[0],10,0,65535,NULL,NULL);
+    router->socks_port = (uint16_t) tor_parse_long(tok->args[1],10,0,65535,NULL,NULL);
+    router->dir_port = (uint16_t) tor_parse_long(tok->args[2],10,0,65535,NULL,NULL);
     ports_set = 1;
   }
 
@@ -813,7 +813,7 @@ routerinfo_t *router_parse_entry_from_string(const char *s,
       log_fn(LOG_WARN,"Wrong # of arguments to \"dircacheport\"");
       goto err;
     }
-    router->dir_port = tor_parse_long(tok->args[0],10,1,65535,NULL,NULL);
+    router->dir_port = (uint16_t) tor_parse_long(tok->args[0],10,1,65535,NULL,NULL);
   }
 
   tok = find_first_by_keyword(tokens, K_BANDWIDTH);