diff options
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/connection.c | 2 | ||||
| -rw-r--r-- | src/or/routerlist.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 1c7e3cf219..f2528aa00b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -434,7 +434,7 @@ int retry_all_connections(void) { if(options.SocksPort) { listener_close_if_present(CONN_TYPE_AP_LISTENER); - if(connection_create_listener(options.SocksBindAddress, + if(connection_create_listener(options.SocksBindAddress, (uint16_t) options.SocksPort, CONN_TYPE_AP_LISTENER) < 0) return -1; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 4ade31c6f2..64d4e64577 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -544,8 +544,7 @@ int router_exit_policy_rejects_all(routerinfo_t *router) { static time_t parse_time(const char *cp) { struct tm st_tm; - /* XXXX WWWW should be HAVE_STRPTIME */ -#ifndef MS_WINDOWS +#ifdef HAVE_STRPTIME if (!strptime(cp, "%Y-%m-%d %H:%M:%S", &st_tm)) { log_fn(LOG_WARN, "Published time was unparseable"); return 0; } @@ -903,7 +902,7 @@ 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 (!(router->published_on = parse_time(tok->args[0]))) + if (!(router->published_on = parse_time(tok->args[0]))) goto err; if (!(tok = find_first_by_keyword(tokens, K_ONION_KEY))) { |