From 295cdeb355d07347f2ba1f4a66ae144fee5efbf7 Mon Sep 17 00:00:00 2001 From: Benny Prijono Date: Sun, 25 Oct 2009 10:50:17 +0000 Subject: More ticket #950 (QoS): - fixed wrong DSCP field operation with sock_qos_bsd.c backend - tested on Linux for SIP (UDP/TCP), UDP RTP/RTCP, and ICE - renamed 801_1_P names to SO_PRIO - changed a bit of doxygen documentation (the title etc) git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2967 74dad513-b988-da41-8d7b-12977e46ad98 --- pjlib/src/pj/sock_qos_bsd.c | 12 +++++++----- pjlib/src/pj/sock_qos_common.c | 4 ++-- pjlib/src/pj/sock_qos_symbian.cpp | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) (limited to 'pjlib/src') diff --git a/pjlib/src/pj/sock_qos_bsd.c b/pjlib/src/pj/sock_qos_bsd.c index 32b2828e..fbd73358 100644 --- a/pjlib/src/pj/sock_qos_bsd.c +++ b/pjlib/src/pj/sock_qos_bsd.c @@ -41,7 +41,8 @@ PJ_DEF(pj_status_t) pj_sock_set_qos_params(pj_sock_t sock, /* Set TOS/DSCP */ if (param->flags & PJ_QOS_PARAM_HAS_DSCP) { - int val = param->dscp_val; + /* Value is dscp_val << 2 */ + int val = (param->dscp_val << 2); status = pj_sock_setsockopt(sock, pj_SOL_IP(), pj_IP_TOS(), &val, sizeof(val)); if (status != PJ_SUCCESS) { @@ -51,12 +52,12 @@ PJ_DEF(pj_status_t) pj_sock_set_qos_params(pj_sock_t sock, } /* Set SO_PRIORITY */ - if (param->flags & PJ_QOS_PARAM_HAS_802_1_P) { + if (param->flags & PJ_QOS_PARAM_HAS_SO_PRIO) { int val = param->so_prio; status = pj_sock_setsockopt(sock, pj_SOL_SOCKET(), pj_SO_PRIORITY(), &val, sizeof(val)); if (status != PJ_SUCCESS) { - param->flags &= ~(PJ_QOS_PARAM_HAS_802_1_P); + param->flags &= ~(PJ_QOS_PARAM_HAS_SO_PRIO); last_err = status; } } @@ -93,7 +94,7 @@ PJ_DEF(pj_status_t) pj_sock_get_qos_params(pj_sock_t sock, &val, &optlen); if (status == PJ_SUCCESS) { p_param->flags |= PJ_QOS_PARAM_HAS_DSCP; - p_param->dscp_val = (pj_uint8_t)val; + p_param->dscp_val = (pj_uint8_t)(val >> 2); } else { last_err = status; } @@ -103,7 +104,7 @@ PJ_DEF(pj_status_t) pj_sock_get_qos_params(pj_sock_t sock, status = pj_sock_getsockopt(sock, pj_SOL_SOCKET(), pj_SO_PRIORITY(), &val, &optlen); if (status == PJ_SUCCESS) { - p_param->flags |= PJ_QOS_PARAM_HAS_802_1_P; + p_param->flags |= PJ_QOS_PARAM_HAS_SO_PRIO; p_param->so_prio = (pj_uint8_t)val; } else { last_err = status; @@ -128,3 +129,4 @@ PJ_DEF(pj_status_t) pj_sock_get_qos_type(pj_sock_t sock, } #endif /* PJ_QOS_IMPLEMENTATION */ + diff --git a/pjlib/src/pj/sock_qos_common.c b/pjlib/src/pj/sock_qos_common.c index a59b606b..27ccf097 100644 --- a/pjlib/src/pj/sock_qos_common.c +++ b/pjlib/src/pj/sock_qos_common.c @@ -23,7 +23,7 @@ #include #define THIS_FILE "sock_qos_common.c" -#define ALL_FLAGS (PJ_QOS_PARAM_HAS_DSCP | PJ_QOS_PARAM_HAS_802_1_P | \ +#define ALL_FLAGS (PJ_QOS_PARAM_HAS_DSCP | PJ_QOS_PARAM_HAS_SO_PRIO | \ PJ_QOS_PARAM_HAS_WMM) /* "Standard" mapping between traffic type and QoS params */ @@ -66,7 +66,7 @@ PJ_DEF(pj_status_t) pj_qos_get_type( const pj_qos_params *param, ++count; } - if (param->flags & PJ_QOS_PARAM_HAS_802_1_P) { + if (param->flags & PJ_QOS_PARAM_HAS_SO_PRIO) { for (i=0; i<=PJ_QOS_TYPE_CONTROL; ++i) { if (param->so_prio >= qos_map[i].so_prio) prio_type = (pj_qos_type)i; diff --git a/pjlib/src/pj/sock_qos_symbian.cpp b/pjlib/src/pj/sock_qos_symbian.cpp index 59912ece..f9e3c3dd 100644 --- a/pjlib/src/pj/sock_qos_symbian.cpp +++ b/pjlib/src/pj/sock_qos_symbian.cpp @@ -27,7 +27,7 @@ PJ_DEF(pj_status_t) pj_sock_set_qos_params(pj_sock_t sock, pj_status_t last_err = PJ_ENOTSUP; /* SO_PRIORITY and WMM are not supported */ - param->flags &= ~(PJ_QOS_PARAM_HAS_802_1_P | PJ_QOS_PARAM_HAS_WMM); + param->flags &= ~(PJ_QOS_PARAM_HAS_SO_PRIO | PJ_QOS_PARAM_HAS_WMM); if (param->flags & PJ_QOS_PARAM_HAS_DSCP) { TInt err; -- cgit v1.2.3