[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r27861 - in gnunet/src: include transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r27861 - in gnunet/src: include transport |
Date: |
Wed, 10 Jul 2013 09:48:42 +0200 |
Author: wachs
Date: 2013-07-10 09:48:41 +0200 (Wed, 10 Jul 2013)
New Revision: 27861
Modified:
gnunet/src/include/gnunet_transport_plugin.h
gnunet/src/transport/plugin_transport_http_client.c
gnunet/src/transport/plugin_transport_http_server.c
gnunet/src/transport/plugin_transport_tcp.c
gnunet/src/transport/plugin_transport_template.c
gnunet/src/transport/plugin_transport_udp.c
gnunet/src/transport/plugin_transport_unix.c
gnunet/src/transport/plugin_transport_wlan.c
Log:
changed return type to enum
added get_network to template
Modified: gnunet/src/include/gnunet_transport_plugin.h
===================================================================
--- gnunet/src/include/gnunet_transport_plugin.h 2013-07-10 01:31:13 UTC
(rev 27860)
+++ gnunet/src/include/gnunet_transport_plugin.h 2013-07-10 07:48:41 UTC
(rev 27861)
@@ -35,6 +35,7 @@
#include "gnunet_scheduler_lib.h"
#include "gnunet_statistics_service.h"
#include "gnunet_transport_service.h"
+#include "gnunet_ats_service.h"
/**
* Opaque pointer that plugins can use to distinguish specific
@@ -498,9 +499,9 @@
*
* @param cls closure ('struct Plugin*')
* @param session the session
- * @return the network type in HBO or GNUNET_SYSERR
+ * @return the network type
*/
-typedef int (*GNUNET_TRANSPORT_GetNetworkType) (void *cls,
+typedef enum GNUNET_ATS_Network_Type (*GNUNET_TRANSPORT_GetNetworkType) (void
*cls,
void *session);
Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2013-07-10 01:31:13 UTC
(rev 27860)
+++ gnunet/src/transport/plugin_transport_http_client.c 2013-07-10 07:48:41 UTC
(rev 27861)
@@ -1444,8 +1444,8 @@
* @param session the session
* @return the network type in HBO or GNUNET_SYSERR
*/
-int http_client_get_network (void *cls,
- void *session)
+static enum GNUNET_ATS_Network_Type
+http_client_get_network (void *cls, void *session)
{
struct Session *s = (struct Session *) session;
GNUNET_assert (NULL != s);
Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2013-07-10 01:31:13 UTC
(rev 27860)
+++ gnunet/src/transport/plugin_transport_http_server.c 2013-07-10 07:48:41 UTC
(rev 27861)
@@ -3011,8 +3011,8 @@
* @param session the session
* @return the network type in HBO or GNUNET_SYSERR
*/
-int http_server_get_network (void *cls,
- void *session)
+static enum GNUNET_ATS_Network_Type
+http_server_get_network (void *cls, void *session)
{
struct Session *s = (struct Session *) session;
GNUNET_assert (NULL != s);
Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2013-07-10 01:31:13 UTC (rev
27860)
+++ gnunet/src/transport/plugin_transport_tcp.c 2013-07-10 07:48:41 UTC (rev
27861)
@@ -2386,8 +2386,8 @@
* @param session the session
* @return the network type in HBO or GNUNET_SYSERR
*/
-int tcp_get_network (void *cls,
- void *session)
+static enum GNUNET_ATS_Network_Type
+tcp_get_network (void *cls,void *session)
{
struct Session *s = (struct Session *) session;
GNUNET_assert (NULL != session);
Modified: gnunet/src/transport/plugin_transport_template.c
===================================================================
--- gnunet/src/transport/plugin_transport_template.c 2013-07-10 01:31:13 UTC
(rev 27860)
+++ gnunet/src/transport/plugin_transport_template.c 2013-07-10 07:48:41 UTC
(rev 27861)
@@ -205,6 +205,20 @@
// FIXME
}
+/**
+ * Function obtain the network type for a session
+ *
+ * @param cls closure ('struct Plugin*')
+ * @param session the session
+ * @return the network type in HBO or GNUNET_SYSERR
+ */
+static enum GNUNET_ATS_Network_Type
+template_plugin_get_network (void *cls, void *session)
+{
+ struct Session *s = (struct Session *) session;
+ GNUNET_assert (NULL != s);
+ return GNUNET_ATS_NET_UNSPECIFIED; /* Change to correct network type */
+}
/**
* Convert the transports address to a nice, human-readable
@@ -354,6 +368,7 @@
api->address_to_string = &template_plugin_address_to_string;
api->string_to_address = &template_plugin_string_to_address;
api->get_session = &template_plugin_get_session;
+ api->get_network = &template_plugin_get_network;
LOG (GNUNET_ERROR_TYPE_INFO, "Template plugin successfully loaded\n");
return api;
}
Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2013-07-10 01:31:13 UTC (rev
27860)
+++ gnunet/src/transport/plugin_transport_udp.c 2013-07-10 07:48:41 UTC (rev
27861)
@@ -1434,8 +1434,8 @@
* @param session the session
* @return the network type in HBO or GNUNET_SYSERR
*/
-int udp_get_network (void *cls,
- void *session)
+static enum GNUNET_ATS_Network_Type
+udp_get_network (void *cls, void *session)
{
struct Session *s = (struct Session *) session;
Modified: gnunet/src/transport/plugin_transport_unix.c
===================================================================
--- gnunet/src/transport/plugin_transport_unix.c 2013-07-10 01:31:13 UTC
(rev 27860)
+++ gnunet/src/transport/plugin_transport_unix.c 2013-07-10 07:48:41 UTC
(rev 27861)
@@ -733,8 +733,8 @@
* @param session the session
* @return the network type in HBO or GNUNET_SYSERR
*/
-int unix_get_network (void *cls,
- void *session)
+static enum GNUNET_ATS_Network_Type
+unix_get_network (void *cls, void *session)
{
GNUNET_assert (NULL != session);
return GNUNET_ATS_NET_LOOPBACK;
Modified: gnunet/src/transport/plugin_transport_wlan.c
===================================================================
--- gnunet/src/transport/plugin_transport_wlan.c 2013-07-10 01:31:13 UTC
(rev 27860)
+++ gnunet/src/transport/plugin_transport_wlan.c 2013-07-10 07:48:41 UTC
(rev 27861)
@@ -1029,8 +1029,8 @@
* @param session the session
* @return the network type in HBO or GNUNET_SYSERR
*/
-int wlan_get_network (void *cls,
- void *session)
+static enum GNUNET_ATS_Network_Type
+wlan_get_network (void *cls, void *session)
{
GNUNET_assert (NULL != session);
return GNUNET_ATS_NET_WLAN;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r27861 - in gnunet/src: include transport,
gnunet <=