pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29781 )
Change subject: cosmetic: Fix indentation whitespace
......................................................................
cosmetic: Fix indentation whitespace
Change-Id: I16f4c8018ac906e865885332fec3912c6e539d4e
---
M src/osmo-bsc/osmo_bsc_main.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 920693f..5452609 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -843,7 +843,7 @@
/* Initialize and connect a single MGCP client. This MGCP client will appear as the one and only pool
* member if there is no MGW pool configured. */
LOGP(DNM, LOGL_NOTICE, "No MGW pool configured, using MGW configuration in VTY node 'msc'\n");
- mgcp_client_single = mgcp_client_init(bsc_gsmnet, bsc_gsmnet->mgw.conf);
+ mgcp_client_single = mgcp_client_init(bsc_gsmnet, bsc_gsmnet->mgw.conf);
if (!mgcp_client_single) {
LOGP(DNM, LOGL_ERROR, "MGW (single) client initalization failed\n");
return -EINVAL;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29781
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I16f4c8018ac906e865885332fec3912c6e539d4e
Gerrit-Change-Number: 29781
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/29783 )
Change subject: cosmetic: Fix typo in comment
......................................................................
cosmetic: Fix typo in comment
Change-Id: I6afe7a7a2ae977782e7f13b1ee90b6c8aafe3050
---
M src/osmo-bsc/osmo_bsc_main.c
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c
index 5452609..863ceea 100644
--- a/src/osmo-bsc/osmo_bsc_main.c
+++ b/src/osmo-bsc/osmo_bsc_main.c
@@ -829,7 +829,7 @@
struct mgcp_client *mgcp_client_single;
unsigned int pool_members_initalized;
- /* Initalize MGW pool. This initalizes and connects all MGCP clients that are currently configured in
+ /* 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);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/29783
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I6afe7a7a2ae977782e7f13b1ee90b6c8aafe3050
Gerrit-Change-Number: 29783
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: pespin.
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmo-mgw/+/29791
to look at the new patch set (#2).
Change subject: mgcp-client: Convert users supporting new MGW Pool VTY node during write-config
......................................................................
mgcp-client: Convert users supporting new MGW Pool VTY node during write-config
If the user (app) already supports the MGW Pool VTY command set
(mgcp_client_pool_vty_init() was called), then if single MGW mode is in
use it's because the config file was not updated to use the new MGW Pool
node. Let's convert it to the new format to help in transitioning to the
new VTY command set.
Related: SYS#5987
Change-Id: I2f6658cc66f8bcbd4a60ee2b932bb5dd65888233
---
M src/libosmo-mgcp-client/mgcp_client_vty.c
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/91/29791/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29791
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I2f6658cc66f8bcbd4a60ee2b932bb5dd65888233
Gerrit-Change-Number: 29791
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29791 )
Change subject: mgcp-client: Convert users supporting new MGW Pool VTY node during write-config
......................................................................
Patch Set 1:
(1 comment)
File src/libosmo-mgcp-client/mgcp_client_vty.c:
Robot Comment from checkpatch (run ID jenkins-gerrit-lint-244):
https://gerrit.osmocom.org/c/osmo-mgw/+/29791/comment/60ac4e1a_4443ea30
PS1, Line 347: /* MGW pool API is suppported by user (global_mgcp_client_pool is set
'suppported' may be misspelled - perhaps 'supported'?
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29791
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I2f6658cc66f8bcbd4a60ee2b932bb5dd65888233
Gerrit-Change-Number: 29791
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-Comment-Date: Tue, 18 Oct 2022 10:42:55 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/29791 )
Change subject: mgcp-client: Convert users supporting new MGW Pool VTY node during write-config
......................................................................
mgcp-client: Convert users supporting new MGW Pool VTY node during write-config
If the user (app) already supports the MGW Pool VTY command set
(mgcp_client_pool_vty_init() was called), then if single MGW mode is in
use it's because the config file was not updated to use the new MGW Pool
node. Let's convert it to the new format to help in transitioning to the
new VTY command set.
Related: SYS#5987
Change-Id: I2f6658cc66f8bcbd4a60ee2b932bb5dd65888233
---
M src/libosmo-mgcp-client/mgcp_client_vty.c
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/91/29791/1
diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c
index 76f8c4f..d68c1c5 100644
--- a/src/libosmo-mgcp-client/mgcp_client_vty.c
+++ b/src/libosmo-mgcp-client/mgcp_client_vty.c
@@ -285,6 +285,11 @@
* \returns CMD_SUCCESS on success, CMD_WARNING on error */
int mgcp_client_config_write(struct vty *vty, const char *indent)
{
+ /* If caller supports MGW pool API (mgcp_client_pool_vty_init was
+ * called), then skip printing any config in this node and print it when
+ * the whole 'mgw' node is printed. */
+ if (global_mgcp_client_pool)
+ return CMD_SUCCESS;
return config_write(vty, indent, global_mgcp_client_conf);
}
@@ -339,6 +344,16 @@
config_write(vty, indent, &pool_member->conf);
}
+ /* MGW pool API is suppported by user (global_mgcp_client_pool is set
+ * because mgcp_client_pool_vty_init was called). If single MGW was
+ * configured through old VTY and no mgw in the new MGW pool VTY is
+ * replacing it, then output the single MGW converted to the new MGW
+ * pool VTY. */
+ if (llist_empty(&pool->member_list) && pool->mgcp_client_single) {
+ vty_out(vty, "%smgw 0%s", pool->vty_indent, VTY_NEWLINE);
+ config_write(vty, indent, global_mgcp_client_conf);
+ }
+
talloc_free(indent);
return CMD_SUCCESS;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/29791
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Change-Id: I2f6658cc66f8bcbd4a60ee2b932bb5dd65888233
Gerrit-Change-Number: 29791
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange