[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8893 - in gnunet/src: include transport upnp util
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r8893 - in gnunet/src: include transport upnp util |
|
Date: |
Sat, 29 Aug 2009 16:06:44 -0600 |
Author: durner
Date: 2009-08-29 16:06:43 -0600 (Sat, 29 Aug 2009)
New Revision: 8893
Modified:
gnunet/src/include/gnunet_connection_lib.h
gnunet/src/include/gnunet_network_lib.h
gnunet/src/include/gnunet_scheduler_lib.h
gnunet/src/transport/plugin_transport_udp.c
gnunet/src/upnp/upnp.c
gnunet/src/upnp/upnp_init.c
gnunet/src/util/connection.c
gnunet/src/util/network.c
gnunet/src/util/scheduler.c
gnunet/src/util/server.c
gnunet/src/util/service.c
gnunet/src/util/test_connection.c
gnunet/src/util/test_connection_addressing.c
gnunet/src/util/test_connection_receive_cancel.c
gnunet/src/util/test_connection_timeout.c
gnunet/src/util/test_service.c
Log:
naming
Modified: gnunet/src/include/gnunet_connection_lib.h
===================================================================
--- gnunet/src/include/gnunet_connection_lib.h 2009-08-29 21:47:57 UTC (rev
8892)
+++ gnunet/src/include/gnunet_connection_lib.h 2009-08-29 22:06:43 UTC (rev
8893)
@@ -99,7 +99,7 @@
GNUNET_SCHEDULER_Handle
*sched,
struct
- GNUNET_NETWORK_Descriptor
+ GNUNET_NETWORK_Handle
*osSocket, size_t maxbuf);
@@ -122,7 +122,7 @@
GNUNET_CONNECTION_AccessCheck
access, void *access_cls,
struct
- GNUNET_NETWORK_Descriptor
+ GNUNET_NETWORK_Handle
*lsock, size_t maxbuf);
Modified: gnunet/src/include/gnunet_network_lib.h
===================================================================
--- gnunet/src/include/gnunet_network_lib.h 2009-08-29 21:47:57 UTC (rev
8892)
+++ gnunet/src/include/gnunet_network_lib.h 2009-08-29 22:06:43 UTC (rev
8893)
@@ -40,7 +40,7 @@
/**
* @brief handle to a socket
*/
-struct GNUNET_NETWORK_Descriptor;
+struct GNUNET_NETWORK_Handle;
/**
* @brief collection of IO descriptors
@@ -52,33 +52,33 @@
#include "gnunet_time_lib.h"
-struct GNUNET_NETWORK_Descriptor *
-GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Descriptor *desc,
+struct GNUNET_NETWORK_Handle *
+GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
struct sockaddr *address,
socklen_t *address_len);
int
-GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Descriptor
+GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Handle
*desc);
-int GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Descriptor *desc,
+int GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
const struct sockaddr *address, socklen_t address_len);
-int GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Descriptor *desc);
+int GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc);
-int GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Descriptor
*desc,
+int GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
const struct sockaddr *address, socklen_t address_len);
-int GNUNET_NETWORK_socket_getsockopt(const struct GNUNET_NETWORK_Descriptor
*desc, int level, int optname,
+int GNUNET_NETWORK_socket_getsockopt(const struct GNUNET_NETWORK_Handle *desc,
int level, int optname,
void *optval, socklen_t *optlen);
-int GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Descriptor
*desc, int backlog);
+int GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc,
int backlog);
-ssize_t GNUNET_NETWORK_socket_read (const struct GNUNET_NETWORK_Descriptor
*desc, void *buf,
+ssize_t GNUNET_NETWORK_socket_read (const struct GNUNET_NETWORK_Handle *desc,
void *buf,
size_t nbyte);
-ssize_t GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Descriptor
*desc, void *buffer,
+ssize_t GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle *desc,
void *buffer,
size_t length, int flags);
int GNUNET_NETWORK_socket_select (struct GNUNET_NETWORK_FDSet *rfds,
@@ -90,34 +90,34 @@
*
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
-int GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Descriptor *fd,
int doBlock);
+int GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd, int
doBlock);
-ssize_t GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Descriptor
*desc,
+ssize_t GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle *desc,
const void *buffer, size_t length, int flags);
-ssize_t GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Descriptor
*desc,
+ssize_t GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle *desc,
const void *message, size_t length, int flags,
const struct sockaddr *dest_addr,
socklen_t dest_len);
-int GNUNET_NETWORK_socket_setsockopt(struct GNUNET_NETWORK_Descriptor *fd, int
level, int option_name,
+int GNUNET_NETWORK_socket_setsockopt(struct GNUNET_NETWORK_Handle *fd, int
level, int option_name,
const void *option_value, socklen_t option_len);
-int GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Descriptor *desc,
int how);
+int GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc, int
how);
-struct GNUNET_NETWORK_Descriptor *GNUNET_NETWORK_socket_socket (int domain,
int type, int protocol);
+struct GNUNET_NETWORK_Handle *GNUNET_NETWORK_socket_socket (int domain, int
type, int protocol);
-ssize_t GNUNET_NETWORK_socket_write (const struct GNUNET_NETWORK_Descriptor
*desc,
+ssize_t GNUNET_NETWORK_socket_write (const struct GNUNET_NETWORK_Handle *desc,
const void *buf, size_t nbyte);
void GNUNET_NETWORK_fdset_zero(struct GNUNET_NETWORK_FDSet *fds);
void GNUNET_NETWORK_fdset_set(struct GNUNET_NETWORK_FDSet *fds,
- const struct GNUNET_NETWORK_Descriptor *desc);
+ const struct GNUNET_NETWORK_Handle *desc);
int GNUNET_NETWORK_fdset_isset(const struct GNUNET_NETWORK_FDSet *fds,
- const struct GNUNET_NETWORK_Descriptor *desc);
+ const struct GNUNET_NETWORK_Handle *desc);
void GNUNET_NETWORK_fdset_add (struct GNUNET_NETWORK_FDSet *dst,
const struct GNUNET_NETWORK_FDSet *src);
Modified: gnunet/src/include/gnunet_scheduler_lib.h
===================================================================
--- gnunet/src/include/gnunet_scheduler_lib.h 2009-08-29 21:47:57 UTC (rev
8892)
+++ gnunet/src/include/gnunet_scheduler_lib.h 2009-08-29 22:06:43 UTC (rev
8893)
@@ -350,7 +350,7 @@
enum GNUNET_SCHEDULER_Priority prio,
GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
struct GNUNET_TIME_Relative delay,
- struct GNUNET_NETWORK_Descriptor *rfd,
GNUNET_SCHEDULER_Task main, void *cls);
+ struct GNUNET_NETWORK_Handle *rfd,
GNUNET_SCHEDULER_Task main, void *cls);
/**
@@ -383,7 +383,7 @@
enum GNUNET_SCHEDULER_Priority prio,
GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
struct GNUNET_TIME_Relative delay,
- struct GNUNET_NETWORK_Descriptor *wfd,
GNUNET_SCHEDULER_Task main, void *cls);
+ struct GNUNET_NETWORK_Handle *wfd,
GNUNET_SCHEDULER_Task main, void *cls);
/**
Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2009-08-29 21:47:57 UTC (rev
8892)
+++ gnunet/src/transport/plugin_transport_udp.c 2009-08-29 22:06:43 UTC (rev
8893)
@@ -267,10 +267,10 @@
* Create a UDP socket. If possible, use IPv6, otherwise
* try IPv4. Update available_protocols accordingly.
*/
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
udp_create_socket ()
{
- struct GNUNET_NETWORK_Descriptor *desc;
+ struct GNUNET_NETWORK_Handle *desc;
available_protocols = VERSION_AVAILABLE_NONE;
desc = NULL;
@@ -416,7 +416,7 @@
struct sockaddr_in6 serverAddrv6;
struct sockaddr *serverAddr;
socklen_t addrlen;
- GNUNET_NETWORK_Descriptor *desc;
+ GNUNET_NETWORK_Handle *desc;
const int on = 1;
unsigned short port;
Modified: gnunet/src/upnp/upnp.c
===================================================================
--- gnunet/src/upnp/upnp.c 2009-08-29 21:47:57 UTC (rev 8892)
+++ gnunet/src/upnp/upnp.c 2009-08-29 22:06:43 UTC (rev 8893)
@@ -104,7 +104,7 @@
char *full_url;
char *buf;
unsigned int buf_len;
- struct GNUNET_NETWORK_Descriptor *sock;
+ struct GNUNET_NETWORK_Handle *sock;
} UPnPDiscoveryData;
static GaimUPnPControlInfo control_info = {
@@ -543,7 +543,7 @@
}
int
-gaim_upnp_discover (struct GNUNET_CONFIGURATION_Handle *cfg, struct
GNUNET_NETWORK_Descriptor *sock)
+gaim_upnp_discover (struct GNUNET_CONFIGURATION_Handle *cfg, struct
GNUNET_NETWORK_Handle *sock)
{
char *proxy;
socklen_t avail;
Modified: gnunet/src/upnp/upnp_init.c
===================================================================
--- gnunet/src/upnp/upnp_init.c 2009-08-29 21:47:57 UTC (rev 8892)
+++ gnunet/src/upnp/upnp_init.c 2009-08-29 22:06:43 UTC (rev 8893)
@@ -50,7 +50,7 @@
static struct GNUNET_ThreadHandle *discovery;
-static struct GNUNET_NETWORK_Descriptor *discovery_socket;
+static struct GNUNET_NETWORK_Handle *discovery_socket;
/**
* Obtain the public/external IP address.
Modified: gnunet/src/util/connection.c
===================================================================
--- gnunet/src/util/connection.c 2009-08-29 21:47:57 UTC (rev 8892)
+++ gnunet/src/util/connection.c 2009-08-29 22:06:43 UTC (rev 8893)
@@ -174,7 +174,7 @@
/**
* Underlying OS's socket, set to NULL after fatal errors.
*/
- struct GNUNET_NETWORK_Descriptor *sock;
+ struct GNUNET_NETWORK_Handle *sock;
/**
* Port to connect to.
@@ -219,7 +219,7 @@
*/
struct GNUNET_CONNECTION_Handle *
GNUNET_CONNECTION_create_from_existing (struct GNUNET_SCHEDULER_Handle
- *sched, struct
GNUNET_NETWORK_Descriptor *osSocket,
+ *sched, struct
GNUNET_NETWORK_Handle *osSocket,
size_t maxbuf)
{
struct GNUNET_CONNECTION_Handle *ret;
@@ -248,13 +248,13 @@
GNUNET_CONNECTION_create_from_accept (struct GNUNET_SCHEDULER_Handle
*sched,
GNUNET_CONNECTION_AccessCheck access,
- void *access_cls, struct
GNUNET_NETWORK_Descriptor *lsock,
+ void *access_cls, struct
GNUNET_NETWORK_Handle *lsock,
size_t maxbuf)
{
struct GNUNET_CONNECTION_Handle *ret;
char addr[32];
socklen_t addrlen;
- struct GNUNET_NETWORK_Descriptor *sock;
+ struct GNUNET_NETWORK_Handle *sock;
int aret;
struct sockaddr_in *v4;
struct sockaddr_in6 *v6;
@@ -389,7 +389,7 @@
static int
try_connect (struct GNUNET_CONNECTION_Handle *sock)
{
- struct GNUNET_NETWORK_Descriptor *s;
+ struct GNUNET_NETWORK_Handle *s;
if (sock->addr != NULL)
{
@@ -598,7 +598,7 @@
const struct sockaddr *serv_addr,
socklen_t addrlen, size_t maxbuf)
{
- struct GNUNET_NETWORK_Descriptor *s;
+ struct GNUNET_NETWORK_Handle *s;
struct GNUNET_CONNECTION_Handle *ret;
s = GNUNET_NETWORK_socket_socket (af_family, SOCK_STREAM, 0);
Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c 2009-08-29 21:47:57 UTC (rev 8892)
+++ gnunet/src/util/network.c 2009-08-29 22:06:43 UTC (rev 8893)
@@ -31,7 +31,7 @@
#define DEBUG_SOCK GNUNET_NO
-struct GNUNET_NETWORK_Descriptor
+struct GNUNET_NETWORK_Handle
{
int fd;
};
@@ -51,14 +51,14 @@
#define FD_COPY(s, d) (memcpy ((d), (s), sizeof (fd_set)))
#endif
-struct GNUNET_NETWORK_Descriptor *
-GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Descriptor *desc,
+struct GNUNET_NETWORK_Handle *
+GNUNET_NETWORK_socket_accept (const struct GNUNET_NETWORK_Handle *desc,
struct sockaddr *address,
socklen_t * address_len)
{
- struct GNUNET_NETWORK_Descriptor *ret;
+ struct GNUNET_NETWORK_Handle *ret;
- ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Descriptor));
+ ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
ret->fd = accept (desc->fd, address, address_len);
#ifdef MINGW
if (INVALID_SOCKET == ret->fd)
@@ -68,7 +68,7 @@
}
int
-GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Descriptor *desc,
+GNUNET_NETWORK_socket_bind (struct GNUNET_NETWORK_Handle *desc,
const struct sockaddr *address,
socklen_t address_len)
{
@@ -88,7 +88,7 @@
* @return GNUNET_OK on success, GNUNET_SYSERR on error
*/
int
-GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Descriptor *fd,
+GNUNET_NETWORK_socket_set_blocking (struct GNUNET_NETWORK_Handle *fd,
int doBlock)
{
#if MINGW
@@ -124,7 +124,7 @@
}
int
-GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Descriptor *desc)
+GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
{
int ret;
#ifdef MINGW
@@ -145,7 +145,7 @@
}
int
-GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Descriptor *desc,
+GNUNET_NETWORK_socket_connect (const struct GNUNET_NETWORK_Handle *desc,
const struct sockaddr *address,
socklen_t address_len)
{
@@ -160,7 +160,7 @@
}
int
-GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Descriptor *desc,
+GNUNET_NETWORK_socket_getsockopt (const struct GNUNET_NETWORK_Handle *desc,
int level, int optname, void *optval,
socklen_t * optlen)
{
@@ -177,7 +177,7 @@
}
int
-GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Descriptor *desc,
+GNUNET_NETWORK_socket_listen (const struct GNUNET_NETWORK_Handle *desc,
int backlog)
{
int ret;
@@ -192,7 +192,7 @@
}
ssize_t
-GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Descriptor * desc,
+GNUNET_NETWORK_socket_recv (const struct GNUNET_NETWORK_Handle * desc,
void *buffer, size_t length, int flags)
{
int ret;
@@ -207,7 +207,7 @@
}
ssize_t
-GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Descriptor * desc,
+GNUNET_NETWORK_socket_send (const struct GNUNET_NETWORK_Handle * desc,
const void *buffer, size_t length, int flags)
{
int ret;
@@ -222,7 +222,7 @@
}
ssize_t
-GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Descriptor * desc,
+GNUNET_NETWORK_socket_sendto (const struct GNUNET_NETWORK_Handle * desc,
const void *message, size_t length, int flags,
const struct sockaddr * dest_addr,
socklen_t dest_len)
@@ -239,7 +239,7 @@
}
int
-GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Descriptor *fd,
+GNUNET_NETWORK_socket_setsockopt (struct GNUNET_NETWORK_Handle *fd,
int level, int option_name,
const void *option_value,
socklen_t option_len)
@@ -255,12 +255,12 @@
return ret;
}
-struct GNUNET_NETWORK_Descriptor *
+struct GNUNET_NETWORK_Handle *
GNUNET_NETWORK_socket_socket (int domain, int type, int protocol)
{
- struct GNUNET_NETWORK_Descriptor *ret;
+ struct GNUNET_NETWORK_Handle *ret;
- ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Descriptor));
+ ret = GNUNET_malloc (sizeof (struct GNUNET_NETWORK_Handle));
ret->fd = socket (domain, type, protocol);
#ifdef MINGW
if (INVALID_SOCKET == ret->fd)
@@ -277,7 +277,7 @@
}
int
-GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Descriptor *desc,
+GNUNET_NETWORK_socket_shutdown (struct GNUNET_NETWORK_Handle *desc,
int how)
{
int ret;
@@ -292,7 +292,7 @@
}
int
-GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Descriptor
+GNUNET_NETWORK_socket_set_inheritable (const struct GNUNET_NETWORK_Handle
*desc)
{
#ifdef MINGW
@@ -320,7 +320,7 @@
void
GNUNET_NETWORK_fdset_set (struct GNUNET_NETWORK_FDSet *fds,
- const struct GNUNET_NETWORK_Descriptor *desc)
+ const struct GNUNET_NETWORK_Handle *desc)
{
FD_SET (desc->fd, &fds->sds);
@@ -330,7 +330,7 @@
int
GNUNET_NETWORK_fdset_isset (const struct GNUNET_NETWORK_FDSet *fds,
- const struct GNUNET_NETWORK_Descriptor *desc)
+ const struct GNUNET_NETWORK_Handle *desc)
{
return FD_ISSET (desc->fd, &fds->sds);
}
Modified: gnunet/src/util/scheduler.c
===================================================================
--- gnunet/src/util/scheduler.c 2009-08-29 21:47:57 UTC (rev 8892)
+++ gnunet/src/util/scheduler.c 2009-08-29 22:06:43 UTC (rev 8893)
@@ -739,7 +739,7 @@
enum GNUNET_SCHEDULER_Priority prio,
GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
struct GNUNET_TIME_Relative delay,
- struct GNUNET_NETWORK_Descriptor *rfd,
GNUNET_SCHEDULER_Task main, void *cls)
+ struct GNUNET_NETWORK_Handle *rfd,
GNUNET_SCHEDULER_Task main, void *cls)
{
struct GNUNET_NETWORK_FDSet *rs;
GNUNET_SCHEDULER_TaskIdentifier ret;
@@ -785,7 +785,7 @@
enum GNUNET_SCHEDULER_Priority prio,
GNUNET_SCHEDULER_TaskIdentifier prerequisite_task,
struct GNUNET_TIME_Relative delay,
- struct GNUNET_NETWORK_Descriptor *wfd,
GNUNET_SCHEDULER_Task main, void *cls)
+ struct GNUNET_NETWORK_Handle *wfd,
GNUNET_SCHEDULER_Task main, void *cls)
{
struct GNUNET_NETWORK_FDSet *ws;
GNUNET_SCHEDULER_TaskIdentifier ret;
Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c 2009-08-29 21:47:57 UTC (rev 8892)
+++ gnunet/src/util/server.c 2009-08-29 22:06:43 UTC (rev 8893)
@@ -131,7 +131,7 @@
* Socket used to listen for new connections. Set to
* "-1" by GNUNET_SERVER_destroy to initiate shutdown.
*/
- struct GNUNET_NETWORK_Descriptor *listen_socket;
+ struct GNUNET_NETWORK_Handle *listen_socket;
/**
* Set to GNUNET_YES if we are shutting down.
@@ -368,11 +368,11 @@
*
* @return NULL on error, otherwise the listen socket
*/
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
open_listen_socket (const struct sockaddr *serverAddr, socklen_t socklen)
{
const static int on = 1;
- struct GNUNET_NETWORK_Descriptor *sock;
+ struct GNUNET_NETWORK_Handle *sock;
uint16_t port;
switch (serverAddr->sa_family)
@@ -454,7 +454,7 @@
idle_timeout, int require_found)
{
struct GNUNET_SERVER_Handle *ret;
- struct GNUNET_NETWORK_Descriptor *lsock;
+ struct GNUNET_NETWORK_Handle *lsock;
struct GNUNET_NETWORK_FDSet *r;
lsock = NULL;
Modified: gnunet/src/util/service.c
===================================================================
--- gnunet/src/util/service.c 2009-08-29 21:47:57 UTC (rev 8892)
+++ gnunet/src/util/service.c 2009-08-29 22:06:43 UTC (rev 8893)
@@ -813,7 +813,7 @@
if (!disablev6)
{
- struct GNUNET_NETWORK_Descriptor *desc;
+ struct GNUNET_NETWORK_Handle *desc;
/* probe IPv6 support */
desc = GNUNET_NETWORK_socket_socket (PF_INET6, SOCK_STREAM, 0);
Modified: gnunet/src/util/test_connection.c
===================================================================
--- gnunet/src/util/test_connection.c 2009-08-29 21:47:57 UTC (rev 8892)
+++ gnunet/src/util/test_connection.c 2009-08-29 22:06:43 UTC (rev 8893)
@@ -40,7 +40,7 @@
static size_t sofar;
-static struct GNUNET_NETWORK_Descriptor *ls;
+static struct GNUNET_NETWORK_Handle *ls;
@@ -49,12 +49,12 @@
*
* @return -1 on error, otherwise the listen socket
*/
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
open_listen_socket ()
{
const static int on = 1;
struct sockaddr_in sa;
- struct GNUNET_NETWORK_Descriptor *desc;
+ struct GNUNET_NETWORK_Handle *desc;
memset (&sa, 0, sizeof (sa));
sa.sin_port = htons (PORT);
Modified: gnunet/src/util/test_connection_addressing.c
===================================================================
--- gnunet/src/util/test_connection_addressing.c 2009-08-29 21:47:57 UTC
(rev 8892)
+++ gnunet/src/util/test_connection_addressing.c 2009-08-29 22:06:43 UTC
(rev 8893)
@@ -40,7 +40,7 @@
static size_t sofar;
-static struct GNUNET_NETWORK_Descriptor *ls;
+static struct GNUNET_NETWORK_Handle *ls;
@@ -49,12 +49,12 @@
*
* @return NULL on error, otherwise the listen socket
*/
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
open_listen_socket ()
{
const static int on = 1;
struct sockaddr_in sa;
- struct GNUNET_NETWORK_Descriptor *desc;
+ struct GNUNET_NETWORK_Handle *desc;
memset (&sa, 0, sizeof (sa));
sa.sin_port = htons (PORT);
Modified: gnunet/src/util/test_connection_receive_cancel.c
===================================================================
--- gnunet/src/util/test_connection_receive_cancel.c 2009-08-29 21:47:57 UTC
(rev 8892)
+++ gnunet/src/util/test_connection_receive_cancel.c 2009-08-29 22:06:43 UTC
(rev 8893)
@@ -38,7 +38,7 @@
static struct GNUNET_CONNECTION_Handle *lsock;
-static struct GNUNET_NETWORK_Descriptor *ls;
+static struct GNUNET_NETWORK_Handle *ls;
static GNUNET_SCHEDULER_TaskIdentifier receive_task;
@@ -50,12 +50,12 @@
*
* @return NULL on error, otherwise the listen socket
*/
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
open_listen_socket ()
{
const static int on = 1;
struct sockaddr_in sa;
- struct GNUNET_NETWORK_Descriptor *desc;
+ struct GNUNET_NETWORK_Handle *desc;
memset (&sa, 0, sizeof (sa));
sa.sin_port = htons (PORT);
Modified: gnunet/src/util/test_connection_timeout.c
===================================================================
--- gnunet/src/util/test_connection_timeout.c 2009-08-29 21:47:57 UTC (rev
8892)
+++ gnunet/src/util/test_connection_timeout.c 2009-08-29 22:06:43 UTC (rev
8893)
@@ -35,7 +35,7 @@
static struct GNUNET_CONNECTION_Handle *lsock;
-static struct GNUNET_NETWORK_Descriptor *ls;
+static struct GNUNET_NETWORK_Handle *ls;
/**
@@ -43,12 +43,12 @@
*
* @return NULL on error, otherwise the listen socket
*/
-static struct GNUNET_NETWORK_Descriptor *
+static struct GNUNET_NETWORK_Handle *
open_listen_socket ()
{
const static int on = 1;
struct sockaddr_in sa;
- struct GNUNET_NETWORK_Descriptor *desc;
+ struct GNUNET_NETWORK_Handle *desc;
memset (&sa, 0, sizeof (sa));
sa.sin_port = htons (PORT);
Modified: gnunet/src/util/test_service.c
===================================================================
--- gnunet/src/util/test_service.c 2009-08-29 21:47:57 UTC (rev 8892)
+++ gnunet/src/util/test_service.c 2009-08-29 22:06:43 UTC (rev 8893)
@@ -300,7 +300,7 @@
main (int argc, char *argv[])
{
int ret = 0;
- struct GNUNET_NETWORK_Descriptor *s;
+ struct GNUNET_NETWORK_Handle *s;
GNUNET_log_setup ("test-service",
#if VERBOSE
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8893 - in gnunet/src: include transport upnp util,
gnunet <=