7 files changed, 27 insertions, 12 deletions

diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 7c3cebee3..365a3c2bd 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -1444,8 +1444,8 @@ client_connect (struct Session *s)
  * @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);
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index dfa3a4998..2cd6eb660 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -3011,8 +3011,8 @@ const char *http_plugin_address_to_string (void *cls,
  * @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);
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 025554a26..18d033556 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -2386,8 +2386,8 @@ stop_session_timeout (struct Session *s)
  * @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);
diff --git a/src/transport/plugin_transport_template.c b/src/transport/plugin_transport_template.c
index dfe6ff6fa..e8874d14e 100644
--- a/src/transport/plugin_transport_template.c
+++ b/src/transport/plugin_transport_template.c
@@ -205,6 +205,20 @@ template_plugin_disconnect (void *cls, const struct GNUNET_PeerIdentity *target)
   // 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 @@ libgnunet_plugin_transport_template_init (void *cls)
   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;
 }
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 565573081..ff9425c83 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -1434,8 +1434,8 @@ session_cmp_it (void *cls,
  * @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;
 
diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c
index 6efb423fb..cf9396dc5 100644
--- a/src/transport/plugin_transport_unix.c
+++ b/src/transport/plugin_transport_unix.c
@@ -733,8 +733,8 @@ session_timeout (void *cls,
  * @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;
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index 1c480dee5..ee3163dd9 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -1029,8 +1029,8 @@ create_macendpoint (struct Plugin *plugin,
  * @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;