- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: bsc: make perform_clear() work when VTY is not initialized

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26617 ) Change subject: bsc: make perform_clear() work when VTY is not initialized ...................................................................... Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26617/1/bsc/BSC_Tests.ttcn File bsc/BSC_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26617/1/bsc/BSC_Tests.ttcn@… PS1, Line 1069: if (g_vty_initialized) { > Can we simply have this check in f_logp()? good idea! -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26617 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: I8116075f32937bd06ba14b426010bf6fec2ef402 Gerrit-Change-Number: 26617 Gerrit-PatchSet: 1 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-Comment-Date: Tue, 04 Jan 2022 13:33:54 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: log: always include timeouts in FSM transition logging

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26609 ) Change subject: log: always include timeouts in FSM transition logging ...................................................................... log: always include timeouts in FSM transition logging Before: state_chg to ACTIVE state_chg to WAIT_RLL_RTP_RELEASED state_chg to WAIT_SCCP_RLSD After: State change to ACTIVE (no timeout) State change to WAIT_RLL_RTP_RELEASED (T3109, 5s) State change to WAIT_SCCP_RLSD (X4, 60s) Change-Id: I94b7dc4d9e5e45dc731bcb3a843ede9fb6cc0839 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index b7e2616..167b0a3 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -891,6 +891,7 @@ rate_ctr_init(tall_bsc_ctx); osmo_fsm_set_dealloc_ctx(OTC_SELECT); + osmo_fsm_log_timeouts(true); /* Allocate global gsm_network struct */ rc = bsc_network_alloc(); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26609 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I94b7dc4d9e5e45dc731bcb3a843ede9fb6cc0839 Gerrit-Change-Number: 26609 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: lchan/gscon: always clear both cross ref pointers

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26610 ) Change subject: lchan/gscon: always clear both cross ref pointers ...................................................................... lchan/gscon: always clear both cross ref pointers During specific release scenarios, it became clear that an lchan still pointed at a conn even after it had been deallocated. That was due to setting conn->lchan = NULL but not lchan->conn = NULL. Fix that. Do lchan_forget_conn() first, because during gscon_forget_lchan() we may enter the gscon clearing dance, which in case of no SCCP conn being present will soon / should immediately deallocate the conn. Related: OS#5337 Related: I8c8537acf6b47b121903197608636c43ae601a57 (osmo-bsc) Change-Id: Idbfe4672233ba8105eff5ba77ee07fd871358255 --- M src/osmo-bsc/lchan_fsm.c 1 file changed, 7 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 5ae6df6..84f8dc5 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -478,8 +478,11 @@ { LOG_LCHAN(lchan, LOGL_DEBUG, "Clearing lchan state\n"); - if (lchan->conn) - gscon_forget_lchan(lchan->conn, lchan); + if (lchan->conn) { + struct gsm_subscriber_connection *conn = lchan->conn; + lchan_forget_conn(lchan); + gscon_forget_lchan(conn, lchan); + } if (lchan->rqd_ref) { talloc_free(lchan->rqd_ref); @@ -1392,8 +1395,9 @@ * lchan_reset(), we make sure it does. But in case of releases from error handling, the * conn might as well notice now already that its lchan is becoming unusable. */ if (lchan->conn) { - gscon_forget_lchan(lchan->conn, lchan); + struct gsm_subscriber_connection *conn = lchan->conn; lchan_forget_conn(lchan); + gscon_forget_lchan(conn, lchan); } rc = rsl_tx_rf_chan_release(lchan); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26610 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Idbfe4672233ba8105eff5ba77ee07fd871358255 Gerrit-Change-Number: 26610 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: lcs: fix bsc_subscr use_count leak

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26611 ) Change subject: lcs: fix bsc_subscr use_count leak ...................................................................... lcs: fix bsc_subscr use_count leak In lcs_ta_req_wait_ta_onenter(), fix use count leak of 'start-paging': get() the use count only after the early exits. osmo-ttcn3-hacks patch I69d4c5c6f8d499bb7f0b96a48af045361433c57b introduces testing against this leak in various LCS tests (e.g. BSC_Tests.TC_lcs_loc_req_for_active_ms_ta_req). Related: OS#5355 Change-Id: Ibbfbfe766eafe42c78048ec5b3b503a11ef5535d --- M src/osmo-bsc/lcs_ta_req.c 1 file changed, 11 insertions(+), 11 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/lcs_ta_req.c b/src/osmo-bsc/lcs_ta_req.c index 6252d46..f0bb02e 100644 --- a/src/osmo-bsc/lcs_ta_req.c +++ b/src/osmo-bsc/lcs_ta_req.c @@ -122,17 +122,6 @@ return; } - paging = (struct bsc_paging_params){ - .reason = BSC_PAGING_FOR_LCS, - .msc = loc_req->conn->sccp.msc, - .bsub = loc_req->conn->bsub, - .tmsi = GSM_RESERVED_TMSI, - .imsi = loc_req->req.imsi, - .chan_needed = RSL_CHANNEED_ANY, - }; - if (paging.bsub) - bsc_subscr_get(paging.bsub, BSUB_USE_PAGING_START); - /* Do we already have an active lchan with knowledge of TA? */ lchan = loc_req->conn->lchan; if (lchan) { @@ -147,6 +136,17 @@ return; } + paging = (struct bsc_paging_params){ + .reason = BSC_PAGING_FOR_LCS, + .msc = loc_req->conn->sccp.msc, + .bsub = loc_req->conn->bsub, + .tmsi = GSM_RESERVED_TMSI, + .imsi = loc_req->req.imsi, + .chan_needed = RSL_CHANNEED_ANY, + }; + if (paging.bsub) + bsc_subscr_get(paging.bsub, BSUB_USE_PAGING_START); + if (!loc_req->req.cell_id_present) { LOG_LCS_TA_REQ(lcs_ta_req, LOGL_DEBUG, "No Cell Identity in BSSMAP Location Request, paging entire BSS\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26611 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibbfbfe766eafe42c78048ec5b3b503a11ef5535d Gerrit-Change-Number: 26611 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: fix gscon clear 1/n: store clear cause in gscon

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26612 ) Change subject: fix gscon clear 1/n: store clear cause in gscon ...................................................................... fix gscon clear 1/n: store clear cause in gscon Allow returning a context sensitive cause instead of a hardcoded one in gscon pre_term(). Also, the conn->cause is needed to move message dispatch to an "onenter" function in patch I234b2a754d0c98031056981823cdbc187e977741. I Split this part off as a separate patch for better readability. Related: OS#5337 Change-Id: Ib6432746040899129d1d73ae8dc59add2d88a915 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscr_conn_fsm.c 2 files changed, 7 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 238b2f7..4e26ec1 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -404,6 +404,8 @@ bool last_eutran_plmn_valid; /* Is information stored in field below available? */ struct osmo_plmn_id last_eutran_plmn; } fast_return; + + enum gsm0808_cause clear_cause; }; diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 2140c9b..ff742a2 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -144,6 +144,7 @@ struct msgb *resp; int rc; + conn->clear_cause = cause; if (conn->rx_clear_command) { LOGPFSML(conn->fi, LOGL_DEBUG, "Not sending BSSMAP CLEAR REQUEST, already got CLEAR COMMAND from MSC\n"); @@ -976,9 +977,7 @@ } LOGPFSML(fi, LOGL_DEBUG, "Releasing all lchans (if any) because this conn is terminating\n"); - /* when things go smoothly, the lchan should have been released before FSM instance termination. So if this is - * necessary it's probably "abnormal". */ - gscon_release_lchans(conn, true, GSM48_RR_CAUSE_ABNORMAL_UNSPEC); + gscon_release_lchans(conn, true, bsc_gsm48_rr_cause_from_gsm0808_cause(conn->clear_cause)); /* drop pending messages */ gscon_dtap_queue_flush(conn, 0); @@ -1057,6 +1056,9 @@ INIT_LLIST_HEAD(&conn->hodec2.penalty_timers); conn->sccp.conn_id = -1; + /* Default clear cause (on RR translates to GSM48_RR_CAUSE_ABNORMAL_UNSPEC) */ + conn->clear_cause = GSM0808_CAUSE_EQUIPMENT_FAILURE; + /* don't allocate from 'conn' context, as gscon_cleanup() will call talloc_free(conn) before * libosmocore will call talloc_free(conn->fi), i.e. avoid use-after-free during cleanup */ conn->fi = osmo_fsm_inst_alloc(&gscon_fsm, net, conn, LOGL_DEBUG, NULL); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib6432746040899129d1d73ae8dc59add2d88a915 Gerrit-Change-Number: 26612 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-bsc[master]: fix gscon clear 2/n: proper state transition to ST_CLEARING

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/26613 ) Change subject: fix gscon clear 2/n: proper state transition to ST_CLEARING ...................................................................... fix gscon clear 2/n: proper state transition to ST_CLEARING The way the ST_CLEARING is entered before this patch has various symptoms of how I / we used osmo_fsm when we were still FSM amateurs in Osmocom. Patch that up: - In gscon_bssmap_clear(), ask for a state transition to ST_CLEARING first. Go ahead only if it is allowed. - move the Clear Request messaging to ST_CLEARING's onenter function. - Fix the timeout behavior: by using conn_fsm_state_chg(), use the actual proper X4 timer value for ST_CLEARING from VTY configuration instead of hardcoded magic numbers. Related: OS#5337 Change-Id: I234b2a754d0c98031056981823cdbc187e977741 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 20 insertions(+), 15 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index ff742a2..e33fe43 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -141,10 +141,24 @@ static void gscon_bssmap_clear(struct gsm_subscriber_connection *conn, enum gsm0808_cause cause) { + /* already clearing? */ + switch (conn->fi->state) { + case ST_CLEARING: + return; + default: + break; + } + conn->clear_cause = cause; + conn_fsm_state_chg(ST_CLEARING); +} + +static void gscon_fsm_clearing_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) +{ struct msgb *resp; int rc; - conn->clear_cause = cause; + struct gsm_subscriber_connection *conn = fi->priv; + enum gsm0808_cause cause = conn->clear_cause; if (conn->rx_clear_command) { LOGPFSML(conn->fi, LOGL_DEBUG, "Not sending BSSMAP CLEAR REQUEST, already got CLEAR COMMAND from MSC\n"); @@ -152,14 +166,14 @@ } if (!conn->sccp.msc) { - LOGPFSML(conn->fi, LOGL_ERROR, "Unable to deliver BSSMAP Clear Request message, no MSC for this conn\n"); + LOGPFSML(fi, LOGL_ERROR, "Unable to deliver BSSMAP Clear Request message, no MSC for this conn\n"); return; } - LOGPFSML(conn->fi, LOGL_DEBUG, "Tx BSSMAP CLEAR REQUEST(%s) to MSC\n", gsm0808_cause_name(cause)); + LOGPFSML(fi, LOGL_DEBUG, "Tx BSSMAP CLEAR REQUEST(%s) to MSC\n", gsm0808_cause_name(cause)); resp = gsm0808_create_clear_rqst(cause); if (!resp) { - LOGPFSML(conn->fi, LOGL_ERROR, "Unable to compose BSSMAP Clear Request message\n"); + LOGPFSML(fi, LOGL_ERROR, "Unable to compose BSSMAP Clear Request message\n"); return; } @@ -355,8 +369,6 @@ osmo_fsm_inst_state_name(conn->fi)); } gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); - if (conn->fi->state != ST_CLEARING) - osmo_fsm_inst_state_chg(fi, ST_CLEARING, 60, -4); return; default: OSMO_ASSERT(false); @@ -376,7 +388,6 @@ confirmed connection, then instead simply drop the connection */ LOGPFSML(fi, LOGL_INFO, "Connection confirmed but lchan was dropped previously, clearing conn\n"); - osmo_fsm_inst_state_chg(conn->fi, ST_CLEARING, 60, -4); gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); break; } @@ -705,6 +716,7 @@ }, [ST_CLEARING] = { .name = "CLEARING", + .onenter = gscon_fsm_clearing_onenter, /* dead end state */ }, }; @@ -763,11 +775,6 @@ yet so we cannot release it. First wait for the CC, and release in gscon_fsm_wait_cc(). */ break; default: - /* Ensure that the FSM is in ST_CLEARING. */ - osmo_fsm_inst_state_chg(conn->fi, ST_CLEARING, 60, -4); - /* fall thru, omit an error log if already in ST_CLEARING */ - case ST_CLEARING: - /* Request a Clear Command from the MSC. */ gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); break; } @@ -806,8 +813,7 @@ osmo_fsm_inst_name(conn->fi), detach_label); } - if ((conn->fi && conn->fi->state != ST_CLEARING) - && !conn->lchan + if (!conn->lchan && !conn->ho.new_lchan && !conn->assignment.new_lchan && !conn->lcs.loc_req) @@ -1205,7 +1211,6 @@ failed_to_send: LOGPFSML(conn->fi, LOGL_ERROR, "Tx BSSMAP CLEAR REQUEST to MSC\n"); gscon_bssmap_clear(conn, GSM0808_CAUSE_EQUIPMENT_FAILURE); - osmo_fsm_inst_state_chg(conn->fi, ST_ACTIVE, 0, 0); } void gscon_submit_rsl_dtap(struct gsm_subscriber_connection *conn, -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/26613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I234b2a754d0c98031056981823cdbc187e977741 Gerrit-Change-Number: 26613 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: ipse <Alexander.Chemeris(a)gmail.com> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: fix ho-out test failures: cleanup neighbor cfg cruft

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26616 ) Change subject: bsc: fix ho-out test failures: cleanup neighbor cfg cruft ...................................................................... bsc: fix ho-out test failures: cleanup neighbor cfg cruft In the out-of-this-BSC handover tests, a neighbor config of LAC 99 left behind from a previous test obstructed the test from working: % BTS 0 already had neighbor LAC:99 ARFCN-BSIC:123-45 % ERROR: duplicate Cell ID in neighbor config, with differing ARFCN+BSIC: LAC:99 ARFCN-BSIC:123-any Add a 'no neighbor lac 99' before configuring the neighbor via VTY. Also add the missing neighbor config to f_tc_srvcc_eutran_to_geran_ho_out_main(). Affects tests: BSC_Tests.TC_ho_out_of_this_bsc BSC_Tests.TC_srvcc_eutran_to_geran_ho_out BSC_Tests.TC_srvcc_eutran_to_geran_ho_out_forbid_fast_return Change-Id: I7a7c97a47a06abb59c0d89638c6b503ab66eb359 --- M bsc/BSC_Tests.ttcn 1 file changed, 14 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 5276ed9..c485ec5 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -5616,6 +5616,7 @@ "handover 1", "handover algorithm 2", "handover2 window rxlev averaging 1", + "no neighbors", "neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); @@ -5687,7 +5688,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); - f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); + f_bts_0_cfg(BSCVTY, {"no neighbor lac 99", "neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -5731,7 +5732,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); - f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); + f_bts_0_cfg(BSCVTY, {"no neighbor lac 99", "neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -5813,7 +5814,7 @@ var template PDU_BSSAP exp_compl := f_gen_exp_compl(); f_establish_fully(ass_req, exp_compl); - f_bts_0_cfg(BSCVTY, {"neighbor lac 99 arfcn 123 bsic any"}); + f_bts_0_cfg(BSCVTY, {"no neighbor lac 99", "neighbor lac 99 arfcn 123 bsic any"}); f_vty_transceive(BSCVTY, "handover any to arfcn 123 bsic any"); BSSAP.receive(tr_BSSMAP_HandoverRequired); @@ -6099,6 +6100,16 @@ var MSC_ConnHdlr vc_conn; var TestHdlrParams pars := f_gen_test_hdlr_pars(); + f_init_vty(); + f_bts_0_cfg(BSCVTY, + {"neighbor-list mode automatic", + "handover 1", + "handover algorithm 2", + "handover2 window rxlev averaging 1", + "no neighbors", + "neighbor lac 99 arfcn 123 bsic any"}); + f_vty_transceive(BSCVTY, "drop bts connection 0 oml"); + f_init(1, true); if (disable_fast_return) { f_vty_allow_srvcc_fast_return(true, 0); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/26616 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: I7a7c97a47a06abb59c0d89638c6b503ab66eb359 Gerrit-Change-Number: 26616 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-bsc-nat[master]: Add vty interface

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26659 ) Change subject: Add vty interface ...................................................................... Add vty interface Related: OS#2545 Change-Id: I6f2d8d1d62b97be471ebcf1bb14aac0b895833d1 --- M include/osmocom/bsc_nat/Makefile.am M include/osmocom/bsc_nat/bsc_nat.h A include/osmocom/bsc_nat/logging.h A include/osmocom/bsc_nat/vty.h M src/osmo-bsc-nat/Makefile.am A src/osmo-bsc-nat/bsc_nat.c A src/osmo-bsc-nat/logging.c M src/osmo-bsc-nat/main.c A src/osmo-bsc-nat/vty.c 9 files changed, 297 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc_nat/Makefile.am b/include/osmocom/bsc_nat/Makefile.am index 158ca4b..f573dd9 100644 --- a/include/osmocom/bsc_nat/Makefile.am +++ b/include/osmocom/bsc_nat/Makefile.am @@ -1,3 +1,5 @@ noinst_HEADERS = \ bsc_nat.h \ + logging.h \ + vty.h \ $(NULL) diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index bbdf826..511d5a4 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -17,3 +17,12 @@ * */ #pragma once + +struct bsc_nat { +}; + +struct bsc_nat *bsc_nat_alloc(void *tall_ctx); +void bsc_nat_free(struct bsc_nat *bsc_nat); + +extern void *tall_bsc_nat_ctx; +extern struct bsc_nat *g_bsc_nat; diff --git a/include/osmocom/bsc_nat/logging.h b/include/osmocom/bsc_nat/logging.h new file mode 100644 index 0000000..88f67b0 --- /dev/null +++ b/include/osmocom/bsc_nat/logging.h @@ -0,0 +1,27 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ +#pragma once + +#include <osmocom/core/logging.h> + +enum { + DMAIN, +}; + +extern const struct log_info bsc_nat_log_info; diff --git a/include/osmocom/bsc_nat/vty.h b/include/osmocom/bsc_nat/vty.h new file mode 100644 index 0000000..f882c23 --- /dev/null +++ b/include/osmocom/bsc_nat/vty.h @@ -0,0 +1,31 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#pragma once + +#include <osmocom/vty/vty.h> +#include <osmocom/vty/buffer.h> +#include <osmocom/vty/command.h> + +enum bsc_nat_vty_nodes { + BSC_NAT_NODE = _LAST_OSMOVTY_NODE, +}; + +void bsc_nat_vty_init(void); +int bsc_nat_vty_go_parent(struct vty *vty); diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index 9d0bf3e..9aa9524 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -25,7 +25,10 @@ $(NULL) osmo_bsc_nat_SOURCES = \ + bsc_nat.c \ + logging.c \ main.c \ + vty.c \ $(NULL) osmo_bsc_nat_LDADD = \ diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c new file mode 100644 index 0000000..149e7cb --- /dev/null +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -0,0 +1,38 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#include "config.h" + +#include <osmocom/core/talloc.h> +#include <osmocom/bsc_nat/bsc_nat.h> + +struct bsc_nat *bsc_nat_alloc(void *tall_ctx) +{ + struct bsc_nat *bsc_nat; + + bsc_nat = talloc_zero(tall_ctx, struct bsc_nat); + OSMO_ASSERT(bsc_nat); + + return bsc_nat; +} + +void bsc_nat_free(struct bsc_nat *bsc_nat) +{ + talloc_free(bsc_nat); +} diff --git a/src/osmo-bsc-nat/logging.c b/src/osmo-bsc-nat/logging.c new file mode 100644 index 0000000..5ada8c2 --- /dev/null +++ b/src/osmo-bsc-nat/logging.c @@ -0,0 +1,37 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ +#include <osmocom/core/logging.h> +#include <osmocom/core/utils.h> + +#include <osmocom/bsc_nat/logging.h> + +static const struct log_info_cat log_cat[] = { + [DMAIN] = { + .name = "DMAIN", + .loglevel = LOGL_NOTICE, + .enabled = 1, + .color = "", + .description = "Main program", + }, +}; + +const struct log_info bsc_nat_log_info = { + .cat = log_cat, + .num_cat = ARRAY_SIZE(log_cat), +}; diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c index 8775af1..813909b 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -19,7 +19,78 @@ #include "config.h" +#include <osmocom/core/application.h> +#include <osmocom/vty/cpu_sched_vty.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/misc.h> +#include <osmocom/vty/ports.h> +#include <osmocom/vty/telnet_interface.h> + +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/logging.h> +#include <osmocom/bsc_nat/vty.h> + +static const char *const copyright = + "OsmoBSCNAT - Osmocom BSC NAT\r\n" + "Copyright (C) 2021 by sysmocom s.f.m.c. GmbH <info(a)sysmocom.de>\r\n" + "Author: Oliver Smith\r\n" + "License AGPLv3+: GNU AGPL version 3 or later <http://gnu.org/licenses/agpl-3.0.html>\r\n" + "This is free software: you are free to change and redistribute it.\r\n" + "There is NO WARRANTY, to the extent permitted by law.\r\n"; + +void *tall_bsc_nat_ctx; +struct bsc_nat *g_bsc_nat; + +static struct vty_app_info vty_info = { + .name = "OsmoBSCNAT", + .version = PACKAGE_VERSION, + .go_parent_cb = bsc_nat_vty_go_parent, +}; + +static void main_vty_init() +{ + int rc; + + vty_info.copyright = copyright; + vty_info.tall_ctx = tall_bsc_nat_ctx; + vty_init(&vty_info); + + bsc_nat_vty_init(); + + logging_vty_add_cmds(); + osmo_talloc_vty_add_cmds(); + osmo_cpu_sched_vty_init(tall_bsc_nat_ctx); + + rc = telnet_init_dynif(tall_bsc_nat_ctx, g_bsc_nat, vty_get_bind_addr(), OSMO_VTY_PORT_BSC_NAT); + if (rc < 0) { + perror("Error binding VTY port"); + exit(1); + } +} + int main(int argc, char **argv) { + int rc; + + talloc_enable_null_tracking(); + tall_bsc_nat_ctx = talloc_named_const(NULL, 0, "bsc_nat"); + + rc = osmo_init_logging2(tall_bsc_nat_ctx, &bsc_nat_log_info); + if (rc < 0) + exit(1); + + g_bsc_nat = bsc_nat_alloc(tall_bsc_nat_ctx); + + main_vty_init(); + + while (!osmo_select_shutdown_done()) + osmo_select_main_ctx(0); + + talloc_report_full(tall_bsc_nat_ctx, stderr); + talloc_free(tall_bsc_nat_ctx); + talloc_free(tall_vty_ctx); + talloc_report_full(NULL, stderr); + talloc_disable_null_tracking(); + return 0; } diff --git a/src/osmo-bsc-nat/vty.c b/src/osmo-bsc-nat/vty.c new file mode 100644 index 0000000..089d27b --- /dev/null +++ b/src/osmo-bsc-nat/vty.c @@ -0,0 +1,79 @@ +/* (C) 2021 by sysmocom - s.f.m.c. GmbH <info(a)sysmocom.de> + * Author: Oliver Smith <osmith(a)sysmocom.de> + * All Rights Reserved + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/lienses/>. + * + */ + +#include "config.h" + +#include <unistd.h> + +#include <osmocom/vty/telnet_interface.h> +#include <osmocom/vty/logging.h> +#include <osmocom/vty/command.h> + +#include <osmocom/bsc_nat/bsc_nat.h> +#include <osmocom/bsc_nat/vty.h> + +int bsc_nat_vty_go_parent(struct vty *vty) +{ + switch (vty->node) { + case BSC_NAT_NODE: + vty->node = CONFIG_NODE; + vty->index = g_bsc_nat; + break; + case CONFIG_NODE: + vty->node = ENABLE_NODE; + vty->index = NULL; + break; + default: + vty->node = CONFIG_NODE; + vty->index = NULL; + break; + } + + return vty->node; +} + +static struct cmd_node bsc_nat_node = { + BSC_NAT_NODE, + "%s(config-bsc-nat)# ", + 1, +}; + +DEFUN(cfg_bsc_nat, + cfg_bsc_nat_cmd, + "bsc-nat", "Configure the BSC NAT\n") +{ + OSMO_ASSERT(g_bsc_nat); + vty->index = g_bsc_nat; + vty->node = BSC_NAT_NODE; + + return CMD_SUCCESS; +} + +static int config_write_bsc_nat(struct vty *vty) +{ + vty_out(vty, "bsc-nat%s", VTY_NEWLINE); + return CMD_SUCCESS; +} + + +void bsc_nat_vty_init(void) +{ + install_element(CONFIG_NODE, &cfg_bsc_nat_cmd); + install_node(&bsc_nat_node, config_write_bsc_nat); +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26659 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: I6f2d8d1d62b97be471ebcf1bb14aac0b895833d1 Gerrit-Change-Number: 26659 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-MessageType: merged

3 years, 5 months

1
0
0 0

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

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26660 ) Change subject: Add command-line options ...................................................................... Add command-line options Related: OS#2545 Change-Id: I41bca9e1b88bb130870d078ed3f499e39e0bf5d3 --- M src/osmo-bsc-nat/main.c 1 file changed, 65 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c index 813909b..1edc134 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -19,6 +19,8 @@ #include "config.h" +#include <getopt.h> + #include <osmocom/core/application.h> #include <osmocom/vty/cpu_sched_vty.h> #include <osmocom/vty/logging.h> @@ -47,7 +49,59 @@ .go_parent_cb = bsc_nat_vty_go_parent, }; -static void main_vty_init() +static struct { + const char *config_file; +} bsc_nat_cmdline_config = { + .config_file = "osmo-bsc-nat.cfg", +}; + +static void print_help() +{ + printf("usage: osmo-bsc-nat <options>\n"); + printf("\n"); + printf("optional arguments:\n"); + printf(" -h, --help show this help message and exit\n"); + printf(" -c, --config-file the config file to use\n"); + printf(" -V, --version show version number and exit\n"); +} + +static void handle_options(int argc, char **argv) +{ + while (1) { + int idx = 0, c; + static const struct option long_options[] = { + {"help", 0, 0, 'h'}, + {"config-file", 1, 0, 'c'}, + {"version", 0, 0, 'V' }, + { 0, 0, 0, 0 }, + }; + + c = getopt_long(argc, argv, "hc:V", long_options, &idx); + + if (c == -1) + break; + + switch (c) { + case 'h': + print_help(); + exit(0); + break; + case 'c': + bsc_nat_cmdline_config.config_file = optarg; + break; + case 'V': + print_version(1); + exit(0); + break; + default: + fprintf(stderr, "Error in command line options. Exiting.\n"); + exit(-1); + break; + } + } +} + +static void main_vty_init(int argc, char **argv) { int rc; @@ -61,6 +115,15 @@ osmo_talloc_vty_add_cmds(); osmo_cpu_sched_vty_init(tall_bsc_nat_ctx); + handle_options(argc, argv); + + rc = vty_read_config_file(bsc_nat_cmdline_config.config_file, NULL); + if (rc < 0) { + fprintf(stderr, "Failed to parse the config file: '%s'\n", + bsc_nat_cmdline_config.config_file); + exit(1); + } + rc = telnet_init_dynif(tall_bsc_nat_ctx, g_bsc_nat, vty_get_bind_addr(), OSMO_VTY_PORT_BSC_NAT); if (rc < 0) { perror("Error binding VTY port"); @@ -81,7 +144,7 @@ g_bsc_nat = bsc_nat_alloc(tall_bsc_nat_ctx); - main_vty_init(); + main_vty_init(argc, argv); while (!osmo_select_shutdown_done()) osmo_select_main_ctx(0); -- 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-MessageType: merged

