- Fix const as reported by newest compiler warnings.

This commit is contained in:
Yorgos Thessalonikefs
2026-06-03 14:00:04 +02:00
parent 5d0770d0ad
commit 4544eaa4cc
6 changed files with 27 additions and 23 deletions
+1 -1
View File
@@ -307,7 +307,7 @@ add_open(const char* ip, int nr, struct listen_port** list, int noproto_is_err,
#endif
}
} else {
char* s = strchr(ip, '@');
const char* s = strchr(ip, '@');
char newif[128];
if(s) {
/* override port with ifspec@port */
+3
View File
@@ -10,6 +10,9 @@
Thanks to Xin Wang, Jiapeng Li, and Jiajia Liu, Northwestern
Polytechnical University, for the report.
3 June 2026: Yorgos
- Fix const as reported by newest compiler warnings.
29 May 2026: Wouter
- Fix header_seen detection for trust anchor files, so that it
detects the id line.
+1 -1
View File
@@ -1126,7 +1126,7 @@ make_sock_port(int stype, const char* ifname, int port,
int use_systemd, int dscp, struct unbound_socket* ub_sock,
const char* additional)
{
char* s = strchr(ifname, '@');
const char* s = strchr(ifname, '@');
if(s) {
/* override port with ifspec@port */
int port;
+3 -3
View File
@@ -1201,7 +1201,7 @@ sldns_str2wire_svcbparam_ipv4hint(const char* val, uint8_t* rd, size_t* rd_len)
{
size_t count;
char ip_str[INET_ADDRSTRLEN+1];
char *next_ip_str;
const char *next_ip_str;
size_t i;
for (i = 0, count = 1; val[i]; i++) {
@@ -1256,7 +1256,7 @@ sldns_str2wire_svcbparam_ipv6hint(const char* val, uint8_t* rd, size_t* rd_len)
{
size_t count;
char ip_str[INET6_ADDRSTRLEN+1];
char *next_ip_str;
const char *next_ip_str;
size_t i;
for (i = 0, count = 1; val[i]; i++) {
@@ -1317,7 +1317,7 @@ static int
sldns_str2wire_svcbparam_mandatory(const char* val, uint8_t* rd, size_t* rd_len)
{
size_t i, count, val_len;
char* next_key;
const char* next_key;
val_len = strlen(val);
+10 -10
View File
@@ -1944,7 +1944,7 @@ extract_port_from_str(const char* str, int max_port) {
int
cfg_mark_ports(const char* str, int allow, int* avail, int num)
{
char* mid = strchr(str, '-');
const char* mid = strchr(str, '-');
#ifdef DISABLE_EXPLICIT_PORT_RANDOMISATION
log_warn("Explicit port randomisation disabled, ignoring "
"outgoing-port-permit and outgoing-port-avoid configuration "
@@ -2647,10 +2647,10 @@ fname_after_chroot(const char* fname, struct config_file* cfg, int use_chdir)
}
/** return next space character in string */
static char* next_space_pos(const char* str)
static const char* next_space_pos(const char* str)
{
char* sp = strchr(str, ' ');
char* tab = strchr(str, '\t');
const char* sp = strchr(str, ' ');
const char* tab = strchr(str, '\t');
if(!tab && !sp)
return NULL;
if(!sp) return tab;
@@ -2659,10 +2659,10 @@ static char* next_space_pos(const char* str)
}
/** return last space character in string */
static char* last_space_pos(const char* str)
static const char* last_space_pos(const char* str)
{
char* sp = strrchr(str, ' ');
char* tab = strrchr(str, '\t');
const char* sp = strrchr(str, ' ');
const char* tab = strrchr(str, '\t');
if(!tab && !sp)
return NULL;
if(!sp) return tab;
@@ -2720,8 +2720,8 @@ cfg_parse_local_zone(struct config_file* cfg, const char* val)
char* cfg_ptr_reverse(char* str)
{
char* ip, *ip_end;
char* name;
const char* ip, *ip_end;
const char* name;
char* result;
char buf[1024];
struct sockaddr_storage addr;
@@ -2872,7 +2872,7 @@ if_listens_on(const char* ifname, int default_port, int port,
struct config_strlist* additional_ports)
{
struct config_strlist* s;
char* p = strchr(ifname, '@');
const char* p = strchr(ifname, '@');
int if_port;
if(p) if_port = atoi(p+1);
else if_port = default_port;
+9 -8
View File
@@ -242,7 +242,7 @@ int
extstrtoaddr(const char* str, struct sockaddr_storage* addr,
socklen_t* addrlen, int port)
{
char* s;
const char* s;
if((s=strchr(str, '@'))) {
char buf[MAX_ADDR_STRLEN];
if(s-str >= MAX_ADDR_STRLEN) {
@@ -268,7 +268,7 @@ ipstrtoaddr(const char* ip, int port, struct sockaddr_storage* addr,
p = (uint16_t) port;
if(str_is_ip6(ip)) {
char buf[MAX_ADDR_STRLEN];
char* s;
const char* s;
struct sockaddr_in6* sa = (struct sockaddr_in6*)addr;
*addrlen = (socklen_t)sizeof(struct sockaddr_in6);
memset(sa, 0, *addrlen);
@@ -304,8 +304,9 @@ ipstrtoaddr(const char* ip, int port, struct sockaddr_storage* addr,
int netblockstrtoaddr(const char* str, int port, struct sockaddr_storage* addr,
socklen_t* addrlen, int* net)
{
const char* s;
char buf[64];
char* s;
char* b = NULL;
*net = (str_is_ip6(str)?128:32);
if((s=strchr(str, '/'))) {
if(atoi(s+1) > *net) {
@@ -323,15 +324,15 @@ int netblockstrtoaddr(const char* str, int port, struct sockaddr_storage* addr,
return 0;
}
strlcpy(buf, str, sizeof(buf));
s = strchr(buf, '/');
if(s) *s = 0;
s = buf;
b = strchr(buf, '/');
if(b) *b = 0;
b = buf;
}
if(!ipstrtoaddr(s?s:str, port, addr, addrlen)) {
if(!ipstrtoaddr(b?b:str, port, addr, addrlen)) {
log_err("cannot parse ip address: '%s'", str);
return 0;
}
if(s) {
if(b) {
addr_mask(addr, *addrlen, *net);
}
return 1;