[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14782 - in gnunet/src: include mesh vpn
From: |
gnunet |
Subject: |
[GNUnet-SVN] r14782 - in gnunet/src: include mesh vpn |
Date: |
Wed, 30 Mar 2011 14:26:58 +0200 |
Author: bartpolot
Date: 2011-03-30 14:26:58 +0200 (Wed, 30 Mar 2011)
New Revision: 14782
Modified:
gnunet/src/include/gnunet_mesh_service.h
gnunet/src/mesh/mesh_api.c
gnunet/src/vpn/gnunet-daemon-exit.c
gnunet/src/vpn/gnunet-daemon-vpn.c
Log:
Changes to integrate mesh application_type re-definition
Modified: gnunet/src/include/gnunet_mesh_service.h
===================================================================
--- gnunet/src/include/gnunet_mesh_service.h 2011-03-30 11:03:33 UTC (rev
14781)
+++ gnunet/src/include/gnunet_mesh_service.h 2011-03-30 12:26:58 UTC (rev
14782)
@@ -139,7 +139,7 @@
void *cls,
GNUNET_MESH_TunnelEndHandler cleaner,
const struct GNUNET_MESH_MessageHandler *handlers,
- const GNUNET_MESH_ServiceType *stypes);
+ const GNUNET_MESH_ApplicationType *stypes);
/**
* Get the peer on the other side of this tunnel if it is just one. Return
NULL otherwise
Modified: gnunet/src/mesh/mesh_api.c
===================================================================
--- gnunet/src/mesh/mesh_api.c 2011-03-30 11:03:33 UTC (rev 14781)
+++ gnunet/src/mesh/mesh_api.c 2011-03-30 12:26:58 UTC (rev 14782)
@@ -95,7 +95,7 @@
unsigned int num_types;
/* array of message-types */
- uint16_t *types;
+ GNUNET_MESH_ApplicationType *types;
struct GNUNET_TRANSPORT_ATS_Information atsi;
struct peer_list_element *next, *prev;
@@ -314,10 +314,10 @@
}
element->num_types = *num;
- element->types = GNUNET_malloc (*num * sizeof (uint16_t));
+ element->types = GNUNET_malloc (*num * sizeof (GNUNET_MESH_ApplicationType));
for (i = 0; i < *num; i++)
- element->types[i] = ntohs (ports[i]);
+ element->types[i] = (GNUNET_MESH_ApplicationType)ntohs (ports[i]);
struct tunnel_list_element *tunnel = handle->pending_by_type_tunnels.head;
while (tunnel != NULL)
@@ -423,7 +423,7 @@
struct GNUNET_MESH_Tunnel *
GNUNET_MESH_peer_request_connect_by_type (struct GNUNET_MESH_Handle *handle,
struct GNUNET_TIME_Relative timeout,
- uint16_t message_type,
+ GNUNET_MESH_ApplicationType
message_type,
GNUNET_MESH_TunnelConnectHandler
connect_handler,
GNUNET_MESH_TunnelDisconnectHandler
@@ -632,7 +632,8 @@
*cfg, void *cls,
GNUNET_MESH_TunnelEndHandler
cleaner,
- const struct GNUNET_MESH_MessageHandler *handlers)
+ const struct GNUNET_MESH_MessageHandler *handlers,
+ const GNUNET_MESH_ApplicationType *stypes)
{
struct GNUNET_MESH_Handle *ret =
GNUNET_malloc (sizeof (struct GNUNET_MESH_Handle));
Modified: gnunet/src/vpn/gnunet-daemon-exit.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-exit.c 2011-03-30 11:03:33 UTC (rev 14781)
+++ gnunet/src/vpn/gnunet-daemon-exit.c 2011-03-30 12:26:58 UTC (rev 14782)
@@ -946,7 +946,8 @@
mesh_handle = GNUNET_MESH_connect(cfg_,
NULL,
NULL,
- handlers);
+ handlers,
+ NULL);
cfg = cfg_;
udp_connections = GNUNET_CONTAINER_multihashmap_create(65536);
Modified: gnunet/src/vpn/gnunet-daemon-vpn.c
===================================================================
--- gnunet/src/vpn/gnunet-daemon-vpn.c 2011-03-30 11:03:33 UTC (rev 14781)
+++ gnunet/src/vpn/gnunet-daemon-vpn.c 2011-03-30 12:26:58 UTC (rev 14782)
@@ -584,7 +584,8 @@
mesh_handle = GNUNET_MESH_connect(cfg_,
NULL,
NULL,
- handlers);
+ handlers,
+ NULL);
cfg = cfg_;
restart_hijack = 0;
hashmap = GNUNET_CONTAINER_multihashmap_create(65536);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14782 - in gnunet/src: include mesh vpn,
gnunet <=