kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make ast_netsock_set_qos() delegate to ast_set_qos().

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@356916 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2012-02-27 14:57:23 +00:00
parent 0cf8b2b136
commit 6214285950
2 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/netsock.h
View File

@@ -54,7 +54,7 @@ struct ast_netsock *ast_netsock_find(struct ast_netsock_list *list,
* \deprecated Use ast_seq_qos in netsock2.h which properly handles IPv4 and IPv6 * \deprecated Use ast_seq_qos in netsock2.h which properly handles IPv4 and IPv6
* sockets, instead. * sockets, instead.
*/ */
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 ast_netsock_sockfd(const struct ast_netsock *ns); int ast_netsock_sockfd(const struct ast_netsock *ns);

22
main/netsock.c
View File

@@ -42,6 +42,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#endif #endif
#include "asterisk/netsock.h" #include "asterisk/netsock.h"
#include "asterisk/netsock2.h"
#include "asterisk/utils.h" #include "asterisk/utils.h"
#include "asterisk/astobj.h" #include "asterisk/astobj.h"
@@ -127,7 +128,7 @@ struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct i
return NULL; return NULL;
} }
ast_netsock_set_qos(netsocket, tos, cos, "IAX2"); ast_set_qos(netsocket, tos, cos, "IAX2");
ast_enable_packet_fragmentation(netsocket); ast_enable_packet_fragmentation(netsocket);
@@ -153,26 +154,11 @@ struct ast_netsock *ast_netsock_bindaddr(struct ast_netsock_list *list, struct i
return ns; 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; return ast_set_qos(sockfd, tos, cos, desc);
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;
} }
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 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; struct sockaddr_in sin;