paulmataruso/osmo-mgw
1
0
Fork 0
mirror of https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git synced 2025-10-23 08:12:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

vty: simplify endpoint allocation

Browse Source 
mgcp_parse_config() uses a helper function allocate_trunk() to
perform the trunk allocation. This helper function only calls
mgcp_endpoints_allocate() and checks the return code.

Call mgcp_endpoints_allocate() directly from mgcp_parse_config()

Change-Id: Iefdc5b905d76d2cd97f26584261fe5cbefb699cf
This commit is contained in:
Philipp Maier
2017-11-10 16:46:41 +01:00
parent 9a3543a8d4
commit 48454983c4
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/libosmo-mgcp/mgcp_vty.c
View File

@@ -1269,18 +1269,6 @@ int mgcp_vty_init(void)
return 0;
}
static int allocate_trunk(struct mgcp_trunk_config *trunk)
{
if (mgcp_endpoints_allocate(trunk) != 0) {
LOGP(DLMGCP, LOGL_ERROR,
"Failed to allocate %d endpoints on trunk %d.\n",
trunk->number_endpoints, trunk->trunk_nr);
return -1;
}
return 0;
}
int mgcp_parse_config(const char *config_file, struct mgcp_config *cfg,
enum mgcp_role role)
{
@@ -1304,17 +1292,18 @@ int mgcp_parse_config(const char *config_file, struct mgcp_config *cfg,
return -1;
}
if (allocate_trunk(&g_cfg->trunk) != 0) {
if (mgcp_endpoints_allocate(&g_cfg->trunk) != 0) {
LOGP(DLMGCP, LOGL_ERROR,
"Failed to initialize the virtual trunk.\n");
"Failed to initialize the virtual trunk (%d endpoints)\n",
g_cfg->trunk.number_endpoints);
return -1;
}
llist_for_each_entry(trunk, &g_cfg->trunks, entry) {
if (allocate_trunk(trunk) != 0) {
if (mgcp_endpoints_allocate(trunk) != 0) {
LOGP(DLMGCP, LOGL_ERROR,
"Failed to initialize E1 trunk %d.\n",
trunk->trunk_nr);
"Failed to initialize trunk %d (%d endpoints)\n",
trunk->trunk_nr, trunk->number_endpoints);
return -1;
}
}