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

Change in osmo-bsc[master]: abis_rsl: delete CHAN RQD from queue when rach ind was sent

by dexter

Attention is currently required from: msuraev, lynxis lazus. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29705 ) Change subject: abis_rsl: delete CHAN RQD from queue when rach ind was sent ...................................................................... Patch Set 3: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/29705/comment/6c525ccc_862d630a PS1, Line 7: abis_rsl: delete CHAN RQD from que when rach ind was sent > Did you mean queue? Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia4abc55fc6fcb1c00991cc84d09529131d014910 Gerrit-Change-Number: 29705 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 14 Oct 2022 14:09:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: delete CHAN RQD from queue when rach ind was sent

by dexter

Attention is currently required from: lynxis lazus, dexter. Hello Jenkins Builder, fixeria, pespin, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/29705 to look at the new patch set (#3). Change subject: abis_rsl: delete CHAN RQD from queue when rach ind was sent ...................................................................... abis_rsl: delete CHAN RQD from queue when rach ind was sent The CHAN REQ entry is not deleted after its information was passed on to the PCU. This causes the same entry to be used over and over again while blocking other incoming CHAN RQD. Change-Id: Ia4abc55fc6fcb1c00991cc84d09529131d014910 Related: OS#5198 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/29705/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29705 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia4abc55fc6fcb1c00991cc84d09529131d014910 Gerrit-Change-Number: 29705 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: when doing packet access, log t1,t3,t2 and fn

by dexter

Attention is currently required from: pespin, lynxis lazus. Hello Jenkins Builder, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/29704 to look at the new patch set (#3). Change subject: abis_rsl: when doing packet access, log t1,t3,t2 and fn ...................................................................... abis_rsl: when doing packet access, log t1,t3,t2 and fn The the (relative) frame number that is forwarded to the PCU is an important parameter which is computed from t1,t3,t2. Change-Id: I83d20ba9e0ce6488d458ccf4a85c8445c30e3a89 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/04/29704/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I83d20ba9e0ce6488d458ccf4a85c8445c30e3a89 Gerrit-Change-Number: 29704 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: show full request reference in log

by dexter

Attention is currently required from: fixeria, pespin, lynxis lazus. Hello Jenkins Builder, lynxis lazus, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/29703 to look at the new patch set (#3). Change subject: abis_rsl: show full request reference in log ...................................................................... abis_rsl: show full request reference in log When a CHAN RQD is received via RSL, we show ra and other parameters. Lets also show T1, T3 and T2. Change-Id: I78499b49ae176b736e384e193fadc0bdd669dffa --- M src/osmo-bsc/abis_rsl.c 1 file changed, 4 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/29703/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I78499b49ae176b736e384e193fadc0bdd669dffa Gerrit-Change-Number: 29703 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-MessageType: newpatchset

2 years, 8 months

1
0
0 0

Change in osmo-sgsn[master]: SNDCP: add LLE-specific logging wrapper

by msuraev

Attention is currently required from: pespin. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/29752 ) Change subject: SNDCP: add LLE-specific logging wrapper ...................................................................... Patch Set 4: (1 comment) File src/sgsn/gprs_sndcp.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/29752/comment/24a35606_a1de6032 PS4, Line 225: (LLE)->llme->tlli, (LLE)->sapi, (NSAPI), llist_count(&gprs_sndcp_entities), ##ARGS) > I don't see this macro using LOGL_ERROR, but a LEVEL field, which means will be used for any logging […] It'll be used with log levels specified in the patch - you can read it and see with which log level it's mostly used. I think it's valuable to print this count where the macro is called - that's why I've submitted this patch. -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/29752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: Idfab1f4be034fc8eab8f87bd8cd88723939e107e Gerrit-Change-Number: 29752 Gerrit-PatchSet: 4 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Fri, 14 Oct 2022 14:09:09 +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

Change in osmo-bsc[master]: abis_rsl: when doing packet access, log t1,t3,t2 and fn

by dexter

Attention is currently required from: pespin, lynxis lazus. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29704 ) Change subject: abis_rsl: when doing packet access, log t1,t3,t2 and fn ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/29704/comment/6b97acff_55750785 PS1, Line 1822: LOG_BTS(rqd->bts, DRSL, LOGL_INFO, "CHAN RQD: fn(t1=%u,t3=%u,t2=%u) = %u\n", t1, t2, t3, fn); > same, why not t1 t2 t3 in order? (The order is intentional, see comment in previous patch) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29704 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I83d20ba9e0ce6488d458ccf4a85c8445c30e3a89 Gerrit-Change-Number: 29704 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 14 Oct 2022 14:04:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-bsc[master]: abis_rsl: show full request reference in log

by dexter

Attention is currently required from: fixeria, pespin, lynxis lazus. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29703 ) Change subject: abis_rsl: show full request reference in log ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/29703/comment/a029d499_9f39eaf1 PS1, Line 1915: LOG_BTS(bts, DRSL, LOGL_INFO, "CHAN RQD: reason: %s (ra=0x%02x, t1=%d, t3=%d, t2=%d, neci=0x%02x, chreq_reason=0x%02x)\n", > Actually, from the end user perspective, it probably makes sense to convert T1/T2/T3 into TDMA Fn va […] The order T1, T2, T3 is intentional. That is the order in which the numbers are stored and also the order in which wireshark will display the values. When debuging it is easier when one does not have to convert between different display variants. The fn is displayed at later log lines as well, no need to display it here once more. (it is important to see T1, T2, T3 since wireshark won't always do the conversion.) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29703 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I78499b49ae176b736e384e193fadc0bdd669dffa Gerrit-Change-Number: 29703 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Comment-Date: Fri, 14 Oct 2022 14:03:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: mgcp-client: Rearrange internal backpointers

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29749 ) Change subject: mgcp-client: Rearrange internal backpointers ...................................................................... mgcp-client: Rearrange internal backpointers Let's properly store backpointers so that it is easy to access all relation chain (pool<->pool_member<->mgcp_client). Related: SYS#5987 Change-Id: I5ec2465075da2e3c8eabca9df60681620a7db499 --- M include/osmocom/mgcp_client/mgcp_client_internal.h 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 4 files changed, 16 insertions(+), 18 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_internal.h b/include/osmocom/mgcp_client/mgcp_client_internal.h index 73e3de2..2eb9b4c 100644 --- a/include/osmocom/mgcp_client/mgcp_client_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_internal.h @@ -16,7 +16,7 @@ mgcp_trans_id_t next_trans_id; struct llist_head responses_pending; struct llist_head inuse_endpoints; - struct mgcp_client_pool *pool; + struct mgcp_client_pool_member *pool_member; }; struct mgcp_inuse_endpoint { diff --git a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h index 91e5a45..d71deaf 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h @@ -26,6 +26,9 @@ /* Entry in llist mgcp_client_pool->pool. */ struct llist_head list; + /* The pool managing this object: */ + struct mgcp_client_pool *pool; + /* Reference number assinged by VTY. This number is used to manage the pool from the VTY and to identify it in * the log. */ unsigned int nr; @@ -48,5 +51,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); +int mgcp_client_pool_member_reinit_client(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 00c0868..bee3555 100644 --- a/src/libosmo-mgcp-client/mgcp_client_pool.c +++ b/src/libosmo-mgcp-client/mgcp_client_pool.c @@ -55,7 +55,7 @@ llist_for_each_entry(pool_member, &pool->member_list, list) { /* Initialize client */ - if (mgcp_client_pool_member_reinit_client(pool_member, pool) == 0) + if (mgcp_client_pool_member_reinit_client(pool_member) == 0) pool_members_initialized++; } @@ -165,25 +165,19 @@ void mgcp_client_pool_put(struct mgcp_client *mgcp_client) { struct mgcp_client_pool_member *pool_member; - struct mgcp_client_pool *pool; if (!mgcp_client) return; - if (mgcp_client->pool) - pool = mgcp_client->pool; - else + if (!mgcp_client->pool_member) return; + pool_member = mgcp_client->pool_member; - 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"); - return; - } - pool_member->refcount--; - } + if (pool_member->refcount == 0) { + LOGPPMGW(pool_member, LOGL_ERROR, "MGW pool member has invalid refcount\n"); + return; } + pool_member->refcount--; } /*************************** @@ -201,6 +195,7 @@ pool_member = talloc_zero(pool, struct mgcp_client_pool_member); OSMO_ASSERT(pool_member); mgcp_client_conf_init(&pool_member->conf); + pool_member->pool = pool; pool_member->nr = nr; llist_add_tail(&pool_member->list, &pool->member_list); return pool_member; @@ -224,7 +219,7 @@ /*! 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) +int mgcp_client_pool_member_reinit_client(struct mgcp_client_pool_member *pool_member) { /* Get rid of a possibly existing old MGCP client instance first */ if (pool_member->client) { @@ -240,7 +235,7 @@ } /* Set backpointer so that we can detect later that this MGCP client is managed by this pool. */ - pool_member->client->pool = pool; + pool_member->client->pool_member = pool_member; /* Connect client */ if (mgcp_client_connect2(pool_member->client, 0)) { diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index 81f8f3e..a823b0c 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -401,7 +401,7 @@ return CMD_WARNING; } - if (mgcp_client_pool_member_reinit_client(pool_member, global_mgcp_client_pool) < 0) { + if (mgcp_client_pool_member_reinit_client(pool_member) < 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); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29749 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I5ec2465075da2e3c8eabca9df60681620a7db499 Gerrit-Change-Number: 29749 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 submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29750 ) Change subject: mgcp-client: Introduce APIs to manually select mgcp_client from pool ...................................................................... mgcp-client: Introduce APIs to manually select mgcp_client from pool This will be used by osmo-bsc to implement MGW-pinning for specific BTS. This is useful for instance to keep all BTS connections targeting the same MGW in order to make use of Osmux trunking optimizations (AMR payload of different calls filling same underlaying UDP packet). Related: SYS#5987 Change-Id: I75ce3e04cd3f6d9cc20d7b4fc0f51083780786c8 --- M TODO-RELEASE M include/osmocom/mgcp_client/mgcp_client_pool.h 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 5 files changed, 32 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index c480ba0..5fe3d53 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -25,4 +25,5 @@ # #library what description / commit summary line libosmo-netif >1.2.0 OSMUX_DEFAULT_PORT, osmux_xfrm_output_*, osmux_xfrm_input_* -libosmocore >1.7.0 osmo_sockaddr_is_any() \ No newline at end of file +libosmocore >1.7.0 osmo_sockaddr_is_any() +libmgcp-client NEW APIs mgcp_client_pool_member_...() \ No newline at end of file diff --git a/include/osmocom/mgcp_client/mgcp_client_pool.h b/include/osmocom/mgcp_client/mgcp_client_pool.h index d0a6ff4..949e870 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool.h @@ -2,10 +2,17 @@ struct mgcp_client; struct mgcp_client_pool; +struct mgcp_client_pool_member; struct mgcp_client_pool *mgcp_client_pool_alloc(void *talloc_ctx); + void mgcp_client_pool_vty_init(int parent_node, int mgw_node, const char *indent, struct mgcp_client_pool *pool); 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); + struct mgcp_client *mgcp_client_pool_get(struct mgcp_client_pool *pool); void mgcp_client_pool_put(struct mgcp_client *mgcp_client); + +struct mgcp_client_pool_member *mgcp_client_pool_find_member_by_nr(struct mgcp_client_pool *pool, unsigned int nr); +struct mgcp_client *mgcp_client_pool_member_get(struct mgcp_client_pool_member *pool_member); +bool mgcp_client_pool_member_is_blocked(const struct mgcp_client_pool_member *pool_member); diff --git a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h index d71deaf..999c3ef 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h @@ -18,9 +18,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); - - /* Struct to handle a member of a pool of MGWs. */ struct mgcp_client_pool_member { /* Entry in llist mgcp_client_pool->pool. */ diff --git a/src/libosmo-mgcp-client/mgcp_client_pool.c b/src/libosmo-mgcp-client/mgcp_client_pool.c index bee3555..caec535 100644 --- a/src/libosmo-mgcp-client/mgcp_client_pool.c +++ b/src/libosmo-mgcp-client/mgcp_client_pool.c @@ -148,12 +148,10 @@ /* Pick a suitable pool member */ pool_member = mgcp_client_pool_pick(pool); - if (pool_member) { - pool_member->refcount++; - return pool_member->client; - } + if (!pool_member) + return NULL; - return NULL; + return mgcp_client_pool_member_get(pool_member); } /*! put an MGCP client back into the pool (decrement reference counter). @@ -273,3 +271,22 @@ return name; } + +/*! Get the MGCP client associated with the pool reference from the pool (increment reference counter). + * \param[in] pool_member MGCP client pool descriptor. + * \returns MGCP client descriptor, NULL if no member was not ready. + */ +struct mgcp_client *mgcp_client_pool_member_get(struct mgcp_client_pool_member *pool_member) +{ + pool_member->refcount++; + return pool_member->client; +} + +/*! Get whether the MGCP client associated with the pool reference is blocked by policy. + * \param[in] pool_member MGCP client pool descriptor. + * \returns true if blocked, false otherwise + */ +bool mgcp_client_pool_member_is_blocked(const struct mgcp_client_pool_member *pool_member) +{ + return pool_member->blocked; +} diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c index a823b0c..da017f6 100644 --- a/src/libosmo-mgcp-client/mgcp_client_vty.c +++ b/src/libosmo-mgcp-client/mgcp_client_vty.c @@ -32,6 +32,7 @@ #include <osmocom/mgcp_client/mgcp_client.h> #include <osmocom/mgcp_client/mgcp_client_internal.h> #include <osmocom/mgcp_client/mgcp_client_pool_internal.h> +#include <osmocom/mgcp_client/mgcp_client_pool.h> #define MGW_STR MGCP_CLIENT_MGW_STR -- 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-MessageType: merged

2 years, 8 months

1
0
0 0

Change in osmo-mgw[master]: mgcp-client: Rearrange order of structs and APIs in header

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29748 ) Change subject: mgcp-client: Rearrange order of structs and APIs in header ...................................................................... mgcp-client: Rearrange order of structs and APIs in header Move mgcp_client_pool up in the file as a preparation for next commit, where pool_member will have a pointer to the pool added. The related APIs on the object are also moved up in the file. Change-Id: I9ff9c6e1e722690835c5d59b1fa87fb7d9e3120c --- M include/osmocom/mgcp_client/mgcp_client_pool_internal.h 1 file changed, 21 insertions(+), 20 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved 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 d9beb6f..91e5a45 100644 --- a/include/osmocom/mgcp_client/mgcp_client_pool_internal.h +++ b/include/osmocom/mgcp_client/mgcp_client_pool_internal.h @@ -1,5 +1,26 @@ #pragma once +/* Struct to handle a pool of MGWs. (Use _pool functions) */ +struct mgcp_client_pool { + + /* A pointer to a 'single' mgcp client. This is a non-pooled MGCP client that is configured using + * 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 mgcp_client_pool_member->list above) */ + 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() */ + char *vty_indent; + + /* VTY node specification used with this pool. This field is populated by mgcp_client_pool_vty_init() */ + 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); + + /* Struct to handle a member of a pool of MGWs. */ struct mgcp_client_pool_member { /* Entry in llist mgcp_client_pool->pool. */ @@ -25,26 +46,6 @@ unsigned int refcount; }; -/* Struct to handle a pool of MGWs. (Use _pool functions) */ -struct mgcp_client_pool { - - /* A pointer to a 'single' mgcp client. This is a non-pooled MGCP client that is configured using - * 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 mgcp_client_pool_member->list above) */ - 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() */ - char *vty_indent; - - /* VTY node specification used with this pool. This field is populated by mgcp_client_pool_vty_init() */ - 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); - 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); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29748 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I9ff9c6e1e722690835c5d59b1fa87fb7d9e3120c Gerrit-Change-Number: 29748 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

2025

2024

2023

2022

gerrit-log October 2022