3 years, 5 months

1
0
0 0

Change in osmo-bsc-nat[master]: Add signal handler

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26661 ) Change subject: Add signal handler ...................................................................... Add signal handler Related: OS#2545 Change-Id: I303e9275a2f1f6f2da742089d079ba604ee5a36b --- M src/osmo-bsc-nat/main.c 1 file changed, 44 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified pespin: Looks good to me, but someone else must approve diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c index 1edc134..a37d3cb 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -131,6 +131,49 @@ } } +static void signal_handler(int signum) +{ + fprintf(stdout, "signal %u received\n", signum); + + switch (signum) { + case SIGINT: + case SIGTERM: + /* If SIGTERM was already sent before, just terminate immediately. */ + if (osmo_select_shutdown_requested()) + exit(-1); + osmo_select_shutdown_request(); + break; + case SIGABRT: + /* in case of abort, we want to obtain a talloc report and + * then run default SIGABRT handler, who will generate coredump + * and abort the process. abort() should do this for us after we + * return, but program wouldn't exit if an external SIGABRT is + * received. + */ + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_bsc_nat_ctx, stderr); + signal(SIGABRT, SIG_DFL); + raise(SIGABRT); + break; + case SIGUSR1: + talloc_report(tall_vty_ctx, stderr); + talloc_report_full(tall_bsc_nat_ctx, stderr); + break; + default: + break; + } +} + +static void signal_handler_init(void) +{ + signal(SIGINT, &signal_handler); + signal(SIGTERM, &signal_handler); + signal(SIGABRT, &signal_handler); + signal(SIGUSR1, &signal_handler); + signal(SIGUSR2, &signal_handler); + osmo_init_ignore_signals(); +} + int main(int argc, char **argv) { int rc; @@ -145,6 +188,7 @@ g_bsc_nat = bsc_nat_alloc(tall_bsc_nat_ctx); main_vty_init(argc, argv); + signal_handler_init(); while (!osmo_select_shutdown_done()) osmo_select_main_ctx(0); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/26661 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: I303e9275a2f1f6f2da742089d079ba604ee5a36b Gerrit-Change-Number: 26661 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-MessageType: merged

3 years, 5 months

1
0
0 0

2025

2024

2023

2022

gerrit-log