diff options
author | Daniel Willmann <dwillmann@sysmocom.de> | 2017-09-08 03:37:58 +0200 |
---|---|---|
committer | Daniel Willmann <dwillmann@sysmocom.de> | 2018-01-30 18:59:28 +0100 |
commit | f585ee7ef8793e89e287f54a8e0b01c4343fcf2b (patch) | |
tree | e238903688afd33e71ed72915e8228e95f8bcd0e /openbsc/src | |
parent | 98fcd4a19dba5f546f545b11431fe367e7d6454f (diff) |
Add warnings in places missing support
Change-Id: Ic3de69792b2cd8e19cd140402bc1f5fbf9a00021
Diffstat (limited to 'openbsc/src')
-rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c | 13 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat.c | 4 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat_utils.c | 3 | ||||
-rw-r--r-- | openbsc/src/osmo-bsc_nat/bsc_nat_vty.c | 16 |
4 files changed, 27 insertions, 9 deletions
diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c index 48847865c..1130c63d5 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c @@ -76,9 +76,12 @@ static void send_direct(struct bsc_nat *nat, struct msgb *output) static void mgcp_queue_for_call_agent(struct bsc_nat *nat, struct msgb *output) { - if (nat->mgcp_ipa) - bsc_nat_send_mgcp_to_msc(nat, output); +#warning "The mgcp_ipa option is not supported anymore" +#if 0 + if (cfg->data->mgcp_ipa) + bsc_nat_send_mgcp_to_msc(cfg->data, output); else +#endif send_direct(nat, output); } @@ -950,11 +953,13 @@ void bsc_nat_handle_mgcp(struct bsc_nat *nat, struct msgb *msg) { struct msgb *resp; +#warning "This function is not needed without mgcp_ipa" + if (!nat->mgcp_ipa) { LOGP(DMGCP, LOGL_ERROR, "MGCP message not allowed on IPA.\n"); return; } - +#if 0 if (msgb_l2len(msg) > sizeof(nat->mgcp_msg) - 1) { LOGP(DMGCP, LOGL_ERROR, "MGCP msg too big for handling.\n"); return; @@ -970,7 +975,7 @@ void bsc_nat_handle_mgcp(struct bsc_nat *nat, struct msgb *msg) /* we do have a direct answer... e.g. AUEP */ if (resp) mgcp_queue_for_call_agent(nat, resp); - +#endif return; } diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat.c b/openbsc/src/osmo-bsc_nat/bsc_nat.c index 52f561dc0..e2471874f 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat.c @@ -368,12 +368,14 @@ static void send_mgcp_reset(struct bsc_connection *bsc) bsc_write_mgcp(bsc, mgcp_reset, sizeof mgcp_reset - 1); } +#warning "Not supported for now" +#if 0 void bsc_nat_send_mgcp_to_msc(struct bsc_nat *nat, struct msgb *msg) { ipa_prepend_header(msg, IPAC_PROTO_MGCP_OLD); -#warning Disabled for now // queue_for_msc(nat->msc_con, msg); } +#endif /* * Below is the handling of messages coming diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c index efa123796..5ab5fb38b 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_utils.c @@ -126,7 +126,8 @@ void bsc_nat_free(struct bsc_nat *nat) osmo_counter_free(nat->stats.bsc.auth_fail); osmo_counter_free(nat->stats.msc.reconn); osmo_counter_free(nat->stats.ussd.reconn); - talloc_free(nat->mgcp_cfg); +#warning "Free each mgcp" +// talloc_free(nat->mgcp_cfgs); talloc_free(nat); } diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c index ca00ed673..1a26443fb 100644 --- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c +++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c @@ -825,12 +825,16 @@ DEFUN(cfg_nat_use_ipa_for_mgcp, "This needs to be set at start. Handle MGCP messages through " "the IPA protocol and not through the UDP socket.\n") { - if (_nat->mgcp_cfg->data) + if (!llist_empty(&_nat->mgcp_cfgs)) vty_out(vty, "%%the setting will not be applied right now.%s", VTY_NEWLINE); - _nat->mgcp_ipa = 1; - return CMD_SUCCESS; + vty_out(vty, "%%This setting is not supported anymore.%s", + VTY_NEWLINE); + return CMD_WARNING; +#warning "MGCP IPA not supported" +// _nat->mgcp_ipa = 1; +// return CMD_SUCCESS; } DEFUN(cfg_nat_default_msc, @@ -1305,6 +1309,11 @@ DEFUN(cfg_bsc_osmux, else if (strcmp(argv[0], "only") == 0) conf->osmux = OSMUX_USAGE_ONLY; +#warning "OSMUX is missing support for multiple mgcp" + if (conf->osmux != OSMUX_USAGE_OFF) + return CMD_WARNING; + +#if 0 if (old == 0 && conf->osmux > 0 && !conf->nat->mgcp_cfg->osmux_init) { LOGP(DMGCP, LOGL_NOTICE, "Setting up OSMUX socket\n"); if (osmux_init(OSMUX_ROLE_BSC_NAT, conf->nat->mgcp_cfg) < 0) { @@ -1320,6 +1329,7 @@ DEFUN(cfg_bsc_osmux, * new upcoming flows should use RTP. */ } +#endif return CMD_SUCCESS; } |