kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-29 07:24:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes qos settings for sockets bound to any IPv6 or IPv4 address.

Browse Source 
(closes issue #18099)
Reported by: jamesnet
Patches:
      issues_18099_v3.diff uploaded by dvossel (license 671 


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@292085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2010-10-18 16:02:17 +00:00
parent d04d58c7c6
commit df369754da
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
main/netsock2.c
View File

@@ -454,21 +454,34 @@ ssize_t ast_sendto(int sockfd, const void *buf, size_t len, int flags,
int ast_set_qos(int sockfd, int tos, int cos, const char *desc) int ast_set_qos(int sockfd, int tos, int cos, const char *desc)
{ {
int res; int res;
int proto_type = IPPROTO_IP; /* ipv4 values by default */ int set_tos;
int dscp_field = IP_TOS; int set_tclass;
struct ast_sockaddr addr; struct ast_sockaddr addr;
/* if this is IPv6 we need to set the TCLASS instead of TOS */ /* If the sock address is IPv6, the TCLASS field must be set. */
if (!ast_getsockname(sockfd, &addr) && ast_sockaddr_is_ipv6(&addr)) { set_tclass = !ast_getsockname(sockfd, &addr) && ast_sockaddr_is_ipv6(&addr) ? 1 : 0;
proto_type = IPPROTO_IPV6;
dscp_field = IPV6_TCLASS; /* If the the sock address is IPv4 or (IPv6 set to any address [::]) set TOS bits */
set_tos = (!set_tclass || (set_tclass && ast_sockaddr_is_any(&addr))) ? 1 : 0;
if (set_tos) {
if ((res = setsockopt(sockfd, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)))) {
ast_log(LOG_WARNING, "Unable to set %s DSCP TOS value to %d (may be you have no "
"root privileges): %s\n", desc, tos, strerror(errno));
} else if (tos) {
ast_verb(2, "Using %s TOS bits %d\n", desc, tos);
}
} }
if ((res = setsockopt(sockfd, proto_type, dscp_field, &tos, sizeof(tos)))) { if (set_tclass) {
ast_log(LOG_WARNING, "Unable to set %s TOS to %d (may be you have no " if (!ast_getsockname(sockfd, &addr) && ast_sockaddr_is_ipv6(&addr)) {
"root privileges): %s\n", desc, tos, strerror(errno)); if ((res = setsockopt(sockfd, IPPROTO_IPV6, IPV6_TCLASS, &tos, sizeof(tos)))) {
} else if (tos) { ast_log(LOG_WARNING, "Unable to set %s DSCP TCLASS field to %d (may be you have no "
ast_verb(2, "Using %s TOS bits %d\n", desc, tos); "root privileges): %s\n", desc, tos, strerror(errno));
} else if (tos) {
ast_verb(2, "Using %s TOS bits %d in TCLASS field.\n", desc, tos);
}
}
} }
#ifdef linux #ifdef linux