commit 80b6ad804d8a7fe4a3369f2dc08b73f8b6d62da9 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 16 15:39:04 2012 -0500

Remove some now-always-true asserts. GCC errors about them --- src/network.c | 1 - src/socks.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/src/network.c b/src/network.c index a28f7b8..bdf64c3 100644 --- a/src/network.c +++ b/src/network.c @@ -564,7 +564,6 @@ open_outbound_hostname(conn_t *conn, int af, const char *addr, uint16_t port) struct event_base *base = bufferevent_get_base(conn->buffer); struct bufferevent *buf; conn_t *newconn; - obfs_assert((port >= 0) && (port <= 65535));

buf = bufferevent_socket_new(base, -1, BEV_OPT_CLOSE_ON_FREE); if (!buf) { diff --git a/src/socks.c b/src/socks.c index e76a24e..71494ba 100644 --- a/src/socks.c +++ b/src/socks.c @@ -589,7 +589,6 @@ socks_state_set_address(socks_state_t *state, const struct sockaddr *sa) uint16_t port; if (sa->sa_family == AF_INET) { const struct sockaddr_in *sin = (const struct sockaddr_in *)sa; - obfs_assert((sin->sin_port >= 0) && (sin->sin_port <= 65535)); port = sin->sin_port; if (evutil_inet_ntop(AF_INET, &sin->sin_addr, state->parsereq.addr, sizeof(state->parsereq.addr)) == NULL)