Browse Source

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
changes/29/28229/2
Neels Hofmeyr 2 months ago
parent
commit
0ca9567fb2
  1. 2
      src/osmo-hnbgw/hnbgw.c
  2. 21
      src/osmo-hnbgw/hnbgw_cn.c

2
src/osmo-hnbgw/hnbgw.c

@ -713,7 +713,7 @@ int main(int argc, char **argv)
}
while (1) {
rc = osmo_select_main(0);
rc = osmo_select_main_ctx(0);
if (rc < 0)
exit(3);
}

21
src/osmo-hnbgw/hnbgw_cn.c

@ -329,18 +329,15 @@ static int handle_cn_conn_conf(struct hnbgw_cnlink *cnlink,
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 */
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));
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\n",
param->conn_id,
osmo_sccp_addr_to_str_c(OTC_SELECT, ss7, &param->called_addr),
osmo_sccp_addr_to_str_c(OTC_SELECT, ss7, &param->calling_addr),
osmo_sccp_addr_to_str_c(OTC_SELECT, ss7, &param->responding_addr));
/* Nothing needs to happen for RUA, RUA towards the HNB doesn't seem to know any confirmations to its CONNECT
* operation. */
return 0;
}

Loading…
Cancel
Save