mollyim/unbound
1
0
Fork 0
mirror of https://github.com/mollyim/unbound.git synced 2025-05-17 07:38:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply suggestions from code review

Browse source 
Co-authored-by: Willem Toorop <willem@nlnetlabs.nl>
This commit is contained in:
TCY16 2021-05-21 15:42:56 +02:00 committed by GitHub
parent eca19fe1d1
commit 24e39a09a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sldns/rrdef.c
View file

@ -382,7 +382,7 @@ static sldns_rr_descriptor rdata_field_descriptors[] = {
{LDNS_RR_TYPE_ZONEMD, "ZONEMD", 4, 4, type_zonemd_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 }, {LDNS_RR_TYPE_ZONEMD, "ZONEMD", 4, 4, type_zonemd_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
/* 64 */ /* 64 */
{LDNS_RR_TYPE_SVCB, "SVCB", 2, 2, type_svcb_wireformat, LDNS_RDF_TYPE_SVCPARAM, LDNS_RR_NO_COMPRESS, 0 }, {LDNS_RR_TYPE_SVCB, "SVCB", 2, 2, type_svcb_wireformat, LDNS_RDF_TYPE_SVCPARAM, LDNS_RR_NO_COMPRESS, 0 },
{(enum sldns_enum_rr_type)0, "TYPE65", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 }, {LDNS_RR_TYPE_HTTPS, "HTTPS", 2, 2, type_svcb_wireformat, LDNS_RDF_TYPE_SVCPARAM, LDNS_RR_NO_COMPRESS, 0 },
{(enum sldns_enum_rr_type)0, "TYPE66", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 }, {(enum sldns_enum_rr_type)0, "TYPE66", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
{(enum sldns_enum_rr_type)0, "TYPE67", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 }, {(enum sldns_enum_rr_type)0, "TYPE67", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },
{(enum sldns_enum_rr_type)0, "TYPE68", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 }, {(enum sldns_enum_rr_type)0, "TYPE68", 1, 1, type_0_wireformat, LDNS_RDF_TYPE_NONE, LDNS_RR_NO_COMPRESS, 0 },

2
sldns/rrdef.h
View file

@ -355,7 +355,7 @@ enum sldns_enum_rdf_type
/** TSIG extended 16bit error value */ /** TSIG extended 16bit error value */
LDNS_RDF_TYPE_TSIGERROR, LDNS_RDF_TYPE_TSIGERROR,
/* draft-ietf-dnsop-svcb-https-04: /* draft-ietf-dnsop-svcb-https-05:
* each SvcParam consisting of a SvcParamKey=SvcParamValue pair or * each SvcParam consisting of a SvcParamKey=SvcParamValue pair or
* a standalone SvcParamKey */ * a standalone SvcParamKey */
LDNS_RDF_TYPE_SVCPARAM, LDNS_RDF_TYPE_SVCPARAM,

4
sldns/str2wire.c
View file

@ -1055,8 +1055,8 @@ sldns_str2wire_svcbparam_ipv4hint(const char* val, uint8_t* rd, size_t* rd_len)
while (count) { while (count) {
if (!(next_ip_str = strchr(val, ','))) { if (!(next_ip_str = strchr(val, ','))) {
if (inet_pton(AF_INET, val, rd + *rd_len) != 1) if (inet_pton(AF_INET, val, rd + *rd_len) != 1)
*rd_len += LDNS_IP4ADDRLEN;
break; break;
*rd_len += LDNS_IP4ADDRLEN;
assert(count == 1); assert(count == 1);
@ -1067,10 +1067,10 @@ sldns_str2wire_svcbparam_ipv4hint(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_INET, ip_str, rd + *rd_len) != 1) { if (inet_pton(AF_INET, ip_str, rd + *rd_len) != 1) {
*rd_len += LDNS_IP4ADDRLEN;
val = ip_str; /* to use in error reporting below */ val = ip_str; /* to use in error reporting below */
break; break;
} }
*rd_len += LDNS_IP4ADDRLEN;
val = next_ip_str + 1; val = next_ip_str + 1;
} }

2
sldns/wire2str.c
View file

@ -1122,7 +1122,7 @@ int sldns_wire2str_svcparam_scan(uint8_t** d, size_t* dlen, char** s, size_t* sl
uint8_t* data = *d; uint8_t* data = *d;
int written_chars = 0; int written_chars = 0;
if(*dlen == 0) return 0; /* verify that we actualy have data */ if(*dlen < 4) return 0; /* verify that we actualy have data */
svcparamkey = sldns_read_uint16(data); svcparamkey = sldns_read_uint16(data);