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

Change in osmo-bsc-nat[master]: Proper exit if bsc_nat_fsm fails to start

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27708 ) Change subject: Proper exit if bsc_nat_fsm fails to start ...................................................................... Proper exit if bsc_nat_fsm fails to start Instead of segfaulting later on, properly exit if the bsc_nat_fsm does not start. One reason for having it fail could be a missing mgw pool config block. Related: SYS#5560 Change-Id: Ia8bbe6ae908d5c3ce49f71b43c950497aeebb6d6 --- M include/osmocom/bsc_nat/bsc_nat_fsm.h M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/main.c 3 files changed, 9 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/08/27708/1 diff --git a/include/osmocom/bsc_nat/bsc_nat_fsm.h b/include/osmocom/bsc_nat/bsc_nat_fsm.h index a2becfb..483658d 100644 --- a/include/osmocom/bsc_nat/bsc_nat_fsm.h +++ b/include/osmocom/bsc_nat/bsc_nat_fsm.h @@ -22,3 +22,4 @@ void bsc_nat_fsm_alloc(struct bsc_nat *bsc_nat); void bsc_nat_fsm_start(struct bsc_nat *bsc_nat); void bsc_nat_fsm_stop(struct bsc_nat *bsc_nat); +bool bsc_nat_fsm_is_started(struct bsc_nat *bsc_nat); diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index 30486ce..33439b8 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -483,3 +483,8 @@ { osmo_fsm_inst_dispatch(bsc_nat->fi, BSC_NAT_FSM_EV_STOP, NULL); } + +bool bsc_nat_fsm_is_started(struct bsc_nat *bsc_nat) +{ + return bsc_nat->fi->state == BSC_NAT_FSM_ST_STARTED; +} diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c index 6cb1e0f..6704565 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -199,6 +199,9 @@ signal_handler_init(); bsc_nat_fsm_start(g_bsc_nat); + if (!bsc_nat_fsm_is_started(g_bsc_nat)) { + exit(1); + } if (msc_alloc_from_addr_book() < 0) exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27708 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: Ia8bbe6ae908d5c3ce49f71b43c950497aeebb6d6 Gerrit-Change-Number: 27708 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: main: use osmo_fsm_set_dealloc_ctx(OTC_SELECT)

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27709 ) Change subject: main: use osmo_fsm_set_dealloc_ctx(OTC_SELECT) ...................................................................... main: use osmo_fsm_set_dealloc_ctx(OTC_SELECT) Prepare to use osmo_mgcp_ep_alloc in a future patch, which requires using osmo_fsm_set_dealloc_ctx(OTC_SELECT) for deferred FSM deallocation (see the warning in src/libosmo-mgcp-client/mgcp_client_endpoint_fsm.c). Related: SYS#5560 Change-Id: I97abf88fa64cc1a4906f356c57912593d4366a37 --- M src/osmo-bsc-nat/main.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/09/27709/1 diff --git a/src/osmo-bsc-nat/main.c b/src/osmo-bsc-nat/main.c index 6704565..7e9f90d 100644 --- a/src/osmo-bsc-nat/main.c +++ b/src/osmo-bsc-nat/main.c @@ -184,6 +184,7 @@ talloc_enable_null_tracking(); tall_bsc_nat_ctx = talloc_named_const(NULL, 0, "bsc_nat"); + osmo_fsm_set_dealloc_ctx(OTC_SELECT); rc = osmo_init_logging2(tall_bsc_nat_ctx, &bsc_nat_log_info); if (rc < 0) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27709 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: I97abf88fa64cc1a4906f356c57912593d4366a37 Gerrit-Change-Number: 27709 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: Initialize MGW pool on start up

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27707 ) Change subject: Initialize MGW pool on start up ...................................................................... Initialize MGW pool on start up Make the MGW pool configurable in the VTY and connect to each configured MGW instance on start up. This is in preparation for the subscr_conn_fsm, which will allocate own MGCP connections while processing BSSMAP assignment request and related messages. Related: SYS#5560 Change-Id: I6030a1f5a9d5fb06f148b2a2e03ae57bcb6b3766 --- M configure.ac M contrib/osmo-bsc-nat.spec.in M debian/control M doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg M include/osmocom/bsc_nat/bsc_nat.h M include/osmocom/bsc_nat/vty.h M src/osmo-bsc-nat/Makefile.am M src/osmo-bsc-nat/bsc_nat.c M src/osmo-bsc-nat/bsc_nat_fsm.c M src/osmo-bsc-nat/vty.c 10 files changed, 64 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/07/27707/1 diff --git a/configure.ac b/configure.ac index 43f38f7..e3d3aeb 100644 --- a/configure.ac +++ b/configure.ac @@ -57,6 +57,7 @@ PKG_CHECK_MODULES(LIBOSMOABIS, libosmoabis >= 1.2.0) PKG_CHECK_MODULES(LIBOSMONETIF, libosmo-netif >= 1.1.0) PKG_CHECK_MODULES(LIBOSMOSIGTRAN, libosmo-sigtran >= 1.5.0) +PKG_CHECK_MODULES(LIBOSMOMGCPCLIENT, libosmo-mgcp-client >= 1.9.0) dnl checks for header files AC_HEADER_STDC diff --git a/contrib/osmo-bsc-nat.spec.in b/contrib/osmo-bsc-nat.spec.in index 97a07ae..ed89f27 100644 --- a/contrib/osmo-bsc-nat.spec.in +++ b/contrib/osmo-bsc-nat.spec.in @@ -35,6 +35,7 @@ BuildRequires: pkgconfig(libcrypto) >= 0.9.5 BuildRequires: pkgconfig(libosmo-netif) >= 1.1.0 BuildRequires: pkgconfig(libosmo-sigtran) >= 1.5.0 +BuildRequires: pkgconfig(libosmo-mgcp-client) >= 1.9.0 BuildRequires: pkgconfig(libosmoabis) >= 1.2.0 BuildRequires: pkgconfig(libosmocore) >= 1.6.0 BuildRequires: pkgconfig(libosmoctrl) >= 1.6.0 diff --git a/debian/control b/debian/control index c542881..35edf84 100644 --- a/debian/control +++ b/debian/control @@ -15,6 +15,7 @@ libosmo-sigtran-dev (>= 1.5.0), libosmo-abis-dev (>= 1.2.0), libosmo-netif-dev (>= 1.1.0), + libosmo-mgcp-client-dev (>= 1.9.0), osmo-gsm-manuals-dev (>= 1.2.0) Standards-Version: 3.9.8 Vcs-Git: git://git.osmocom.org/osmo-bsc-nat.git diff --git a/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg b/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg index 2f5ff39..a82b451 100644 --- a/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg +++ b/doc/examples/osmo-bsc-nat/osmo-bsc-nat.cfg @@ -17,3 +17,10 @@ bsc-nat cs7-instance-cn 0 cs7-instance-ran 1 + +mgw 0 + mgw remote-ip 127.0.0.14 + mgw remote-port 2427 + mgw local-ip 127.0.0.15 + mgw local-port 2427 + mgw endpoint-domain bscnat diff --git a/include/osmocom/bsc_nat/bsc_nat.h b/include/osmocom/bsc_nat/bsc_nat.h index 93717cc..032386a 100644 --- a/include/osmocom/bsc_nat/bsc_nat.h +++ b/include/osmocom/bsc_nat/bsc_nat.h @@ -20,6 +20,8 @@ #pragma once #include <osmocom/core/fsm.h> +#include <osmocom/core/tdef.h> +#include <osmocom/mgcp_client/mgcp_client_pool.h> #include <osmocom/sigtran/sccp_sap.h> enum bsc_nat_net { @@ -40,6 +42,11 @@ struct llist_head subscr_conns; /* list of struct subscr_conn */ struct { + struct mgcp_client_pool *pool; + struct osmo_tdef *tdefs; + } mgw; + + struct { struct bsc_nat_sccp_inst *sccp_inst; uint32_t subscr_conn_id_next; struct llist_head mscs; /* list of struct msc */ @@ -61,3 +68,4 @@ extern void *tall_bsc_nat_ctx; extern struct bsc_nat *g_bsc_nat; +extern struct osmo_tdef_group g_bsc_nat_tdef_group[]; diff --git a/include/osmocom/bsc_nat/vty.h b/include/osmocom/bsc_nat/vty.h index 9a842b5..9ced790 100644 --- a/include/osmocom/bsc_nat/vty.h +++ b/include/osmocom/bsc_nat/vty.h @@ -24,6 +24,7 @@ #include <osmocom/vty/command.h> enum bsc_nat_vty_nodes { + MGW_NODE, BSC_NAT_NODE = _LAST_OSMOVTY_NODE, }; diff --git a/src/osmo-bsc-nat/Makefile.am b/src/osmo-bsc-nat/Makefile.am index e2b11ca..1ddb8ca 100644 --- a/src/osmo-bsc-nat/Makefile.am +++ b/src/osmo-bsc-nat/Makefile.am @@ -13,6 +13,7 @@ $(LIBOSMONETIF_CFLAGS) \ $(COVERAGE_CFLAGS) \ $(LIBOSMOABIS_CFLAGS) \ + $(LIBOSMOMGCPCLIENT_CFLAGS) \ $(LIBOSMOSIGTRAN_CFLAGS) \ $(NULL) @@ -45,5 +46,6 @@ $(LIBOSMONETIF_LIBS) \ $(COVERAGE_LDFLAGS) \ $(LIBOSMOABIS_LIBS) \ + $(LIBOSMOMGCPCLIENT_LIBS) \ $(LIBOSMOSIGTRAN_LIBS) \ $(NULL) diff --git a/src/osmo-bsc-nat/bsc_nat.c b/src/osmo-bsc-nat/bsc_nat.c index 7ba24e6..b847679 100644 --- a/src/osmo-bsc-nat/bsc_nat.c +++ b/src/osmo-bsc-nat/bsc_nat.c @@ -28,6 +28,16 @@ #include <osmocom/bsc_nat/msc.h> #include <osmocom/bsc_nat/subscr_conn.h> +struct osmo_tdef g_mgw_tdefs[] = { + { .T = -2427, .default_val = 5, .desc = "timeout for MGCP response from MGW" }, + {} +}; + +struct osmo_tdef_group g_bsc_nat_tdef_group[] = { + { .name = "mgw", .tdefs = g_mgw_tdefs, .desc = "MGW (Media Gateway) interface" }, + {} +}; + struct bsc_nat *bsc_nat_alloc(void *tall_ctx) { struct bsc_nat *bsc_nat; @@ -35,6 +45,10 @@ bsc_nat = talloc_zero(tall_ctx, struct bsc_nat); OSMO_ASSERT(bsc_nat); + bsc_nat->mgw.pool = mgcp_client_pool_alloc(bsc_nat); + bsc_nat->mgw.tdefs = g_mgw_tdefs; + osmo_tdefs_reset(bsc_nat->mgw.tdefs); + bsc_nat->cn.sccp_inst = talloc_zero(bsc_nat, struct bsc_nat_sccp_inst); OSMO_ASSERT(bsc_nat->cn.sccp_inst); talloc_set_name_const(bsc_nat->cn.sccp_inst, "struct bsc_nat_sccp_inst (CN)"); diff --git a/src/osmo-bsc-nat/bsc_nat_fsm.c b/src/osmo-bsc-nat/bsc_nat_fsm.c index d3a3b01..30486ce 100644 --- a/src/osmo-bsc-nat/bsc_nat_fsm.c +++ b/src/osmo-bsc-nat/bsc_nat_fsm.c @@ -344,6 +344,24 @@ talloc_free(sccp_inst); } +static int mgw_init(struct mgcp_client_pool *pool) +{ + unsigned int pool_members_initialized; + + /* Initialize MGW pool. This initalizes and connects all MGCP clients that are currently configured in + * the pool. Adding additional MGCP clients to the pool is possible but the user has to configure and + * (re)connect them manually from the VTY. */ + pool_members_initialized = mgcp_client_pool_connect(pool); + if (!pool_members_initialized) { + LOGP(DMAIN, LOGL_ERROR, "Failed to initialize any MGW pool members!\n"); + return -1; + } + + LOGP(DMAIN, LOGL_NOTICE, "MGW pool with %u pool member(s) initialized\n", pool_members_initialized); + + return 0; +} + static void st_starting_on_enter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct bsc_nat *bsc_nat = (struct bsc_nat *)fi->priv; @@ -358,6 +376,11 @@ return; } + if (mgw_init(bsc_nat->mgw.pool) < 0) { + osmo_fsm_inst_state_chg(fi, BSC_NAT_FSM_ST_STOPPED, 0, 0); + return; + } + osmo_fsm_inst_state_chg(fi, BSC_NAT_FSM_ST_STARTED, 0, 0); } diff --git a/src/osmo-bsc-nat/vty.c b/src/osmo-bsc-nat/vty.c index bf86faa..852b1db 100644 --- a/src/osmo-bsc-nat/vty.c +++ b/src/osmo-bsc-nat/vty.c @@ -19,8 +19,10 @@ #include "config.h" #include <unistd.h> +#include <osmocom/mgcp_client/mgcp_client_pool.h> #include <osmocom/vty/command.h> #include <osmocom/vty/logging.h> +#include <osmocom/vty/tdef_vty.h> #include <osmocom/vty/telnet_interface.h> #include <osmocom/bsc_nat/bsc_nat.h> #include <osmocom/bsc_nat/vty.h> @@ -77,4 +79,8 @@ install_node(&bsc_nat_node, config_write_bsc_nat); install_element(BSC_NAT_NODE, &cfg_cs7_instance_cn_cmd); install_element(BSC_NAT_NODE, &cfg_cs7_instance_ran_cmd); + + osmo_tdef_vty_groups_init(CONFIG_NODE, g_bsc_nat_tdef_group); + + mgcp_client_pool_vty_init(CONFIG_NODE, MGW_NODE, "", g_bsc_nat->mgw.pool); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27707 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: I6030a1f5a9d5fb06f148b2a2e03ae57bcb6b3766 Gerrit-Change-Number: 27707 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bssap: forward paging from MSC to all BSCs

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27704 ) Change subject: bssap: forward paging from MSC to all BSCs ...................................................................... bssap: forward paging from MSC to all BSCs I've considered only forwarding to specific BSCs based on the cell identifier list inside the paging. For that, the cell identifier would need to be stored beforehand (read it from location update? or put it in vty config?) and I'm not sure if it is required, so don't do this for now and extend it later if needed. Related: SYS#5560 Related: https://osmocom.org/projects/osmo-bscnat/wiki/AoIP_OsmoBSCNAT#PAGING-BSC Change-Id: I2532d94aab82d136b932d57fa53c8ecf2d8d1fd9 --- M src/osmo-bsc-nat/bssap.c 1 file changed, 38 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/04/27704/1 diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index 94a450a..8e73a50 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -38,6 +38,41 @@ return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); } +static int bssmap_cn_handle_paging(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +{ + struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran.sccp_inst; + struct msc *msc = msc_get(); + struct bsc *bsc; + int ret = 0; + int rc; + + if (msc->addr.pc != addr->pc) { + LOGP(DMAIN, LOGL_ERROR, "Unexpected Rx PAGING in CN from %s, which is not %s\n", + osmo_ss7_pointcode_print(NULL, addr->pc), talloc_get_name(msc)); + return -1; + } + + LOGP(DMAIN, LOGL_DEBUG, "Rx PAGING from %s\n", talloc_get_name(msc)); + + msgb_pull_to_l2(msg); + + /* Page all BSCs */ + llist_for_each_entry(bsc, &g_bsc_nat->ran.bscs, list) { + LOGP(DMAIN, LOGL_DEBUG, "Fwd to %s\n", talloc_get_name(bsc)); + rc = osmo_sccp_tx_unitdata(sccp_inst->scu, + &sccp_inst->addr, + &bsc->addr, + msg->data, + msgb_length(msg)); + if (rc < 0) { + LOGP(DMAIN, LOGL_ERROR, "Fwd to %s failed\n", talloc_get_name(bsc)); + ret = rc; + } + } + + return ret; +} + static int bssmap_cn_handle_reset_ack(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { struct msc *msc = msc_get(); @@ -59,6 +94,9 @@ int ret = 0; switch (msg->l3h[0]) { + case BSS_MAP_MSG_PAGING: + ret = bssmap_cn_handle_paging(addr, msg, length); + break; case BSS_MAP_MSG_RESET_ACKNOWLEDGE: ret = bssmap_cn_handle_reset_ack(addr, msg, length); break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27704 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: I2532d94aab82d136b932d57fa53c8ecf2d8d1fd9 Gerrit-Change-Number: 27704 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: README: osmo-dev: add BSC{0,1}_CODEC_LIST="fr2"

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27705 ) Change subject: README: osmo-dev: add BSC{0,1}_CODEC_LIST="fr2" ...................................................................... README: osmo-dev: add BSC{0,1}_CODEC_LIST="fr2" In the test setup, let the real BSC and virtual BSC use the same codec. With this the voice frames are successfully sent back by the virtual MS. When using a different codec, since transcoding is not implemented in OsmoMGW, the stream becomes invalid in MGW-MSC and gets dropped by BTS1, never reaching the virtual MS. Related: SYS#5560 Change-Id: I78d666ad77c03459f5369b64e651e47ce1d4f12c --- M README.md 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/05/27705/1 diff --git a/README.md b/README.md index ca367a2..7c66e35 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,8 @@ ``` BSC_COUNT=2 +BSC0_CODEC_LIST="fr2" +BSC1_CODEC_LIST="fr2" BTS1_RUN_IN_OSMO_DEV=1 STP_RAN_IP="127.0.0.2" MS_RUN_IN_OSMO_DEV=1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27705 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: I78d666ad77c03459f5369b64e651e47ce1d4f12c Gerrit-Change-Number: 27705 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bssap.h, subscr_conn.h: fix missing includes

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27706 ) Change subject: bssap.h, subscr_conn.h: fix missing includes ...................................................................... bssap.h, subscr_conn.h: fix missing includes Related: SYS#5560 Change-Id: Ieb048c0f299bca1b194979c26cbeadbc81dee05f --- M include/osmocom/bsc_nat/bssap.h M include/osmocom/bsc_nat/subscr_conn.h 2 files changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/06/27706/1 diff --git a/include/osmocom/bsc_nat/bssap.h b/include/osmocom/bsc_nat/bssap.h index f474909..7f45a2f 100644 --- a/include/osmocom/bsc_nat/bssap.h +++ b/include/osmocom/bsc_nat/bssap.h @@ -19,6 +19,7 @@ #pragma once +#include <osmocom/core/msgb.h> #include <osmocom/bsc_nat/bsc_nat.h> int bssap_handle_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msgb, diff --git a/include/osmocom/bsc_nat/subscr_conn.h b/include/osmocom/bsc_nat/subscr_conn.h index 696e0c3..7de3f0f 100644 --- a/include/osmocom/bsc_nat/subscr_conn.h +++ b/include/osmocom/bsc_nat/subscr_conn.h @@ -19,6 +19,8 @@ #pragma once +#include <osmocom/bsc_nat/bsc_nat.h> + /* connection for one subscriber */ struct subscr_conn { struct llist_head list; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27706 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: Ieb048c0f299bca1b194979c26cbeadbc81dee05f Gerrit-Change-Number: 27706 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bssap: make "not implemented" log msgs consistent

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27701 ) Change subject: bssap: make "not implemented" log msgs consistent ...................................................................... bssap: make "not implemented" log msgs consistent Use LOGL_ERROR and word them the same way as the not implemented message in sccp_sap_up_cn and sccp_sap_up_ran. Related: SYS#5560 Change-Id: Ice8d67a30064a91d68256f43dcfb052d237e5594 --- M src/osmo-bsc-nat/bssap.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/01/27701/1 diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index f88bb20..a7f629e 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -63,7 +63,7 @@ ret = bssap_cn_handle_reset_ack(addr, msg, length); break; default: - LOGP(DMAIN, LOGL_NOTICE, "Unimplemented BSSMAP UDT %s\n", gsm0808_bssap_name(msg->l3h[0])); + LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, gsm0808_bssap_name(msg->l3h[0])); break; } @@ -96,7 +96,7 @@ ret = bssap_ran_handle_reset(addr, msg, length); break; default: - LOGP(DMAIN, LOGL_NOTICE, "Unimplemented BSSMAP UDT %s\n", gsm0808_bssap_name(msg->l3h[0])); + LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, gsm0808_bssap_name(msg->l3h[0])); break; } @@ -143,7 +143,7 @@ rc = bssap_rcvmsg_udt(sccp_inst, addr, msgb, length - sizeof(*bs)); break; default: - LOGP(DMAIN, LOGL_NOTICE, "Unimplemented msg type: %s\n", gsm0808_bssap_name(bs->type)); + LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, gsm0808_bssap_name(bs->type)); } return rc; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27701 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: Ice8d67a30064a91d68256f43dcfb052d237e5594 Gerrit-Change-Number: 27701 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bssap: fix printing bssmap names

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27702 ) Change subject: bssap: fix printing bssmap names ...................................................................... bssap: fix printing bssmap names Use the proper function to print BSSMAP names, so it doesn't say "unknown 0x52" etc. Related: SYS#5560 Change-Id: I353a9d13b14de6d0ba9aabe8cb3057dd7a98cb51 --- M src/osmo-bsc-nat/bssap.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/02/27702/1 diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index a7f629e..67a06fb 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -63,7 +63,7 @@ ret = bssap_cn_handle_reset_ack(addr, msg, length); break; default: - LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, gsm0808_bssap_name(msg->l3h[0])); + LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, gsm0808_bssmap_name(msg->l3h[0])); break; } @@ -96,7 +96,7 @@ ret = bssap_ran_handle_reset(addr, msg, length); break; default: - LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, gsm0808_bssap_name(msg->l3h[0])); + LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, gsm0808_bssmap_name(msg->l3h[0])); break; } @@ -111,7 +111,7 @@ return -1; } - LOGP(DMAIN, LOGL_NOTICE, "Rx UDT BSSMAP %s\n", gsm0808_bssap_name(msg->l3h[0])); + LOGP(DMAIN, LOGL_NOTICE, "Rx UDT BSSMAP %s\n", gsm0808_bssmap_name(msg->l3h[0])); if (sccp_inst == g_bsc_nat->cn.sccp_inst) return bssap_cn_rcvmsg_udt(addr, msg, length); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27702 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: I353a9d13b14de6d0ba9aabe8cb3057dd7a98cb51 Gerrit-Change-Number: 27702 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bsc-nat[master]: bssap: name bssmap functions properly

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27703 ) Change subject: bssap: name bssmap functions properly ...................................................................... bssap: name bssmap functions properly Almost all functions in bssap.c actually handle bssmap, so name them accordingly. Related: SYS#5560 Change-Id: Ib583b64187bcf3138399e7a099248ee79492bb03 --- M include/osmocom/bsc_nat/bssap.h M src/osmo-bsc-nat/bssap.c M src/osmo-bsc-nat/msc_fsm.c 3 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc-nat refs/changes/03/27703/1 diff --git a/include/osmocom/bsc_nat/bssap.h b/include/osmocom/bsc_nat/bssap.h index ca387c2..f474909 100644 --- a/include/osmocom/bsc_nat/bssap.h +++ b/include/osmocom/bsc_nat/bssap.h @@ -24,4 +24,4 @@ int bssap_handle_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msgb, unsigned int length); -int bssap_tx_reset(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr); +int bssmap_tx_reset(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr); diff --git a/src/osmo-bsc-nat/bssap.c b/src/osmo-bsc-nat/bssap.c index 67a06fb..94a450a 100644 --- a/src/osmo-bsc-nat/bssap.c +++ b/src/osmo-bsc-nat/bssap.c @@ -27,7 +27,7 @@ #include <osmocom/bsc_nat/logging.h> #include <osmocom/bsc_nat/msc.h> -int bssap_tx_reset(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr) +int bssmap_tx_reset(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr) { enum bsc_nat_net net = sccp_inst == g_bsc_nat->cn.sccp_inst ? BSC_NAT_NET_CN : BSC_NAT_NET_RAN; @@ -38,7 +38,7 @@ return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); } -static int bssap_cn_handle_reset_ack(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +static int bssmap_cn_handle_reset_ack(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { struct msc *msc = msc_get(); @@ -54,13 +54,13 @@ return 0; } -static int bssap_cn_rcvmsg_udt(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +static int bssmap_cn_rcvmsg_udt(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { int ret = 0; switch (msg->l3h[0]) { case BSS_MAP_MSG_RESET_ACKNOWLEDGE: - ret = bssap_cn_handle_reset_ack(addr, msg, length); + ret = bssmap_cn_handle_reset_ack(addr, msg, length); break; default: LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, gsm0808_bssmap_name(msg->l3h[0])); @@ -70,7 +70,7 @@ return ret; } -static int bssap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +static int bssmap_ran_handle_reset(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { struct bsc_nat_sccp_inst *sccp_inst = g_bsc_nat->ran.sccp_inst; struct bsc *bsc; @@ -87,13 +87,13 @@ return osmo_sccp_tx_unitdata_msg(sccp_inst->scu, &sccp_inst->addr, addr, msg); } -static int bssap_ran_rcvmsg_udt(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) +static int bssmap_ran_rcvmsg_udt(struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { int ret = 0; switch (msg->l3h[0]) { case BSS_MAP_MSG_RESET: - ret = bssap_ran_handle_reset(addr, msg, length); + ret = bssmap_ran_handle_reset(addr, msg, length); break; default: LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, gsm0808_bssmap_name(msg->l3h[0])); @@ -103,7 +103,7 @@ return ret; } -static int bssap_rcvmsg_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msg, +static int bssmap_rcvmsg_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msg, unsigned int length) { if (length < 1) { @@ -114,8 +114,8 @@ LOGP(DMAIN, LOGL_NOTICE, "Rx UDT BSSMAP %s\n", gsm0808_bssmap_name(msg->l3h[0])); if (sccp_inst == g_bsc_nat->cn.sccp_inst) - return bssap_cn_rcvmsg_udt(addr, msg, length); - return bssap_ran_rcvmsg_udt(addr, msg, length); + return bssmap_cn_rcvmsg_udt(addr, msg, length); + return bssmap_ran_rcvmsg_udt(addr, msg, length); } int bssap_handle_udt(struct bsc_nat_sccp_inst *sccp_inst, struct osmo_sccp_addr *addr, struct msgb *msgb, @@ -140,7 +140,7 @@ switch (bs->type) { case BSSAP_MSG_BSS_MANAGEMENT: msgb->l3h = &msgb->l2h[sizeof(*bs)]; - rc = bssap_rcvmsg_udt(sccp_inst, addr, msgb, length - sizeof(*bs)); + rc = bssmap_rcvmsg_udt(sccp_inst, addr, msgb, length - sizeof(*bs)); break; default: LOGP(DMAIN, LOGL_ERROR, "%s(%s) is not implemented!\n", __func__, gsm0808_bssap_name(bs->type)); diff --git a/src/osmo-bsc-nat/msc_fsm.c b/src/osmo-bsc-nat/msc_fsm.c index e660c57..fc8beaf 100644 --- a/src/osmo-bsc-nat/msc_fsm.c +++ b/src/osmo-bsc-nat/msc_fsm.c @@ -63,7 +63,7 @@ case MSC_FSM_EV_TX_RESET: LOGP(DMAIN, LOGL_DEBUG, "Tx RESET to %s\n", talloc_get_name(msc)); - if (bssap_tx_reset(g_bsc_nat->cn.sccp_inst, &msc->addr) < 0) { + if (bssmap_tx_reset(g_bsc_nat->cn.sccp_inst, &msc->addr) < 0) { LOGP(DMAIN, LOGL_ERROR, "Could not send RESET to MSC (SCCP not up yet?)\n"); } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc-nat/+/27703 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: Ib583b64187bcf3138399e7a099248ee79492bb03 Gerrit-Change-Number: 27703 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): fix indexes in the AMR CMI lookup table

by pespin

Attention is currently required from: osmith, laforge, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27699 ) Change subject: osmo-bts-trx: rx_tchh_fn(): fix indexes in the AMR CMI lookup table ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27699 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4f22cf49fd52ed26f8017f76461059a701c181e1 Gerrit-Change-Number: 27699 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 08 Apr 2022 16:23:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022