3 files changed, 18 insertions, 19 deletions

diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 6a2449a7a..4264f22a4 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -328,9 +328,8 @@ struct GNUNET_ATS_SchedulingHandle;
 
 /**
  * Opaque session handle, defined by plugins.  Contents not known to ATS.
- * FIXME: This violates our naming conventions.
  */
-struct Session;
+struct GNUNET_ATS_Session;
 
 
 /**
@@ -353,7 +352,7 @@ typedef void
 (*GNUNET_ATS_AddressSuggestionCallback) (void *cls,
                                          const struct GNUNET_PeerIdentity *peer,
                                          const struct GNUNET_HELLO_Address *address,
-                                         struct Session *session,
+                                         struct GNUNET_ATS_Session *session,
                                          struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                                          struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in);
 
@@ -402,7 +401,7 @@ struct GNUNET_ATS_AddressRecord;
 struct GNUNET_ATS_AddressRecord *
 GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh,
                         const struct GNUNET_HELLO_Address *address,
-                        struct Session *session,
+                        struct GNUNET_ATS_Session *session,
                         const struct GNUNET_ATS_Properties *prop);
 
 
@@ -414,7 +413,7 @@ GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh,
  */
 void
 GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar,
-                                struct Session *session);
+                                struct GNUNET_ATS_Session *session);
 
 
 /**
@@ -431,7 +430,7 @@ GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar,
  */
 int
 GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar,
-                                struct Session *session);
+                                struct GNUNET_ATS_Session *session);
 
 
 /**
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h
index 0dc159cb4..375104c46 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -48,11 +48,11 @@
  * connection may not have an address that can be used for meaningful
  * distinction between sessions to the same peer.
  *
- * Each 'struct Session' MUST start with the 'struct GNUNET_PeerIdentity'
+ * Each 'struct GNUNET_ATS_Session' MUST start with the 'struct GNUNET_PeerIdentity'
  * of the peer the session is for (which will be used for some error
  * checking by the ATS code).
  */
-struct Session;
+struct GNUNET_ATS_Session;
 
 
 /**
@@ -71,7 +71,7 @@ struct Session;
 typedef void
 (*GNUNET_TRANSPORT_SessionEnd) (void *cls,
                                 const struct GNUNET_HELLO_Address *address,
-                                struct Session *session);
+                                struct GNUNET_ATS_Session *session);
 
 
 /**
@@ -85,7 +85,7 @@ typedef void
 typedef void
 (*GNUNET_TRANSPORT_SessionStart) (void *cls,
                                   const struct GNUNET_HELLO_Address *address,
-                                  struct Session *session,
+                                  struct GNUNET_ATS_Session *session,
                                   enum GNUNET_ATS_Network_Type net);
 
 
@@ -114,7 +114,7 @@ typedef void
 typedef struct GNUNET_TIME_Relative
 (*GNUNET_TRANSPORT_PluginReceiveCallback) (void *cls,
                                            const struct GNUNET_HELLO_Address *address,
-                                           struct Session *session,
+                                           struct GNUNET_ATS_Session *session,
                                            const struct GNUNET_MessageHeader *message);
 
 
@@ -334,7 +334,7 @@ typedef void
  */
 typedef ssize_t
 (*GNUNET_TRANSPORT_TransmitFunction) (void *cls,
-                                      struct Session *session,
+                                      struct GNUNET_ATS_Session *session,
                                       const char *msgbuf,
                                       size_t msgbuf_size,
                                       unsigned int priority,
@@ -357,7 +357,7 @@ typedef ssize_t
  */
 typedef int
 (*GNUNET_TRANSPORT_DisconnectSessionFunction) (void *cls,
-                                               struct Session *session);
+                                               struct GNUNET_ATS_Session *session);
 
 
 /**
@@ -463,7 +463,7 @@ typedef int
  * @param address the hello address
  * @return the session if the address is valid, NULL otherwise
  */
-typedef struct Session *
+typedef struct GNUNET_ATS_Session *
 (*GNUNET_TRANSPORT_CreateSession) (void *cls,
                                    const struct GNUNET_HELLO_Address *address);
 
@@ -480,7 +480,7 @@ typedef struct Session *
 typedef void
 (*GNUNET_TRANSPORT_UpdateSessionTimeout) (void *cls,
                                           const struct GNUNET_PeerIdentity *peer,
-                                          struct Session *session);
+                                          struct GNUNET_ATS_Session *session);
 
 
 /**
@@ -496,7 +496,7 @@ typedef void
 typedef void
 (*GNUNET_TRANSPORT_UpdateInboundDelay) (void *cls,
                                         const struct GNUNET_PeerIdentity *peer,
-                                        struct Session *session,
+                                        struct GNUNET_ATS_Session *session,
                                         struct GNUNET_TIME_Relative delay);
 
 
@@ -546,7 +546,7 @@ typedef int
  */
 typedef enum GNUNET_ATS_Network_Type
 (*GNUNET_TRANSPORT_GetNetworkType) (void *cls,
-                                    struct Session *session);
+                                    struct GNUNET_ATS_Session *session);
 
 
 /**
@@ -575,7 +575,7 @@ typedef enum GNUNET_ATS_Network_Type
  */
 typedef void
 (*GNUNET_TRANSPORT_SessionInfoCallback) (void *cls,
-                                         struct Session *session,
+                                         struct GNUNET_ATS_Session *session,
                                          const struct GNUNET_TRANSPORT_SessionInfo *info);
 
 
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index 7f178e4c4..07470047e 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -891,7 +891,7 @@ struct GNUNET_TRANSPORT_PluginMonitor;
 
 /**
  * Abstract representation of a plugin's session.
- * Corresponds to the `struct Session` within the TRANSPORT service.
+ * Corresponds to the `struct GNUNET_ATS_Session` within the TRANSPORT service.
  */
 struct GNUNET_TRANSPORT_PluginSession;