nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Note byte-order on result for parse_addr_port()

Browse Source 
svn:r2444
This commit is contained in:
Nick Mathewson 2004-10-12 16:02:15 +00:00
parent 0068415b80
commit a91fc48b39
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/util.c
View File

@ -2032,9 +2032,9 @@ int tor_lookup_hostname(const char *name, uint32_t *addr)
* <b>address</b> is provided, set *<b>address</b> to a copy of the * <b>address</b> is provided, set *<b>address</b> to a copy of the
* host portion of the string. If <b>addr</b> is provided, try to * host portion of the string. If <b>addr</b> is provided, try to
* resolve the host portion of the string and store it into * resolve the host portion of the string and store it into
* *<b>addr</b>. If <b>port</b> is provided, store the port number * *<b>addr</b> (in network byte order). If <b>port</b> is provided,
* into *<b>port</b>, or 0 if no port is given. Return 0 on success, * store the port number into *<b>port</b>, or 0 if no port is given.
* -1 on failure. * Return 0 on success, -1 on failure.
*/ */
int int
parse_addr_port(const char *addrport, char **address, uint32_t *addr, parse_addr_port(const char *addrport, char **address, uint32_t *addr,

6
src/or/test.c
View File

@ -640,12 +640,12 @@ test_util() {
cp = NULL; u32 = 3; u16 = 3; cp = NULL; u32 = 3; u16 = 3;
test_assert(!parse_addr_port("1.2.3.4", &cp, &u32, &u16)); test_assert(!parse_addr_port("1.2.3.4", &cp, &u32, &u16));
test_streq(cp, "1.2.3.4"); test_streq(cp, "1.2.3.4");
test_eq(u32, 0x01020304u); test_eq(u32, htonl(0x01020304u));
test_eq(u16, 0); test_eq(u16, 0);
tor_free(cp); tor_free(cp);
test_assert(!parse_addr_port("4.3.2.1:99", &cp, &u32, &u16)); test_assert(!parse_addr_port("4.3.2.1:99", &cp, &u32, &u16));
test_streq(cp, "4.3.2.1"); test_streq(cp, "4.3.2.1");
test_eq(u32, 0x04030201u); test_eq(u32, htonl(0x04030201u));
test_eq(u16, 99); test_eq(u16, 99);
tor_free(cp); tor_free(cp);
test_assert(!parse_addr_port("nonexistent.address:4040", &cp, NULL, &u16)); test_assert(!parse_addr_port("nonexistent.address:4040", &cp, NULL, &u16));
@ -654,7 +654,7 @@ test_util() {
tor_free(cp); tor_free(cp);
test_assert(!parse_addr_port("localhost:9999", &cp, &u32, &u16)); test_assert(!parse_addr_port("localhost:9999", &cp, &u32, &u16));
test_streq(cp, "localhost"); test_streq(cp, "localhost");
test_eq(u32, 0x7f000001u); test_eq(u32, htonl(0x7f000001u));
test_eq(u16, 9999); test_eq(u16, 9999);
tor_free(cp); tor_free(cp);
u32 = 3; u32 = 3;