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

mgcp: Introduce a trunk config for multiple trunks. 

A trunk will always have 32 endpoints to be used and we allow
a sparse allocation of endpoints.
This commit is contained in:
Holger Hans Peter Freyther 2011-02-28 12:11:02 +01:00
parent ab3bb9d444
commit 0e939fec42
6 changed files with 140 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openbsc/include/openbsc/mgcp.h
View File

@ -103,6 +103,8 @@ struct mgcp_port_range {
};
struct mgcp_trunk_config {
struct llist_head entry;
struct mgcp_config *cfg;
int trunk_nr;
@ -150,6 +152,7 @@ struct mgcp_config {
/* trunk handling */
struct mgcp_trunk_config trunk;
struct llist_head trunks;
};
/* config management */

3
openbsc/include/openbsc/mgcp_internal.h
View File

@ -147,5 +147,8 @@ static inline int endp_back_channel(int endpoint)
return endpoint + 60;
}
struct mgcp_trunk_config *mgcp_trunk_alloc(struct mgcp_config *cfg, int index);
struct mgcp_trunk_config *mgcp_trunk_num(struct mgcp_config *cfg, int index);
#endif

1
openbsc/include/openbsc/vty.h
View File

@ -34,6 +34,7 @@ enum bsc_vty_node {
NAT_BSC_NODE,
MSC_NODE,
OM2K_NODE,
TRUNK_NODE,
};
extern int bsc_vty_is_config_node(struct vty *vty, int node);

8
openbsc/src/common_vty.c
View File

