Skip to content

[25.12] backport fixes/updates from master #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openwrt-bot merged 9 commits into from
Dec 29, 2025
Merged

[25.12] backport fixes/updates from master #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
449ce83
dhcpv6: migrate dhcpv6_response_is_valid to switch case
systemcrash Dec 20, 2025
04aea4e
dhcpv6: offload FQDN construction to init_dhcpv6
systemcrash Dec 20, 2025
6e3272d
dhcpv6: clarifying comments
systemcrash Dec 20, 2025
235cdc9
all: add log helpers
systemcrash Dec 19, 2025
6aa4e49
config: fix potential memory leaks in error paths
systemcrash Dec 22, 2025
c05b803
odhcp6c: do cleanup at exit
systemcrash Dec 22, 2025
11abe37
ra: convert if block to switch
systemcrash Nov 18, 2025
8774d3c
dhcpv6: dhcpv6_send: convert whitespaces to tabs
Noltari Dec 29, 2025
699cc61
dhcpv6: omit IA_NA on Request
Noltari Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 31 additions & 26 deletions src/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@
#include <resolv.h>
#include <stdlib.h>
#include <string.h>
#include <syslog.h>

#include "config.h"
#include "odhcp6c.h"
Expand All @@ -78,6 +77,7 @@ struct config_dhcp *config_dhcp_get(void) {
}

