neels has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-hnbgw/+/28229 )
Change subject: use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf()
......................................................................
use osmo_select_main_ctx(), tweak log in handle_cn_conn_conf()
Upcoming patch adds to this function. Let me first combine those four
LOGP() to a single one, use proper osmo_sccp_addr_to_str_c(OTC_SELECT).
To be able to use OTC_SELECT, switch hnbgw.c to osmo_select_main_ctx().
Related: SYS#5968
Change-Id: I1e0ea0a883e8cf65e6cfb45ed9b6f3d8fb7c59eb
---
M src/osmo-hnbgw/hnbgw.c
M src/osmo-hnbgw/hnbgw_cn.c
2 files changed, 9 insertions(+), 12 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/29/28229/1
diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index 833486c..96c7ad1 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -713,7 +713,7 @@
}
while (1) {
- rc = osmo_select_main(0);
+ rc = osmo_select_main_ctx(0);
if (rc < 0)
exit(3);
}
diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c
index 5ee5fd4..9c06497 100644
--- a/src/osmo-hnbgw/hnbgw_cn.c
+++ b/src/osmo-hnbgw/hnbgw_cn.c
@@ -329,18 +329,15 @@
const struct osmo_scu_connect_param *param,
struct osmo_prim_hdr *oph)
{
- /* we don't actually need to do anything, as RUA towards the HNB
- * doesn't seem to know any confirmations to its CONNECT
- * operation */
+ struct osmo_ss7_instance *ss7 = osmo_sccp_get_ss7(cnlink->gw->sccp.client);
+ LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d, addrs: called=%s
calling=%s responding=%s",
+ param->conn_id,
+ osmo_sccp_addr_to_str_c(OTC_SELECT, ss7, ¶m->called_addr),
+ osmo_sccp_addr_to_str_c(OTC_SELECT, ss7, ¶m->calling_addr),
+ osmo_sccp_addr_to_str_c(OTC_SELECT, ss7, ¶m->responding_addr));
- LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() conn_id=%d\n",
- param->conn_id);
- LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() called_addr=%s\n",
- inet_ntoa(param->called_addr.ip.v4));
- LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() calling_addr=%s\n",
- inet_ntoa(param->calling_addr.ip.v4));
- LOGP(DMAIN, LOGL_DEBUG, "handle_cn_conn_conf() responding_addr=%s\n",
- inet_ntoa(param->responding_addr.ip.v4));
+ /* Nothing needs to happen for RUA, RUA towards the HNB doesn't seem to know any
confirmations to its CONNECT
+ * operation. */
return 0;
}
--
To view, visit
https://gerrit.osmocom.org/c/osmo-hnbgw/+/28229
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: I1e0ea0a883e8cf65e6cfb45ed9b6f3d8fb7c59eb
Gerrit-Change-Number: 28229
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de>
Gerrit-MessageType: newchange