[MERGED] osmo-mgw[master]: mgcp_client: don't configure "bts base"

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: mgcp_client: don't configure "bts base"
......................................................................


mgcp_client: don't configure "bts base"

There should not be any BTS base port to be configured at an MGCP client.

Possibly this is related to the legacy behavior of libosmo-legacy-mgcp, and
certainly has no place in libosmo-mgcp-client.

Further changes may be needed to follow up on removal of the BTS base port
concept, at least drop it from the VTY for now.

Change-Id: I36e46208d7b75611e5ade3c74d8e1c25870de511
---
M include/osmocom/mgcp_client/mgcp_client.h
M src/libosmo-mgcp-client/mgcp_client.c
M src/libosmo-mgcp-client/mgcp_client_vty.c
3 files changed, 0 insertions(+), 31 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/mgcp_client/mgcp_client.h b/include/osmocom/mgcp_client/mgcp_client.h
index 1a6cbce..8a2c404 100644
--- a/include/osmocom/mgcp_client/mgcp_client.h
+++ b/include/osmocom/mgcp_client/mgcp_client.h
@@ -21,7 +21,6 @@
 	int remote_port;
 	uint16_t first_endpoint;
 	uint16_t last_endpoint;
-	uint16_t bts_base;
 };
 
 typedef unsigned int mgcp_trans_id_t;
diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c
index 2047637..a35ad6f 100644
--- a/src/libosmo-mgcp-client/mgcp_client.c
+++ b/src/libosmo-mgcp-client/mgcp_client.c
@@ -45,7 +45,6 @@
 		.remote_port = -1,
 		.first_endpoint = 0,
 		.last_endpoint = 0,
-		.bts_base = 0,
 	};
 }
 
@@ -383,7 +382,6 @@
 
 	mgcp->actual.first_endpoint = conf->first_endpoint > 0 ? (uint16_t)conf->first_endpoint : 0;
 	mgcp->actual.last_endpoint = conf->last_endpoint > 0 ? (uint16_t)conf->last_endpoint : 0;
-	mgcp->actual.bts_base = conf->bts_base > 0 ? (uint16_t)conf->bts_base : 4000;
 
 	return mgcp;
 }
diff --git a/src/libosmo-mgcp-client/mgcp_client_vty.c b/src/libosmo-mgcp-client/mgcp_client_vty.c
index f8129c0..1d58bb5 100644
--- a/src/libosmo-mgcp-client/mgcp_client_vty.c
+++ b/src/libosmo-mgcp-client/mgcp_client_vty.c
@@ -123,32 +123,12 @@
       "set first useable endpoint identifier\n"
       "set the last useable endpoint identifier\n")
 
-#define BTS_START_STR "First UDP port allocated for the BTS side\n"
-#define UDP_PORT_STR "UDP Port number\n"
-DEFUN(cfg_mgw_rtp_bts_base_port,
-      cfg_mgw_rtp_bts_base_port_cmd,
-      "mgw bts-base <0-65534>",
-      MGW_STR
-      BTS_START_STR
-      UDP_PORT_STR)
-{
-	global_mgcp_client_conf->bts_base = atoi(argv[0]);
-	return CMD_SUCCESS;
-}
-ALIAS_DEPRECATED(cfg_mgw_rtp_bts_base_port,
-      cfg_mgcpgw_rtp_bts_base_port_cmd,
-      "mgcpgw bts-base <0-65534>",
-      MGW_STR
-      BTS_START_STR
-      UDP_PORT_STR)
-
 int mgcp_client_config_write(struct vty *vty, const char *indent)
 {
 	const char *addr;
 	int port;
 	uint16_t first_endpoint;
 	uint16_t last_endpoint;
-	uint16_t bts_base;
 
 	addr = global_mgcp_client_conf->local_addr;
 	if (addr)
@@ -175,12 +155,6 @@
 			first_endpoint, last_endpoint, VTY_NEWLINE);
 	}
 
-	bts_base = global_mgcp_client_conf->bts_base;
-	if (bts_base) {
-		vty_out(vty, "%smgw bts-base %u%s", indent,
-			bts_base, VTY_NEWLINE);
-	}
-
 	return CMD_SUCCESS;
 }
 
@@ -194,7 +168,6 @@
 	install_element(node, &cfg_mgw_remote_ip_cmd);
 	install_element(node, &cfg_mgw_remote_port_cmd);
 	install_element(node, &cfg_mgw_endpoint_range_cmd);
-	install_element(node, &cfg_mgw_rtp_bts_base_port_cmd);
 
 	/* deprecated 'mgcpgw' commands */
 	install_element(node, &cfg_mgcpgw_local_ip_cmd);
@@ -202,5 +175,4 @@
 	install_element(node, &cfg_mgcpgw_remote_ip_cmd);
 	install_element(node, &cfg_mgcpgw_remote_port_cmd);
 	install_element(node, &cfg_mgcpgw_endpoint_range_cmd);
-	install_element(node, &cfg_mgcpgw_rtp_bts_base_port_cmd);
 }

-- 
To view, visit https://gerrit.osmocom.org/4701
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I36e46208d7b75611e5ade3c74d8e1c25870de511
Gerrit-PatchSet: 2
Gerrit-Project: osmo-mgw
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder