nat: Use the mgcp_config_alloc to have defaults initialized

Initialize the net_base properly and benefit from future
config changes but also reset certain defauls that we do
not want at the nat.
This commit is contained in:
Holger Hans Peter Freyther
2010-08-05 10:08:36 +00:00
parent f138f917ec
commit d5e6c2374b
2 changed files with 9 additions and 1 deletions

View File

@@ -533,11 +533,19 @@ int bsc_mgcp_nat_init(struct bsc_nat *nat)
}
/* some more MGCP config handling */
if (nat->mgcp_cfg->audio_name)
talloc_free(nat->mgcp_cfg->audio_name);
nat->mgcp_cfg->audio_name = NULL;
nat->mgcp_cfg->audio_payload = -1;
nat->mgcp_cfg->data = nat;
nat->mgcp_cfg->policy_cb = bsc_mgcp_policy_cb;
nat->mgcp_cfg->force_realloc = 1;
if (nat->mgcp_cfg->bts_ip)
talloc_free(nat->mgcp_cfg->bts_ip);
nat->mgcp_cfg->bts_ip = "";
nat->bsc_endpoints = talloc_zero_array(nat,
struct bsc_endpoint,
nat->mgcp_cfg->number_endpoints + 1);

View File

@@ -1120,7 +1120,7 @@ int main(int argc, char** argv)
return -4;
}
nat->mgcp_cfg = talloc_zero(nat, struct mgcp_config);
nat->mgcp_cfg = mgcp_config_alloc();
if (!nat->mgcp_cfg) {
fprintf(stderr, "Failed to allocate MGCP cfg.\n");
return -5;