[GNUnet-SVN] r27996 - in gnunet/src: dv include transport

[gnunet]

Author: grothoff
Date: 2013-07-13 17:33:30 +0200 (Sat, 13 Jul 2013)
New Revision: 27996

Modified:
   gnunet/src/dv/plugin_transport_dv.c
   gnunet/src/include/gnunet_transport_plugin.h
   gnunet/src/transport/plugin_transport_bluetooth.c
   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:
-add dv_get_network to DV API, improve signature to use 'struct Session *' 
instead of 'void *'

Modified: gnunet/src/dv/plugin_transport_dv.c
===================================================================
--- gnunet/src/dv/plugin_transport_dv.c 2013-07-13 15:00:28 UTC (rev 27995)
+++ gnunet/src/dv/plugin_transport_dv.c 2013-07-13 15:33:30 UTC (rev 27996)
@@ -634,7 +634,27 @@
 }
 
 
+
 /**
+ * Function to obtain the network type for a session
+ * FIXME: we should probably look at the network type
+ * used by the next hop here.  Or find some other way
+ * to properly allow ATS-DV resource allocation.
+ *
+ * @param cls closure ('struct Plugin*')
+ * @param session the session
+ * @return the network type
+ */
+static enum GNUNET_ATS_Network_Type 
+dv_get_network (void *cls,
+               struct Session *session)
+{
+  GNUNET_assert (NULL != session);
+  return GNUNET_ATS_NET_UNSPECIFIED;
+}
+
+
+/**
  * Entry point for the plugin.
  */
 void *
@@ -670,7 +690,8 @@
   api->check_address = &dv_plugin_check_address;
   api->address_to_string = &dv_plugin_address_to_string;
   api->string_to_address = &dv_plugin_string_to_address;
-  api->get_session = dv_get_session;
+  api->get_session = &dv_get_session;
+  api->get_network = &dv_get_network;
   return api;
 }
 

Modified: gnunet/src/include/gnunet_transport_plugin.h
===================================================================
--- gnunet/src/include/gnunet_transport_plugin.h        2013-07-13 15:00:28 UTC 
(rev 27995)
+++ gnunet/src/include/gnunet_transport_plugin.h        2013-07-13 15:33:30 UTC 
(rev 27996)
@@ -497,14 +497,14 @@
 
 
 /**
- * Function obtain the network type for a session
+ * Function to obtain the network type for a session
  *
  * @param cls closure ('struct Plugin*')
  * @param session the session
  * @return the network type
  */
 typedef enum GNUNET_ATS_Network_Type (*GNUNET_TRANSPORT_GetNetworkType) (void 
*cls,
-                                                void *session);
+                                                                        struct 
Session *session);
 
 
 /**
@@ -571,7 +571,6 @@
    */
   GNUNET_TRANSPORT_CreateSession get_session;
 
-
   /**
    * Function to obtain the network type for a session
    */

Modified: gnunet/src/transport/plugin_transport_bluetooth.c
===================================================================
--- gnunet/src/transport/plugin_transport_bluetooth.c   2013-07-13 15:00:28 UTC 
(rev 27995)
+++ gnunet/src/transport/plugin_transport_bluetooth.c   2013-07-13 15:33:30 UTC 
(rev 27996)
@@ -1024,6 +1024,7 @@
   return pos;
 }
 
+
 /**
  * Function obtain the network type for a session
  *
@@ -1032,10 +1033,11 @@
  * @return the network type in HBO or GNUNET_SYSERR
  */
 static enum GNUNET_ATS_Network_Type
-bluetooth_get_network (void *cls, void *session)
+bluetooth_get_network (void *cls,
+                      struct Session *session)
 {
-       GNUNET_assert (NULL != session);
-       return GNUNET_ATS_NET_BT;
+  GNUNET_assert (NULL != session);
+  return GNUNET_ATS_NET_BT;
 }
 
 

Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2013-07-13 15:00:28 UTC 
(rev 27995)
+++ gnunet/src/transport/plugin_transport_http_client.c 2013-07-13 15:33:30 UTC 
(rev 27996)
@@ -1438,6 +1438,7 @@
   return res;
 }
 
+
 /**
  * Function obtain the network type for a session
  *
@@ -1446,11 +1447,11 @@
  * @return the network type in HBO or GNUNET_SYSERR
  */
 static enum GNUNET_ATS_Network_Type
-http_client_get_network (void *cls, void *session)
+http_client_get_network (void *cls,
+                        struct Session *session)
 {
-       struct Session *s = (struct Session *) session;
-       GNUNET_assert (NULL != s);
-       return ntohl(s->ats_address_network_type);
+  GNUNET_assert (NULL != session);
+  return ntohl (session->ats_address_network_type);
 }
 
 

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2013-07-13 15:00:28 UTC 
(rev 27995)
+++ gnunet/src/transport/plugin_transport_http_server.c 2013-07-13 15:33:30 UTC 
(rev 27996)
@@ -3021,6 +3021,7 @@
 
 }
 
