Change in osmo-mgw[master]: mgcp_vty: fix config write for trunk 0

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Thu Nov 26 08:52:22 UTC 2020


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/21363 )

Change subject: mgcp_vty: fix config write for trunk 0
......................................................................

mgcp_vty: fix config write for trunk 0

When a trunk 0 is created (which is legal) than it is impossible to
write this trunk back to the config. The reason for this that there is
still a filtering in place from the time where trunk 0 was not allowed.
This filter needs to be extended to filter only virtual trunk 0 but not
E1 trunk 0 out.

Change-Id: Iad6b577b5a711c35f98c477351fde567d8c87298
---
M src/libosmo-mgcp/mgcp_vty.c
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Jenkins Builder: Verified
  laforge: Looks good to me, approved



diff --git a/src/libosmo-mgcp/mgcp_vty.c b/src/libosmo-mgcp/mgcp_vty.c
index 74e8da0..681ca99 100644
--- a/src/libosmo-mgcp/mgcp_vty.c
+++ b/src/libosmo-mgcp/mgcp_vty.c
@@ -958,7 +958,8 @@
 		   config of trunk 0 here. The configuration for the virtual
 		   trunk is written by config_write_mgcp(). */
 
-		if (trunk->trunk_nr == MGCP_VIRT_TRUNK_ID)
+		if (trunk->trunk_type == MGCP_TRUNK_VIRTUAL
+		    && trunk->trunk_nr == MGCP_VIRT_TRUNK_ID)
 			continue;
 
 		vty_out(vty, " trunk %d%s", trunk->trunk_nr, VTY_NEWLINE);

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

Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: Iad6b577b5a711c35f98c477351fde567d8c87298
Gerrit-Change-Number: 21363
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20201126/30f8d3c3/attachment.htm>


More information about the gerrit-log mailing list