mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Merge remote-tracking branch 'origin/maint-0.2.2'
This commit is contained in:
commit
4a7f979b54
@ -604,7 +604,7 @@ tor_addr_parse_mask_ports(const char *s, tor_addr_t *addr_out,
|
||||
if (family == AF_INET6 && v4map) {
|
||||
if (bits > 32 && bits < 96) { /* Crazy */
|
||||
log_warn(LD_GENERAL,
|
||||
"Bad mask bits %i for V4-mapped V6 address; rejecting.",
|
||||
"Bad mask bits %d for V4-mapped V6 address; rejecting.",
|
||||
bits);
|
||||
goto err;
|
||||
}
|
||||
|
@ -4641,8 +4641,8 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out,
|
||||
if (eos-desc > REND_DESC_MAX_SIZE) {
|
||||
/* XXX023 If we are parsing this descriptor as a server, this
|
||||
* should be a protocol warning. */
|
||||
log_warn(LD_REND, "Descriptor length is %i which exceeds "
|
||||
"maximum rendezvous descriptor size of %i bytes.",
|
||||
log_warn(LD_REND, "Descriptor length is %d which exceeds "
|
||||
"maximum rendezvous descriptor size of %d bytes.",
|
||||
(int)(eos-desc), REND_DESC_MAX_SIZE);
|
||||
goto err;
|
||||
}
|
||||
|
@ -477,9 +477,9 @@ test_addr_ip6_helpers(void)
|
||||
i = get_interface_address6(LOG_DEBUG, AF_INET6, &t2);
|
||||
#if 0
|
||||
tor_inet_ntop(AF_INET, &t1.sa.sin_addr, buf, sizeof(buf));
|
||||
printf("\nv4 address: %s (family=%i)", buf, IN_FAMILY(&t1));
|
||||
printf("\nv4 address: %s (family=%d)", buf, IN_FAMILY(&t1));
|
||||
tor_inet_ntop(AF_INET6, &t2.sa6.sin6_addr, buf, sizeof(buf));
|
||||
printf("\nv6 address: %s (family=%i)", buf, IN_FAMILY(&t2));
|
||||
printf("\nv6 address: %s (family=%d)", buf, IN_FAMILY(&t2));
|
||||
#endif
|
||||
|
||||
done:
|
||||
|
Loading…
Reference in New Issue
Block a user