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

mgcp: Implement find_trunk to find the E1 trunks as well.

This commit is contained in:
Holger Hans Peter Freyther 2011-02-28 12:32:18 +01:00
parent cdba04978d
commit 6ea7e777f5
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,12 +37,16 @@
static struct mgcp_config *g_cfg = NULL; static struct mgcp_config *g_cfg = NULL;
static struct mgcp_trunk_config *find_trunk(struct mgcp_config *cfg, int trunk) static struct mgcp_trunk_config *find_trunk(struct mgcp_config *cfg, int nr)
{ {
if (trunk != 0) struct mgcp_trunk_config *trunk;
return NULL;
return &cfg->trunk; if (nr == 0)
trunk = &cfg->trunk;
else
trunk = mgcp_trunk_num(cfg, nr);
return trunk;
} }
/* /*
@ -466,6 +470,12 @@ DEFUN(loop_endp,
return CMD_WARNING; return CMD_WARNING;
} }
if (!trunk->endpoints) {
vty_out(vty, "%%Trunk %d has no endpoints allocated.%s",
trunk->trunk_nr, VTY_NEWLINE);
return CMD_WARNING;
}
int endp_no = strtoul(argv[1], NULL, 16); int endp_no = strtoul(argv[1], NULL, 16);
if (endp_no < 1 || endp_no >= trunk->number_endpoints) { if (endp_no < 1 || endp_no >= trunk->number_endpoints) {
vty_out(vty, "Loopback number %s/%d is invalid.%s", vty_out(vty, "Loopback number %s/%d is invalid.%s",
@ -509,6 +519,12 @@ DEFUN(tap_call,
return CMD_WARNING; return CMD_WARNING;
} }
if (!trunk->endpoints) {
vty_out(vty, "%%Trunk %d has no endpoints allocated.%s",
trunk->trunk_nr, VTY_NEWLINE);
return CMD_WARNING;
}
int endp_no = strtoul(argv[1], NULL, 16); int endp_no = strtoul(argv[1], NULL, 16);
if (endp_no < 1 || endp_no >= trunk->number_endpoints) { if (endp_no < 1 || endp_no >= trunk->number_endpoints) {
vty_out(vty, "Endpoint number %s/%d is invalid.%s", vty_out(vty, "Endpoint number %s/%d is invalid.%s",
@ -554,6 +570,12 @@ DEFUN(free_endp, free_endp_cmd,
return CMD_WARNING; return CMD_WARNING;
} }
if (!trunk->endpoints) {
vty_out(vty, "%%Trunk %d has no endpoints allocated.%s",
trunk->trunk_nr, VTY_NEWLINE);
return CMD_WARNING;
}
int endp_no = strtoul(argv[1], NULL, 16); int endp_no = strtoul(argv[1], NULL, 16);
if (endp_no < 1 || endp_no >= trunk->number_endpoints) { if (endp_no < 1 || endp_no >= trunk->number_endpoints) {
vty_out(vty, "Endpoint number %s/%d is invalid.%s", vty_out(vty, "Endpoint number %s/%d is invalid.%s",