Changeset 5113:1bf3bca6cb51 in roaraudio
- Timestamp:
- 08/01/11 00:42:17 (13 years ago)
- Branch:
- default
- Phase:
- public
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
include/libroar/socket.h
r5109 r5113 76 76 int roar_socket_decnet_set_timeout (int fh, time_t sec, int usec); 77 77 int roar_socket_recvbuf(int fh, int len); 78 int roar_socket_set_tos(int fh); 78 79 79 80 int roar_socket_dup_udp_local_end (int fh); -
libroar/socket.c
r5109 r5113 57 57 #ifdef ROAR_HAVE_IPV4 58 58 int fh; 59 #ifndef ROAR_TARGET_WIN3260 int opt = IPTOS_LOWDELAY;61 #endif62 59 #if defined(TCP_NODELAY) && !defined(ROAR_TARGET_WIN32) 63 60 int t = 1; … … 68 65 fh = socket(AF_INET, SOCK_STREAM, 0); 69 66 70 #ifndef ROAR_TARGET_WIN32 71 setsockopt(fh, IPPROTO_IP, IP_TOS, &opt, sizeof(int)); 72 #endif 67 roar_socket_set_tos(fh); 73 68 #if defined(TCP_NODELAY) && !defined(ROAR_TARGET_WIN32) 74 69 setsockopt(fh, IPPROTO_TCP, TCP_NODELAY, &t, sizeof(int)); … … 84 79 #ifdef ROAR_HAVE_IPV4 85 80 int fh; 86 #ifndef ROAR_TARGET_WIN3287 int opt = IPTOS_LOWDELAY;88 #endif89 81 90 82 roar_socket_win32_init(); … … 92 84 fh = socket(AF_INET, SOCK_DGRAM, 0); 93 85 94 #ifndef ROAR_TARGET_WIN32 95 setsockopt(fh, IPPROTO_IP, IP_TOS, &opt, sizeof(int)); 96 #endif 86 roar_socket_set_tos(fh); 97 87 98 88 return fh; … … 105 95 #ifdef ROAR_HAVE_IPV6 106 96 int fh; 107 int opt = IPTOS_LOWDELAY;108 97 109 98 roar_socket_win32_init(); … … 111 100 fh = socket(AF_INET6, SOCK_STREAM, 0); 112 101 113 setsockopt(fh, IPPROTO_IP, IP_TOS, &opt, sizeof(int));102 roar_socket_set_tos(fh); 114 103 115 104 return fh; … … 122 111 #ifdef ROAR_HAVE_IPV6 123 112 int fh; 124 int opt = IPTOS_LOWDELAY;125 113 126 114 roar_socket_win32_init(); … … 128 116 fh = socket(AF_INET6, SOCK_DGRAM, 0); 129 117 130 setsockopt(fh, IPPROTO_IP, IP_TOS, &opt, sizeof(int));118 roar_socket_set_tos(fh); 131 119 132 120 return fh; … … 174 162 175 163 return setsockopt(fh, SOL_SOCKET, SO_RCVBUF, (void *)&len, sizeof(len)); 164 #else 165 return -1; 166 #endif 167 } 168 169 int roar_socket_set_tos(int fh) { 170 #ifndef ROAR_TARGET_WIN32 171 int opt = IPTOS_LOWDELAY; 172 int ret; 173 174 roar_err_clear_errno(); 175 ret = setsockopt(fh, IPPROTO_IP, IP_TOS, &opt, sizeof(int)); 176 if ( ret < 0 ) 177 roar_err_from_errno(); 178 179 return ret; 176 180 #else 177 181 return -1;
Note: See TracChangeset
for help on using the changeset viewer.