diff options
author | Sean Bright <sean@malleable.com> | 2012-02-27 14:57:23 +0000 |
---|---|---|
committer | Sean Bright <sean@malleable.com> | 2012-02-27 14:57:23 +0000 |
commit | 62142859500e720005866b3756b60f6f043fd7ff (patch) | |
tree | fa654c055792239077403b1ec1536dae0016e4df /main/netsock.c | |
parent | 0cf8b2b136409e572c0aa33d183951e3c21f7315 (diff) |
Make ast_netsock_set_qos() delegate to ast_set_qos().
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356916 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/netsock.c')
-rw-r--r-- | main/netsock.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/main/netsock.c b/main/netsock.c index f75db27ad..d178fbed4 100644 --- a/main/netsock.c +++ b/main/netsock.c @@ -42,6 +42,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #endif #include "asterisk/netsock.h" +#include "asterisk/netsock2.h" #include "asterisk/utils.h" #include "asterisk/astobj.h" @@ -127,7 +128,7 @@ struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct i return NULL; } - ast_netsock_set_qos(netsocket, tos, cos, "IAX2"); + ast_set_qos(netsocket, tos, cos, "IAX2"); ast_enable_packet_fragmentation(netsocket); @@ -153,26 +154,11 @@ struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct i return ns; } -int ast_netsock_set_qos(int netsocket, int tos, int cos, const char *desc) +int ast_netsock_set_qos(int sockfd, int tos, int cos, const char *desc) { - int res; - - if ((res = setsockopt(netsocket, IPPROTO_IP, IP_TOS, &tos, sizeof(tos)))) - ast_log(LOG_WARNING, "Unable to set %s TOS to %d, may be you have no root privileges\n", desc, tos); - else if (tos) - ast_verb(2, "Using %s TOS bits %d\n", desc, tos); - -#if defined(linux) - if (setsockopt(netsocket, SOL_SOCKET, SO_PRIORITY, &cos, sizeof(cos))) - ast_log(LOG_WARNING, "Unable to set %s CoS to %d\n", desc, cos); - else if (cos) - ast_verb(2, "Using %s CoS mark %d\n", desc, cos); -#endif - - return res; + return ast_set_qos(sockfd, tos, cos, desc); } - struct ast_netsock *ast_netsock_bind(struct ast_netsock_list *list, struct io_context *ioc, const char *bindinfo, int defaultport, int tos, int cos, ast_io_cb callback, void *data) { struct sockaddr_in sin; |