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

Change in libosmocore[master]: msgb: introduce extended copy functions

by msuraev

Attention is currently required from: laforge, pespin, fixeria. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29761 ) Change subject: msgb: introduce extended copy functions ...................................................................... Patch Set 4: (1 comment) File include/osmocom/core/msgb.h: https://gerrit.osmocom.org/c/libosmocore/+/29761/comment/21b156b1_ddb88dc1 PS3, Line 73: extern struct msgb *msgb_copy_ext(const struct msgb *msg, uint16_t new_len, const char *name); > agreeing with pespin. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I36d4c16241d19f0f73c325be4d0e0bdef6813615 Gerrit-Change-Number: 29761 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 17 Oct 2022 16:30:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in libosmocore[master]: msgb: introduce extended copy functions

by msuraev

Attention is currently required from: pespin, fixeria, msuraev. Hello Jenkins Builder, pespin, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/29761 to look at the new patch set (#4). Change subject: msgb: introduce extended copy functions ...................................................................... msgb: introduce extended copy functions Those are similar to existing *msgb_alloc*() functions but allows to change the size of destination msgb provided it fits the data from source msgb. Change-Id: I36d4c16241d19f0f73c325be4d0e0bdef6813615 Signed-off-by: Max <msuraev(a)sysmocom.de> --- M include/osmocom/core/msgb.h M src/msgb.c 2 files changed, 46 insertions(+), 10 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/61/29761/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29761 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I36d4c16241d19f0f73c325be4d0e0bdef6813615 Gerrit-Change-Number: 29761 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: Introduce support for libosmo-mgcp-client MGW pooling

by pespin

pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-msc/+/29782 ) Change subject: Introduce support for libosmo-mgcp-client MGW pooling ...................................................................... Introduce support for libosmo-mgcp-client MGW pooling Change-Id: I7670ba56fe989706579224a364595fdd4b4708ff --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vty.h M src/libmsc/call_leg.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_tests.c 6 files changed, 61 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/29782/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7670ba56fe989706579224a364595fdd4b4708ff Gerrit-Change-Number: 29782 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: cosmetic: Fix typo in comment

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29783 ) Change subject: cosmetic: Fix typo in comment ...................................................................... cosmetic: Fix typo in comment Change-Id: I6afe7a7a2ae977782e7f13b1ee90b6c8aafe3050 --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/83/29783/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 5452609..863ceea 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -829,7 +829,7 @@ struct mgcp_client *mgcp_client_single; unsigned int pool_members_initalized; - /* Initalize MGW pool. This initalizes and connects all MGCP clients that are currently configured in + /* 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_initalized = mgcp_client_pool_connect(bsc_gsmnet->mgw.mgw_pool); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6afe7a7a2ae977782e7f13b1ee90b6c8aafe3050 Gerrit-Change-Number: 29783 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: Introduce support for libosmo-mgcp-client MGW pooling

by Jenkins Builder

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/29782 ) Change subject: Introduce support for libosmo-mgcp-client MGW pooling ...................................................................... Patch Set 1: (1 comment) File src/osmo-msc/msc_main.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-220): https://gerrit.osmocom.org/c/osmo-msc/+/29782/comment/be454ca5_91f71493 PS1, Line 555: /* Initalize MGW pool. This initalizes and connects all MGCP clients that are currently configured in 'Initalize' may be misspelled - perhaps 'Initialize'? -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7670ba56fe989706579224a364595fdd4b4708ff Gerrit-Change-Number: 29782 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Mon, 17 Oct 2022 16:14:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-msc[master]: Introduce support for libosmo-mgcp-client MGW pooling

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/29782 ) Change subject: Introduce support for libosmo-mgcp-client MGW pooling ...................................................................... Introduce support for libosmo-mgcp-client MGW pooling Change-Id: I7670ba56fe989706579224a364595fdd4b4708ff --- M include/osmocom/msc/gsm_data.h M include/osmocom/msc/vty.h M src/libmsc/call_leg.c M src/libmsc/msc_vty.c M src/osmo-msc/msc_main.c M tests/msc_vlr/msc_vlr_tests.c 6 files changed, 61 insertions(+), 12 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/82/29782/1 diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h index 43944e7..1cf6820 100644 --- a/include/osmocom/msc/gsm_data.h +++ b/include/osmocom/msc/gsm_data.h @@ -16,6 +16,7 @@ #include <osmocom/crypt/utran_cipher.h> #include <osmocom/mgcp_client/mgcp_client.h> +#include <osmocom/mgcp_client/mgcp_client_pool.h> #include <osmocom/msc/msc_common.h> #include <osmocom/msc/neighbor_ident.h> @@ -216,7 +217,9 @@ struct { struct osmo_tdef *tdefs; struct mgcp_client_conf conf; - struct mgcp_client *client; + /* MGW pool, also includes the single MGCP client as fallback if no + * pool is configured. */ + struct mgcp_client_pool *mgw_pool; } mgw; struct { diff --git a/include/osmocom/msc/vty.h b/include/osmocom/msc/vty.h index 1e13846..5fd8bec 100644 --- a/include/osmocom/msc/vty.h +++ b/include/osmocom/msc/vty.h @@ -25,6 +25,7 @@ HLR_NODE, CFG_SGS_NODE, SMSC_NODE, + MGW_NODE, }; int bsc_vty_init_extra(void); diff --git a/src/libmsc/call_leg.c b/src/libmsc/call_leg.c index e890f75..3408d36 100644 --- a/src/libmsc/call_leg.c +++ b/src/libmsc/call_leg.c @@ -17,6 +17,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ +#include <asm-generic/errno-base.h> #include <osmocom/core/fsm.h> #include <osmocom/mgcp_client/mgcp_client_endpoint_fsm.h> @@ -275,10 +276,17 @@ if (cl->rtp[dir]) return 0; - if (!cl->mgw_endpoint) + if (!cl->mgw_endpoint) { + struct mgcp_client *mgcp_client = mgcp_client_pool_get(gsmnet->mgw.mgw_pool); + if (!mgcp_client) { + LOG_CALL_LEG(cl, LOGL_ERROR, + "cannot ensure MGW endpoint -- no MGW configured, check configuration!\n"); + return -ENODEV; + } cl->mgw_endpoint = osmo_mgcpc_ep_alloc(cl->fi, CALL_LEG_EV_MGW_ENDPOINT_GONE, - gsmnet->mgw.client, gsmnet->mgw.tdefs, cl->fi->id, - "%s", mgcp_client_rtpbridge_wildcard(gsmnet->mgw.client)); + mgcp_client, gsmnet->mgw.tdefs, cl->fi->id, + "%s", mgcp_client_rtpbridge_wildcard(mgcp_client)); + } if (!cl->mgw_endpoint) { LOG_CALL_LEG(cl, LOGL_ERROR, "failed to setup MGW endpoint\n"); return -EIO; diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c index be05a95..357b975 100644 --- a/src/libmsc/msc_vty.c +++ b/src/libmsc/msc_vty.c @@ -2033,6 +2033,8 @@ install_element(GSMNET_NODE, &cfg_net_no_per_loc_upd_cmd); install_element(GSMNET_NODE, &cfg_net_call_wait_cmd); install_element(GSMNET_NODE, &cfg_net_no_call_wait_cmd); + mgcp_client_pool_vty_init(GSMNET_NODE, MGW_NODE, " ", msc_network->mgw.mgw_pool); + install_element(CONFIG_NODE, &cfg_msc_cmd); install_node(&msc_node, config_write_msc); @@ -2066,7 +2068,9 @@ /* Timer configuration commands (generic osmo_tdef API) */ osmo_tdef_vty_groups_init(MSC_NODE, msc_tdef_group); + /* Deprecated: Old MGCP config without pooling support in MSC node: */ mgcp_client_vty_init(msc_network, MSC_NODE, &msc_network->mgw.conf); + #ifdef BUILD_IU ranap_iu_vty_init(MSC_NODE, (enum ranap_nsap_addr_enc*)&msc_network->iu.rab_assign_addr_enc); #endif diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c index 9cc4120..16d9d07 100644 --- a/src/osmo-msc/msc_main.c +++ b/src/osmo-msc/msc_main.c @@ -256,6 +256,7 @@ MSC_HLR_REMOTE_IP_DEFAULT); net->gsup_server_port = MSC_HLR_REMOTE_PORT_DEFAULT; + net->mgw.mgw_pool = mgcp_client_pool_alloc(net); mgcp_client_conf_init(&net->mgw.conf); net->call_waiting = true; net->lcls_permitted = false; @@ -546,6 +547,41 @@ extern void *tall_call_ctx; extern void *tall_trans_ctx; +static int msc_mgw_setup(void) +{ + struct mgcp_client *mgcp_client_single; + unsigned int pool_members_initalized; + + /* Initalize 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_initalized = mgcp_client_pool_connect(msc_network->mgw.mgw_pool); + if (pool_members_initalized) { + LOGP(DMSC, LOGL_NOTICE, + "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'msc').\n", + pool_members_initalized); + return 0; + } + + /* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool + * member if there is no MGW pool configured. */ + LOGP(DMSC, LOGL_NOTICE, "No MGW pool configured, using MGW configuration in VTY node 'msc'\n"); + mgcp_client_single = mgcp_client_init(msc_network, &msc_network->mgw.conf); + if (!mgcp_client_single) { + LOGP(DMSC, LOGL_ERROR, "MGW (single) client initalization failed\n"); + return -EINVAL; + } + if (mgcp_client_connect(mgcp_client_single)) { + LOGP(DMSC, LOGL_ERROR, "MGW (single) connect failed at (%s:%u)\n", + msc_network->mgw.conf.remote_addr, + msc_network->mgw.conf.remote_port); + return -EINVAL; + } + mgcp_client_pool_register_single(msc_network->mgw.mgw_pool, mgcp_client_single); + + return 0; +} + int main(int argc, char **argv) { int rc; @@ -705,13 +741,8 @@ if (sms_queue_start(msc_network) != 0) return -1; - msc_network->mgw.client = mgcp_client_init( - msc_network, &msc_network->mgw.conf); - - if (mgcp_client_connect(msc_network->mgw.client)) { - fprintf(stderr, "MGCPGW connect failed\n"); + if (msc_mgw_setup() != 0) return 7; - } if (ss7_setup(tall_msc_ctx, &sccp_a, &sccp_iu)) { fprintf(stderr, "Setting up SCCP client failed.\n"); diff --git a/tests/msc_vlr/msc_vlr_tests.c b/tests/msc_vlr/msc_vlr_tests.c index 378f84a..3ef94f2 100644 --- a/tests/msc_vlr/msc_vlr_tests.c +++ b/tests/msc_vlr/msc_vlr_tests.c @@ -1136,6 +1136,7 @@ struct gsm_network *test_net(void *ctx) { struct gsm_network *net = gsm_network_init(ctx, mncc_recv); + struct mgcp_client *client; net->gsup_server_addr_str = talloc_strdup(net, "no_gsup_server"); net->gsup_server_port = 0; @@ -1172,8 +1173,9 @@ net->mgw.tdefs = g_mgw_tdefs; mgcp_client_conf_init(&net->mgw.conf); net->mgw.tdefs = g_mgw_tdefs; - net->mgw.client = mgcp_client_init(net, &net->mgw.conf); - + net->mgw.mgw_pool = mgcp_client_pool_alloc(net); + client = mgcp_client_init(net, &net->mgw.conf); + mgcp_client_pool_register_single(net->mgw.mgw_pool, client); return net; } -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/29782 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I7670ba56fe989706579224a364595fdd4b4708ff Gerrit-Change-Number: 29782 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in libosmocore[master]: msgb: expand copy test

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/29760 ) Change subject: msgb: expand copy test ...................................................................... msgb: expand copy test * use proper Lx comparison functions * use msgb_l4len() * check test invariant * print destination properly Change-Id: I695c40e9350f608049111e81907fa6a5f48bb199 --- M tests/msgb/msgb_test.c 1 file changed, 16 insertions(+), 4 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/tests/msgb/msgb_test.c b/tests/msgb/msgb_test.c index aebb68c..bd52f9f 100644 --- a/tests/msgb/msgb_test.c +++ b/tests/msgb/msgb_test.c @@ -161,13 +161,25 @@ OSMO_ASSERT(msgb_l1len(msg) == msgb_l1len(msg2)); OSMO_ASSERT(msgb_l2len(msg) == msgb_l2len(msg2)); OSMO_ASSERT(msgb_l3len(msg) == msgb_l3len(msg2)); - OSMO_ASSERT(msg->tail - msg->l4h == msg2->tail - msg2->l4h); + OSMO_ASSERT(msgb_l4len(msg) == msgb_l4len(msg2)); - for (i = 0; i < msgb_length(msg2); i++) - OSMO_ASSERT(msg2->data[i] == (uint8_t)i); + if (!msgb_eq_data_print(msg2, msg->data, msgb_length(msg))) + printf("copy test failed!\n"); + + if (!msgb_eq_l1_data_print(msg2, msgb_l1(msg), msgb_l1len(msg))) + printf("copy test failed at L1!\n"); + if (!msgb_eq_l2_data_print(msg2, msgb_l2(msg), msgb_l2len(msg))) + printf("copy test failed at L2!\n"); + if (!msgb_eq_l3_data_print(msg2, msgb_l3(msg), msgb_l3len(msg))) + printf("copy test failed at L3!\n"); + if (!msgb_eq_l4_data_print(msg2, msgb_l4(msg), msgb_l4len(msg))) + printf("copy test failed at L4!\n"); printf("Src: %s\n", msgb_hexdump(msg)); - printf("Dst: %s\n", msgb_hexdump(msg)); + printf("Dst: %s\n", msgb_hexdump(msg2)); + + OSMO_ASSERT(msgb_test_invariant(msg)); + OSMO_ASSERT(msgb_test_invariant(msg2)); msgb_free(msg); msgb_free(msg2); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/29760 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I695c40e9350f608049111e81907fa6a5f48bb199 Gerrit-Change-Number: 29760 Gerrit-PatchSet: 3 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: cosmetic: Fix indentation whitespace

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29781 ) Change subject: cosmetic: Fix indentation whitespace ...................................................................... cosmetic: Fix indentation whitespace Change-Id: I16f4c8018ac906e865885332fec3912c6e539d4e --- M src/osmo-bsc/osmo_bsc_main.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/81/29781/1 diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c index 920693f..5452609 100644 --- a/src/osmo-bsc/osmo_bsc_main.c +++ b/src/osmo-bsc/osmo_bsc_main.c @@ -843,7 +843,7 @@ /* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool * member if there is no MGW pool configured. */ LOGP(DNM, LOGL_NOTICE, "No MGW pool configured, using MGW configuration in VTY node 'msc'\n"); - mgcp_client_single = mgcp_client_init(bsc_gsmnet, bsc_gsmnet->mgw.conf); + mgcp_client_single = mgcp_client_init(bsc_gsmnet, bsc_gsmnet->mgw.conf); if (!mgcp_client_single) { LOGP(DNM, LOGL_ERROR, "MGW (single) client initalization failed\n"); return -EINVAL; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29781 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I16f4c8018ac906e865885332fec3912c6e539d4e Gerrit-Change-Number: 29781 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: vty: Move all MSC_NODE commands to be together

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29779 ) Change subject: vty: Move all MSC_NODE commands to be together ...................................................................... vty: Move all MSC_NODE commands to be together Change-Id: Ib35282bf4f2f671d700560a5284115a39dd695eb --- M src/osmo-bsc/bsc_vty.c 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/29779/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index fd5382f..d32baf8 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -3536,7 +3536,11 @@ install_element(MSC_NODE, &cfg_msc_show_nri_cmd); install_element(MSC_NODE, &cfg_msc_allow_attach_cmd); install_element(MSC_NODE, &cfg_msc_no_allow_attach_cmd); - + install_element(MSC_NODE, &cfg_msc_mgw_x_osmo_ign_cmd); + install_element(MSC_NODE, &cfg_msc_no_mgw_x_osmo_ign_cmd); + install_element(MSC_NODE, &cfg_msc_osmux_cmd); + /* Deprecated: Old MGCP config without pooling support in MSC node: */ + mgcp_client_vty_init(network, MSC_NODE, network->mgw.conf); /* Deprecated: ping time config, kept to support legacy config files. */ install_element(MSC_NODE, &cfg_net_msc_no_ping_time_cmd); install_element(MSC_NODE, &cfg_net_msc_ping_time_cmd); @@ -3555,10 +3559,5 @@ install_element(CFG_LOG_NODE, &logging_fltr_imsi_cmd); - mgcp_client_vty_init(network, MSC_NODE, network->mgw.conf); - install_element(MSC_NODE, &cfg_msc_mgw_x_osmo_ign_cmd); - install_element(MSC_NODE, &cfg_msc_no_mgw_x_osmo_ign_cmd); - install_element(MSC_NODE, &cfg_msc_osmux_cmd); - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib35282bf4f2f671d700560a5284115a39dd695eb Gerrit-Change-Number: 29779 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: gscon_ensure_mgw_endpoint(): Set mgw_enpoint ptr to NULL not needed

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29780 ) Change subject: gscon_ensure_mgw_endpoint(): Set mgw_enpoint ptr to NULL not needed ...................................................................... gscon_ensure_mgw_endpoint(): Set mgw_enpoint ptr to NULL not needed The condition prior to this conditional branch already asserts the var is NULL. Change-Id: I94c9532045c657fc07e4ad53d567847915bae367 --- M src/osmo-bsc/bsc_subscr_conn_fsm.c 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/80/29780/1 diff --git a/src/osmo-bsc/bsc_subscr_conn_fsm.c b/src/osmo-bsc/bsc_subscr_conn_fsm.c index 2a4e387..30a7eae 100644 --- a/src/osmo-bsc/bsc_subscr_conn_fsm.c +++ b/src/osmo-bsc/bsc_subscr_conn_fsm.c @@ -700,7 +700,6 @@ if (!mgcp_client) { LOGPFSML(conn->fi, LOGL_ERROR, "cannot ensure MGW endpoint -- no MGW configured, check configuration!\n"); - conn->user_plane.mgw_endpoint = NULL; return NULL; } } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29780 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I94c9532045c657fc07e4ad53d567847915bae367 Gerrit-Change-Number: 29780 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022