Changeset 7413 for trunk/libtransmission/net.c
- Timestamp:
- Dec 16, 2008, 9:06:47 PM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/libtransmission/net.c
r7410 r7413 69 69 } 70 70 71 tr_bool 72 tr_isAddress( const tr_address * a ) 73 { 74 return a && ( a->type==AF_INET || a->type==AF_INET6 ); 75 } 71 76 72 77 const char * 73 78 tr_ntop( const tr_address * src, char * dst, int size ) 74 { 79 { 80 assert( tr_isAddress( src ) ); 81 75 82 if( src->type == TR_AF_INET ) 76 83 return inet_ntop( AF_INET, &src->addr, dst, size ); … … 114 121 tr_normalizeV4Mapped( tr_address * const addr ) 115 122 { 123 assert( tr_isAddress( addr ) ); 124 116 125 if( addr->type == TR_AF_INET6 && IN6_IS_ADDR_V4MAPPED( &addr->addr.addr6 ) ) 117 126 { … … 133 142 int addrlen; 134 143 135 assert( a ); 136 assert( b ); 137 assert( a->type == TR_AF_INET || a->type == TR_AF_INET6 ); 138 assert( b->type == TR_AF_INET || b->type == TR_AF_INET6 ); 144 assert( tr_isAddress( a ) ); 145 assert( tr_isAddress( b ) ); 139 146 140 147 /* IPv6 addresses are always "greater than" IPv4 */ … … 164 171 { 165 172 tr_socketList * tmp; 173 166 174 assert( head ); 175 assert( tr_isAddress( addr ) ); 176 167 177 for( tmp = head; tmp->next; tmp = tmp->next ); 168 178 tmp->next = tr_socketListNew( addr ); … … 174 184 { 175 185 tr_socketList * tmp; 186 187 assert( tr_isAddress( addr ) ); 188 176 189 tmp = tr_new( tr_socketList, 1 ); 177 190 tmp->socket = -1; … … 185 198 { 186 199 assert( head ); 200 187 201 if( head->next ) 188 202 tr_socketListFree( head->next ); … … 195 209 { 196 210 tr_socketList * tmp; 211 197 212 assert( head ); 198 213 assert( el ); 214 199 215 for( tmp = head; tmp->next && tmp->next != el; tmp = tmp->next ); 200 216 tmp->next = el->next; … … 208 224 { 209 225 tr_socketList * tmp; 226 210 227 assert( head ); 211 228 assert( start ); 229 212 230 for( tmp = head; tmp->next && tmp->next != start; tmp = tmp->next ); 213 231 tr_socketListFree( start ); … … 215 233 } 216 234 235 #if 0 217 236 int 218 237 tr_socketListGetSocket( const tr_socketList * const el ) 219 238 { 220 239 assert( el ); 240 221 241 return el->socket; 222 242 } … … 228 248 return &el->addr; 229 249 } 250 #endif 230 251 231 252 void … … 246 267 247 268 int 248 tr_netSetTOS( int s, 249 int tos ) 269 tr_netSetTOS( int s, int tos ) 250 270 { 251 271 #ifdef IP_TOS … … 302 322 struct sockaddr_in sock4; 303 323 struct sockaddr_in6 sock6; 324 325 assert( tr_isAddress( addr ) ); 326 304 327 if( addr->type == TR_AF_INET ) 305 328 { … … 333 356 socklen_t addrlen; 334 357 358 assert( tr_isAddress( addr ) ); 359 335 360 if( ( s = createSocket( ( addr->type == TR_AF_INET ? AF_INET : AF_INET6 ), 336 361 type ) ) < 0 ) … … 369 394 const int type = SOCK_STREAM; 370 395 int addrlen; 396 397 assert( tr_isAddress( addr ) ); 371 398 372 399 #if defined( SO_REUSEADDR ) || defined( SO_REUSEPORT ) … … 408 435 tr_port * port ) 409 436 { 410 int fd = makeSocketNonBlocking( tr_fdSocketAccept( b, addr, port ) ); 437 int fd; 438 439 assert( tr_isAddress( addr ) ); 440 441 fd = makeSocketNonBlocking( tr_fdSocketAccept( b, addr, port ) ); 411 442 setSndBuf( session, fd ); 412 443 return fd;
Note: See TracChangeset
for help on using the changeset viewer.