diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-07-27 20:34:45 +0800 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2010-07-27 20:35:03 +0800 |
| commit | d0c32295903bf29206c8cb25ed3d9847b71a413b (patch) | |
| tree | 429960a5a79df788b77ccc88f0e64ead1f077a21 | |
| parent | 6b7710739a345cc38935124b7097b4ad594b57bb (diff) | |
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).
| -rw-r--r-- | openbsc/include/openbsc/mgcp.h | 2 | ||||
| -rw-r--r-- | openbsc/src/mgcp/mgcp_network.c | 4 | ||||
| -rw-r--r-- | openbsc/src/mgcp/mgcp_vty.c | 20 |
3 files changed, 16 insertions, 10 deletions
diff --git a/openbsc/include/openbsc/mgcp.h b/openbsc/include/openbsc/mgcp.h index a66f0ca70..ef0a9208f 100644 --- a/openbsc/include/openbsc/mgcp.h +++ b/openbsc/include/openbsc/mgcp.h @@ -93,7 +93,7 @@ struct mgcp_config { int audio_loop; int early_bind; int rtp_base_port; - int endp_tos; + int endp_dscp; char *forward_ip; int forward_port; diff --git a/openbsc/src/mgcp/mgcp_network.c b/openbsc/src/mgcp/mgcp_network.c index 8b412270f..6e6b7a663 100644 --- a/openbsc/src/mgcp/mgcp_network.c +++ b/openbsc/src/mgcp/mgcp_network.c @@ -255,8 +255,8 @@ static int bind_rtp(struct mgcp_endpoint *endp) goto cleanup1; } - set_ip_tos(endp->local_rtp.fd, cfg->endp_tos); - set_ip_tos(endp->local_rtcp.fd, cfg->endp_tos); + set_ip_tos(endp->local_rtp.fd, cfg->endp_dscp); + set_ip_tos(endp->local_rtcp.fd, cfg->endp_dscp); endp->local_rtp.cb = rtp_data_cb; endp->local_rtp.data = endp; diff --git a/openbsc/src/mgcp/mgcp_vty.c b/openbsc/src/mgcp/mgcp_vty.c index f923b22d5..00a2e351f 100644 --- a/openbsc/src/mgcp/mgcp_vty.c +++ b/openbsc/src/mgcp/mgcp_vty.c @@ -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 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 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) vty_out(vty, " sdp audio payload number %d%s", g_cfg->audio_payload, VTY_NEWLINE); if (g_cfg->audio_name) @@ -167,16 +167,21 @@ DEFUN(cfg_mgcp_rtp_base_port, return CMD_SUCCESS; } -DEFUN(cfg_mgcp_rtp_ip_tos, - cfg_mgcp_rtp_ip_tos_cmd, - "rtp ip-tos <0-255>", - "Set the IP_TOS socket attribute on the RTP/RTCP sockets.\n" "The TOS value.") +DEFUN(cfg_mgcp_rtp_ip_dscp, + cfg_mgcp_rtp_ip_dscp_cmd, + "rtp ip-dscp <0-255>", + "Set the IP_TOS socket attribute on the RTP/RTCP sockets.\n" "The DSCP value.") { - int tos = atoi(argv[0]); - g_cfg->endp_tos = tos; + int dscp = atoi(argv[0]); + g_cfg->endp_dscp = dscp; 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, cfg_mgcp_sdp_payload_number_cmd, "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_early_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_sdp_payload_number_cmd); install_element(MGCP_NODE, &cfg_mgcp_sdp_payload_name_cmd); |