aboutsummaryrefslogtreecommitdiff
path: root/src/util/server.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-09 19:22:59 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-09 19:22:59 +0000
commit7e332f5e005af87032decb86ac0a4bfbcc915cdc (patch)
treeb2fceb05e28b44bc8318950192853417294488e8 /src/util/server.c
parent25e37143ca6ddc3ea7d3c2e3fd7c66002a45e060 (diff)
downloadgnunet-7e332f5e005af87032decb86ac0a4bfbcc915cdc.tar.gz
gnunet-7e332f5e005af87032decb86ac0a4bfbcc915cdc.zip
-rename serverAddr to server_addr to follow naming conventions
Diffstat (limited to 'src/util/server.c')
-rw-r--r--src/util/server.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/util/server.c b/src/util/server.c
index 397e32f8c..40e7c9f48 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -433,24 +433,24 @@ process_listen_socket (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
433/** 433/**
434 * Create and initialize a listen socket for the server. 434 * Create and initialize a listen socket for the server.
435 * 435 *
436 * @param serverAddr address to listen on 436 * @param server_addr address to listen on
437 * @param socklen length of address 437 * @param socklen length of address
438 * @return NULL on error, otherwise the listen socket 438 * @return NULL on error, otherwise the listen socket
439 */ 439 */
440static struct GNUNET_NETWORK_Handle * 440static struct GNUNET_NETWORK_Handle *
441open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen) 441open_listen_socket (const struct sockaddr *server_addr, socklen_t socklen)
442{ 442{
443 struct GNUNET_NETWORK_Handle *sock; 443 struct GNUNET_NETWORK_Handle *sock;
444 uint16_t port; 444 uint16_t port;
445 int eno; 445 int eno;
446 446
447 switch (serverAddr->sa_family) 447 switch (server_addr->sa_family)
448 { 448 {
449 case AF_INET: 449 case AF_INET:
450 port = ntohs (((const struct sockaddr_in *) serverAddr)->sin_port); 450 port = ntohs (((const struct sockaddr_in *) server_addr)->sin_port);
451 break; 451 break;
452 case AF_INET6: 452 case AF_INET6:
453 port = ntohs (((const struct sockaddr_in6 *) serverAddr)->sin6_port); 453 port = ntohs (((const struct sockaddr_in6 *) server_addr)->sin6_port);
454 break; 454 break;
455 case AF_UNIX: 455 case AF_UNIX:
456 port = 0; 456 port = 0;
@@ -460,7 +460,7 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
460 port = 0; 460 port = 0;
461 break; 461 break;
462 } 462 }
463 sock = GNUNET_NETWORK_socket_create (serverAddr->sa_family, SOCK_STREAM, 0); 463 sock = GNUNET_NETWORK_socket_create (server_addr->sa_family, SOCK_STREAM, 0);
464 if (NULL == sock) 464 if (NULL == sock)
465 { 465 {
466 LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket"); 466 LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
@@ -468,7 +468,7 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
468 return NULL; 468 return NULL;
469 } 469 }
470 /* bind the socket */ 470 /* bind the socket */
471 if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, serverAddr, socklen)) 471 if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, server_addr, socklen))
472 { 472 {
473 eno = errno; 473 eno = errno;
474 if (EADDRINUSE != errno) 474 if (EADDRINUSE != errno)
@@ -481,7 +481,7 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
481 if (0 != port) 481 if (0 != port)
482 LOG (GNUNET_ERROR_TYPE_ERROR, _("`%s' failed for port %d (%s).\n"), 482 LOG (GNUNET_ERROR_TYPE_ERROR, _("`%s' failed for port %d (%s).\n"),
483 "bind", port, 483 "bind", port,
484 (AF_INET == serverAddr->sa_family) ? "IPv4" : "IPv6"); 484 (AF_INET == server_addr->sa_family) ? "IPv4" : "IPv6");
485 eno = 0; 485 eno = 0;
486 } 486 }
487 else 487 else
@@ -490,10 +490,10 @@ open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
490 LOG (GNUNET_ERROR_TYPE_WARNING, 490 LOG (GNUNET_ERROR_TYPE_WARNING,
491 _("`%s' failed for port %d (%s): address already in use\n"), 491 _("`%s' failed for port %d (%s): address already in use\n"),
492 "bind", port, 492 "bind", port,
493 (AF_INET == serverAddr->sa_family) ? "IPv4" : "IPv6"); 493 (AF_INET == server_addr->sa_family) ? "IPv4" : "IPv6");
494 else if (AF_UNIX == serverAddr->sa_family) 494 else if (AF_UNIX == server_addr->sa_family)
495 { 495 {
496 const struct sockaddr_un *un = (const struct sockaddr_un *) serverAddr; 496 const struct sockaddr_un *un = (const struct sockaddr_un *) server_addr;
497 unsigned int off = 0; 497 unsigned int off = 0;
498 498
499 if ('\0' == un->sun_path[0]) 499 if ('\0' == un->sun_path[0])
@@ -560,8 +560,8 @@ GNUNET_SERVER_create_with_sockets (GNUNET_CONNECTION_AccessCheck access,
560 * 560 *
561 * @param access function for access control 561 * @param access function for access control
562 * @param access_cls closure for access 562 * @param access_cls closure for access
563 * @param serverAddr address to listen on (including port), NULL terminated array 563 * @param server_addr address to listen on (including port), NULL terminated array
564 * @param socklen length of serverAddr 564 * @param socklen length of server_addr
565 * @param idle_timeout after how long should we timeout idle connections? 565 * @param idle_timeout after how long should we timeout idle connections?
566 * @param require_found if YES, connections sending messages of unknown type 566 * @param require_found if YES, connections sending messages of unknown type
567 * will be closed 567 * will be closed
@@ -570,7 +570,7 @@ GNUNET_SERVER_create_with_sockets (GNUNET_CONNECTION_AccessCheck access,
570 */ 570 */
571struct GNUNET_SERVER_Handle * 571struct GNUNET_SERVER_Handle *
572GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls, 572GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls,
573 struct sockaddr *const *serverAddr, 573 struct sockaddr *const *server_addr,
574 const socklen_t * socklen, 574 const socklen_t * socklen,
575 struct GNUNET_TIME_Relative idle_timeout, 575 struct GNUNET_TIME_Relative idle_timeout,
576 int require_found) 576 int require_found)
@@ -582,19 +582,19 @@ GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls,
582 int seen; 582 int seen;
583 583
584 i = 0; 584 i = 0;
585 while (NULL != serverAddr[i]) 585 while (NULL != server_addr[i])
586 i++; 586 i++;
587 if (i > 0) 587 if (i > 0)
588 { 588 {
589 lsocks = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle *) * (i + 1)); 589 lsocks = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle *) * (i + 1));
590 i = 0; 590 i = 0;
591 j = 0; 591 j = 0;
592 while (NULL != serverAddr[i]) 592 while (NULL != server_addr[i])
593 { 593 {
594 seen = 0; 594 seen = 0;
595 for (k=0;k<i;k++) 595 for (k=0;k<i;k++)
596 if ( (socklen[k] == socklen[i]) && 596 if ( (socklen[k] == socklen[i]) &&
597 (0 == memcmp (serverAddr[k], serverAddr[i], socklen[i])) ) 597 (0 == memcmp (server_addr[k], server_addr[i], socklen[i])) )
598 { 598 {
599 seen = 1; 599 seen = 1;
600 break; 600 break;
@@ -605,7 +605,7 @@ GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls,
605 i++; 605 i++;
606 continue; 606 continue;
607 } 607 }
608 lsocks[j] = open_listen_socket (serverAddr[i], socklen[i]); 608 lsocks[j] = open_listen_socket (server_addr[i], socklen[i]);
609 if (NULL != lsocks[j]) 609 if (NULL != lsocks[j])
610 j++; 610 j++;
611 i++; 611 i++;