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

Change in osmo-mgw[master]: mgcp-client: Move internal API acting on mgcp_client_pool to the corr...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29746 ) Change subject: mgcp-client: Move internal API acting on mgcp_client_pool to the correct file section ...................................................................... mgcp-client: Move internal API acting on mgcp_client_pool to the correct file section Change-Id: Ia0cccb783918eea72c4a77861dac4b60ad369b95 --- M src/libosmo-mgcp-client/mgcp_client_pool.c 1 file changed, 26 insertions(+), 26 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client_pool.c b/src/libosmo-mgcp-client/mgcp_client_pool.c index c8282fe..5b921f1 100644 --- a/src/libosmo-mgcp-client/mgcp_client_pool.c +++ b/src/libosmo-mgcp-client/mgcp_client_pool.c @@ -27,32 +27,6 @@ #define LOGPPMGW(pool_member, level, fmt, args...) \ LOGP(DLMGCP, level, "MGW-pool(%s) " fmt, mgcp_client_pool_member_name(pool_member), ## args) -/* Get a human readable name for a given pool member. */ -const char *mgcp_client_pool_member_name(const struct mgcp_client_pool_member *pool_member) -{ - const struct mgcp_client *mpcp_client; - struct mgcp_client mpcp_client_dummy; - static char name[512]; - const char *description; - - if (!pool_member) - return "(null)"; - - /* It is not guranteed that a pool_member has an MGCP client. The client may not yet be initialized or the - * initalization may have been failed. In this case we will generate a dummy MGCP client to work with. */ - if (!pool_member->client) { - memcpy(&mpcp_client_dummy.actual, &pool_member->conf, sizeof(mpcp_client_dummy.actual)); - mpcp_client = &mpcp_client_dummy; - } else { - mpcp_client = pool_member->client; - } - - description = mgcp_client_name(mpcp_client); - snprintf(name, sizeof(name), "%d:%s", pool_member->nr, description); - - return name; -} - /*! Allocate MGCP client pool. This is called once on startup and before the pool is used with * mgcp_client_pool_vty_init(). Since the pool is linked with the VTY it must exist througout the entire runtime. * \param[in] talloc_ctx talloc context. */ @@ -263,3 +237,29 @@ } talloc_free(pool_member); } + +/* Get a human readable name for a given pool member. */ +const char *mgcp_client_pool_member_name(const struct mgcp_client_pool_member *pool_member) +{ + const struct mgcp_client *mpcp_client; + struct mgcp_client mpcp_client_dummy; + static char name[512]; + const char *description; + + if (!pool_member) + return "(null)"; + + /* It is not guranteed that a pool_member has an MGCP client. The client may not yet be initialized or the + * initalization may have been failed. In this case we will generate a dummy MGCP client to work with. */ + if (!pool_member->client) { + memcpy(&mpcp_client_dummy.actual, &pool_member->conf, sizeof(mpcp_client_dummy.actual)); + mpcp_client = &mpcp_client_dummy; + } else { + mpcp_client = pool_member->client; + } + + description = mgcp_client_name(mpcp_client); + snprintf(name, sizeof(name), "%d:%s", pool_member->nr, description); + + return name; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29746 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ia0cccb783918eea72c4a77861dac4b60ad369b95 Gerrit-Change-Number: 29746 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: mgcp-client: Refactor reinit of mgcp clients

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29747 ) Change subject: mgcp-client: Refactor reinit of mgcp clients ...................................................................... mgcp-client: Refactor reinit of mgcp clients The second parameter of mgcp_client_pool_member_reinit_client() will be removed in a follow-up patch after further refactoring. Related: SYS#5987 Change-Id: I0ab59278629c0e7e7c62a68b54b4235df58a5d77 --- M include/osmocom/mgcp_client/mgcp_client_pool_internal.h M src/libosmo-mgcp-client/mgcp_client_pool.c M src/libosmo-mgcp-client/mgcp_client_vty.c 3 files changed, 37 insertions(+), 43 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h index 582090c..d9beb6f 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h @@ -47,4 +47,5 @@ struct mgcp_client_pool_member *mgcp_client_pool_member_alloc(struct mgcp_client_pool *pool, unsigned int nr); void mgcp_client_pool_member_free(struct mgcp_client_pool_member *pool_member); +int mgcp_client_pool_member_reinit_client(struct mgcp_client_pool_member *pool_member, struct mgcp_client_pool *pool); const char *mgcp_client_pool_member_name(const struct mgcp_client_pool_member *pool_member); diff --git a/src/libosmo-mgcp-client/mgcp_client_pool.c b/src/libosmo-mgcp-client/mgcp_client_pool.c index 5b921f1..00c0868 100644 --- a/src/libosmo-mgcp-client/mgcp_client_pool.c +++ b/src/libosmo-mgcp-client/mgcp_client_pool.c @@ -18,6 +18,7 @@ * */ +#include <asm-generic/errno.h> #include <osmocom/mgcp_client/mgcp_client.h> #include <osmocom/mgcp_client/mgcp_client_internal.h> #include <osmocom/mgcp_client/mgcp_client_pool_internal.h> @@ -54,26 +55,8 @@ llist_for_each_entry(pool_member, &pool->member_list, list) { /* Initialize client */ - pool_member->client = mgcp_client_init(pool_member, &pool_member->conf); - if (!pool_member->client) { - LOGPPMGW(pool_member, LOGL_ERROR, "MGCP client initialization failed\n"); - continue; - } - - /* Set backpointer so that we can detect later that this MGCP client is managed - * by this pool. */ - pool_member->client->pool = pool; - - /* Connect client */ - if (mgcp_client_connect2(pool_member->client, 0)) { - LOGPPMGW(pool_member, LOGL_ERROR, "MGCP client connect failed at (%s:%u)\n", - pool_member->conf.remote_addr, pool_member->conf.remote_port); - talloc_free(pool_member->client); - pool_member->client = NULL; - continue; - } - - pool_members_initialized++; + if (mgcp_client_pool_member_reinit_client(pool_member, pool) == 0) + pool_members_initialized++; } return pool_members_initialized; @@ -238,6 +221,38 @@ talloc_free(pool_member); } +/*! Recreate and reconnect the MGCP client associated to the pool descriptor. + * \param[in] pool_member MGCP client pool descriptor. + */ +int mgcp_client_pool_member_reinit_client(struct mgcp_client_pool_member *pool_member, struct mgcp_client_pool *pool) +{ + /* Get rid of a possibly existing old MGCP client instance first */ + if (pool_member->client) { + mgcp_client_disconnect(pool_member->client); + talloc_free(pool_member->client); + } + + /* Initialize client */ + pool_member->client = mgcp_client_init(pool_member, &pool_member->conf); + if (!pool_member->client) { + LOGPPMGW(pool_member, LOGL_ERROR, "MGCP client initialization failed\n"); + return -EINVAL; + } + + /* Set backpointer so that we can detect later that this MGCP client is managed by this pool. */ + pool_member->client->pool = pool; + + /* Connect client */ + if (mgcp_client_connect2(pool_member->client, 0)) { + LOGPPMGW(pool_member, LOGL_ERROR, "MGCP client connect failed at (%s:%u)\n", + pool_member->conf.remote_addr, pool_member->conf.remote_port); + talloc_free(pool_member->client); + pool_member->client = NULL; + return -ECONNABORTED; + } + return 0; +} + /* Get a human readable name for a given pool member. */ const char *mgcp_client_pool_member_name(const struct mgcp_client_pool_member *pool_member) { diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index 505f3ab..81f8f3e 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -401,32 +401,10 @@ return CMD_WARNING; } - /* Get rid of a possibly existing old MGCP client instance first */ - if (pool_member->client) { - mgcp_client_disconnect(pool_member->client); - talloc_free(pool_member->client); - } - - /* Create a new MGCP client instance with the current config */ - pool_member->client = mgcp_client_init(pool_member, &pool_member->conf); - if (!pool_member->client) { - LOGP(DLMGCP, LOGL_ERROR, "(manual) MGW %s initalization failed\n", - mgcp_client_pool_member_name(pool_member)); - vty_out(vty, "%% MGCP client (MGW %s) initalization failed ('%s')%s", - mgcp_client_pool_member_name(pool_member), argv[0], VTY_NEWLINE); - return CMD_WARNING; - } - - /* Set backpointer so that we can detect later that this MGCP client is managed by this pool. */ - pool_member->client->pool = global_mgcp_client_pool; - - /* Connect client */ - if (mgcp_client_connect(pool_member->client)) { + if (mgcp_client_pool_member_reinit_client(pool_member, global_mgcp_client_pool) < 0) { LOGP(DLMGCP, LOGL_ERROR, "(manual) MGW %s connect failed at (%s:%u)\n", mgcp_client_pool_member_name(pool_member), pool_member->conf.remote_addr, pool_member->conf.remote_port); - talloc_free(pool_member->client); - pool_member->client = NULL; vty_out(vty, "%% MGCP client (MGW %s) initalization failed ('%s')%s", mgcp_client_pool_member_name(pool_member), argv[0], VTY_NEWLINE); return CMD_WARNING; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29747 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I0ab59278629c0e7e7c62a68b54b4235df58a5d77 Gerrit-Change-Number: 29747 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: mgcp-client: Move & rename helper function outside of vty code

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29744 ) Change subject: mgcp-client: Move & rename helper function outside of vty code ...................................................................... mgcp-client: Move & rename helper function outside of vty code This way acessing of the list is kept inside the same file. Related: SYS#5987 Change-Id: I6b26c2de4064d9c28f92452178fff170fb295576 --- M include/osmocom/mgcp_client/mgcp_client_pool_internal.h M src/libosmo-mgcp-client/mgcp_client_pool.c M src/libosmo-mgcp-client/mgcp_client_vty.c 3 files changed, 20 insertions(+), 21 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h index b67c968..148a5cf 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h @@ -43,4 +43,6 @@ struct cmd_node *vty_node; }; +struct mgcp_client_pool_member *mgcp_client_pool_find_member_by_nr(struct mgcp_client_pool *pool, unsigned int nr); + const char *mgcp_client_pool_member_name(const struct mgcp_client_pool_member *pool_member); diff --git a/src/libosmo-mgcp-client/mgcp_client_pool.c b/src/libosmo-mgcp-client/mgcp_client_pool.c index e6c3237..0555ff3 100644 --- a/src/libosmo-mgcp-client/mgcp_client_pool.c +++ b/src/libosmo-mgcp-client/mgcp_client_pool.c @@ -118,6 +118,19 @@ pool->mgcp_client_single = mgcp_client; } +/*! Lookup the selected MGCP client config by its reference number */ +struct mgcp_client_pool_member *mgcp_client_pool_find_member_by_nr(struct mgcp_client_pool *pool, unsigned int nr) +{ + struct mgcp_client_pool_member *pool_member; + + llist_for_each_entry(pool_member, &pool->member_list, list) { + if (pool_member->nr == nr) + return pool_member; + } + + return NULL; +} + /* Not every pool member may have a functional MGCP client, we will run through the pool once until we meet a * pool member that is suitable (has a client, is not blocked, has a low load). */ static struct mgcp_client_pool_member *mgcp_client_pool_pick(struct mgcp_client_pool *pool) diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index f85dd3f..748042f 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -337,29 +337,13 @@ return CMD_SUCCESS; } -/* Lookup the selected MGCP client config by its reference number */ -static struct mgcp_client_pool_member *pool_member_by_nr(unsigned int nr) -{ - struct mgcp_client_pool_member *pool_member = NULL; - struct mgcp_client_pool_member *pool_member_tmp; - - llist_for_each_entry(pool_member_tmp, &global_mgcp_client_pool->member_list, list) { - if (pool_member_tmp->nr == nr) { - pool_member = pool_member_tmp; - break; - } - } - - return pool_member; -} - DEFUN_ATTR(cfg_mgw, cfg_mgw_cmd, "mgw <0-255>", "Select a MGCP client config to setup\n" "reference number\n", CMD_ATTR_IMMEDIATE) { int nr = atoi(argv[0]); struct mgcp_client_pool_member *pool_member; - pool_member = pool_member_by_nr(nr); + pool_member = mgcp_client_pool_find_member_by_nr(global_mgcp_client_pool, nr); if (!pool_member) { pool_member = talloc_zero(global_mgcp_client_pool, struct mgcp_client_pool_member); OSMO_ASSERT(pool_member); @@ -382,7 +366,7 @@ int nr = atoi(argv[0]); struct mgcp_client_pool_member *pool_member; - pool_member = pool_member_by_nr(nr); + pool_member = mgcp_client_pool_find_member_by_nr(global_mgcp_client_pool, nr); if (!pool_member) { vty_out(vty, "%% no such MGCP client configured ('%s')%s", argv[0], VTY_NEWLINE); return CMD_WARNING; @@ -412,7 +396,7 @@ int nr = atoi(argv[0]); struct mgcp_client_pool_member *pool_member = NULL; - pool_member = pool_member_by_nr(nr); + pool_member = mgcp_client_pool_find_member_by_nr(global_mgcp_client_pool, nr); if (!pool_member) { vty_out(vty, "%% no such MGCP client configured ('%s')%s", argv[0], VTY_NEWLINE); return CMD_WARNING; @@ -466,7 +450,7 @@ int nr = atoi(argv[0]); struct mgcp_client_pool_member *pool_member = NULL; - pool_member = pool_member_by_nr(nr); + pool_member = mgcp_client_pool_find_member_by_nr(global_mgcp_client_pool, nr); if (!pool_member) { vty_out(vty, "%% no such MGCP client configured ('%s')%s", argv[0], VTY_NEWLINE); return CMD_WARNING; @@ -483,7 +467,7 @@ int nr = atoi(argv[0]); struct mgcp_client_pool_member *pool_member = NULL; - pool_member = pool_member_by_nr(nr); + pool_member = mgcp_client_pool_find_member_by_nr(global_mgcp_client_pool, nr); if (!pool_member) { vty_out(vty, "%% no such MGCP client configured ('%s')%s", argv[0], VTY_NEWLINE); return CMD_WARNING; -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I6b26c2de4064d9c28f92452178fff170fb295576 Gerrit-Change-Number: 29744 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: mgcp-client: Create alloc() and free() internal APIs for mgcp_client_...

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29745 ) Change subject: mgcp-client: Create alloc() and free() internal APIs for mgcp_client_pool_member ...................................................................... mgcp-client: Create alloc() and free() internal APIs for mgcp_client_pool_member Related: SYS#5987 Change-Id: Ibd2bf976885c777fe944652af6fe6eb0f1820468 --- M include/osmocom/mgcp_client/mgcp_client_pool_internal.h M src/libosmo-mgcp-client/mgcp_client_pool.c M src/libosmo-mgcp-client/mgcp_client_vty.c 3 files changed, 39 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h index 148a5cf..582090c 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h @@ -45,4 +45,6 @@ struct mgcp_client_pool_member *mgcp_client_pool_find_member_by_nr(struct mgcp_client_pool *pool, unsigned int nr); +struct mgcp_client_pool_member *mgcp_client_pool_member_alloc(struct mgcp_client_pool *pool, unsigned int nr); +void mgcp_client_pool_member_free(struct mgcp_client_pool_member *pool_member); const char *mgcp_client_pool_member_name(const struct mgcp_client_pool_member *pool_member); diff --git a/src/libosmo-mgcp-client/mgcp_client_pool.c b/src/libosmo-mgcp-client/mgcp_client_pool.c index 0555ff3..c8282fe 100644 --- a/src/libosmo-mgcp-client/mgcp_client_pool.c +++ b/src/libosmo-mgcp-client/mgcp_client_pool.c @@ -228,3 +228,38 @@ } } } + +/*************************** + * mgcp_client_pool_member: + ***************************/ + +/*! Allocate an mgcp_client_pool_member. + * \param[in] pool MGCP client pool descriptor. + * \param[in] nr Reference number of the pool member. + */ +struct mgcp_client_pool_member *mgcp_client_pool_member_alloc(struct mgcp_client_pool *pool, unsigned int nr) +{ + struct mgcp_client_pool_member *pool_member; + + pool_member = talloc_zero(pool, struct mgcp_client_pool_member); + OSMO_ASSERT(pool_member); + mgcp_client_conf_init(&pool_member->conf); + pool_member->nr = nr; + llist_add_tail(&pool_member->list, &pool->member_list); + return pool_member; +} + +/*! Free an mgcp_client_pool_member allocated through mgcp_client_pool_member_alloc(). + * \param[in] pool_member MGCP client pool descriptor. + * + * It also frees the associated MGCP client if present. + */ +void mgcp_client_pool_member_free(struct mgcp_client_pool_member *pool_member) +{ + llist_del(&pool_member->list); + if (pool_member->client) { + mgcp_client_disconnect(pool_member->client); + talloc_free(pool_member->client); + } + talloc_free(pool_member); +} diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index 748042f..505f3ab 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -345,11 +345,8 @@ pool_member = mgcp_client_pool_find_member_by_nr(global_mgcp_client_pool, nr); if (!pool_member) { - pool_member = talloc_zero(global_mgcp_client_pool, struct mgcp_client_pool_member); + pool_member = mgcp_client_pool_member_alloc(global_mgcp_client_pool, nr); OSMO_ASSERT(pool_member); - mgcp_client_conf_init(&pool_member->conf); - pool_member->nr = nr; - llist_add_tail(&pool_member->list, &global_mgcp_client_pool->member_list); } vty->index = &pool_member->conf; @@ -379,12 +376,7 @@ return CMD_WARNING; } - llist_del(&pool_member->list); - if (pool_member->client) { - mgcp_client_disconnect(pool_member->client); - talloc_free(pool_member->client); - } - talloc_free(pool_member); + mgcp_client_pool_member_free(pool_member); return CMD_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29745 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ibd2bf976885c777fe944652af6fe6eb0f1820468 Gerrit-Change-Number: 29745 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: mgcp-client: Fix typo in internal function name

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29736 ) Change subject: mgcp-client: Fix typo in internal function name ...................................................................... mgcp-client: Fix typo in internal function name Change-Id: I073038f1d6c68bc8546763a2c8c791fb5a021630 --- M src/libosmo-mgcp-client/mgcp_client_vty.c 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: osmith: Looks good to me, approved laforge: Looks good to me, approved msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index 88b056b..44cff2e 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -493,7 +493,7 @@ return CMD_SUCCESS; } -DEFUN(mgw_show, mgw_snow_cmd, "show mgw-pool", SHOW_STR "Display information about the MGW-Pool\n") +DEFUN(mgw_show, mgw_show_cmd, "show mgw-pool", SHOW_STR "Display information about the MGW-Pool\n") { vty_out(vty, "%% MGW-Pool:%s", VTY_NEWLINE); struct mgcp_client_pool_member *pool_member; @@ -551,7 +551,7 @@ install_lib_element(ENABLE_NODE, &mgw_block_cmd); install_lib_element(ENABLE_NODE, &mgw_unblock_cmd); - install_lib_element_ve(&mgw_snow_cmd); + install_lib_element_ve(&mgw_show_cmd); global_mgcp_client_pool = pool; } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29736 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I073038f1d6c68bc8546763a2c8c791fb5a021630 Gerrit-Change-Number: 29736 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: mgcp-client: Rename internal field in mgcp_client_pool

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29743 ) Change subject: mgcp-client: Rename internal field in mgcp_client_pool ...................................................................... mgcp-client: Rename internal field in mgcp_client_pool Having a list named pool inside an object already named pool is quite confusing. Let's rename the field so that it makes sense immediatelly when looking at it. Change-Id: I4062af6b619317c48223ad4577eaaad05d4eec9d --- M include/osmocom/mgcp_client/mgcp_client_pool_internal.h M src/libosmo-mgcp-client/mgcp_client_pool.c M src/libosmo-mgcp-client/mgcp_client_vty.c 3 files changed, 13 insertions(+), 13 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h index 588ba04..b67c968 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h @@ -33,7 +33,7 @@ struct mgcp_client *mgcp_client_single; /* A list that manages the pool members (see mgcp_client_pool_member->list above) */ - struct llist_head pool; + struct llist_head member_list; /* String to use for indentation when writing the configuration file to the VTY. This field is populated by * mgcp_client_pool_vty_init() */ diff --git a/src/libosmo-mgcp-client/mgcp_client_pool.c b/src/libosmo-mgcp-client/mgcp_client_pool.c index f3ed392..e6c3237 100644 --- a/src/libosmo-mgcp-client/mgcp_client_pool.c +++ b/src/libosmo-mgcp-client/mgcp_client_pool.c @@ -64,7 +64,7 @@ if (!pool) return NULL; - INIT_LLIST_HEAD(&pool->pool); + INIT_LLIST_HEAD(&pool->member_list); return pool; } @@ -77,7 +77,7 @@ struct mgcp_client_pool_member *pool_member; unsigned int pool_members_initialized = 0; - llist_for_each_entry(pool_member, &pool->pool, list) { + llist_for_each_entry(pool_member, &pool->member_list, list) { /* Initialize client */ pool_member->client = mgcp_client_init(pool_member, &pool_member->conf); @@ -126,7 +126,7 @@ struct mgcp_client_pool_member *pool_member_picked = NULL; unsigned int n_pool_members = 0; - llist_for_each_entry(pool_member, &pool->pool, list) { + llist_for_each_entry(pool_member, &pool->member_list, list) { n_pool_members++; if (pool_member->blocked == false && pool_member->client) { if (!pool_member_picked) @@ -164,14 +164,14 @@ * by the application code. */ /* When the pool is empty, return a single MGCP client if it is registered. */ - if (llist_empty(&pool->pool) && pool->mgcp_client_single) { + if (llist_empty(&pool->member_list) && pool->mgcp_client_single) { LOGP(DLMGCP, LOGL_DEBUG, "MGW pool is empty -- using (single) MGW %s\n", mgcp_client_name(pool->mgcp_client_single)); return pool->mgcp_client_single; } /* Abort when the pool is empty */ - if (llist_empty(&pool->pool)) { + if (llist_empty(&pool->member_list)) { LOGP(DLMGCP, LOGL_ERROR, "MGW pool is empty -- no MGW available!\n"); return NULL; } @@ -205,7 +205,7 @@ else return; - llist_for_each_entry(pool_member, &pool->pool, list) { + llist_for_each_entry(pool_member, &pool->member_list, list) { if (pool_member->client == mgcp_client) { if (pool_member->refcount == 0) { LOGPPMGW(pool_member, LOGL_ERROR, "MGW pool member has invalid refcount\n"); diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index 44cff2e..f85dd3f 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -328,7 +328,7 @@ snprintf(indent, indent_buf_len, "%s ", pool->vty_indent); - llist_for_each_entry(pool_member, &pool->pool, list) { + llist_for_each_entry(pool_member, &pool->member_list, list) { vty_out(vty, "%smgw %u%s", pool->vty_indent, pool_member->nr, VTY_NEWLINE); config_write(vty, indent, &pool_member->conf); } @@ -343,7 +343,7 @@ struct mgcp_client_pool_member *pool_member = NULL; struct mgcp_client_pool_member *pool_member_tmp; - llist_for_each_entry(pool_member_tmp, &global_mgcp_client_pool->pool, list) { + llist_for_each_entry(pool_member_tmp, &global_mgcp_client_pool->member_list, list) { if (pool_member_tmp->nr == nr) { pool_member = pool_member_tmp; break; @@ -365,7 +365,7 @@ OSMO_ASSERT(pool_member); mgcp_client_conf_init(&pool_member->conf); pool_member->nr = nr; - llist_add_tail(&pool_member->list, &global_mgcp_client_pool->pool); + llist_add_tail(&pool_member->list, &global_mgcp_client_pool->member_list); } vty->index = &pool_member->conf; @@ -498,15 +498,15 @@ vty_out(vty, "%% MGW-Pool:%s", VTY_NEWLINE); struct mgcp_client_pool_member *pool_member; - if (llist_empty(&global_mgcp_client_pool->pool) && global_mgcp_client_pool->mgcp_client_single) { + if (llist_empty(&global_mgcp_client_pool->member_list) && global_mgcp_client_pool->mgcp_client_single) { vty_out(vty, "%% (pool is empty, single MGCP client will be used)%s", VTY_NEWLINE); return CMD_SUCCESS; - } else if (llist_empty(&global_mgcp_client_pool->pool)) { + } else if (llist_empty(&global_mgcp_client_pool->member_list)) { vty_out(vty, "%% (pool is empty)%s", VTY_NEWLINE); return CMD_SUCCESS; } - llist_for_each_entry(pool_member, &global_mgcp_client_pool->pool, list) { + llist_for_each_entry(pool_member, &global_mgcp_client_pool->member_list, list) { vty_out(vty, "%% MGW %s%s", mgcp_client_pool_member_name(pool_member), VTY_NEWLINE); vty_out(vty, "%% mgcp-client: %s%s", pool_member->client ? "connected" : "disconnected", VTY_NEWLINE); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29743 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I4062af6b619317c48223ad4577eaaad05d4eec9d Gerrit-Change-Number: 29743 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: mgcp-client: pool: Improve documentation of some internal fields

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29733 ) Change subject: mgcp-client: pool: Improve documentation of some internal fields ...................................................................... mgcp-client: pool: Improve documentation of some internal fields Change-Id: Ic9823ab0a3f101549452a7c7a0b1b5b21aaa837c --- M include/osmocom/mgcp_client/mgcp_client_pool_internal.h 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h index 95f5525..588ba04 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h @@ -2,6 +2,7 @@ /* Struct to handle a member of a pool of MGWs. */ struct mgcp_client_pool_member { + /* Entry in llist mgcp_client_pool->pool. */ struct llist_head list; /* Reference number assinged by VTY. This number is used to manage the pool from the VTY and to identify it in @@ -31,7 +32,7 @@ * mgcp_client_vty_init() and actively registered by the API user using mgcp_client_pool_register_single() */ struct mgcp_client *mgcp_client_single; - /* A list that manages the pool members (see above) */ + /* A list that manages the pool members (see mgcp_client_pool_member->list above) */ struct llist_head pool; /* String to use for indentation when writing the configuration file to the VTY. This field is populated by -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29733 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Ic9823ab0a3f101549452a7c7a0b1b5b21aaa837c Gerrit-Change-Number: 29733 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: mgcp-client: Avoid double iteration picking client from pool

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29734 ) Change subject: mgcp-client: Avoid double iteration picking client from pool ...................................................................... mgcp-client: Avoid double iteration picking client from pool Change-Id: I99e8be878452c5d8e2183239fbdd499dcf507e90 --- M src/libosmo-mgcp-client/mgcp_client_pool.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/libosmo-mgcp-client/mgcp_client_pool.c b/src/libosmo-mgcp-client/mgcp_client_pool.c index 0531953..f3ed392 100644 --- a/src/libosmo-mgcp-client/mgcp_client_pool.c +++ b/src/libosmo-mgcp-client/mgcp_client_pool.c @@ -124,17 +124,18 @@ { struct mgcp_client_pool_member *pool_member; struct mgcp_client_pool_member *pool_member_picked = NULL; - unsigned int n_pool_members = llist_count(&pool->pool); + unsigned int n_pool_members = 0; llist_for_each_entry(pool_member, &pool->pool, list) { + n_pool_members++; if (pool_member->blocked == false && pool_member->client) { if (!pool_member_picked) pool_member_picked = pool_member; else if (pool_member_picked->refcount > pool_member->refcount) pool_member_picked = pool_member; } else { - LOGPPMGW(pool_member, LOGL_DEBUG, "MGW pool has %u members -- MGW %u is unusable\n", n_pool_members, - pool_member->nr); + LOGPPMGW(pool_member, LOGL_DEBUG, "%s -- MGW %u is unusable (blocked=%u, cli=%u)\n", + __func__, pool_member->nr, pool_member->blocked, !!pool_member->client); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29734 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I99e8be878452c5d8e2183239fbdd499dcf507e90 Gerrit-Change-Number: 29734 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: mgcp-client: Introduce APIs to manually select mgcp_client from pool

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29750 ) Change subject: mgcp-client: Introduce APIs to manually select mgcp_client from pool ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I75ce3e04cd3f6d9cc20d7b4fc0f51083780786c8 Gerrit-Change-Number: 29750 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-Comment-Date: Fri, 14 Oct 2022 13:52:44 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in libosmocore[master]: Add osmo_sock_get_name_multiaddr_buf()

by pespin

Attention is currently required from: neels, fixeria, msuraev. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28997 ) Change subject: Add osmo_sock_get_name_multiaddr_buf() ...................................................................... Patch Set 14: (1 comment) Patchset: PS14: > No, having clearly separated parts reduces overall complexity and makes code easier to follow and us […] Let's see what others thing about it. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28997 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If76595ebd1cf26ba904887a36c4cc14a1b5c4521 Gerrit-Change-Number: 28997 Gerrit-PatchSet: 14 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Oct 2022 13:48:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

2025

2024

2023

2022

gerrit-log October 2022