aboutsummaryrefslogtreecommitdiff
path: root/src/common/address.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-11-27 22:18:16 -0500
committerNick Mathewson <nickm@torproject.org>2012-11-27 22:18:16 -0500
commit190c1d4981e5751aabd3d894095851c830f1d570 (patch)
treea832d932339382cb7f43fb33a255d7507e037c2e /src/common/address.h
parent267c0e5aa14deeb2ca0d7997b4ef5a5c2bbf5fd4 (diff)
parent6f21d2e49657ada264cace9da7cf6945b4fc073d (diff)
downloadtor-190c1d4981e5751aabd3d894095851c830f1d570.tar
tor-190c1d4981e5751aabd3d894095851c830f1d570.tar.gz
Merge branch 'bug7013_take2_squashed'
Diffstat (limited to 'src/common/address.h')
-rw-r--r--src/common/address.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/common/address.h b/src/common/address.h
index 9c0df6c24..0e2bbdcf8 100644
--- a/src/common/address.h
+++ b/src/common/address.h
@@ -208,6 +208,9 @@ int tor_addr_is_loopback(const tor_addr_t *addr);
int tor_addr_port_split(int severity, const char *addrport,
char **address_out, uint16_t *port_out);
+int tor_addr_port_parse(int severity, const char *addrport,
+ tor_addr_t *address_out, uint16_t *port_out);
+
int tor_addr_hostname_is_local(const char *name);
/* IPv4 helpers */