osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27464 ) Change subject: bsc_nat_fsm: move conn.ind before conn.conf ...................................................................... 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 --- M src/osmo-bsc-nat/bsc_nat_fsm.c 1 file changed, 21 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/64/27464/1 diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index b4e0516..085cafd 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -128,27 +128,6 @@ 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 @@ 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)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27464 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc-nat Gerrit-Branch: master Gerrit-Change-Id: Ibdb5a9b092ab481f35cf5920f3635fdf4a9b85c2 Gerrit-Change-Number: 27464 Gerrit-PatchSet: 1 Gerrit-Owner: osmith &lt;osmith(a)sysmocom.de&gt; Gerrit-MessageType: newchange