+
 /**
  * Function obtain the network type for a session
  *
@@ -3029,13 +3030,14 @@
  * @return the network type in HBO or GNUNET_SYSERR
  */
 static enum GNUNET_ATS_Network_Type
-http_server_get_network (void *cls, void *session)
+http_server_get_network (void *cls,
+                        struct Session *session)
 {
-       struct Session *s = (struct Session *) session;
-       GNUNET_assert (NULL != s);
-       return ntohl(s->ats_address_network_type);
+  GNUNET_assert (NULL != session);
+  return ntohl (session->ats_address_network_type);
 }
 
+
 /**
  * Entry point for the plugin.
  *

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2013-07-13 15:00:28 UTC (rev 
27995)
+++ gnunet/src/transport/plugin_transport_tcp.c 2013-07-13 15:33:30 UTC (rev 
27996)
@@ -2394,11 +2394,11 @@
  * @return the network type in HBO or GNUNET_SYSERR
  */
 static enum GNUNET_ATS_Network_Type
-tcp_get_network (void *cls,void *session)
+tcp_get_network (void *cls,
+                struct Session *session)
 {
-       struct Session *s = (struct Session *) session;
-       GNUNET_assert (NULL != session);
-       return ntohl(s->ats_address_network_type);
+  GNUNET_assert (NULL != session);
+  return ntohl (session->ats_address_network_type);
 }
 
 

Modified: gnunet/src/transport/plugin_transport_template.c
===================================================================
--- gnunet/src/transport/plugin_transport_template.c    2013-07-13 15:00:28 UTC 
(rev 27995)
+++ gnunet/src/transport/plugin_transport_template.c    2013-07-13 15:33:30 UTC 
(rev 27996)
@@ -205,6 +205,7 @@
   // FIXME
 }
 
+
 /**
  * Function obtain the network type for a session
  *
@@ -213,13 +214,14 @@
  * @return the network type in HBO or GNUNET_SYSERR
  */
 static enum GNUNET_ATS_Network_Type
-template_plugin_get_network (void *cls, void *session)
+template_plugin_get_network (void *cls, 
+                            struct Session *session)
 {
-       struct Session *s = (struct Session *) session;
-       GNUNET_assert (NULL != s);
-       return GNUNET_ATS_NET_UNSPECIFIED; /* Change to correct network type */
+  GNUNET_assert (NULL != session);
+  return GNUNET_ATS_NET_UNSPECIFIED; /* Change to correct network type */
 }
 
+
 /**
  * Convert the transports address to a nice, human-readable
  * format.

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2013-07-13 15:00:28 UTC (rev 
27995)
+++ gnunet/src/transport/plugin_transport_udp.c 2013-07-13 15:33:30 UTC (rev 
27996)
@@ -1443,6 +1443,7 @@
   return GNUNET_YES;
 }
 
+
 /**
  * Function obtain the network type for a session
  *
@@ -1451,13 +1452,13 @@
  * @return the network type in HBO or GNUNET_SYSERR
  */
 static enum GNUNET_ATS_Network_Type
-udp_get_network (void *cls, void *session)
+udp_get_network (void *cls, 
+                struct Session *session)
 {
-       struct Session *s = (struct Session *) session;
-
-       return ntohl(s->ats.value);
+  return ntohl (session->ats.value);
 }
 
+
 /**
  * Creates a new outbound session the transport service will use to send data 
to the
  * peer

Modified: gnunet/src/transport/plugin_transport_unix.c
===================================================================
--- gnunet/src/transport/plugin_transport_unix.c        2013-07-13 15:00:28 UTC 
(rev 27995)
+++ gnunet/src/transport/plugin_transport_unix.c        2013-07-13 15:33:30 UTC 
(rev 27996)
@@ -732,6 +732,7 @@
   disconnect_session (s);
 }
 
+
 /**
  * Function obtain the network type for a session
  *
@@ -740,10 +741,11 @@
  * @return the network type in HBO or GNUNET_SYSERR
  */
 static enum GNUNET_ATS_Network_Type
-unix_get_network (void *cls, void *session)
+unix_get_network (void *cls, 
+                 struct Session *session)
 {
-       GNUNET_assert (NULL != session);
-       return GNUNET_ATS_NET_LOOPBACK;
+  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-13 15:00:28 UTC 
(rev 27995)
+++ gnunet/src/transport/plugin_transport_wlan.c        2013-07-13 15:33:30 UTC 
(rev 27996)
@@ -1057,6 +1057,7 @@
   return pos;
 }
 
+
 /**
  * Function obtain the network type for a session
  *
@@ -1065,12 +1066,14 @@
  * @return the network type in HBO or GNUNET_SYSERR
  */
 static enum GNUNET_ATS_Network_Type
-wlan_get_network (void *cls, void *session)
+wlan_get_network (void *cls, 
+                 struct Session *session)
 {
-       GNUNET_assert (NULL != session);
-       return GNUNET_ATS_NET_WLAN;
+  GNUNET_assert (NULL != session);
+  return GNUNET_ATS_NET_WLAN;
 }
 
+
 /**
  * Creates a new outbound session the transport service will use to send data 
to the
  * peer