upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-23 16:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix comments - 1

Browse source
This commit is contained in:
Tom Carpay 2021-07-01 16:59:48 +02:00
parent e41125495d
commit 3d50c25f5b
3 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile.in
View file

@ -330,7 +330,7 @@ TEST_BIN=asynclook$(EXEEXT) delayer$(EXEEXT) \
lock-verify$(EXEEXT) memstats$(EXEEXT) perf$(EXEEXT) \ lock-verify$(EXEEXT) memstats$(EXEEXT) perf$(EXEEXT) \
petal$(EXEEXT) pktview$(EXEEXT) streamtcp$(EXEEXT) \ petal$(EXEEXT) pktview$(EXEEXT) streamtcp$(EXEEXT) \
$(DNSTAP_SOCKET_TESTBIN) dohclient$(EXEEXT) \ $(DNSTAP_SOCKET_TESTBIN) dohclient$(EXEEXT) \
testbound$(EXEEXT) unittest$(EXEEXT) testbound$(EXEEXT) unittest$(EXEEXT) readzone$(EXEEXT)
tests: all $(TEST_BIN) tests: all $(TEST_BIN)
check: test check: test

9
sldns/str2wire.c
View file

@ -1176,7 +1176,6 @@ sldns_str2wire_svcbparam_ipv4hint(const char* val, uint8_t* rd, size_t* rd_len)
int count; int count;
char ip_str[INET_ADDRSTRLEN+1]; char ip_str[INET_ADDRSTRLEN+1];
char *next_ip_str; char *next_ip_str;
uint32_t *ip_wire_dst = NULL;
size_t i; size_t i;
for (i = 0, count = 1; val[i]; i++) { for (i = 0, count = 1; val[i]; i++) {
@ -1218,7 +1217,6 @@ sldns_str2wire_svcbparam_ipv4hint(const char* val, uint8_t* rd, size_t* rd_len)
val = next_ip_str + 1; val = next_ip_str + 1;
} }
ip_wire_dst++;
count--; count--;
} }
if (count) /* verify that we parsed all values */ if (count) /* verify that we parsed all values */
@ -1233,7 +1231,6 @@ sldns_str2wire_svcbparam_ipv6hint(const char* val, uint8_t* rd, size_t* rd_len)
int count; int count;
char ip_str[INET6_ADDRSTRLEN+1]; char ip_str[INET6_ADDRSTRLEN+1];
char *next_ip_str; char *next_ip_str;
uint32_t *ip_wire_dst = NULL;
size_t i; size_t i;
for (i = 0, count = 1; val[i]; i++) { for (i = 0, count = 1; val[i]; i++) {
@ -1269,14 +1266,12 @@ sldns_str2wire_svcbparam_ipv6hint(const char* val, uint8_t* rd, size_t* rd_len)
memcpy(ip_str, val, next_ip_str - val); memcpy(ip_str, val, next_ip_str - val);
ip_str[next_ip_str - val] = 0; ip_str[next_ip_str - val] = 0;
if (inet_pton(AF_INET6, ip_str, rd + *rd_len) != 1) { if (inet_pton(AF_INET6, ip_str, rd + *rd_len) != 1) {
val = ip_str; /* to use in error reporting below */
break; break;
} }
*rd_len += LDNS_IP6ADDRLEN; *rd_len += LDNS_IP6ADDRLEN;
val = next_ip_str + 1; val = next_ip_str + 1;
} }
ip_wire_dst++;
count--; count--;
} }
if (count) /* verify that we parsed all values */ if (count) /* verify that we parsed all values */
@ -1297,7 +1292,6 @@ sldns_str2wire_svcbparam_mandatory(const char* val, uint8_t* rd, size_t* rd_len)
{ {
size_t i, count, val_len; size_t i, count, val_len;
char* next_key; char* next_key;
uint16_t* key_dst = NULL;
val_len = strlen(val); val_len = strlen(val);
@ -1342,7 +1336,6 @@ sldns_str2wire_svcbparam_mandatory(const char* val, uint8_t* rd, size_t* rd_len)
val_len -= next_key - val + 1; val_len -= next_key - val + 1;
val = next_key + 1; /* skip the comma */ val = next_key + 1; /* skip the comma */
key_dst += 1;
} }
/* In draft-ietf-dnsop-svcb-https-06 Section 7: /* In draft-ietf-dnsop-svcb-https-06 Section 7:
@ -1470,8 +1463,6 @@ sldns_str2wire_svcbparam_alpn_value(const char* val,
return LDNS_WIREPARSE_ERR_SVCB_ALPN_KEY_TOO_LARGE; return LDNS_WIREPARSE_ERR_SVCB_ALPN_KEY_TOO_LARGE;
} }
while (val_len) { while (val_len) {
size_t dst_len;
str_len = (next_str = sldns_str2wire_svcbparam_parse_next_unescaped_comma(val)) str_len = (next_str = sldns_str2wire_svcbparam_parse_next_unescaped_comma(val))
? (size_t)(next_str - val) : val_len; ? (size_t)(next_str - val) : val_len;

2
sldns/wire2str.c
View file

@ -989,7 +989,7 @@ static int sldns_wire2str_svcparam_port2str(char** s,
if (data_len != 2) if (data_len != 2)
return -1; /* wireformat error, a short is 2 bytes */ return -1; /* wireformat error, a short is 2 bytes */
w = sldns_str_print(s, slen, "=%d", (int)sldns_read_uint16(data)); w = sldns_str_print(s, slen, "=%d", (int)sldns_read_uint16(data));
*data += 2; data += 2;
return w; return w;
} }