diff options
author | Stefano Brivio <sbrivio@redhat.com> | 2023-02-16 19:46:36 +0100 |
---|---|---|
committer | Stefano Brivio <sbrivio@redhat.com> | 2023-02-16 19:59:07 +0100 |
commit | 4663ccc89a7fcbf9d901a80730ee925fc7f64c59 (patch) | |
tree | bca53e7f4a395bb9a36c29d5b1fb00845c7a81ae | |
parent | 36f0199f6ef4183837ae72551a778a4054de43fd (diff) | |
download | passt-4663ccc89a7fcbf9d901a80730ee925fc7f64c59.tar passt-4663ccc89a7fcbf9d901a80730ee925fc7f64c59.tar.gz passt-4663ccc89a7fcbf9d901a80730ee925fc7f64c59.tar.bz2 passt-4663ccc89a7fcbf9d901a80730ee925fc7f64c59.tar.lz passt-4663ccc89a7fcbf9d901a80730ee925fc7f64c59.tar.xz passt-4663ccc89a7fcbf9d901a80730ee925fc7f64c59.tar.zst passt-4663ccc89a7fcbf9d901a80730ee925fc7f64c59.zip |
conf: Fix typo and logic in conf_ports() check for port binding2023_02_16.4663ccc
Ouch, I accidentally pushed the previous change without running the
tests:
- we need to check, in conf_ports(), that udp_sock_init()
managed to bind at least a port, not the opposite
- for -T and -U, we have no way to know if we'll manage to bind
the port later, so never report an error for those
Fixes: 3d0de2c1d727 ("conf, tcp, udp: Exit if we fail to bind sockets for all given ports")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
-rw-r--r-- | conf.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -306,6 +306,9 @@ static void conf_ports(const struct ctx *c, char optname, const char *optarg, } else if (optname == 'u') { if (!udp_sock_init(c, 0, af, addr, ifname, i)) bound_one = true; + } else { + /* No way to check in advance for -T and -U */ + bound_one = true; } } @@ -356,8 +359,11 @@ static void conf_ports(const struct ctx *c, char optname, const char *optarg, if (!tcp_sock_init(c, af, addr, ifname, i)) bound_one = true; } else if (optname == 'u') { - if (udp_sock_init(c, 0, af, addr, ifname, i)) + if (!udp_sock_init(c, 0, af, addr, ifname, i)) bound_one = true; + } else { + /* No way to check in advance for -T and -U */ + bound_one = true; } } } while ((p = next_chunk(p, ','))); |