bsc: The ip.access rtp-payload has no useful meaning
Sending this as the RTP_PAYLOAD2 will produce a MDCX NACK
as we send the RTP_PAYLOAD in the CRCX. It does not seem to
be necessary to send anything != 0 for the RTP_PAYLOAD2.
diff --git a/openbsc/include/openbsc/osmo_msc_data.h b/openbsc/include/openbsc/osmo_msc_data.h
index 5c769c1..59f92b3 100644
--- a/openbsc/include/openbsc/osmo_msc_data.h
+++ b/openbsc/include/openbsc/osmo_msc_data.h
@@ -49,7 +49,6 @@
struct bsc_msc_connection *msc_con;
int core_ncc;
int core_mcc;
- int rtp_payload;
int rtp_base;
/* audio codecs */
diff --git a/openbsc/src/bsc/osmo_bsc_vty.c b/openbsc/src/bsc/osmo_bsc_vty.c
index a76a7e1..6e24e15 100644
--- a/openbsc/src/bsc/osmo_bsc_vty.c
+++ b/openbsc/src/bsc/osmo_bsc_vty.c
@@ -63,8 +63,6 @@
if (data->core_mcc != -1)
vty_out(vty, " core-mobile-country-code %d%s",
data->core_mcc, VTY_NEWLINE);
- vty_out(vty, " ip.access rtp-payload %d%s",
- data->rtp_payload, VTY_NEWLINE);
vty_out(vty, " ip.access rtp-base %d%s", data->rtp_base, VTY_NEWLINE);
vty_out(vty, " ip %s%s", data->msc_ip, VTY_NEWLINE);
vty_out(vty, " port %d%s", data->msc_port, VTY_NEWLINE);
@@ -125,18 +123,6 @@
return CMD_SUCCESS;
}
-DEFUN(cfg_net_bsc_rtp_payload,
- cfg_net_bsc_rtp_payload_cmd,
- "ip.access rtp-payload <0-255>",
- IPA_STR
- "Set the rtp-payload for the RTP stream\n"
- "RTP payload number\n")
-{
- struct osmo_msc_data *data = osmo_msc_data(vty);
- data->rtp_payload = atoi(argv[0]);
- return CMD_SUCCESS;
-}
-
DEFUN(cfg_net_bsc_rtp_base,
cfg_net_bsc_rtp_base_cmd,
"ip.access rtp-base <1-65000>",
@@ -283,7 +269,6 @@
install_element(MSC_NODE, &cfg_net_bsc_token_cmd);
install_element(MSC_NODE, &cfg_net_bsc_ncc_cmd);
install_element(MSC_NODE, &cfg_net_bsc_mcc_cmd);
- install_element(MSC_NODE, &cfg_net_bsc_rtp_payload_cmd);
install_element(MSC_NODE, &cfg_net_bsc_rtp_base_cmd);
install_element(MSC_NODE, &cfg_net_bsc_codec_list_cmd);
install_element(MSC_NODE, &cfg_net_msc_ip_cmd);
diff --git a/openbsc/src/gsm_data.c b/openbsc/src/gsm_data.c
index a4a5b20..f388306 100644
--- a/openbsc/src/gsm_data.c
+++ b/openbsc/src/gsm_data.c
@@ -319,7 +319,6 @@
net->msc_data->pong_timeout = 5;
net->msc_data->core_ncc = -1;
net->msc_data->core_mcc = -1;
- net->msc_data->rtp_payload = 126;
net->msc_data->rtp_base = 4000;
gsm_net_update_ctype(net);