Use tor_assert, not assert.

This commit is contained in:
Nick Mathewson 2016-08-23 09:24:20 -04:00
parent bd45f7c668
commit e8d7953c61

View File

@ -1970,8 +1970,8 @@ static void
router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr,
int listener_type)
{
assert(listener_type == CONN_TYPE_OR_LISTENER ||
listener_type == CONN_TYPE_DIR_LISTENER);
tor_assert(listener_type == CONN_TYPE_OR_LISTENER ||
listener_type == CONN_TYPE_DIR_LISTENER);
/* The first advertised Port may be the magic constant CFG_AUTO_PORT.
*/
@ -1985,7 +1985,7 @@ router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr,
AF_INET);
/* If we're building a descriptor with no advertised address,
* something is terribly wrong. */
assert(port_addr);
tor_assert(port_addr);
tor_addr_t desc_addr;
char port_addr_str[TOR_ADDR_BUF_LEN];