diff options
| author | teor <teor@torproject.org> | 2020-04-30 06:17:18 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-30 06:54:42 +1000 |
| commit | cd7e2fc210349615c8e9cdb879f98cb0c9cac57b (patch) | |
| tree | 60b9ddd3c3c1c60b64b1d643e7ef3dbfa8f8ec65 /src/core/or/relay.c | |
| parent | f62b051e873aa4be564e9f83745902d4541f79f4 (diff) | |
| download | tor-cd7e2fc210349615c8e9cdb879f98cb0c9cac57b.tar.gz tor-cd7e2fc210349615c8e9cdb879f98cb0c9cac57b.zip | |
net: Make all address bytes functions take uint8_t *
Part of 33817.
Diffstat (limited to 'src/core/or/relay.c')
| -rw-r--r-- | src/core/or/relay.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 00bbf77b99..b831af0ac3 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -867,7 +867,7 @@ connection_ap_process_end_not_open( ttl = (int)ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+5)); } else if (rh->length == 17 || rh->length == 21) { tor_addr_from_ipv6_bytes(&addr, - (char*)(cell->payload+RELAY_HEADER_SIZE+1)); + (cell->payload+RELAY_HEADER_SIZE+1)); if (rh->length == 21) ttl = (int)ntohl(get_uint32(cell->payload+RELAY_HEADER_SIZE+17)); } @@ -1092,7 +1092,7 @@ connected_cell_parse(const relay_header_t *rh, const cell_t *cell, return -1; if (get_uint8(payload + 4) != 6) return -1; - tor_addr_from_ipv6_bytes(addr_out, (char*)(payload + 5)); + tor_addr_from_ipv6_bytes(addr_out, (payload + 5)); bytes = ntohl(get_uint32(payload + 21)); if (bytes <= INT32_MAX) *ttl_out = (int) bytes; @@ -1165,7 +1165,7 @@ resolved_cell_parse(const cell_t *cell, const relay_header_t *rh, if (answer_len != 16) goto err; addr = tor_malloc_zero(sizeof(*addr)); - tor_addr_from_ipv6_bytes(&addr->addr, (const char*) cp); + tor_addr_from_ipv6_bytes(&addr->addr, cp); cp += 16; addr->ttl = ntohl(get_uint32(cp)); cp += 4; @@ -3217,7 +3217,7 @@ decode_address_from_payload(tor_addr_t *addr_out, const uint8_t *payload, case RESOLVED_TYPE_IPV6: if (payload[1] != 16) return NULL; - tor_addr_from_ipv6_bytes(addr_out, (char*)(payload+2)); + tor_addr_from_ipv6_bytes(addr_out, (payload+2)); break; default: tor_addr_make_unspec(addr_out); |