Attention is currently required from: osmith.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-msc/+/32206
to look at the new patch set (#3).
Change subject: msc_mgw_setup: use mgcp_client_pool_empty()
......................................................................
msc_mgw_setup: use mgcp_client_pool_empty()
Don't fall back to the legacy config if the pool is configured but no
connection to any pool member can be established.
Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db
Related: OS#5993
Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3
---
M TODO-RELEASE
M src/osmo-msc/msc_main.c
2 files changed, 21 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/06/32206/3
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3
Gerrit-Change-Number: 32206
Gerrit-PatchSet: 3
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 )
Change subject: msc_mgw_setup: use mgcp_client_pool_empty()
......................................................................
Patch Set 2:
(1 comment)
File src/osmo-msc/msc_main.c:
https://gerrit.osmocom.org/c/osmo-msc/+/32206/comment/bf7bdf94_ca8bbdcb
PS2, Line 565: if (pool_members_initalized) {
Can you perhaps now change this to have the error as early termination? it's way clearer imho since there starts to be several branches:
```
if (!pool_members_initalized) {
LOGP(DMSC, LOGL_ERROR, "MGW pool failed to configure any pool members\n");
return -EINVAL;
}
LOGP(DMSC, LOGL_NOTICE,
"MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'msc').\n",
pool_members_initalized);
return 0;
```
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3
Gerrit-Change-Number: 32206
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-CC: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Tue, 04 Apr 2023 13:57:12 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208 )
Change subject: hnbgw_mgw_setup: use mgcp_client_pool_empty()
......................................................................
hnbgw_mgw_setup: use mgcp_client_pool_empty()
Don't fall back to the legacy config if the pool is configured but no
connection to any pool member can be established.
Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db
Related: OS#5993
Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927
---
M TODO-RELEASE
M src/osmo-hnbgw/hnbgw.c
2 files changed, 25 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/08/32208/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index cec63db..cf72895 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -10,3 +10,4 @@
osmo-hnbgw cfg config deprecated: 'sccp cr max-payload-len <0-999999>'
libosmo-sigtran >=1.7.0 Ensure SCCP CR max payload length of 130 bytes is enforced.
Uses osmo_scu_prim_hdr_name_c()
+libosmo-mgcp-client > 1.11.0 mgcp_client_pool_empty()
diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c
index 0624803..14f04af 100644
--- a/src/osmo-hnbgw/hnbgw.c
+++ b/src/osmo-hnbgw/hnbgw.c
@@ -693,12 +693,16 @@
/* 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(g_hnb_gw->mgw_pool);
- if (pool_members_initalized) {
- LOGP(DMGW, LOGL_NOTICE,
- "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'mgcp').\n",
- pool_members_initalized);
- return 0;
+ if (!mgcp_client_pool_empty(g_hnb_gw->mgw_pool)) {
+ pool_members_initalized = mgcp_client_pool_connect(g_hnb_gw->mgw_pool);
+ if (pool_members_initalized) {
+ LOGP(DMGW, LOGL_NOTICE,
+ "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'mgcp').\n",
+ pool_members_initalized);
+ return 0;
+ }
+ LOGP(DMGW, LOGL_ERROR, "MGW pool failed to configure any pool members\n");
+ return -EINVAL;
}
/* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool
--
To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32208
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hnbgw
Gerrit-Branch: master
Gerrit-Change-Id: Icf3f3f0524c9d27f645c68851aaf9c6f33842927
Gerrit-Change-Number: 32208
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/32207 )
Change subject: bsc_mgw_setup: use mgcp_client_pool_empty()
......................................................................
bsc_mgw_setup: use mgcp_client_pool_empty()
Don't fall back to the legacy config if the pool is configured but no
connection to any pool member can be established.
Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db
Related: OS#5993
Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40
---
M TODO-RELEASE
M src/osmo-bsc/osmo_bsc_main.c
2 files changed, 26 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/07/32207/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index 2658cdd..690e9ea 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -13,4 +13,5 @@
libosmogsm >1.8.0 circuit switched data stuff (gsm0808_enc/dec_channel_type etc.)
libosmo-abis >1.4.0 osmo_ortp.h: add RTP_PT_CSDATA
libosmo-sccp >1.7.0 osmo_sccp_{get,set}_priv()
-libosmocore >1.8.0 GSM48_IE_CIP_MODE_SET_HO and GSM48_IE_SYNC_IND_HO
\ No newline at end of file
+libosmocore >1.8.0 GSM48_IE_CIP_MODE_SET_HO and GSM48_IE_SYNC_IND_HO
+libosmo-mgcp-client > 1.11.0 mgcp_client_pool_empty()
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 5866ec1..c6afb50 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -839,12 +839,16 @@
/* 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);
- if (pool_members_initalized) {
- LOGP(DNM, LOGL_NOTICE,
- "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'msc').\n",
- pool_members_initalized);
- return 0;
+ if (!mgcp_client_pool_empty(bsc_gsmnet->mgw.mgw_pool)) {
+ pool_members_initalized = mgcp_client_pool_connect(bsc_gsmnet->mgw.mgw_pool);
+ if (pool_members_initalized) {
+ LOGP(DNM, LOGL_NOTICE,
+ "MGW pool with %u pool members configured, (ignoring MGW configuration in VTY node 'msc').\n",
+ pool_members_initalized);
+ return 0;
+ }
+ LOGP(DNM, LOGL_ERROR, "MGW pool failed to configure any pool members\n");
+ return -EINVAL;
}
/* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/32207
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I3a8418fb5841c71049ec91439143e1fe5553ed40
Gerrit-Change-Number: 32207
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 )
Change subject: msc_mgw_setup: use mgcp_client_pool_empty()
......................................................................
msc_mgw_setup: use mgcp_client_pool_empty()
Don't fall back to the legacy config if the pool is configured but no
connection to any pool member can be established.
Depends: osmo-mgw I009483ac9dfd6627e414f14d43b89f40ea4644db
Related: OS#5993
Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3
---
M TODO-RELEASE
M src/osmo-msc/msc_main.c
2 files changed, 25 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/06/32206/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3
Gerrit-Change-Number: 32206
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-MessageType: newpatchset
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/32206 )
Change subject: msc_mgw_setup: use mgcp_client_pool_empty()
......................................................................
msc_mgw_setup: use mgcp_client_pool_empty()
Don't fall back to the legacy config if the pool is configured but no
connection to any pool member can be established.
Related: OS#5993
Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3
---
M TODO-RELEASE
M src/osmo-msc/msc_main.c
2 files changed, 24 insertions(+), 6 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/06/32206/1
diff --git a/TODO-RELEASE b/TODO-RELEASE
index d0852fc..a2695f2 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -7,3 +7,4 @@
# If any interfaces have been added since the last public release: c:r:a + 1.
# If any interfaces have been removed or changed since the last public release: c:r:0.
#library what description / commit summary line
+libosmo-mgcp-client > 1.11.0 mgcp_client_pool_empty()
diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c
index a1e91ce..9417c0b 100644
--- a/src/osmo-msc/msc_main.c
+++ b/src/osmo-msc/msc_main.c
@@ -560,12 +560,16 @@
/* 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(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;
+ if (!mgcp_client_pool_empty(msc_network->mgw.mgw_pool)) {
+ 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;
+ }
+ LOGP(DMSC, LOGL_ERROR, "MGW pool failed to configure any pool members\n");
+ return -EINVAL;
}
/* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool
--
To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/32206
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-msc
Gerrit-Branch: master
Gerrit-Change-Id: I44e7b2723d801ceb03aaa2e5546802b4eb56b3c3
Gerrit-Change-Number: 32206
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange
osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/32205 )
Change subject: mgcp_client_pool: add mgcp_client_pool_empty()
......................................................................
mgcp_client_pool: add mgcp_client_pool_empty()
Check if the private struct mgcp_client_pool has an empty member_list.
Clients that support both the legacy config and the pool config can
use this to properly exit with error if pool members are configured,
but no connection to any of the pool members can be established.
Currently clients can't distinguish a config without pool members and a
config with pool members that is broken and will fall back to using the
defaults of the legacy config in both cases.
Related: OS#5993
Change-Id: I009483ac9dfd6627e414f14d43b89f40ea4644db
---
M include/osmocom/mgcp_client/mgcp_client_pool.h
M src/libosmo-mgcp-client/mgcp_client_pool.c
2 files changed, 26 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/05/32205/1
diff --git a/include/osmocom/mgcp_client/mgcp_client_pool.h b/include/osmocom/mgcp_client/mgcp_client_pool.h
index 46d7e90..ba31fb0 100644
--- a/include/osmocom/mgcp_client/mgcp_client_pool.h
+++ b/include/osmocom/mgcp_client/mgcp_client_pool.h
@@ -12,6 +12,7 @@
int mgcp_client_pool_config_write(struct vty *vty, const char *indent);
unsigned int mgcp_client_pool_connect(struct mgcp_client_pool *pool);
void mgcp_client_pool_register_single(struct mgcp_client_pool *pool, struct mgcp_client *mgcp_client);
+bool mgcp_client_pool_empty(const struct mgcp_client_pool *pool);
struct mgcp_client *mgcp_client_pool_get(struct mgcp_client_pool *pool);
void mgcp_client_pool_put(struct mgcp_client *mgcp_client);
diff --git a/src/libosmo-mgcp-client/mgcp_client_pool.c b/src/libosmo-mgcp-client/mgcp_client_pool.c
index fe3cccd..4156664 100644
--- a/src/libosmo-mgcp-client/mgcp_client_pool.c
+++ b/src/libosmo-mgcp-client/mgcp_client_pool.c
@@ -75,6 +75,11 @@
pool->mgcp_client_single = mgcp_client;
}
+bool mgcp_client_pool_empty(const struct mgcp_client_pool *pool)
+{
+ return llist_empty(&pool->member_list);
+}
+
/*! 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)
{
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/32205
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I009483ac9dfd6627e414f14d43b89f40ea4644db
Gerrit-Change-Number: 32205
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-MessageType: newchange