mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

icmp: Avoid unnecessary handling of unspecified bind address

Browse source 
We go to some trouble, if the configured output address is unspecified, to
pass NULL to sock_l4().  But while passing NULL is one way to get sock_l4()
not to specify a bind address, passing the "any" address explicitly works
too.  Use this to simplify icmp_tap_handler().

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2023-12-08 01:31:38 +11:00 committed by Stefano Brivio
parent b9f4314ef9
commit 24d1f6570b
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
icmp.c
View file

@ -187,16 +187,12 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
iref.id = id = ntohs(ih->un.echo.id); iref.id = id = ntohs(ih->un.echo.id);
if ((s = icmp_id_map[V4][id].sock) <= 0) { if ((s = icmp_id_map[V4][id].sock) <= 0) {
const struct in_addr *bind_addr = NULL;
const char *bind_if; const char *bind_if;
bind_if = *c->ip4.ifname_out ? c->ip4.ifname_out : NULL; bind_if = *c->ip4.ifname_out ? c->ip4.ifname_out : NULL;
if (!IN4_IS_ADDR_UNSPECIFIED(&c->ip4.addr_out)) s = sock_l4(c, AF_INET, IPPROTO_ICMP,
bind_addr = &c->ip4.addr_out; &c->ip4.addr_out, bind_if, id, iref.u32);
s = sock_l4(c, AF_INET, IPPROTO_ICMP, bind_addr,
bind_if, id, iref.u32);
if (s < 0) if (s < 0)
goto fail_sock; goto fail_sock;
if (s > FD_REF_MAX) { if (s > FD_REF_MAX) {
@ -241,16 +237,12 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af,
iref.id = id = ntohs(ih->icmp6_identifier); iref.id = id = ntohs(ih->icmp6_identifier);
if ((s = icmp_id_map[V6][id].sock) <= 0) { if ((s = icmp_id_map[V6][id].sock) <= 0) {
const struct in6_addr *bind_addr = NULL;
const char *bind_if; const char *bind_if;
bind_if = *c->ip6.ifname_out ? c->ip6.ifname_out : NULL; bind_if = *c->ip6.ifname_out ? c->ip6.ifname_out : NULL;
if (!IN6_IS_ADDR_UNSPECIFIED(&c->ip6.addr_out)) s = sock_l4(c, AF_INET6, IPPROTO_ICMPV6,
bind_addr = &c->ip6.addr_out; &c->ip6.addr_out, bind_if, id, iref.u32);
s = sock_l4(c, AF_INET6, IPPROTO_ICMPV6, bind_addr,
bind_if, id, iref.u32);
if (s < 0) if (s < 0)
goto fail_sock; goto fail_sock;
if (s > FD_REF_MAX) { if (s > FD_REF_MAX) {