[GNUnet-SVN] r17575 - in gnunet/src: ats include

[gnunet]

Author: grothoff
Date: 2011-10-18 17:20:50 +0200 (Tue, 18 Oct 2011)
New Revision: 17575

Modified:
   gnunet/src/ats/ats.h
   gnunet/src/ats/ats_api_scheduling.c
   gnunet/src/ats/gnunet-service-ats_scheduling.c
   gnunet/src/include/gnunet_protocols.h
Log:
send session release messages back to ATS API

Modified: gnunet/src/ats/ats.h
===================================================================
--- gnunet/src/ats/ats.h        2011-10-18 14:49:02 UTC (rev 17574)
+++ gnunet/src/ats/ats.h        2011-10-18 15:20:50 UTC (rev 17575)
@@ -169,6 +169,20 @@
 };
 
 
+/**
+ * Message sent by ATS service to client to confirm that it is done
+ * using the given session ID.
+ */
+struct SessionReleaseMessage
+{
+  struct GNUNET_MessageHeader header;
+
+  uint32_t session_id GNUNET_PACKED;
+
+  struct GNUNET_PeerIdentity peer;
+};
+
+
 struct ReservationResultMessage
 {
   struct GNUNET_MessageHeader header;

Modified: gnunet/src/ats/ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/ats_api_scheduling.c 2011-10-18 14:49:02 UTC (rev 17574)
+++ gnunet/src/ats/ats_api_scheduling.c 2011-10-18 15:20:50 UTC (rev 17575)
@@ -71,6 +71,11 @@
    * Session handle.
    */
   struct Session *session;
+
+  /**
+   * Set to GNUNET_YES if the slot is used.
+   */
+  int slot_used;
 };
 
 
@@ -321,6 +326,7 @@
   GNUNET_assert (f > 0);
   sh->session_array[f].session = session;
   sh->session_array[f].peer = *peer;
+  sh->session_array[f].slot_used = GNUNET_YES;
   return f;
 }
 
@@ -343,10 +349,47 @@
                              &sh->session_array[session_id].peer,
                              sizeof (struct GNUNET_PeerIdentity)));
   sh->session_array[session_id].session = NULL;
+  memset (&sh->session_array[session_id].peer,
+         0, 
+         sizeof (struct GNUNET_PeerIdentity));
 }
 
 
 /**
+ * Release the session slot from the session table (ATS service is
+ * also done using it).
+ *
+ * @param sh our handle
+ * @param session_id identifies session that is no longer valid
+ * @param peer peer the session belongs to
+ */
+static void
+release_session (struct GNUNET_ATS_SchedulingHandle *sh,
+                uint32_t session_id,
+                const struct GNUNET_PeerIdentity *peer)
+{
+  GNUNET_assert (session_id < sh->session_array_size);
+  GNUNET_assert (0 == memcmp (peer,
+                             &sh->session_array[session_id].peer,
+                             sizeof (struct GNUNET_PeerIdentity)));
+  sh->session_array[session_id].slot_used = GNUNET_NO;
+  memset (&sh->session_array[session_id].peer,
+         0, 
+         sizeof (struct GNUNET_PeerIdentity));
+}
+
+
+static void
+process_release_message (struct GNUNET_ATS_SchedulingHandle *sh,
+                        const struct SessionReleaseMessage *srm)
+{
+  release_session (sh,
+                  ntohl (srm->session_id),
+                  &srm->peer);
+}
+
+
+/**
  * Type of a function to call when we receive a message
  * from the service.
  *
@@ -374,6 +417,16 @@
                                             &reconnect_task, sh);
     return;
   }
+  if ( (ntohs (msg->type) == GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE) &&
+       (ntohs (msg->size) == sizeof (struct SessionReleaseMessage)) )
+  {
+    process_release_message (sh,
+                            (const struct SessionReleaseMessage*) msg);
+    GNUNET_CLIENT_receive (sh->client,
+                          &process_ats_message, sh,
+                          GNUNET_TIME_UNIT_FOREVER_REL);
+    return;
+  }
   if ( (ntohs (msg->type) != GNUNET_MESSAGE_TYPE_ATS_ADDRESS_SUGGESTION) ||
        (ntohs (msg->size) <= sizeof (struct AddressSuggestionMessage)) )
   {

Modified: gnunet/src/ats/gnunet-service-ats_scheduling.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_scheduling.c      2011-10-18 14:49:02 UTC 
(rev 17574)
+++ gnunet/src/ats/gnunet-service-ats_scheduling.c      2011-10-18 15:20:50 UTC 
(rev 17575)
@@ -234,6 +234,7 @@
 
 {
   const struct AddressDestroyedMessage * m;
+  struct SessionReleaseMessage srm;
   const char *address;
   const char *plugin_name;
   uint16_t address_length;
@@ -280,6 +281,17 @@
                         address,
                         address_length,
                         ntohl (m->session_id));
+  if (0 != ntohl (m->session_id))
+  {
+    srm.header.type = ntohs (GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE);
+    srm.header.size = ntohs (sizeof (struct SessionReleaseMessage));
+    srm.session_id = m->session_id;
+    srm.peer = m->peer;
+    GNUNET_SERVER_notification_context_unicast (nc,
+                                               client,
+                                               &srm.header,
+                                               GNUNET_NO);
+  }
   GNUNET_SERVER_receive_done (client, GNUNET_OK);
 }
 

Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2011-10-18 14:49:02 UTC (rev 
17574)
+++ gnunet/src/include/gnunet_protocols.h       2011-10-18 15:20:50 UTC (rev 
17575)
@@ -1044,7 +1044,13 @@
  */
 #define GNUNET_MESSAGE_TYPE_ATS_PREFERENCE_CHANGE 348
 
+/**
+ * Type of the 'struct SessionReleaseMessage' sent by ATS to client
+ * to confirm that a session ID was destroyed.
+ */
+#define GNUNET_MESSAGE_TYPE_ATS_SESSION_RELEASE 349
 
+
 
/*******************************************************************************
  * TODO: we need a way to register message types centrally (via some webpage).
  * For now: unofficial extensions should start at 48k, internal extensions