openwrt/odhcp6c
1
0
Fork 0
mirror of https://git.openwrt.org/project/odhcp6c.git synced 2025-12-20 01:20:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

src: fix shadowed local variables

Browse Source 
Fix shadowed local variables and enable warning to prevent more shadowed
variables in the future.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
Álvaro Fernández Rojas
2025-11-28 08:42:29 +01:00
parent f98b6ec823
commit 98dfd156f3
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -27,8 +27,10 @@ target_compile_options(${PROJECT_NAME} PRIVATE -Wformat)
target_compile_options(${PROJECT_NAME} PRIVATE -Werror=format-security)
target_compile_options(${PROJECT_NAME} PRIVATE -Werror=format-nonliteral)
target_compile_options(${PROJECT_NAME} PRIVATE -Wimplicit-fallthrough=5)
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-shadow=compatible-local)
target_compile_options(${PROJECT_NAME} PRIVATE -Wno-unused-parameter)
target_compile_options(${PROJECT_NAME} PRIVATE -Wmissing-declarations)
target_compile_options(${PROJECT_NAME} PRIVATE -Wshadow=local)
# Libraries

18
src/ra.c
View File

@@ -537,18 +537,18 @@ bool ra_process(void)
}
} else if (opt->type == ND_OPT_DNSSL && opt->len > 1) {
uint32_t *valid = (uint32_t*)&opt->data[2];
uint8_t *buf = &opt->data[6];
uint8_t *end = &buf[(opt->len - 1) * 8];
uint8_t *ds_buf = &opt->data[6];
uint8_t *end = &ds_buf[(opt->len - 1) * 8];
entry->router = from.sin6_addr;
entry->valid = ntohl(*valid);
while (buf < end) {
int len = dn_expand(buf, end, buf, (char*)entry->auxtarget, 256);
if (len < 1)
while (ds_buf < end) {
int ds_len = dn_expand(ds_buf, end, ds_buf, (char*)entry->auxtarget, 256);
if (ds_len < 1)
break;
buf = &buf[len];
ds_buf = &ds_buf[ds_len];
entry->auxlen = strlen((char*)entry->auxtarget);
if (entry->auxlen == 0)
@@ -564,7 +564,7 @@ bool ra_process(void)
continue;
struct icmpv6_opt_captive_portal *capt_port = (struct icmpv6_opt_captive_portal*)opt;
uint8_t *buf = &capt_port->data[0];
uint8_t *cp_buf = &capt_port->data[0];
size_t ref_len = sizeof(URN_IETF_CAPT_PORT_UNRESTR) - 1;
/* RFC8910 §2:
@@ -572,7 +572,7 @@ bool ra_process(void)
* condition by using this option with the IANA-assigned URI for
* this purpose. Clients observing the URI value ... may forego
* time-consuming forms of captive portal detection. */
if (memcmp(buf, URN_IETF_CAPT_PORT_UNRESTR, ref_len)) {
if (memcmp(cp_buf, URN_IETF_CAPT_PORT_UNRESTR, ref_len)) {
/* URI are not guaranteed to be \0 terminated if data is unpadded */
size_t uri_len = (capt_port->len * 8) - 2;
/* Allocate new buffer including room for '\0' */
@@ -580,7 +580,7 @@ bool ra_process(void)
if (!copy)
continue;
memcpy(copy, buf, uri_len);
memcpy(copy, cp_buf, uri_len);
copy[uri_len] = '\0';
odhcp6c_clear_state(STATE_CAPT_PORT_RA);
odhcp6c_add_state(STATE_CAPT_PORT_RA, copy, uri_len);