cellular-infrastructure
/
osmo-mgw
mirror of https://gerrit.osmocom.org/osmo-mgw
10
0
Fork 0
Code Issues Releases Wiki Activity

mgcp: Rename TOS to DSCP 

DSCP is the more modern information for TOS and the kernel
will set parts of TOS by itself (e.g. for ECN).
This commit is contained in:
Holger Hans Peter Freyther 2010-07-27 20:34:45 +08:00
parent 6b7710739a
commit d0c3229590
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openbsc/include/openbsc/mgcp.h
View File

@ -93,7 +93,7 @@ struct mgcp_config {
int audio_loop; int audio_loop;
int early_bind; int early_bind;
int rtp_base_port; int rtp_base_port;
int endp_tos; int endp_dscp;
char *forward_ip; char *forward_ip;
int forward_port; int forward_port;

4
openbsc/src/mgcp/mgcp_network.c
View File

@ -255,8 +255,8 @@ static int bind_rtp(struct mgcp_endpoint *endp)
goto cleanup1; goto cleanup1;
} }
set_ip_tos(endp->local_rtp.fd, cfg->endp_tos); set_ip_tos(endp->local_rtp.fd, cfg->endp_dscp);
set_ip_tos(endp->local_rtcp.fd, cfg->endp_tos); set_ip_tos(endp->local_rtcp.fd, cfg->endp_dscp);
endp->local_rtp.cb = rtp_data_cb; endp->local_rtp.cb = rtp_data_cb;
endp->local_rtp.data = endp; endp->local_rtp.data = endp;

20
openbsc/src/mgcp/mgcp_vty.c
View File

@ -58,7 +58,7 @@ static int config_write_mgcp(struct vty *vty)
vty_out(vty, " bind port %u%s", g_cfg->source_port, VTY_NEWLINE); vty_out(vty, " bind port %u%s", g_cfg->source_port, VTY_NEWLINE);
vty_out(vty, " bind early %u%s", !!g_cfg->early_bind, VTY_NEWLINE); vty_out(vty, " bind early %u%s", !!g_cfg->early_bind, VTY_NEWLINE);
vty_out(vty, " rtp base %u%s", g_cfg->rtp_base_port, VTY_NEWLINE); vty_out(vty, " rtp base %u%s", g_cfg->rtp_base_port, VTY_NEWLINE);
vty_out(vty, " rtp ip-tos %d%s", g_cfg->endp_tos, VTY_NEWLINE); vty_out(vty, " rtp ip-dscp %d%s", g_cfg->endp_dscp, VTY_NEWLINE);
if (g_cfg->audio_payload != -1) if (g_cfg->audio_payload != -1)
vty_out(vty, " sdp audio payload number %d%s", g_cfg->audio_payload, VTY_NEWLINE); vty_out(vty, " sdp audio payload number %d%s", g_cfg->audio_payload, VTY_NEWLINE);
if (g_cfg->audio_name) if (g_cfg->audio_name)
@ -167,16 +167,21 @@ DEFUN(cfg_mgcp_rtp_base_port,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN(cfg_mgcp_rtp_ip_tos, DEFUN(cfg_mgcp_rtp_ip_dscp,
cfg_mgcp_rtp_ip_tos_cmd, cfg_mgcp_rtp_ip_dscp_cmd,
"rtp ip-tos <0-255>", "rtp ip-dscp <0-255>",
"Set the IP_TOS socket attribute on the RTP/RTCP sockets.\n" "The TOS value.") "Set the IP_TOS socket attribute on the RTP/RTCP sockets.\n" "The DSCP value.")
{ {
int tos = atoi(argv[0]); int dscp = atoi(argv[0]);
g_cfg->endp_tos = tos; g_cfg->endp_dscp = dscp;
return CMD_SUCCESS; return CMD_SUCCESS;
} }
ALIAS_DEPRECATED(cfg_mgcp_rtp_ip_dscp, cfg_mgcp_rtp_ip_tos_cmd,
"rtp ip-tos <0-255>",
"Set the IP_TOS socket attribute on the RTP/RTCP sockets.\n" "The DSCP value.")
DEFUN(cfg_mgcp_sdp_payload_number, DEFUN(cfg_mgcp_sdp_payload_number,
cfg_mgcp_sdp_payload_number_cmd, cfg_mgcp_sdp_payload_number_cmd,
"sdp audio payload number <1-255>", "sdp audio payload number <1-255>",
@ -263,6 +268,7 @@ int mgcp_vty_init(void)
install_element(MGCP_NODE, &cfg_mgcp_bind_port_cmd); install_element(MGCP_NODE, &cfg_mgcp_bind_port_cmd);
install_element(MGCP_NODE, &cfg_mgcp_bind_early_cmd); install_element(MGCP_NODE, &cfg_mgcp_bind_early_cmd);
install_element(MGCP_NODE, &cfg_mgcp_rtp_base_port_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_base_port_cmd);
install_element(MGCP_NODE, &cfg_mgcp_rtp_ip_dscp_cmd);
install_element(MGCP_NODE, &cfg_mgcp_rtp_ip_tos_cmd); install_element(MGCP_NODE, &cfg_mgcp_rtp_ip_tos_cmd);
install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_number_cmd); install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_number_cmd);
install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_name_cmd); install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_name_cmd);