dingaopaicandu
/
osmo-bsc-nat
forked from cellular-infrastructure/osmo-bsc-nat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bsc_nat_fsm: move conn.ind before conn.conf 

conn.ind happens before conn.conf, so use the same order in the switch
statement.

Related: SYS#5560
Change-Id: Ibdb5a9b092ab481f35cf5920f3635fdf4a9b85c2
This commit is contained in:
Oliver Smith 2022-03-09 13:08:52 +01:00
parent d586b71e8b
commit f0a26d8ecc
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/osmo-bsc-nat/bsc_nat_fsm.c
View File

@ -128,27 +128,6 @@ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu)
int rc = -1;
switch (OSMO_PRIM_HDR(oph)) {
case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM):
/* indication of connection confirm */
LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph));
if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr,
&prim->u.connect.calling_addr) < 0)
goto error;
if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0)
goto error;
LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n",
osmo_sccp_inst_addr_name(NULL, &peer_addr_out),
dest == g_bsc_nat->ran ? "RAN" : "CN");
msgb_pull_to_l2(oph->msg);
osmo_sccp_tx_conn_resp(dest->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data,
msgb_length(oph->msg));
rc = 0;
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_INDICATION):
/* indication of new inbound connection request */
LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph));
@ -170,6 +149,27 @@ static int sccp_sap_up(struct osmo_prim_hdr *oph, void *scu)
rc = 0;
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_CONNECT, PRIM_OP_CONFIRM):
/* indication of connection confirm */
LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph));
if (sccp_sap_get_peer_addr_in(src, &peer_addr_in, &prim->u.connect.called_addr,
&prim->u.connect.calling_addr) < 0)
goto error;
if (sccp_sap_get_peer_addr_out(src, peer_addr_in, &peer_addr_out) < 0)
goto error;
LOG_SCCP(src, peer_addr_in, LOGL_NOTICE, "Forwarding to %s in %s\n",
osmo_sccp_inst_addr_name(NULL, &peer_addr_out),
dest == g_bsc_nat->ran ? "RAN" : "CN");
msgb_pull_to_l2(oph->msg);
osmo_sccp_tx_conn_resp(dest->scu, prim->u.connect.conn_id, &peer_addr_out, oph->msg->data,
msgb_length(oph->msg));
rc = 0;
break;
case OSMO_PRIM(OSMO_SCU_PRIM_N_DATA, PRIM_OP_INDICATION):
/* connection-oriented data received */
LOG_SCCP(src, NULL, LOGL_DEBUG, "%s(%s)\n", __func__, osmo_scu_prim_name(oph));