torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix unit tests, make it compile

Browse Source 
svn:r2543
This commit is contained in:
Nick Mathewson
2004-10-16 21:57:24 +00:00
parent 2c84159748
commit 0273f58629
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/or/connection.c
+1 -1
View File
@@ -329,7 +329,7 @@ static int connection_create_listener(const char *bindaddress, uint16_t bindport
if (usePort==0)
usePort = bindport;
binaddrr.sin_addr.s_addr = htonl(addr);
bindaddr.sin_addr.s_addr = htonl(addr);
bindaddr.sin_family = AF_INET;
bindaddr.sin_port = htons((uint16_t) usePort);
trunk/src/or/routerparse.c
+2 -2
View File
@@ -388,10 +388,10 @@ router_parse_routerlist_from_directory(const char *str,
goto err;
}
if (tok->n_args > 1) {
log_fn(LOG_WARN, "Invalid recommended-software line", tok->n_args);goto err;
log_fn(LOG_WARN, "Invalid recommended-software line");goto err;
}
versions = tor->n_args ? tor_strdup(tok->args[0]) : tor_strdup("");
versions = tok->n_args ? tor_strdup(tok->args[0]) : tor_strdup("");
if (!(tok = find_first_by_keyword(tokens, K_RUNNING_ROUTERS))) {
log_fn(LOG_WARN, "Missing running-routers line from directory.");
trunk/src/or/test.c
+4 -4
View File
@@ -661,12 +661,12 @@ test_util() {
cp = NULL; u32 = 3; u16 = 3;
test_assert(!parse_addr_port("1.2.3.4", &cp, &u32, &u16));
test_streq(cp, "1.2.3.4");
test_eq(u32, htonl(0x01020304u));
test_eq(u32, 0x01020304u);
test_eq(u16, 0);
tor_free(cp);
test_assert(!parse_addr_port("4.3.2.1:99", &cp, &u32, &u16));
test_streq(cp, "4.3.2.1");
test_eq(u32, htonl(0x04030201u));
test_eq(u32, 0x04030201u);
test_eq(u16, 99);
tor_free(cp);
test_assert(!parse_addr_port("nonexistent.address:4040", &cp, NULL, &u16));
@@ -675,13 +675,13 @@ test_util() {
tor_free(cp);
test_assert(!parse_addr_port("localhost:9999", &cp, &u32, &u16));
test_streq(cp, "localhost");
test_eq(u32, htonl(0x7f000001u));
test_eq(u32, 0x7f000001u);
test_eq(u16, 9999);
tor_free(cp);
u32 = 3;
test_assert(!parse_addr_port("localhost", NULL, &u32, &u16));
test_eq(cp, NULL);
test_eq(u32, htonl(0x7f000001u));
test_eq(u32, 0x7f000001u);
test_eq(u16, 0);
tor_free(cp);