March 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: bsc: inter-BSC HO in: expect codecs in HO Request ACK

by neels

Attention is currently required from: neels, pespin. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27311 to look at the new patch set (#2). Change subject: bsc: inter-BSC HO in: expect codecs in HO Request ACK ...................................................................... bsc: inter-BSC HO in: expect codecs in HO Request ACK Expect IEs Speech Codec (Chosen) and Codec List (BSS Supported), they are missing in current osmo-bsc. Related: SYS#5839 Depends: I3c0576505a3ceb3cd5cc31dc69c5bc4a86a4ea08 (osmo-bsc) Change-Id: Ib2b4e27be241e2a92c0c3bffdf906bf22c09352b --- M bsc/BSC_Tests.ttcn 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/11/27311/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27311 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ib2b4e27be241e2a92c0c3bffdf906bf22c09352b Gerrit-Change-Number: 27311 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: support "empty" SCCP N-Connect from MSC

by neels

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27373 to look at the new patch set (#2). Change subject: support "empty" SCCP N-Connect from MSC ...................................................................... support "empty" SCCP N-Connect from MSC Teach osmo-bsc to handle empty N-Connect. So far we were always expecting user data in an SCCP N-Connect from an MSC. However, it is perfectly valid for an initial BSSMAP request to follow later. This is relevant for: - Handover Request (incoming inter-BSC handover) - Perform Location Request (query physical location of the MS) Add state WAIT_INITIAL_USER_DATA with new timeout net X25. Always enter this state so that we don't have two separate code paths for handling initial user data. Related: SYS#5864 Change-Id: I535c791fa01e99a2226392eb05f676ba6c3cc16e --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/net_init.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_msc.c M tests/timer.vty 6 files changed, 137 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/73/27373/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I535c791fa01e99a2226392eb05f676ba6c3cc16e Gerrit-Change-Number: 27373 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: support "empty" SCCP N-Connect from MSC

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27373 ) Change subject: support "empty" SCCP N-Connect from MSC ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: @osmith I think this linter complaint might be a candidate for dropping the linter rule: "src/osmo-bsc/net_init.c:74: ERROR:SPACING: space required before that '-' (ctx:OxV)" See osmo-bsc net_init.c, in struct value definitions we like to omit the spaces: { .T=-25, .default_val=5, .desc="Timeout for initial user data after an MSC initiated an SCCP connection to the BSS" }, Apparently it is only complaining about the ".T=-25" even though there are lots of other unspaced '='. I ran s/\([^ ]\)=\([^ ]\)/\1 = \2/g on that code, but the result looks more noisy to me than unspaced '='. (It seems this linter rule has lead to inconsistent style, some of those timer definitions have spaces and some don't. See https://git.osmocom.org/osmo-bsc/tree/src/osmo-bsc/net_init.c#n59 ) I assume it's not possible to apply the linter rule only outside of struct value definitions? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I535c791fa01e99a2226392eb05f676ba6c3cc16e Gerrit-Change-Number: 27373 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 03 Mar 2022 02:54:41 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc-nat[master]: Add command-line options

by neels

Attention is currently required from: osmith. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26660 ) Change subject: Add command-line options ...................................................................... Patch Set 2: (2 comments) Patchset: PS2: just noticed this very old draft comment of mine, maybe it is still relevant File src/osmo-bsc-nat/main.c: https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26660/comment/e64cbc72_4fd9af23 PS2, Line 65: printf(" -V, --version show version number and exit\n"); we usually also have some more options: -D --daemonize Fork the process into a background daemon I have never once used this, but it exists in most osmo programs. And: printf("\nVTY reference generation:\n"); printf(" --vty-ref-mode MODE VTY reference generation mode (e.g. 'expert').\n"); printf(" --vty-ref-xml Generate the VTY reference XML output and exit.\n"); I assume osmo-bsc-nat has a VTY? So then we definitely want to (be able to) auto generate a VTY reference. e.g. see handle_long_options() in msc_main.c. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26660 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: I41bca9e1b88bb130870d078ed3f499e39e0bf5d3 Gerrit-Change-Number: 26660 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Thu, 03 Mar 2022 02:45:09 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: tweak error msg: s/inter-BSC MT/inter-BSC incoming

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27374 ) Change subject: tweak error msg: s/inter-BSC MT/inter-BSC incoming ...................................................................... tweak error msg: s/inter-BSC MT/inter-BSC incoming "inter-BSC MT" was the terminology of an early development stage of inter-BSC handover, code review requested "incoming" instead. This one was missed when applying code review. Related: SYS#5864 Change-Id: I1ca810542e89980ffda11876fd30626467e452d1 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/74/27374/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index a912663..55780e5 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -463,7 +463,7 @@ return; } LOG_HO(conn, LOGL_ERROR, - "Conn is in state %s, the only accepted handover kind is inter-BSC MT\n", + "Conn is in state %s, the only accepted handover kind is inter-BSC incoming handover\n", osmo_fsm_inst_state_name(conn->fi)); } gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27374 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1ca810542e89980ffda11876fd30626467e452d1 Gerrit-Change-Number: 27374 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: silence bogus error: event not permitted: READY_TO_SWITCH_RTP

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27375 ) Change subject: silence bogus error: event not permitted: READY_TO_SWITCH_RTP ...................................................................... silence bogus error: event not permitted: READY_TO_SWITCH_RTP During inter-BSC incoming handover, there is no previous lchan to be switched, so this event always comes in the READY state of lchan_rtp_fsm. No need to complain about that and confuse log readers. Related: SYS#5864 Change-Id: I96fd53b8c8da621a40bd65f85070eabd030cc875 --- M src/osmo-bsc/lchan_rtp_fsm.c 1 file changed, 7 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/27375/1 diff --git a/src/osmo-bsc/lchan_rtp_fsm.c b/src/osmo-bsc/lchan_rtp_fsm.c index 62cd100..e117c65 100644 --- a/src/osmo-bsc/lchan_rtp_fsm.c +++ b/src/osmo-bsc/lchan_rtp_fsm.c @@ -522,6 +522,12 @@ lchan_rtp_fsm_state_chg(LCHAN_RTP_ST_ROLLBACK); return; + case LCHAN_RTP_EV_READY_TO_SWITCH_RTP: + /* Ignore / silence an "event not permitted" error. In case of an inter-BSC incoming handover, there is + * no previous lchan to be switched over, and we are already in this state when the usual handover code + * path emits this event. */ + return; + default: OSMO_ASSERT(false); } @@ -704,6 +710,7 @@ | S(LCHAN_RTP_EV_ESTABLISHED) | S(LCHAN_RTP_EV_RELEASE) | S(LCHAN_RTP_EV_ROLLBACK) + | S(LCHAN_RTP_EV_READY_TO_SWITCH_RTP) , .out_state_mask = 0 | S(LCHAN_RTP_ST_ESTABLISHED) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27375 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I96fd53b8c8da621a40bd65f85070eabd030cc875 Gerrit-Change-Number: 27375 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: add missing counter increment for Perform Location Request

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27372 ) Change subject: add missing counter increment for Perform Location Request ...................................................................... add missing counter increment for Perform Location Request Also increment message counter for the case that a Perform Location Request came in the initial SCCP N-Connect message. Related: SYS#5864 Change-Id: I3f78ce73eb16fdff1f19359963405b2235000fc4 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/72/27372/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 15dbd38..3da13d2 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -329,6 +329,7 @@ return; case BSS_MAP_MSG_PERFORM_LOCATION_RQST: + rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_PERFORM_LOCATION_REQUEST]); /* Location Services: MSC asks for location of an IDLE subscriber */ conn_fsm_state_chg(ST_ACTIVE); lcs_loc_req_start(conn, msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3f78ce73eb16fdff1f19359963405b2235000fc4 Gerrit-Change-Number: 27372 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: support "empty" SCCP N-Connect from MSC

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27373 ) Change subject: support "empty" SCCP N-Connect from MSC ...................................................................... support "empty" SCCP N-Connect from MSC Teach osmo-bsc to handle empty N-Connect. So far we were always expecting user data in an SCCP N-Connect from an MSC. However, it is perfectly valid for an initial BSSMAP request to follow later. This is relevant for: - Handover Request (incoming inter-BSC handover) - Perform Location Request (query physical location of the MS) Add state WAIT_INITIAL_USER_DATA with new timeout net X25. Always enter this state so that we don't have two separate code paths for handling initial user data. Related: SYS#5864 Change-Id: I535c791fa01e99a2226392eb05f676ba6c3cc16e --- M include/osmocom/bsc/bsc_subscr_conn_fsm.h M src/osmo-bsc/bsc_subscr_conn_fsm.c M src/osmo-bsc/net_init.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/osmo_bsc_msc.c M tests/timer.vty 6 files changed, 137 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/73/27373/1 diff --git a/include/osmocom/bsc/bsc_subscr_conn_fsm.h b/include/osmocom/bsc/bsc_subscr_conn_fsm.h index d7deb06..0e495aa 100644 --- a/include/osmocom/bsc/bsc_subscr_conn_fsm.h +++ b/include/osmocom/bsc/bsc_subscr_conn_fsm.h @@ -9,6 +9,7 @@ enum gscon_fsm_event { /* local SCCP stack tells us incoming conn from MSC */ GSCON_EV_A_CONN_IND, + GSCON_EV_A_INITIAL_USER_DATA, /* RSL side requests CONNECT to MSC */ GSCON_EV_MO_COMPL_L3, /* MSC confirms the SCCP connection */ diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 3da13d2..a912663 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -60,6 +60,8 @@ enum gscon_fsm_states { ST_INIT, + /* wait for initial BSSMAP after the MSC opened a new SCCP connection */ + ST_WAIT_INITIAL_USER_DATA, /* waiting for CC from MSC */ ST_WAIT_CC, /* active connection */ @@ -73,6 +75,7 @@ static const struct value_string gscon_fsm_event_names[] = { {GSCON_EV_A_CONN_IND, "MT-CONNECT.ind"}, + {GSCON_EV_A_INITIAL_USER_DATA, "A_INITIAL_USER_DATA"}, {GSCON_EV_MO_COMPL_L3, "MO_COMPL_L3"}, {GSCON_EV_A_CONN_CFM, "MO-CONNECT.cfm"}, {GSCON_EV_A_CLEAR_CMD, "CLEAR_CMD"}, @@ -95,6 +98,7 @@ }; struct osmo_tdef_state_timeout conn_fsm_timeouts[32] = { + [ST_WAIT_INITIAL_USER_DATA] = { .T = -25 }, [ST_WAIT_CC] = { .T = -3210 }, [ST_WAIT_CLEAR_CMD] = { .T = -4 }, [ST_WAIT_SCCP_RLSD] = { .T = -4 }, @@ -258,23 +262,21 @@ gscon_release_lchan(conn, conn->lchan, do_rr_release, false, cause_rr); } -static void handle_bssap_n_connect(struct osmo_fsm_inst *fi, struct osmo_scu_prim *scu_prim) +static int validate_initial_user_data(struct osmo_fsm_inst *fi, struct msgb *msg) { - struct gsm_subscriber_connection *conn = fi->priv; - struct msgb *msg = scu_prim->oph.msg; struct bssmap_header *bs; - uint8_t bssmap_type; + enum BSS_MAP_MSG_TYPE bssmap_type; msg->l3h = msgb_l2(msg); if (!msgb_l3(msg)) { LOGPFSML(fi, LOGL_ERROR, "internal error: no l3 in msg\n"); - goto refuse; + return -EINVAL; } if (msgb_l3len(msg) < sizeof(*bs)) { LOGPFSML(fi, LOGL_ERROR, "message too short for BSSMAP header (%u < %zu)\n", msgb_l3len(msg), sizeof(*bs)); - goto refuse; + return -EINVAL; } bs = (struct bssmap_header*)msgb_l3(msg); @@ -282,7 +284,7 @@ LOGPFSML(fi, LOGL_ERROR, "message too short for length indicated in BSSMAP header (%u < %u)\n", msgb_l3len(msg), bs->length); - goto refuse; + return -EINVAL; } switch (bs->type) { @@ -290,36 +292,43 @@ break; default: LOGPFSML(fi, LOGL_ERROR, - "message type not allowed for N-CONNECT: %s\n", gsm0808_bssap_name(bs->type)); - goto refuse; + "message type not allowed for initial BSSMAP: %s\n", gsm0808_bssap_name(bs->type)); + return -EINVAL; } msg->l4h = &msg->l3h[sizeof(*bs)]; + + /* Validate initial message type. See also BSC_Tests.TC_outbound_connect. */ bssmap_type = msg->l4h[0]; - - LOGPFSML(fi, LOGL_DEBUG, "Rx N-CONNECT: %s: %s\n", gsm0808_bssap_name(bs->type), - gsm0808_bssmap_name(bssmap_type)); - switch (bssmap_type) { case BSS_MAP_MSG_HANDOVER_RQST: case BSS_MAP_MSG_PERFORM_LOCATION_RQST: - break; + return 0; default: - LOGPFSML(fi, LOGL_ERROR, "No support for N-CONNECT: %s: %s\n", + LOGPFSML(fi, LOGL_ERROR, "No support for initial BSSMAP: %s: %s\n", gsm0808_bssap_name(bs->type), gsm0808_bssmap_name(bssmap_type)); - goto refuse; + return -EINVAL; } +} - /* First off, accept the new conn. */ - if (osmo_sccp_tx_conn_resp(conn->sccp.msc->a.sccp_user, scu_prim->u.connect.conn_id, - &scu_prim->u.connect.called_addr, NULL, 0)) { - LOGPFSML(fi, LOGL_ERROR, "Cannot send SCCP CONN RESP\n"); - goto refuse; - } +static void handle_initial_user_data(struct osmo_fsm_inst *fi, struct msgb *msg) +{ + struct gsm_subscriber_connection *conn = fi->priv; + struct bssmap_header *bs; + enum BSS_MAP_MSG_TYPE bssmap_type; + struct rate_ctr *ctrs = conn->sccp.msc->msc_ctrs->ctr; - /* Make sure the conn FSM will osmo_sccp_tx_disconn() on term */ - conn->sccp.state = SUBSCR_SCCP_ST_CONNECTED; + /* validate_initial_user_data() must be called before this */ + OSMO_ASSERT(msgb_l4(msg)); + + bs = msgb_l3(msg); + bssmap_type = msg->l4h[0]; + + /* FIXME: Extract optional IMSI and update FSM using osmo_fsm_inst_set_id() (OS#2969) */ + + LOGPFSML(fi, LOGL_DEBUG, "Rx initial BSSMAP: %s: %s\n", gsm0808_bssap_name(bs->type), + gsm0808_bssmap_name(bssmap_type)); switch (bssmap_type) { case BSS_MAP_MSG_HANDOVER_RQST: @@ -336,13 +345,51 @@ return; default: - OSMO_ASSERT(false); + LOGPFSML(fi, LOGL_ERROR, "No support for initial BSSMAP: %s: %s\n", + gsm0808_bssap_name(bs->type), gsm0808_bssmap_name(bssmap_type)); + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); + return; + } +} + +static void handle_sccp_n_connect(struct osmo_fsm_inst *fi, struct osmo_scu_prim *scu_prim) +{ + struct gsm_subscriber_connection *conn = fi->priv; + struct msgb *msg = scu_prim->oph.msg; + + /* Make sure the conn FSM will osmo_sccp_tx_disconn() on term */ + conn->sccp.state = SUBSCR_SCCP_ST_CONNECTED; + + msg->l3h = msgb_l2(msg); + + /* If (BSSMAP) user data is included, validate it before accepting the connection */ + if (msgb_l3(msg) && msgb_l3len(msg)) { + if (validate_initial_user_data(fi, msg)) { + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); + return; + } } -refuse: - osmo_sccp_tx_disconn(conn->sccp.msc->a.sccp_user, scu_prim->u.connect.conn_id, - &scu_prim->u.connect.called_addr, 0); - osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); + /* accept the new conn. */ + if (osmo_sccp_tx_conn_resp(conn->sccp.msc->a.sccp_user, scu_prim->u.connect.conn_id, + &scu_prim->u.connect.called_addr, NULL, 0)) { + LOGPFSML(fi, LOGL_ERROR, "Cannot send SCCP CONN RESP\n"); + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); + return; + } + + /* The initial user data may already be included in this N-Connect, or it may come later in a separate message. + * If it is already included, also go to ST_WAIT_INITIAL_USER_DATA now, so that we don't have to tend to two + * separate code paths doing the same thing (handling of HANDOVER_END). */ + OSMO_ASSERT(conn_fsm_state_chg(ST_WAIT_INITIAL_USER_DATA) == 0); + + /* It is usually a bad idea to continue using a fi after a state change, because the fi might terminate during + * the state change. In this case it is certain that the fi stays around for the initial user data. */ + if (msgb_l3(msg) && msgb_l3len(msg)) { + handle_initial_user_data(fi, msg); + } else { + LOGPFSML(fi, LOGL_DEBUG, "N-Connect does not contain user data (no BSSMAP message included)\n"); + } } static void gscon_fsm_init(struct osmo_fsm_inst *fi, uint32_t event, void *data) @@ -351,7 +398,6 @@ struct osmo_scu_prim *scu_prim = NULL; struct msgb *msg = NULL; int rc; - enum handover_result ho_result; switch (event) { case GSCON_EV_MO_COMPL_L3: @@ -379,11 +425,28 @@ osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); return; } - /* FIXME: Extract optional IMSI and update FSM using osmo_fsm_inst_set_id() - * related: OS2969 (same as above) */ - - handle_bssap_n_connect(fi, scu_prim); + handle_sccp_n_connect(fi, scu_prim); break; + default: + OSMO_ASSERT(false); + } +} + +static void gscon_fsm_wait_initial_user_data(struct osmo_fsm_inst *fi, uint32_t event, void *data) +{ + struct gsm_subscriber_connection *conn = fi->priv; + struct msgb *msg = data; + enum handover_result ho_result; + + switch (event) { + case GSCON_EV_A_INITIAL_USER_DATA: + if (validate_initial_user_data(fi, msg)) { + osmo_fsm_inst_term(fi, OSMO_FSM_TERM_REGULAR, NULL); + return; + } + handle_initial_user_data(fi, msg); + break; + case GSCON_EV_HANDOVER_END: ho_result = HO_RESULT_ERROR; if (data) @@ -715,10 +778,20 @@ static const struct osmo_fsm_state gscon_fsm_states[] = { [ST_INIT] = { .name = "INIT", - .in_event_mask = S(GSCON_EV_MO_COMPL_L3) | S(GSCON_EV_A_CONN_IND) - | S(GSCON_EV_HANDOVER_END), - .out_state_mask = S(ST_WAIT_CC) | S(ST_ACTIVE) | S(ST_WAIT_CLEAR_CMD) | S(ST_WAIT_SCCP_RLSD), + .in_event_mask = S(GSCON_EV_MO_COMPL_L3) | S(GSCON_EV_A_CONN_IND), + .out_state_mask = 0 + | S(ST_WAIT_INITIAL_USER_DATA) + | S(ST_WAIT_CC) | S(ST_ACTIVE) | S(ST_WAIT_CLEAR_CMD) | S(ST_WAIT_SCCP_RLSD), .action = gscon_fsm_init, + }, + [ST_WAIT_INITIAL_USER_DATA] = { + .name = "WAIT_INITIAL_USER_DATA", + .in_event_mask = 0 + | S(GSCON_EV_A_INITIAL_USER_DATA) + | S(GSCON_EV_HANDOVER_END) + , + .out_state_mask = S(ST_WAIT_CC) | S(ST_ACTIVE) | S(ST_WAIT_CLEAR_CMD) | S(ST_WAIT_SCCP_RLSD), + .action = gscon_fsm_wait_initial_user_data, }, [ST_WAIT_CC] = { .name = "WAIT_CC", diff --git a/src/osmo-bsc/net_init.c b/src/osmo-bsc/net_init.c index adcffc7..8a8c0a6 100644 --- a/src/osmo-bsc/net_init.c +++ b/src/osmo-bsc/net_init.c @@ -71,6 +71,7 @@ .desc = "Forget-sum period for all_allocated:* rate counters:" " after this amount of idle time, forget internally cumulated time remainders. Zero to always" " keep remainders. See also X16, X17." }, + { .T=-25, .default_val=5, .desc="Timeout for initial user data after an MSC initiated an SCCP connection to the BSS" }, { .T=-3111, .default_val=4, .desc="Wait time after lchan was released in error (should be T3111 + 2s)" }, { .T=-3210, .default_val=20, .desc="After L3 Complete, wait for MSC to confirm" }, {} diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index aba652a..311b0fa 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -981,6 +981,24 @@ return -1; } +/* Handle Handover Request message, part of inter-BSC handover: + * The MSC opened a new SCCP connection and is asking this BSS to accept an inter-BSC incoming handover. + * If we accept, we'll send a Handover Request Acknowledge. + * This function is only called when the Handover Request is *not* included in the initial SCCP N-Connect message, but + * follows an "empty" N-Connect in a separate DT1 message. + */ +static int bssmap_handle_handover_request(struct gsm_subscriber_connection *conn, struct msgb *msg) +{ + if (osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_A_INITIAL_USER_DATA, msg)) { + /* A Handover Request message should come in on a newly opened SCCP conn. Apparently the MSC has sent a + * Handover Request on an already busy SCCP conn, and naturally we cannot accept another subscriber + * here. This is unlikely to ever happen in practice. Respond in the only possible way: */ + bsc_tx_bssmap_ho_failure(conn); + return -EINVAL; + } + return 0; +} + /* Handle Handover Command message, part of inter-BSC handover: * This BSS sent a Handover Required message. * The MSC contacts the remote BSS and receives from it an RR Handover Command; this BSSMAP Handover @@ -1165,6 +1183,10 @@ rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_LCLS_CONNECT_CTRL]); ret = bssmap_handle_lcls_connect_ctrl(conn, msg, length); break; + case BSS_MAP_MSG_HANDOVER_RQST: + rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_HANDOVER_RQST]); + ret = bssmap_handle_handover_request(conn, msg); + break; case BSS_MAP_MSG_HANDOVER_CMD: rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_HANDOVER_CMD]); ret = bssmap_handle_handover_cmd(conn, msg, length); diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index baef4e5..4d1d85b 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -55,6 +55,7 @@ [MSC_CTR_BSSMAP_RX_DT1_CIPHER_MODE_CMD] = {"bssmap:rx:dt1:cipher_mode:cmd", "Number of received BSSMAP DT1 CIPHER MODE CMD messages"}, [MSC_CTR_BSSMAP_RX_DT1_ASSIGMENT_RQST] = {"bssmap:rx:dt1:assignment:rqst", "Number of received BSSMAP DT1 ASSIGMENT RQST messages"}, [MSC_CTR_BSSMAP_RX_DT1_LCLS_CONNECT_CTRL] = {"bssmap:rx:dt1:lcls_connect_ctrl:cmd", "Number of received BSSMAP DT1 LCLS CONNECT CTRL messages"}, + [MSC_CTR_BSSMAP_RX_DT1_HANDOVER_RQST] = {"bssmap:rx:dt1:handover:rqst", "Number of received BSSMAP DT1 HANDOVER RQST messages"}, [MSC_CTR_BSSMAP_RX_DT1_HANDOVER_CMD] = {"bssmap:rx:dt1:handover:cmd", "Number of received BSSMAP DT1 HANDOVER CMD messages"}, [MSC_CTR_BSSMAP_RX_DT1_CLASSMARK_RQST] = {"bssmap:rx:dt1:classmark:rqst", "Number of received BSSMAP DT1 CLASSMARK RQST messages"}, [MSC_CTR_BSSMAP_RX_DT1_CONFUSION] = {"bssmap:rx:dt1:confusion", "Number of received BSSMAP DT1 CONFUSION messages"}, diff --git a/tests/timer.vty b/tests/timer.vty index e832070..04c9872 100644 --- a/tests/timer.vty +++ b/tests/timer.vty @@ -33,6 +33,7 @@ net: X16 = 1000 ms Granularity for all_allocated:* rate counters: amount of milliseconds that one counter increment represents. See also X17, X18 (default: 1000 ms) net: X17 = 0 ms Rounding threshold for all_allocated:* rate counters: round up to the next counter increment after this many milliseconds. If set to half of X16 (or 0), employ the usual round() behavior: round up after half of a granularity period. If set to 1, behave like ceil(): already increment the counter immediately when all channels are allocated. If set >= X16, behave like floor(): only increment after a full X16 period of all channels being occupied. See also X16, X18 (default: 0 ms) net: X18 = 60000 ms Forget-sum period for all_allocated:* rate counters: after this amount of idle time, forget internally cumulated time remainders. Zero to always keep remainders. See also X16, X17. (default: 60000 ms) +net: X25 = 5 s Timeout for initial user data after an MSC initiated an SCCP connection to the BSS (default: 5 s) net: X3111 = 4 s Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s) net: X3210 = 20 s After L3 Complete, wait for MSC to confirm (default: 20 s) mgw: X2427 = 5 s timeout for MGCP response from MGW (default: 5 s) @@ -86,6 +87,7 @@ net: X16 = 1000 ms Granularity for all_allocated:* rate counters: amount of milliseconds that one counter increment represents. See also X17, X18 (default: 1000 ms) net: X17 = 0 ms Rounding threshold for all_allocated:* rate counters: round up to the next counter increment after this many milliseconds. If set to half of X16 (or 0), employ the usual round() behavior: round up after half of a granularity period. If set to 1, behave like ceil(): already increment the counter immediately when all channels are allocated. If set >= X16, behave like floor(): only increment after a full X16 period of all channels being occupied. See also X16, X18 (default: 0 ms) net: X18 = 60000 ms Forget-sum period for all_allocated:* rate counters: after this amount of idle time, forget internally cumulated time remainders. Zero to always keep remainders. See also X16, X17. (default: 60000 ms) +net: X25 = 5 s Timeout for initial user data after an MSC initiated an SCCP connection to the BSS (default: 5 s) net: X3111 = 4 s Wait time after lchan was released in error (should be T3111 + 2s) (default: 4 s) net: X3210 = 20 s After L3 Complete, wait for MSC to confirm (default: 20 s) mgw: X2427 = 5 s timeout for MGCP response from MGW (default: 5 s) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27373 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I535c791fa01e99a2226392eb05f676ba6c3cc16e Gerrit-Change-Number: 27373 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: tweak logl to ERROR for invalid initial BSSMAP

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27370 ) Change subject: tweak logl to ERROR for invalid initial BSSMAP ...................................................................... tweak logl to ERROR for invalid initial BSSMAP Related: SYS#5864 Change-Id: Idd7d763129a5acdf19cd0ae86e82b77ee0073f2f --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 4 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/27370/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 33dd283..94438a8 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -272,14 +272,14 @@ } if (msgb_l3len(msg) < sizeof(*bs)) { - LOGPFSML(fi, LOGL_NOTICE, "message too short for BSSMAP header (%u < %zu)\n", + LOGPFSML(fi, LOGL_ERROR, "message too short for BSSMAP header (%u < %zu)\n", msgb_l3len(msg), sizeof(*bs)); goto refuse; } bs = (struct bssmap_header*)msgb_l3(msg); if (msgb_l3len(msg) < (bs->length + sizeof(*bs))) { - LOGPFSML(fi, LOGL_NOTICE, + LOGPFSML(fi, LOGL_ERROR, "message too short for length indicated in BSSMAP header (%u < %u)\n", msgb_l3len(msg), bs->length); goto refuse; @@ -289,7 +289,7 @@ case BSSAP_MSG_BSS_MANAGEMENT: break; default: - LOGPFSML(fi, LOGL_NOTICE, + LOGPFSML(fi, LOGL_ERROR, "message type not allowed for N-CONNECT: %s\n", gsm0808_bssap_name(bs->type)); goto refuse; } @@ -306,7 +306,7 @@ break; default: - LOGPFSML(fi, LOGL_NOTICE, "No support for N-CONNECT: %s: %s\n", + LOGPFSML(fi, LOGL_ERROR, "No support for N-CONNECT: %s: %s\n", gsm0808_bssap_name(bs->type), gsm0808_bssmap_name(bssmap_type)); goto refuse; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idd7d763129a5acdf19cd0ae86e82b77ee0073f2f Gerrit-Change-Number: 27370 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-bsc[master]: add message counter for inter-BSC incoming Handover Request

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27371 ) Change subject: add message counter for inter-BSC incoming Handover Request ...................................................................... add message counter for inter-BSC incoming Handover Request Related: SYS#5864 Change-Id: Icdde2bb339a5e367a4d297802214a1ef3f36eefa --- M include/osmocom/bsc/bsc_msc_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/71/27371/1 diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index e5f48d1..fd5ea3e 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -61,6 +61,7 @@ MSC_CTR_BSSMAP_RX_DT1_CIPHER_MODE_CMD, MSC_CTR_BSSMAP_RX_DT1_ASSIGMENT_RQST, MSC_CTR_BSSMAP_RX_DT1_LCLS_CONNECT_CTRL, + MSC_CTR_BSSMAP_RX_DT1_HANDOVER_RQST, MSC_CTR_BSSMAP_RX_DT1_HANDOVER_CMD, MSC_CTR_BSSMAP_RX_DT1_CLASSMARK_RQST, MSC_CTR_BSSMAP_RX_DT1_CONFUSION, diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 94438a8..15dbd38 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -323,6 +323,7 @@ switch (bssmap_type) { case BSS_MAP_MSG_HANDOVER_RQST: + rate_ctr_inc(&ctrs[MSC_CTR_BSSMAP_RX_DT1_HANDOVER_RQST]); /* Inter-BSC MT Handover Request, another BSS is handovering to us. */ handover_start_inter_bsc_in(conn, msg); return; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icdde2bb339a5e367a4d297802214a1ef3f36eefa Gerrit-Change-Number: 27371 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022