[MERGED] osmo-hlr[master]: fix: properly handle error rc by osmo_gsup_conn_ccm_get()

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Neels Hofmeyr gerrit-no-reply at lists.osmocom.org
Tue Mar 7 23:23:16 UTC 2017


Neels Hofmeyr has submitted this change and it was merged.

Change subject: fix: properly handle error rc by osmo_gsup_conn_ccm_get()
......................................................................


fix: properly handle error rc by osmo_gsup_conn_ccm_get()

Change-Id: I70e4a5e75dd596052e61df9a6ad52b7f56fb6b26
---
M src/gsup_server.c
1 file changed, 8 insertions(+), 2 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/src/gsup_server.c b/src/gsup_server.c
index d431637..b0e1858 100644
--- a/src/gsup_server.c
+++ b/src/gsup_server.c
@@ -185,9 +185,15 @@
 	osmo_tlvp_dump(tlvp, DLGSUP, LOGL_INFO);
 
 	addr_len = osmo_gsup_conn_ccm_get(clnt, &addr, IPAC_IDTAG_SERNR);
-	if (addr_len)
-		gsup_route_add(clnt, addr, addr_len);
+	if (addr_len <= 0) {
+		LOGP(DLGSUP, LOGL_ERROR, "GSUP client %s:%u has no %s IE and"
+		     " cannot be routed\n",
+		     conn->addr, conn->port,
+		     ipa_ccm_idtag_name(IPAC_IDTAG_SERNR));
+		return -EINVAL;
+	}
 
+	gsup_route_add(clnt, addr, addr_len);
 	return 0;
 }
 

-- 
To view, visit https://gerrit.osmocom.org/1952
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I70e4a5e75dd596052e61df9a6ad52b7f56fb6b26
Gerrit-PatchSet: 3
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Max <msuraev at sysmocom.de>
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>



More information about the gerrit-log mailing list