Change in osmo-gbproxy[master]: gbproxy_ctrl: Ignore SIG-BVCI in ctrl commands

daniel gerrit-no-reply at lists.osmocom.org
Mon Jul 19 14:11:06 UTC 2021


daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gbproxy/+/24965 )


Change subject: gbproxy_ctrl: Ignore SIG-BVCI in ctrl commands
......................................................................

gbproxy_ctrl: Ignore SIG-BVCI in ctrl commands

Both ctrl commands gbproxy-state and number-of-peers should only
operate on PtP-BVCs. This patch avoids a crash in gbproxy-state and
fixes the count of number-of-peers to only include PtP-BVCs.

Related: SYS#5542, OS#5200
Change-Id: Ida5f9ad0a16b991e77eec0e3cdb779dcfa472fab
---
M src/gb_proxy_ctrl.c
1 file changed, 7 insertions(+), 1 deletion(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-gbproxy refs/changes/65/24965/1

diff --git a/src/gb_proxy_ctrl.c b/src/gb_proxy_ctrl.c
index 99dcbe1..1d51d22 100644
--- a/src/gb_proxy_ctrl.c
+++ b/src/gb_proxy_ctrl.c
@@ -103,6 +103,9 @@
 	hash_for_each(cfg->bss_nses, i, nse_peer, list) {
 		struct gbproxy_bvc *bvc;
 		hash_for_each(nse_peer->bvcs, j, bvc, list) {
+			if (bvc->bvci == 0)
+				continue;
+
 			struct gprs_ra_id *raid = &bvc->cell->id.raid;
 
 			cmd->reply = talloc_asprintf_append(cmd->reply, "%u,%u,%u-%u-%u-%u,%s\n",
@@ -127,8 +130,11 @@
 	int i, j;
 
 	hash_for_each(cfg->bss_nses, i, nse_peer, list) {
-		hash_for_each(nse_peer->bvcs, j, bvc, list)
+		hash_for_each(nse_peer->bvcs, j, bvc, list) {
+			if (bvc->bvci == 0)
+				continue;
 			count++;
+		}
 	}
 
 	cmd->reply = talloc_strdup(cmd, "");

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-gbproxy/+/24965
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-gbproxy
Gerrit-Branch: master
Gerrit-Change-Id: Ida5f9ad0a16b991e77eec0e3cdb779dcfa472fab
Gerrit-Change-Number: 24965
Gerrit-PatchSet: 1
Gerrit-Owner: daniel <dwillmann at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210719/a1ca8bd4/attachment.htm>


More information about the gerrit-log mailing list