[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r30064 - in gnunet/src: include transport util
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r30064 - in gnunet/src: include transport util |
|
Date: |
Wed, 9 Oct 2013 21:22:59 +0200 |
Author: grothoff
Date: 2013-10-09 21:22:59 +0200 (Wed, 09 Oct 2013)
New Revision: 30064
Modified:
gnunet/src/include/gnunet_server_lib.h
gnunet/src/transport/plugin_transport_udp.c
gnunet/src/transport/plugin_transport_udp.h
gnunet/src/transport/plugin_transport_udp_broadcasting.c
gnunet/src/util/server.c
Log:
-rename serverAddr to server_addr to follow naming conventions
Modified: gnunet/src/include/gnunet_server_lib.h
===================================================================
--- gnunet/src/include/gnunet_server_lib.h 2013-10-09 18:01:16 UTC (rev
30063)
+++ gnunet/src/include/gnunet_server_lib.h 2013-10-09 19:22:59 UTC (rev
30064)
@@ -140,8 +140,8 @@
*
* @param access function for access control
* @param access_cls closure for @a access
- * @param serverAddr address toes listen on (including port), NULL terminated
array
- * @param socklen lengths of respective @a serverAddr
+ * @param server_addr address toes listen on (including port), NULL terminated
array
+ * @param socklen lengths of respective @a server_addr
* @param idle_timeout after how long should we timeout idle connections?
* @param require_found if #GNUNET_YES, connections sending messages of
unknown type
* will be closed
@@ -150,7 +150,7 @@
*/
struct GNUNET_SERVER_Handle *
GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls,
- struct sockaddr *const *serverAddr,
+ struct sockaddr *const *server_addr,
const socklen_t * socklen,
struct GNUNET_TIME_Relative idle_timeout,
int require_found);
Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2013-10-09 18:01:16 UTC (rev
30063)
+++ gnunet/src/transport/plugin_transport_udp.c 2013-10-09 19:22:59 UTC (rev
30064)
@@ -2753,9 +2753,9 @@
{
int tries;
int sockets_created = 0;
- struct sockaddr_in6 serverAddrv6;
- struct sockaddr_in serverAddrv4;
- struct sockaddr *serverAddr;
+ struct sockaddr_in6 server_addrv6;
+ struct sockaddr_in server_addrv4;
+ struct sockaddr *server_addr;
struct sockaddr *addrs[2];
socklen_t addrlens[2];
socklen_t addrlen;
@@ -2774,31 +2774,31 @@
}
else
{
- memset (&serverAddrv6, '\0', sizeof (struct sockaddr_in6));
+ memset (&server_addrv6, '\0', sizeof (struct sockaddr_in6));
#if HAVE_SOCKADDR_IN_SIN_LEN
- serverAddrv6.sin6_len = sizeof (struct sockaddr_in6);
+ server_addrv6.sin6_len = sizeof (struct sockaddr_in6);
#endif
- serverAddrv6.sin6_family = AF_INET6;
+ server_addrv6.sin6_family = AF_INET6;
if (NULL != bind_v6)
- serverAddrv6.sin6_addr = bind_v6->sin6_addr;
+ server_addrv6.sin6_addr = bind_v6->sin6_addr;
else
- serverAddrv6.sin6_addr = in6addr_any;
+ server_addrv6.sin6_addr = in6addr_any;
if (0 == plugin->port) /* autodetect */
- serverAddrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32
(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
+ server_addrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32
(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
else
- serverAddrv6.sin6_port = htons (plugin->port);
+ server_addrv6.sin6_port = htons (plugin->port);
addrlen = sizeof (struct sockaddr_in6);
- serverAddr = (struct sockaddr *) &serverAddrv6;
+ server_addr = (struct sockaddr *) &server_addrv6;
tries = 0;
while (tries < 10)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv6 `%s'\n",
- GNUNET_a2s (serverAddr, addrlen));
+ GNUNET_a2s (server_addr, addrlen));
/* binding */
if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv6,
- serverAddr,
addrlen))
+ server_addr,
addrlen))
break;
eno = errno;
if (0 != plugin->port)
@@ -2807,7 +2807,7 @@
break; /* bind failed on specific port */
}
/* autodetect */
- serverAddrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32
(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
+ server_addrv6.sin6_port = htons (GNUNET_CRYPTO_random_u32
(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
tries ++;
}
if (tries >= 10)
@@ -2821,8 +2821,8 @@
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
"IPv6 socket created on port %s\n",
- GNUNET_a2s (serverAddr, addrlen));
- addrs[sockets_created] = (struct sockaddr *) &serverAddrv6;
+ GNUNET_a2s (server_addr, addrlen));
+ addrs[sockets_created] = (struct sockaddr *) &server_addrv6;
addrlens[sockets_created] = sizeof (struct sockaddr_in6);
sockets_created++;
}
@@ -2830,7 +2830,7 @@
{
LOG (GNUNET_ERROR_TYPE_ERROR,
"Failed to bind UDP socket to %s: %s\n",
- GNUNET_a2s (serverAddr, addrlen),
+ GNUNET_a2s (server_addr, addrlen),
STRERROR (eno));
}
}
@@ -2847,35 +2847,35 @@
}
else
{
- memset (&serverAddrv4, '\0', sizeof (struct sockaddr_in));
+ memset (&server_addrv4, '\0', sizeof (struct sockaddr_in));
#if HAVE_SOCKADDR_IN_SIN_LEN
- serverAddrv4.sin_len = sizeof (struct sockaddr_in);
+ server_addrv4.sin_len = sizeof (struct sockaddr_in);
#endif
- serverAddrv4.sin_family = AF_INET;
+ server_addrv4.sin_family = AF_INET;
if (NULL != bind_v4)
- serverAddrv4.sin_addr = bind_v4->sin_addr;
+ server_addrv4.sin_addr = bind_v4->sin_addr;
else
- serverAddrv4.sin_addr.s_addr = INADDR_ANY;
+ server_addrv4.sin_addr.s_addr = INADDR_ANY;
if (0 == plugin->port)
/* autodetect */
- serverAddrv4.sin_port = htons (GNUNET_CRYPTO_random_u32
(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
+ server_addrv4.sin_port = htons (GNUNET_CRYPTO_random_u32
(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
else
- serverAddrv4.sin_port = htons (plugin->port);
+ server_addrv4.sin_port = htons (plugin->port);
addrlen = sizeof (struct sockaddr_in);
- serverAddr = (struct sockaddr *) &serverAddrv4;
+ server_addr = (struct sockaddr *) &server_addrv4;
tries = 0;
while (tries < 10)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Binding to IPv4 `%s'\n",
- GNUNET_a2s (serverAddr, addrlen));
+ GNUNET_a2s (server_addr, addrlen));
/* binding */
if (GNUNET_OK == GNUNET_NETWORK_socket_bind (plugin->sockv4,
- serverAddr, addrlen))
+ server_addr, addrlen))
break;
eno = errno;
if (0 != plugin->port)
@@ -2885,7 +2885,7 @@
}
/* autodetect */
- serverAddrv4.sin_port = htons (GNUNET_CRYPTO_random_u32
(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
+ server_addrv4.sin_port = htons (GNUNET_CRYPTO_random_u32
(GNUNET_CRYPTO_QUALITY_STRONG, 33537) + 32000);
tries ++;
}
@@ -2899,8 +2899,8 @@
if (plugin->sockv4 != NULL)
{
LOG (GNUNET_ERROR_TYPE_DEBUG,
- "IPv4 socket created on port %s\n", GNUNET_a2s (serverAddr,
addrlen));
- addrs[sockets_created] = (struct sockaddr *) &serverAddrv4;
+ "IPv4 socket created on port %s\n", GNUNET_a2s (server_addr,
addrlen));
+ addrs[sockets_created] = (struct sockaddr *) &server_addrv4;
addrlens[sockets_created] = sizeof (struct sockaddr_in);
sockets_created++;
}
@@ -2908,7 +2908,7 @@
{
LOG (GNUNET_ERROR_TYPE_ERROR,
"Failed to bind UDP socket to %s: %s\n",
- GNUNET_a2s (serverAddr, addrlen), STRERROR (eno));
+ GNUNET_a2s (server_addr, addrlen), STRERROR (eno));
}
}
@@ -2978,8 +2978,8 @@
char * bind6_address;
char * fancy_interval;
struct GNUNET_TIME_Relative interval;
- struct sockaddr_in serverAddrv4;
- struct sockaddr_in6 serverAddrv6;
+ struct sockaddr_in server_addrv4;
+ struct sockaddr_in6 server_addrv6;
int res;
int have_bind4;
int have_bind6;
@@ -3027,7 +3027,7 @@
/* Addresses */
have_bind4 = GNUNET_NO;
- memset (&serverAddrv4, 0, sizeof (serverAddrv4));
+ memset (&server_addrv4, 0, sizeof (server_addrv4));
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_string (env->cfg, "transport-udp",
"BINDTO", &bind4_address))
@@ -3035,7 +3035,7 @@
LOG (GNUNET_ERROR_TYPE_DEBUG,
"Binding udp plugin to specific address: `%s'\n",
bind4_address);
- if (1 != inet_pton (AF_INET, bind4_address, &serverAddrv4.sin_addr))
+ if (1 != inet_pton (AF_INET, bind4_address, &server_addrv4.sin_addr))
{
GNUNET_free (bind4_address);
return NULL;
@@ -3044,7 +3044,7 @@
}
GNUNET_free_non_null (bind4_address);
have_bind6 = GNUNET_NO;
- memset (&serverAddrv6, 0, sizeof (serverAddrv6));
+ memset (&server_addrv6, 0, sizeof (server_addrv6));
if (GNUNET_YES ==
GNUNET_CONFIGURATION_get_value_string (env->cfg, "transport-udp",
"BINDTO6", &bind6_address))
@@ -3053,7 +3053,7 @@
"Binding udp plugin to specific address: `%s'\n",
bind6_address);
if (1 !=
- inet_pton (AF_INET6, bind6_address, &serverAddrv6.sin6_addr))
+ inet_pton (AF_INET6, bind6_address, &server_addrv6.sin6_addr))
{
LOG (GNUNET_ERROR_TYPE_ERROR, _("Invalid IPv6 address: `%s'\n"),
bind6_address);
@@ -3109,8 +3109,8 @@
plugin = p;
LOG(GNUNET_ERROR_TYPE_DEBUG, "Setting up sockets\n");
- res = setup_sockets (p, (GNUNET_YES == have_bind6) ? &serverAddrv6 : NULL,
- (GNUNET_YES == have_bind4) ? &serverAddrv4 : NULL );
+ res = setup_sockets (p, (GNUNET_YES == have_bind6) ? &server_addrv6 : NULL,
+ (GNUNET_YES == have_bind4) ? &server_addrv4 : NULL );
if ((res == 0) || ((p->sockv4 == NULL )&& (p->sockv6 == NULL)))
{
LOG (GNUNET_ERROR_TYPE_ERROR,
@@ -3124,7 +3124,7 @@
else if (broadcast == GNUNET_YES)
{
LOG (GNUNET_ERROR_TYPE_DEBUG, "Starting broadcasting\n");
- setup_broadcast (p, &serverAddrv6, &serverAddrv4);
+ setup_broadcast (p, &server_addrv6, &server_addrv4);
}
api = GNUNET_malloc (sizeof (struct GNUNET_TRANSPORT_PluginFunctions));
Modified: gnunet/src/transport/plugin_transport_udp.h
===================================================================
--- gnunet/src/transport/plugin_transport_udp.h 2013-10-09 18:01:16 UTC (rev
30063)
+++ gnunet/src/transport/plugin_transport_udp.h 2013-10-09 19:22:59 UTC (rev
30064)
@@ -299,7 +299,7 @@
udp_broadcast_receive ();
void
-setup_broadcast (struct Plugin *plugin, struct sockaddr_in6 *serverAddrv6,
struct sockaddr_in *serverAddrv4);
+setup_broadcast (struct Plugin *plugin, struct sockaddr_in6 *server_addrv6,
struct sockaddr_in *server_addrv4);
void
stop_broadcast (struct Plugin *plugin);
Modified: gnunet/src/transport/plugin_transport_udp_broadcasting.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp_broadcasting.c 2013-10-09
18:01:16 UTC (rev 30063)
+++ gnunet/src/transport/plugin_transport_udp_broadcasting.c 2013-10-09
19:22:59 UTC (rev 30064)
@@ -391,7 +391,7 @@
void
-setup_broadcast (struct Plugin *plugin, struct sockaddr_in6 *serverAddrv6,
struct sockaddr_in *serverAddrv4)
+setup_broadcast (struct Plugin *plugin, struct sockaddr_in6 *server_addrv6,
struct sockaddr_in *server_addrv4)
{
const struct GNUNET_MessageHeader *hello;
hello = plugin->env->get_our_hello ();
@@ -417,7 +417,7 @@
LOG (GNUNET_ERROR_TYPE_WARNING,
_
("Failed to set IPv4 broadcast option for broadcast socket on port
%d\n"),
- ntohs (serverAddrv4->sin_port));
+ ntohs (server_addrv4->sin_port));
}
else
{
Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c 2013-10-09 18:01:16 UTC (rev 30063)
+++ gnunet/src/util/server.c 2013-10-09 19:22:59 UTC (rev 30064)
@@ -433,24 +433,24 @@
/**
* Create and initialize a listen socket for the server.
*
- * @param serverAddr address to listen on
+ * @param server_addr address to listen on
* @param socklen length of address
* @return NULL on error, otherwise the listen socket
*/
static struct GNUNET_NETWORK_Handle *
-open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
+open_listen_socket (const struct sockaddr *server_addr, socklen_t socklen)
{
struct GNUNET_NETWORK_Handle *sock;
uint16_t port;
int eno;
- switch (serverAddr->sa_family)
+ switch (server_addr->sa_family)
{
case AF_INET:
- port = ntohs (((const struct sockaddr_in *) serverAddr)->sin_port);
+ port = ntohs (((const struct sockaddr_in *) server_addr)->sin_port);
break;
case AF_INET6:
- port = ntohs (((const struct sockaddr_in6 *) serverAddr)->sin6_port);
+ port = ntohs (((const struct sockaddr_in6 *) server_addr)->sin6_port);
break;
case AF_UNIX:
port = 0;
@@ -460,7 +460,7 @@
port = 0;
break;
}
- sock = GNUNET_NETWORK_socket_create (serverAddr->sa_family, SOCK_STREAM, 0);
+ sock = GNUNET_NETWORK_socket_create (server_addr->sa_family, SOCK_STREAM, 0);
if (NULL == sock)
{
LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
@@ -468,7 +468,7 @@
return NULL;
}
/* bind the socket */
- if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, serverAddr, socklen))
+ if (GNUNET_OK != GNUNET_NETWORK_socket_bind (sock, server_addr, socklen))
{
eno = errno;
if (EADDRINUSE != errno)
@@ -481,7 +481,7 @@
if (0 != port)
LOG (GNUNET_ERROR_TYPE_ERROR, _("`%s' failed for port %d (%s).\n"),
"bind", port,
- (AF_INET == serverAddr->sa_family) ? "IPv4" : "IPv6");
+ (AF_INET == server_addr->sa_family) ? "IPv4" : "IPv6");
eno = 0;
}
else
@@ -490,10 +490,10 @@
LOG (GNUNET_ERROR_TYPE_WARNING,
_("`%s' failed for port %d (%s): address already in use\n"),
"bind", port,
- (AF_INET == serverAddr->sa_family) ? "IPv4" : "IPv6");
- else if (AF_UNIX == serverAddr->sa_family)
+ (AF_INET == server_addr->sa_family) ? "IPv4" : "IPv6");
+ else if (AF_UNIX == server_addr->sa_family)
{
- const struct sockaddr_un *un = (const struct sockaddr_un *) serverAddr;
+ const struct sockaddr_un *un = (const struct sockaddr_un *) server_addr;
unsigned int off = 0;
if ('\0' == un->sun_path[0])
@@ -560,8 +560,8 @@
*
* @param access function for access control
* @param access_cls closure for access
- * @param serverAddr address to listen on (including port), NULL terminated
array
- * @param socklen length of serverAddr
+ * @param server_addr address to listen on (including port), NULL terminated
array
+ * @param socklen length of server_addr
* @param idle_timeout after how long should we timeout idle connections?
* @param require_found if YES, connections sending messages of unknown type
* will be closed
@@ -570,7 +570,7 @@
*/
struct GNUNET_SERVER_Handle *
GNUNET_SERVER_create (GNUNET_CONNECTION_AccessCheck access, void *access_cls,
- struct sockaddr *const *serverAddr,
+ struct sockaddr *const *server_addr,
const socklen_t * socklen,
struct GNUNET_TIME_Relative idle_timeout,
int require_found)
@@ -582,19 +582,19 @@
int seen;
i = 0;
- while (NULL != serverAddr[i])
+ while (NULL != server_addr[i])
i++;
if (i > 0)
{
lsocks = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle *) * (i + 1));
i = 0;
j = 0;
- while (NULL != serverAddr[i])
+ while (NULL != server_addr[i])
{
seen = 0;
for (k=0;k<i;k++)
if ( (socklen[k] == socklen[i]) &&
- (0 == memcmp (serverAddr[k], serverAddr[i], socklen[i])) )
+ (0 == memcmp (server_addr[k], server_addr[i], socklen[i])) )
{
seen = 1;
break;
@@ -605,7 +605,7 @@
i++;
continue;
}
- lsocks[j] = open_listen_socket (serverAddr[i], socklen[i]);
+ lsocks[j] = open_listen_socket (server_addr[i], socklen[i]);
if (NULL != lsocks[j])
j++;
i++;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r30064 - in gnunet/src: include transport util,
gnunet <=