aboutgitcodebugslistschat
path: root/dhcpv6.c
diff options
context:
space:
mode:
authorStefano Brivio <sbrivio@redhat.com>2024-11-07 17:47:08 +0100
committerStefano Brivio <sbrivio@redhat.com>2024-11-08 08:24:11 +0100
commit5f5e814cfc27c14cd7f116c8fb59e17d5671cafe (patch)
tree6a878e4e7b9b87cb9aaa5c1f604adc523ecf4c82 /dhcpv6.c
parent78da088f7babfa0431c6fb2704ef0709fe057770 (diff)
downloadpasst-5f5e814cfc27c14cd7f116c8fb59e17d5671cafe.tar
passt-5f5e814cfc27c14cd7f116c8fb59e17d5671cafe.tar.gz
passt-5f5e814cfc27c14cd7f116c8fb59e17d5671cafe.tar.bz2
passt-5f5e814cfc27c14cd7f116c8fb59e17d5671cafe.tar.lz
passt-5f5e814cfc27c14cd7f116c8fb59e17d5671cafe.tar.xz
passt-5f5e814cfc27c14cd7f116c8fb59e17d5671cafe.tar.zst
passt-5f5e814cfc27c14cd7f116c8fb59e17d5671cafe.zip
dhcpv6: Use for loop instead of goto to avoid false positive cppcheck warning
cppcheck 2.16.0 reports: dhcpv6.c:334:14: style: The comparison 'ia_type == 3' is always true. [knownConditionTrueFalse] if (ia_type == OPT_IA_NA) { ^ dhcpv6.c:306:12: note: 'ia_type' is assigned value '3' here. ia_type = OPT_IA_NA; ^ dhcpv6.c:334:14: note: The comparison 'ia_type == 3' is always true. if (ia_type == OPT_IA_NA) { ^ this is not really the case as we set ia_type to OPT_IA_TA and then jump back. Anyway, there's no particular reason to use a goto here: add a trivial foreach() macro to go through elements of an array and use it instead. Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'dhcpv6.c')
-rw-r--r--dhcpv6.c47
1 files changed, 21 insertions, 26 deletions
diff --git a/dhcpv6.c b/dhcpv6.c
index 14a5c7e..f2e7307 100644
--- a/dhcpv6.c
+++ b/dhcpv6.c
@@ -296,47 +296,42 @@ static struct opt_hdr *dhcpv6_opt(const struct pool *p, size_t *offset,
static struct opt_hdr *dhcpv6_ia_notonlink(const struct pool *p,
struct in6_addr *la)
{
+ int ia_types[2] = { OPT_IA_NA, OPT_IA_TA }, *ia_type;
+ const struct opt_ia_addr *opt_addr;
char buf[INET6_ADDRSTRLEN];
struct in6_addr req_addr;
const struct opt_hdr *h;
struct opt_hdr *ia;
size_t offset;
- int ia_type;
- ia_type = OPT_IA_NA;
-ia_ta:
- offset = 0;
- while ((ia = dhcpv6_opt(p, &offset, ia_type))) {
- if (ntohs(ia->l) < OPT_VSIZE(ia_na))
- return NULL;
+ foreach(ia_type, ia_types) {
+ offset = 0;
+ while ((ia = dhcpv6_opt(p, &offset, *ia_type))) {
+ if (ntohs(ia->l) < OPT_VSIZE(ia_na))
+ return NULL;
- offset += sizeof(struct opt_ia_na);
+ offset += sizeof(struct opt_ia_na);
- while ((h = dhcpv6_opt(p, &offset, OPT_IAAADR))) {
- const struct opt_ia_addr *opt_addr;
+ while ((h = dhcpv6_opt(p, &offset, OPT_IAAADR))) {
+ if (ntohs(h->l) != OPT_VSIZE(ia_addr))
+ return NULL;
- if (ntohs(h->l) != OPT_VSIZE(ia_addr))
- return NULL;
+ opt_addr = (const struct opt_ia_addr *)h;
+ req_addr = opt_addr->addr;
+ if (!IN6_ARE_ADDR_EQUAL(la, &req_addr))
+ goto err;
- opt_addr = (const struct opt_ia_addr *)h;
- req_addr = opt_addr->addr;
- if (!IN6_ARE_ADDR_EQUAL(la, &req_addr)) {
- info("DHCPv6: requested address %s not on link",
- inet_ntop(AF_INET6, &req_addr,
- buf, sizeof(buf)));
- return ia;
+ offset += sizeof(struct opt_ia_addr);
}
-
- offset += sizeof(struct opt_ia_addr);
}
}
- if (ia_type == OPT_IA_NA) {
- ia_type = OPT_IA_TA;
- goto ia_ta;
- }
-
return NULL;
+
+err:
+ info("DHCPv6: requested address %s not on link",
+ inet_ntop(AF_INET6, &req_addr, buf, sizeof(buf)));
+ return ia;
}
/**