void config_dhcp_reset(void) {
config_dhcp.log_level = LOG_WARNING;
config_dhcp.release = true;
config_dhcp.dscp = 0;
config_dhcp.sk_prio = 0;
Expand Down Expand Up @@ -119,7 +119,7 @@ void config_set_release(bool enable) {

bool config_set_dscp(unsigned int value) {
if (value > 63) {
syslog(LOG_ERR, "Invalid DSCP value");
error("Invalid DSCP value");
return false;
}
config_dhcp.dscp = value;
Expand All @@ -128,7 +128,7 @@ bool config_set_dscp(unsigned int value) {

bool config_set_sk_priority(unsigned int priority) {
if (priority > 6) {
syslog(LOG_ERR, "Invalid SK priority value");
error("Invalid SK priority value");
return false;
}
config_dhcp.sk_prio = priority;
Expand All @@ -152,7 +152,7 @@ bool config_set_request_addresses(char* mode) {
} else if (!strcmp(mode, "try")) {
config_dhcp.ia_na_mode = IA_MODE_TRY;
} else {
syslog(LOG_ERR, "Invalid IA_NA Request Addresses mode");
error("Invalid IA_NA Request Addresses mode");
return false;
}

Expand All @@ -172,7 +172,7 @@ bool config_set_request_prefix(unsigned int length, unsigned int id) {
prefix.iaid = htonl(id);

if (odhcp6c_add_state(STATE_IA_PD_INIT, &prefix, sizeof(prefix))) {
syslog(LOG_ERR, "Failed to set request IPv6-Prefix");
error("Failed to set request IPv6-Prefix");
return false;
}
}
Expand Down Expand Up @@ -203,13 +203,13 @@ void config_clear_requested_options(void) {

bool config_add_requested_options(unsigned int option) {
if (option > UINT16_MAX) {
syslog(LOG_ERR, "Invalid requested option");
error("Invalid requested option");
return false;
}

option = htons(option);
if (odhcp6c_insert_state(STATE_ORO, 0, &option, 2)) {
syslog(LOG_ERR, "Failed to set requested option");
error("Failed to set requested option");
return false;
}
config_dhcp.oro_user_cnt++;
Expand All @@ -227,7 +227,7 @@ bool config_add_send_options(char* option) {
bool config_set_rtx_delay_max(enum config_dhcp_msg msg, unsigned int value)
{
if (msg >= CONFIG_DHCP_MAX || value > UINT8_MAX) {
syslog(LOG_ERR, "Invalid retransmission Maximum Delay value");
error("Invalid retransmission Maximum Delay value");
return false;
}
config_dhcp.message_rtx[msg].delay_max = value;
Expand All @@ -237,7 +237,7 @@ bool config_set_rtx_delay_max(enum config_dhcp_msg msg, unsigned int value)
bool config_set_rtx_timeout_init(enum config_dhcp_msg msg, unsigned int value)
{
if (msg >= CONFIG_DHCP_MAX || value > UINT8_MAX || value == 0) {
syslog(LOG_ERR, "Invalid retransmission Initial Timeout value");
error("Invalid retransmission Initial Timeout value");
return false;
}
config_dhcp.message_rtx[msg].timeout_init = value;
Expand All @@ -247,7 +247,7 @@ bool config_set_rtx_timeout_init(enum config_dhcp_msg msg, unsigned int value)
bool config_set_rtx_timeout_max(enum config_dhcp_msg msg, unsigned int value)
{
if (msg >= CONFIG_DHCP_MAX || value > UINT16_MAX) {
syslog(LOG_ERR, "Invalid retransmission Maximum Timeout value");
error("Invalid retransmission Maximum Timeout value");
return false;
}
config_dhcp.message_rtx[msg].timeout_max = value;
Expand All @@ -257,7 +257,7 @@ bool config_set_rtx_timeout_max(enum config_dhcp_msg msg, unsigned int value)
bool config_set_rtx_rc_max(enum config_dhcp_msg msg, unsigned int value)
{
if (msg >= CONFIG_DHCP_MAX || value > UINT8_MAX) {
syslog(LOG_ERR, "Invalid retransmission Retry Attempt value");
error("Invalid retransmission Retry Attempt value");
return false;
}
config_dhcp.message_rtx[msg].rc_max = value;
Expand All @@ -267,7 +267,7 @@ bool config_set_rtx_rc_max(enum config_dhcp_msg msg, unsigned int value)
bool config_set_irt_default(unsigned int value)
{
if (value == 0) {
syslog(LOG_ERR, "Invalid Default Information Refresh Time value");
error("Invalid Default Information Refresh Time value");
return false;
}
config_dhcp.irt_default = value;
Expand All @@ -277,7 +277,7 @@ bool config_set_irt_default(unsigned int value)
bool config_set_irt_min(unsigned int value)
{
if (value == 0) {
syslog(LOG_ERR, "Invalid Minimum Information Refresh Time value");
error("Invalid Minimum Information Refresh Time value");
return false;
}
config_dhcp.irt_min = value;
Expand All @@ -287,7 +287,7 @@ bool config_set_irt_min(unsigned int value)
bool config_set_rand_factor(unsigned int value)
{
if (value > 999 || value < 10) {
syslog(LOG_ERR, "Invalid Random Factor value");
error("Invalid Random Factor value");
return false;
}
config_dhcp.rand_factor = value;
Expand All @@ -303,7 +303,7 @@ bool config_set_auth_protocol(const char* protocol)
} else if (!strcmp(protocol, "ReconfigureKeyAuthentication")) {
config_dhcp.auth_protocol = AUTH_PROT_RKAP;
} else {
syslog(LOG_ERR, "Invalid Authentication protocol");
error("Invalid Authentication protocol");
return false;
}

Expand All @@ -322,9 +322,10 @@ static int config_parse_opt_u8(const char *src, uint8_t **dst)
{
int len = strlen(src);

*dst = realloc(*dst, len/2);
if (!*dst)
uint8_t *tmp = realloc(*dst, len/2);
if (!tmp)
return -1;
*dst = tmp;

return script_unhexlify(*dst, len, src);
}
Expand All @@ -345,9 +346,10 @@ static int config_parse_opt_string(const char *src, uint8_t **dst, const bool ar

int len = strlen(src);

*dst = realloc(*dst, o_len + len);
if (!*dst)
uint8_t *tmp = realloc(*dst, o_len + len);
if (!tmp)
return -1;
*dst = tmp;

memcpy(&((*dst)[o_len]), src, len);

Expand Down Expand Up @@ -381,9 +383,10 @@ static int config_parse_opt_dns_string(const char *src, uint8_t **dst, const boo
if (len < 0)
return -1;

*dst = realloc(*dst, o_len + len);
if (!*dst)
uint8_t *dst_tmp = realloc(*dst, o_len + len);
if (!dst_tmp)
return -1;
*dst = dst_tmp;

memcpy(&((*dst)[o_len]), tmp, len);

Expand Down Expand Up @@ -413,9 +416,10 @@ static int config_parse_opt_ip6(const char *src, uint8_t **dst, const bool array
sep++;
}

*dst = realloc(*dst, o_len + len);
if (!*dst)
uint8_t *tmp = realloc(*dst, o_len + len);
if (!tmp)
return -1;
*dst = tmp;

if (inet_pton(AF_INET6, src, &((*dst)[o_len])) < 1)
return -1;
Expand Down Expand Up @@ -445,9 +449,10 @@ static int config_parse_opt_user_class(const char *src, uint8_t **dst, const boo
}
uint16_t str_len = strlen(src);

*dst = realloc(*dst, o_len + str_len + 2);
if (!*dst)
uint8_t *tmp = realloc(*dst, o_len + str_len + 2);
if (!tmp)
return -1;
*dst = tmp;

struct user_class {
uint16_t len;
Expand Down Expand Up @@ -493,7 +498,7 @@ int config_add_opt(const uint16_t code, const uint8_t *data, const uint16_t len)

if (odhcp6c_add_state(STATE_OPTS, &opt_hdr, sizeof(opt_hdr)) ||
odhcp6c_add_state(STATE_OPTS, data, len)) {
syslog(LOG_ERR, "Failed to add option %hu", code);
error("Failed to add option %hu", code);
return 1;
}

Expand Down
2 changes: 2 additions & 0 deletions src/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ enum config_dhcp_msg {
};

struct config_dhcp {
bool log_syslog;
bool release;
int log_level;
int dscp;
int sk_prio;
bool stateful_only_mode;
Expand Down
Loading