diff options
| author | Vadim Yanitskiy <vyanitskiy@sysmocom.de> | 2023-03-31 21:12:14 +0700 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2023-03-31 15:46:29 +0000 |
| commit | eb1de8902489064e8a82c5f9c290d6f93a1a0138 (patch) | |
| tree | ef391da5a96add084ae82f13135da532fe58b09d | |
| parent | a9b4849e49aada0ae8175d09f15142c253e37e7e (diff) | |
gprs: fix has_valid_nsvc(): permit local udp port 0
NSVC local port 0 is actually a valid value, which tells the PCU to
pick a random port for bind()ing. It was supported before 315af2f9e,
but now osmo-bsc would simply ignore NSVCs with 'local udp port 0'
and leave the respective MOs unconfigured in the BTS.
Change-Id: I0afd83e77f3daeeb082e7db911610428b5bc587c
Fixes: 315af2f9e "bts: ipa/osmo-bts/sysmobts: MO: add support for the second NSVC"
Related: OS#5979
| -rw-r--r-- | src/osmo-bsc/nm_gprs_nsvc_fsm.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/osmo-bsc/nm_gprs_nsvc_fsm.c b/src/osmo-bsc/nm_gprs_nsvc_fsm.c index 518608215..906ba2a79 100644 --- a/src/osmo-bsc/nm_gprs_nsvc_fsm.c +++ b/src/osmo-bsc/nm_gprs_nsvc_fsm.c @@ -90,12 +90,17 @@ static void st_op_disabled_notinstalled(struct osmo_fsm_inst *fi, uint32_t event } } -static bool has_valid_nsvc(struct gsm_gprs_nsvc *nsvc) +static bool has_valid_nsvc(const struct gsm_gprs_nsvc *nsvc) { + /* remote address must be valid */ + if (osmo_sockaddr_is_any(&nsvc->remote)) + return false; + /* remote port must be valid */ switch (nsvc->remote.u.sa.sa_family) { case AF_INET: + return nsvc->remote.u.sin.sin_port != 0; case AF_INET6: - return (nsvc->local_port > 0 && !osmo_sockaddr_is_any(&nsvc->remote)); + return nsvc->remote.u.sin6.sin6_port != 0; default: return false; } |