cellular-infrastructure
/
osmo-msc
mirror of https://gerrit.osmocom.org/osmo-msc
9
0
Fork 0
Code Issues Releases Wiki Activity

mgcp: make bts base port configurable 

Currently the rtp base port of the BTS is hardcoded (4000) and not
configurable. This patch adds VTY configuration options to make
it adjustable.

Change-Id: I76e008eb0bd95b2941b67ea2fbdc1a82eef3cc5f
This commit is contained in:
Philipp Maier 2017-06-12 12:26:31 +02:00 committed by Neels Hofmeyr
parent 62afc1467a
commit 2b3b4d407f
4 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/openbsc/mgcpgw_client.h
View File

@ -26,6 +26,7 @@ struct mgcpgw_client_conf {
int remote_port;
uint16_t first_endpoint;
uint16_t last_endpoint;
uint16_t bts_base;
};
struct mgcp_response_head {

2
src/libmgcp/mgcpgw_client.c
View File

@ -45,6 +45,7 @@ void mgcpgw_client_conf_init(struct mgcpgw_client_conf *conf)
.remote_port = -1,
.first_endpoint = 0,
.last_endpoint = 0,
.bts_base = 0,
};
}
@ -342,6 +343,7 @@ struct mgcpgw_client *mgcpgw_client_init(void *ctx,
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;
}

21
src/libmgcp/mgcpgw_client_vty.c
View File

@ -99,12 +99,26 @@ DEFUN(cfg_mgcpgw_endpoint_range, cfg_mgcpgw_endpoint_range_cmd,
return CMD_SUCCESS;
}
#define BTS_START_STR "First UDP port allocated for the BTS side\n"
#define UDP_PORT_STR "UDP Port number\n"
DEFUN(cfg_mgcp_rtp_bts_base_port,
cfg_mgcp_rtp_bts_base_port_cmd,
"mgcpgw bts-base <0-65534>",
MGCPGW_STR
BTS_START_STR
UDP_PORT_STR)
{
global_mgcpgw_client_conf->bts_base = atoi(argv[0]);
return CMD_SUCCESS;
}
int mgcpgw_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_mgcpgw_client_conf->local_addr;
if (addr)
@ -131,6 +145,12 @@ int mgcpgw_client_config_write(struct vty *vty, const char *indent)
first_endpoint, last_endpoint, VTY_NEWLINE);
}
bts_base = global_mgcpgw_client_conf->bts_base;
if (bts_base) {
vty_out(vty, "%smgcpgw bts-base %u%s", indent,
bts_base, VTY_NEWLINE);
}
return CMD_SUCCESS;
}
@ -143,4 +163,5 @@ void mgcpgw_client_vty_init(int node, struct mgcpgw_client_conf *conf)
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_mgcp_rtp_bts_base_port_cmd);
}

12
src/libmsc/msc_ifaces.c
View File

@ -195,6 +195,7 @@ static int conn_iu_rab_act_cs(struct gsm_trans *trans)
struct mgcpgw_client *mgcp = conn->network->mgcpgw.client;
struct msgb *msg;
struct msgb *msg_dlcx;
uint16_t bts_base;
/* HACK. where to scope the RAB Id? At the conn / subscriber /
* ue_conn_ctx? */
@ -203,9 +204,14 @@ static int conn_iu_rab_act_cs(struct gsm_trans *trans)
conn->iu.mgcp_rtp_endpoint =
mgcpgw_client_next_endpoint(conn->network->mgcpgw.client);
/* HACK: the addresses should be known from CRCX response
* and config. */
conn->iu.mgcp_rtp_port_ue = 4000 + 2 * conn->iu.mgcp_rtp_endpoint;
/* This will calculate the port we assign to the BTS via AoIP
* assignment command (or rab-assignment on 3G) The BTS will send
* its RTP traffic to that port on the MGCPGW side. The MGCPGW only
* gets the endpoint ID via the CRCX. It will do the same calculation
* on his side too to get knowledge of the rtp port. */
bts_base = mgcp->actual.bts_base;
conn->iu.mgcp_rtp_port_ue = bts_base + 2 * conn->iu.mgcp_rtp_endpoint;
/* Since we know now the endpoint number, we enforce a DLCX on tha
* endpoint in order to ensure that this endpoint is not occupied