@ -86,6 +86,9 @@ enum node_type bsc_vty_go_parent(struct vty *vty)
case MSC_NODE:
vty->node = GSMNET_NODE;
break;
case TRUNK_NODE:
vty->node = MGCP_NODE;
break;
default:
vty->node = CONFIG_NODE;
}
@ -154,6 +157,10 @@ gDEFUN(ournode_exit,
case MSC_NODE:
vty->node = GSMNET_NODE;
break;
case TRUNK_NODE:
vty->node = MGCP_NODE;
vty->index = NULL;
break;
default:
break;
}
@ -175,6 +182,7 @@ gDEFUN(ournode_end,
case TRX_NODE:
case TS_NODE:
case MGCP_NODE:
case TRUNK_NODE:
case GBPROXY_NODE:
case SGSN_NODE:
case NS_NODE:

33
openbsc/src/mgcp/mgcp_protocol.c
View File

@ -874,9 +874,42 @@ struct mgcp_config *mgcp_config_alloc(void)
cfg->trunk.audio_name = talloc_strdup(cfg, "AMR/8000");
cfg->trunk.audio_payload = 126;
INIT_LLIST_HEAD(&cfg->trunks);
return cfg;
}
struct mgcp_trunk_config *mgcp_trunk_alloc(struct mgcp_config *cfg, int nr)
{
struct mgcp_trunk_config *trunk;
trunk = talloc_zero(cfg, struct mgcp_trunk_config);
if (!trunk) {
LOGP(DMGCP, LOGL_ERROR, "Failed to allocate.\n");
return NULL;
}
trunk->cfg = cfg;
trunk->trunk_type = MGCP_TRUNK_E1;
trunk->trunk_nr = nr;
trunk->audio_name = talloc_strdup(cfg, "AMR/8000");
trunk->audio_payload = 126;
trunk->number_endpoints = 33;
llist_add_tail(&trunk->entry, &cfg->trunks);
return trunk;
}
struct mgcp_trunk_config *mgcp_trunk_num(struct mgcp_config *cfg, int index)
{
struct mgcp_trunk_config *trunk;
llist_for_each_entry(trunk, &cfg->trunks, entry)
if (trunk->trunk_nr == index)
return trunk;
return NULL;
}
static void mgcp_rtp_end_reset(struct mgcp_rtp_end *end)
{
if (end->local_alloc == PORT_ALLOC_DYNAMIC) {

96
openbsc/src/mgcp/mgcp_vty.c
View File

@ -54,6 +54,12 @@ struct cmd_node mgcp_node = {
1,
};
struct cmd_node trunk_node = {
TRUNK_NODE,
"%s(trunk)#",
1,
};
static int config_write_mgcp(struct vty *vty)
{
vty_out(vty, "mgcp%s", VTY_NEWLINE);
@ -360,6 +366,78 @@ DEFUN(cfg_mgcp_transcoder_remote_base,
return CMD_SUCCESS;
}
DEFUN(cfg_mgcp_trunk, cfg_mgcp_trunk_cmd,
"trunk <1-64>",
"Configure a SS7 trunk\n" "Trunk Nr\n")
{
struct mgcp_trunk_config *trunk;
int index = atoi(argv[0]);
trunk = mgcp_trunk_num(g_cfg, index);
if (!trunk)
trunk = mgcp_trunk_alloc(g_cfg, index);
if (!trunk) {
vty_out(vty, "%%Unable to allocate trunk %u.%s",
index, VTY_NEWLINE);
return CMD_WARNING;
}
vty->node = TRUNK_NODE;
vty->index = trunk;
return CMD_SUCCESS;
}
static int config_write_trunk(struct vty *vty)
{
struct mgcp_trunk_config *trunk;
llist_for_each_entry(trunk, &g_cfg->trunks, entry) {
vty_out(vty, " trunk %d%s", trunk->trunk_nr, VTY_NEWLINE);
vty_out(vty, " sdp audio payload number %d%s",
trunk->audio_payload, VTY_NEWLINE);
vty_out(vty, " sdp audio payload name %s%s",
trunk->audio_name, VTY_NEWLINE);
vty_out(vty, " loop %d%s",
trunk->audio_loop, VTY_NEWLINE);
}
return CMD_SUCCESS;
}
DEFUN(cfg_trunk_payload_number,
cfg_trunk_payload_number_cmd,
"sdp audio payload number <1-255>",
"SDP related\n" "Audio\n" "Payload\n" "Payload Number\n")
{
struct mgcp_trunk_config *trunk = vty->index;
unsigned int payload = atoi(argv[0]);
trunk->audio_payload = payload;
return CMD_SUCCESS;
}
DEFUN(cfg_trunk_payload_name,
cfg_trunk_payload_name_cmd,
"sdp audio payload name NAME",
"SDP related\n" "Audio\n" "Payload\n" "Payload Name\n")
{
struct mgcp_trunk_config *trunk = vty->index;
bsc_replace_string(g_cfg, &trunk->audio_name, argv[0]);
return CMD_SUCCESS;
}
DEFUN(cfg_trunk_loop,
cfg_trunk_loop_cmd,
"loop (0|1)",
"Loop the audio")
{
struct mgcp_trunk_config *trunk = vty->index;
trunk->audio_loop = atoi(argv[0]);
return CMD_SUCCESS;
}
DEFUN(loop_endp,
loop_endp_cmd,
@ -504,14 +582,24 @@ int mgcp_vty_init(void)
install_element(MGCP_NODE, &cfg_mgcp_rtp_transcoder_base_cmd);
install_element(MGCP_NODE, &cfg_mgcp_rtp_ip_dscp_cmd);
install_element(MGCP_NODE, &cfg_mgcp_rtp_ip_tos_cmd);
install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_number_cmd);
install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_name_cmd);
install_element(MGCP_NODE, &cfg_mgcp_loop_cmd);
install_element(MGCP_NODE, &cfg_mgcp_number_endp_cmd);
install_element(MGCP_NODE, &cfg_mgcp_agent_addr_cmd);
install_element(MGCP_NODE, &cfg_mgcp_transcoder_cmd);
install_element(MGCP_NODE, &cfg_mgcp_no_transcoder_cmd);
install_element(MGCP_NODE, &cfg_mgcp_transcoder_remote_base_cmd);
install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_number_cmd);
install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_name_cmd);
install_element(MGCP_NODE, &cfg_mgcp_loop_cmd);
install_element(MGCP_NODE, &cfg_mgcp_number_endp_cmd);
install_element(MGCP_NODE, &cfg_mgcp_trunk_cmd);
install_node(&trunk_node, config_write_trunk);
install_default(TRUNK_NODE);
install_element(TRUNK_NODE, &ournode_exit_cmd);
install_element(TRUNK_NODE, &ournode_end_cmd);
install_element(TRUNK_NODE, &cfg_trunk_payload_number_cmd);
install_element(TRUNK_NODE, &cfg_trunk_payload_name_cmd);
install_element(TRUNK_NODE, &cfg_trunk_loop_cmd);
return 0;
}