diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-08-07 19:13:35 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-08-07 19:13:35 +0000 |
| commit | d9601c65e0529c1f79e52ca3576cbc8f0a82f8f6 (patch) | |
| tree | 7025b74af0ad9c3bfb8a0ce6953864787d150e6a /src/common | |
| parent | 635f3c8aeef717d03a86117dfa81944fb6788bca (diff) | |
| download | tor-d9601c65e0529c1f79e52ca3576cbc8f0a82f8f6.tar tor-d9601c65e0529c1f79e52ca3576cbc8f0a82f8f6.tar.gz | |
r17666@tombo: nickm | 2008-08-07 15:12:30 -0400
Make tor_addr_from_sockaddr also give away the port in a useful format
svn:r16458
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/address.c | 7 | ||||
| -rw-r--r-- | src/common/address.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/common/address.c b/src/common/address.c index e5b11a4ff..ac4ae041d 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -94,7 +94,8 @@ tor_addr_to_sockaddr(const tor_addr_t *a, /** Set the tor_addr_t in <b>a</b> to contain the socket address contained in * <b>sa</b>. */ int -tor_addr_from_sockaddr(tor_addr_t *a, const struct sockaddr *sa) +tor_addr_from_sockaddr(tor_addr_t *a, const struct sockaddr *sa, + uint16_t *port_out) { tor_assert(a); tor_assert(sa); @@ -103,10 +104,14 @@ tor_addr_from_sockaddr(tor_addr_t *a, const struct sockaddr *sa) struct sockaddr_in *sin = (struct sockaddr_in *) sa; a->family = AF_INET; a->addr.in_addr.s_addr = sin->sin_addr.s_addr; + if (port_out) + *port_out = ntohs(sin->sin_port); } else if (sa->sa_family == AF_INET6) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *) sa; a->family = AF_INET6; memcpy(&a->addr.in6_addr, &sin6->sin6_addr, sizeof(struct in6_addr)); + if (port_out) + *port_out = ntohs(sin6->sin6_port); } else { a->family = AF_UNSPEC; return -1; diff --git a/src/common/address.h b/src/common/address.h index 133a9b192..c206bf144 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -40,7 +40,8 @@ static INLINE const struct in6_addr *tor_addr_to_in6(const tor_addr_t *a); static INLINE int tor_addr_eq_ipv4h(const tor_addr_t *a, uint32_t u); socklen_t tor_addr_to_sockaddr(const tor_addr_t *a, uint16_t port, struct sockaddr *sa_out, socklen_t len); -int tor_addr_from_sockaddr(tor_addr_t *a, const struct sockaddr *sa); +int tor_addr_from_sockaddr(tor_addr_t *a, const struct sockaddr *sa, + uint16_t *port_out); void tor_addr_make_unspec(tor_addr_t *a); static INLINE const struct in6_addr * |