diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2020-09-23 23:56:37 +0200 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2020-09-25 09:45:24 +0000 |
| commit | 38b19e88bbe0da721792f94995504524ee083ae3 (patch) | |
| tree | 79c195d0b5fe56a56e38a19844290e112d726b20 /src/gb/gprs_ns2_udp.c | |
| parent | c1cd333072062e676a8cab4a0931beddb7b4a788 (diff) | |
ns2: refactor nsvc_by_ functions
gprs_ns2_nsvc_by_sockaddr_nsei is doing the lookup within a NSE.
gprs_ns2_nsvc_by_sockaddr_bind is doing the lookup within a bind.
Make both function look similiar and take similiar arguments.
Change-Id: Ia499fc279013668abe7348e578a0768f7d16faf9
Diffstat (limited to 'src/gb/gprs_ns2_udp.c')
| -rw-r--r-- | src/gb/gprs_ns2_udp.c | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c index bb421a75..9994a725 100644 --- a/src/gb/gprs_ns2_udp.c +++ b/src/gb/gprs_ns2_udp.c @@ -81,16 +81,12 @@ static void free_vc(struct gprs_ns2_vc *nsvc) /*! Find a NS-VC by its remote socket address. * \param[in] bind in which to search * \param[in] saddr remote peer socket adddress to search - * \param[out] result pointer to result - * \returns 0 on success; 1 if no NS-VC was found; negative on error */ -int gprs_ns2_find_vc_by_sockaddr(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *saddr, struct gprs_ns2_vc **result) + * \returns NS-VC matching sockaddr; NULL if none found */ +struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind(struct gprs_ns2_vc_bind *bind, struct osmo_sockaddr *saddr) { struct gprs_ns2_vc *nsvc; struct priv_vc *vcpriv; - if (!result) - return -EINVAL; - llist_for_each_entry(nsvc, &bind->nsvc, blist) { vcpriv = nsvc->priv; if (vcpriv->remote.u.sa.sa_family != saddr->u.sa.sa_family) @@ -98,11 +94,10 @@ int gprs_ns2_find_vc_by_sockaddr(struct gprs_ns2_vc_bind *bind, struct osmo_sock if (osmo_sockaddr_cmp(&vcpriv->remote, saddr)) continue; - *result = nsvc; - return 0; + return nsvc; } - return 1; + return NULL; } static inline int nsip_sendmsg(struct gprs_ns2_vc_bind *bind, @@ -194,8 +189,8 @@ static int handle_nsip_read(struct osmo_fd *bfd) return -EINVAL; /* check if a vc is available */ - rc = gprs_ns2_find_vc_by_sockaddr(bind, &saddr, &nsvc); - if (rc) { + nsvc = gprs_ns2_nsvc_by_sockaddr_bind(bind, &saddr); + if (!nsvc) { /* VC not found */ rc = ns2_create_vc(bind, msg, "newconnection", &reject, &nsvc); switch (rc) { |