Changeset 5205 for trunk/module-camd35.c
- Timestamp:
- 05/09/11 02:04:49 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/module-camd35.c
r5201 r5205 388 388 { 389 389 struct sockaddr_in loc_sa; 390 struct protoent *ptrp;391 int32_t p_proto;//, sock_type;392 390 char ptxt[16]; 393 391 … … 399 397 } 400 398 client->is_udp=(client->reader->typ==R_CAMD35); 401 if( (ptrp=getprotobyname(client->is_udp ? "udp" : "tcp")) )402 p_proto=ptrp->p_proto;403 else404 p_proto=(client->is_udp) ? 17 : 6; // use defaults on error405 399 406 400 client->ip=0; … … 415 409 loc_sa.sin_port = htons(client->reader->l_port); 416 410 417 if ((client->udp_fd=socket(PF_INET, client->is_udp ? SOCK_DGRAM : SOCK_STREAM, p_proto))<0)411 if ((client->udp_fd=socket(PF_INET, client->is_udp ? SOCK_DGRAM : SOCK_STREAM, client->is_udp ? IPPROTO_UDP : IPPROTO_TCP))<0) 418 412 { 419 413 cs_log("Socket creation failed (errno=%d %s)", errno, strerror(errno)); … … 458 452 { 459 453 struct sockaddr_in loc_sa; 460 struct protoent *ptrp;461 int32_t p_proto;462 454 struct s_client *cl = cur_client(); 463 455 … … 467 459 return(1); 468 460 } 469 470 ptrp=getprotobyname("udp");471 if (ptrp)472 p_proto=ptrp->p_proto;473 else474 p_proto=17; // use defaults on error475 461 476 462 memset((char *)&loc_sa,0,sizeof(loc_sa)); … … 479 465 loc_sa.sin_port = htons(cl->reader->log_port); 480 466 481 if ((logfd=socket(PF_INET, SOCK_DGRAM, p_proto))<0)467 if ((logfd=socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP))<0) 482 468 { 483 469 cs_log("Socket creation failed (errno=%d %s)", errno, strerror(errno));
Note:
See TracChangeset
for help on using the changeset viewer.