osmith has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged