mirror of
https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git
synced 2025-11-02 13:03:33 +00:00
Compare commits
1 Commits
laforge/os
...
pmaier/mgw
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5a71251229 |
@@ -190,7 +190,7 @@ int e1_trunk_nr_from_epname(const char *epname)
|
||||
|
||||
errno = 0;
|
||||
trunk_nr = strtoul(epname + prefix_len, &str_trunk_nr_end, 10);
|
||||
if (errno == ERANGE || trunk_nr > 64 || trunk_nr == 0
|
||||
if (errno == ERANGE || trunk_nr > 64
|
||||
|| epname + prefix_len == str_trunk_nr_end
|
||||
|| str_trunk_nr_end[0] != '/')
|
||||
return -EINVAL;
|
||||
@@ -217,7 +217,7 @@ struct mgcp_trunk *mgcp_trunk_by_name(const struct mgcp_config *cfg, const char
|
||||
}
|
||||
|
||||
trunk_nr = e1_trunk_nr_from_epname(epname);
|
||||
if (trunk_nr > 0)
|
||||
if (trunk_nr >= 0)
|
||||
return mgcp_trunk_by_num(cfg, MGCP_TRUNK_E1, trunk_nr);
|
||||
|
||||
/* Earlier versions of osmo-mgw were accepting endpoint names
|
||||
|
||||
@@ -866,16 +866,11 @@ ALIAS_DEPRECATED(cfg_mgcp_agent_addr, cfg_mgcp_agent_addr_cmd_old,
|
||||
"IPv4 Address of the callagent\n")
|
||||
|
||||
DEFUN(cfg_mgcp_trunk, cfg_mgcp_trunk_cmd,
|
||||
"trunk <1-64>", "Configure a SS7 trunk\n" "Trunk Nr\n")
|
||||
"trunk <0-64>", "Configure a SS7 trunk\n" "Trunk Nr\n")
|
||||
{
|
||||
struct mgcp_trunk *trunk;
|
||||
int index = atoi(argv[0]);
|
||||
|
||||
/* Due to historical reasons, the trunk id number 0 is reserved for the
|
||||
* virtual trunk. This trunk is configured with separate VTY
|
||||
* parameters, so we restrict the access to trunks with id numbers
|
||||
* greater than 0. */
|
||||
|
||||
trunk = mgcp_trunk_by_num(g_cfg, MGCP_TRUNK_E1, index);
|
||||
if (!trunk) {
|
||||
trunk = mgcp_trunk_alloc(g_cfg, MGCP_TRUNK_E1, index);
|
||||
|
||||
Reference in New Issue
Block a user