mirror of
				https://gitea.osmocom.org/cellular-infrastructure/osmo-mgw.git
				synced 2025-11-04 05:53:26 +00:00 
			
		
		
		
	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.
This commit is contained in:
		@@ -49,7 +49,6 @@ struct osmo_msc_data {
 | 
				
			|||||||
	struct bsc_msc_connection *msc_con;
 | 
						struct bsc_msc_connection *msc_con;
 | 
				
			||||||
	int core_ncc;
 | 
						int core_ncc;
 | 
				
			||||||
	int core_mcc;
 | 
						int core_mcc;
 | 
				
			||||||
	int rtp_payload;
 | 
					 | 
				
			||||||
	int rtp_base;
 | 
						int rtp_base;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* audio codecs */
 | 
						/* audio codecs */
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -63,8 +63,6 @@ static int config_write_msc(struct vty *vty)
 | 
				
			|||||||
	if (data->core_mcc != -1)
 | 
						if (data->core_mcc != -1)
 | 
				
			||||||
		vty_out(vty, "  core-mobile-country-code %d%s",
 | 
							vty_out(vty, "  core-mobile-country-code %d%s",
 | 
				
			||||||
			data->core_mcc, VTY_NEWLINE);
 | 
								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.access rtp-base %d%s", data->rtp_base, VTY_NEWLINE);
 | 
				
			||||||
	vty_out(vty, "  ip %s%s", data->msc_ip, VTY_NEWLINE);
 | 
						vty_out(vty, "  ip %s%s", data->msc_ip, VTY_NEWLINE);
 | 
				
			||||||
	vty_out(vty, "  port %d%s", data->msc_port, VTY_NEWLINE);
 | 
						vty_out(vty, "  port %d%s", data->msc_port, VTY_NEWLINE);
 | 
				
			||||||
@@ -125,18 +123,6 @@ DEFUN(cfg_net_bsc_mcc,
 | 
				
			|||||||
	return CMD_SUCCESS;
 | 
						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,
 | 
					DEFUN(cfg_net_bsc_rtp_base,
 | 
				
			||||||
      cfg_net_bsc_rtp_base_cmd,
 | 
					      cfg_net_bsc_rtp_base_cmd,
 | 
				
			||||||
      "ip.access rtp-base <1-65000>",
 | 
					      "ip.access rtp-base <1-65000>",
 | 
				
			||||||
@@ -283,7 +269,6 @@ int bsc_vty_init_extra(void)
 | 
				
			|||||||
	install_element(MSC_NODE, &cfg_net_bsc_token_cmd);
 | 
						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_ncc_cmd);
 | 
				
			||||||
	install_element(MSC_NODE, &cfg_net_bsc_mcc_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_rtp_base_cmd);
 | 
				
			||||||
	install_element(MSC_NODE, &cfg_net_bsc_codec_list_cmd);
 | 
						install_element(MSC_NODE, &cfg_net_bsc_codec_list_cmd);
 | 
				
			||||||
	install_element(MSC_NODE, &cfg_net_msc_ip_cmd);
 | 
						install_element(MSC_NODE, &cfg_net_msc_ip_cmd);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -319,7 +319,6 @@ struct gsm_network *gsm_network_init(u_int16_t country_code, u_int16_t network_c
 | 
				
			|||||||
	net->msc_data->pong_timeout = 5;
 | 
						net->msc_data->pong_timeout = 5;
 | 
				
			||||||
	net->msc_data->core_ncc = -1;
 | 
						net->msc_data->core_ncc = -1;
 | 
				
			||||||
	net->msc_data->core_mcc = -1;
 | 
						net->msc_data->core_mcc = -1;
 | 
				
			||||||
	net->msc_data->rtp_payload = 126;
 | 
					 | 
				
			||||||
	net->msc_data->rtp_base = 4000;
 | 
						net->msc_data->rtp_base = 4000;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	gsm_net_update_ctype(net);
 | 
						gsm_net_update_ctype(net);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user