social: guest_talk test; multicast: fix member_to_origin_resume()

3 files changed, 46 insertions, 40 deletions

diff --git a/src/social/gnunet-service-social.c b/src/social/gnunet-service-social.c
index 90d12200d..de4163720 100644
--- a/src/social/gnunet-service-social.c
+++ b/src/social/gnunet-service-social.c
@@ -857,11 +857,6 @@ psyc_transmit_queue_next_part (struct Place *plc,
                                struct FragmentTransmitQueue *tmit_frag)
 {
   uint16_t psize = ntohs (tmit_frag->next_part->size);
-  GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-              "%p psyc_transmit_queue_next_part: %x + %u - %x = %u < %u\n",
-              plc, tmit_frag->next_part, psize, &tmit_frag[1],
-              (char *) tmit_frag->next_part + psize - ((char *) &tmit_frag[1]),
-              tmit_frag->size);
   if ((char *) tmit_frag->next_part + psize - ((char *) &tmit_frag[1])
       < tmit_frag->size)
   {
@@ -952,11 +947,15 @@ psyc_transmit_notify_data (void *cls, uint16_t *data_size, void *data)
     break;
 
   case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_END:
-  case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_CANCEL:
     *data_size = 0;
     ret = GNUNET_YES;
     break;
 
+  case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_CANCEL:
+    *data_size = 0;
+    ret = GNUNET_SYSERR;
+    break;
+
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 "%p psyc_transmit_notify_data: unexpected message part of type %u.\n",
@@ -964,7 +963,7 @@ psyc_transmit_notify_data (void *cls, uint16_t *data_size, void *data)
     ret = GNUNET_SYSERR;
   }
 
-  if (GNUNET_SYSERR == ret)
+  if (GNUNET_SYSERR == ret && GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_CANCEL != ptype)
   {
     *data_size = 0;
     tmit_msg = psyc_transmit_queue_next_msg (plc, tmit_msg);
@@ -975,7 +974,27 @@ psyc_transmit_notify_data (void *cls, uint16_t *data_size, void *data)
   }
   else
   {
-    psyc_transmit_queue_next_part (plc, tmit_msg, tmit_frag);
+    tmit_frag = psyc_transmit_queue_next_part (plc, tmit_msg, tmit_frag);
+    if (NULL != tmit_frag)
+    {
+      struct GNUNET_MessageHeader *pmsg = tmit_frag->next_part;
+      ptype = ntohs (pmsg->type);
+      switch (ptype)
+      {
+      case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_END:
+        ret = GNUNET_YES;
+        break;
+      case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_CANCEL:
+        ret = GNUNET_SYSERR;
+        break;
+      }
+      switch (ptype)
+      {
+      case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_END:
+      case GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_CANCEL:
+        tmit_frag = psyc_transmit_queue_next_part (plc, tmit_msg, tmit_frag);
+      }
+    }
 
     if (NULL == tmit_msg->frags_head
         && GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_END <= ptype)
@@ -1060,12 +1079,6 @@ psyc_transmit_notify_mod (void *cls, uint16_t *data_size, void *data,
     *data_size = mod_size;
     memcpy (data, &pmod[1], mod_size);
     ret = GNUNET_NO;
-#if REMOVE // FIXME
-    ret = (mod_size - strnlen ((char *) &pmod[1], mod_size) - 1
-           == *full_value_size)
-      ? GNUNET_YES
-      : GNUNET_NO;
-#endif
     break;
   }
 
@@ -1120,7 +1133,8 @@ psyc_transmit_notify_mod (void *cls, uint16_t *data_size, void *data,
   }
   else
   {
-    psyc_transmit_queue_next_part (plc, tmit_msg, tmit_frag);
+    if (GNUNET_YES != ret)
+      psyc_transmit_queue_next_part (plc, tmit_msg, tmit_frag);
 
     if (NULL == tmit_msg->frags_head
         && GNUNET_MESSAGE_TYPE_PSYC_MESSAGE_END <= ptype)
@@ -1241,7 +1255,6 @@ psyc_transmit_queue_next_method (struct Place *plc,
 
   uint16_t psize = ntohs (pmsg->size);
   *pmeth = (struct GNUNET_PSYC_MessageMethod *) pmsg;
-
   if (psize < sizeof (**pmeth) + 1 || '\0' != *((char *) *pmeth + psize - 1))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -1253,6 +1266,7 @@ psyc_transmit_queue_next_method (struct Place *plc,
     GNUNET_break (0);
     return GNUNET_SYSERR;
   }
+
   psyc_transmit_queue_next_part (plc, tmit_msg, tmit_frag);
   return GNUNET_OK;
 }
diff --git a/src/social/social_api.c b/src/social/social_api.c
index d19f83e89..76fd0f9f9 100644
--- a/src/social/social_api.c
+++ b/src/social/social_api.c
@@ -1458,14 +1458,17 @@ GNUNET_SOCIAL_guest_enter_by_name (const struct GNUNET_CONFIGURATION_Handle *cfg
  *         otherwise handle to cancel the request.
  */
 struct GNUNET_SOCIAL_TalkRequest *
-GNUNET_SOCIAL_guest_talk (struct GNUNET_SOCIAL_Guest *guest,
+GNUNET_SOCIAL_guest_talk (struct GNUNET_SOCIAL_Guest *gst,
                           const char *method_name,
                           const struct GNUNET_ENV_Environment *env,
                           GNUNET_PSYC_TransmitNotifyData notify_data,
                           void *notify_data_cls,
                           enum GNUNET_SOCIAL_TalkFlags flags)
 {
-  return NULL;
+  if (GNUNET_OK ==
+      GNUNET_PSYC_transmit_message (gst->plc.tmit, method_name, env,
+                                    NULL, notify_data, notify_data_cls, flags));
+  return (struct GNUNET_SOCIAL_TalkRequest *) gst->plc.tmit;
 }
 
 
diff --git a/src/social/test_social.c b/src/social/test_social.c
index 340c4482a..fa3ce6e6d 100644
--- a/src/social/test_social.c
+++ b/src/social/test_social.c
@@ -38,7 +38,7 @@
 
 #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 30)
 
-#define DEBUG_SERVICE 0
+#define DEBUG_SERVICE 1
 #define DATA2ARG(data) data, sizeof (data)
 
 /**
@@ -110,9 +110,8 @@ enum
   TEST_HOST_ANNOUNCE     = 5,
   TEST_HOST_ANNOUNCE_END = 6,
   TEST_GUEST_TALK        = 7,
-  TEST_GUEST_TALK_END    = 8,
-  TEST_GUEST_LEAVE       = 9,
-  TEST_HOST_LEAVE       = 10,
+  TEST_GUEST_LEAVE       = 8,
+  TEST_HOST_LEAVE        = 9,
 } test;
 
 
@@ -294,6 +293,8 @@ host_farewell (void *cls,
                size_t variable_count,
                struct GNUNET_ENV_Modifier *variables)
 {
+  // FIXME: this function is not called yet
+
   struct GNUNET_CRYPTO_EcdsaPublicKey *
     nym_key = GNUNET_SOCIAL_nym_get_key (nym);
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -319,7 +320,7 @@ guest_left (void *cls)
 
 
 void
-schedule_guest_leave (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+guest_leave()
 {
   test = TEST_GUEST_LEAVE;
   /* FIXME test keep_active */
@@ -396,14 +397,6 @@ guest_recv_eom (void *cls,
     guest_talk ();
     break;
 
-  case TEST_GUEST_TALK:
-    test = TEST_GUEST_TALK_END;
-    break;
-
-  case TEST_GUEST_TALK_END:
-    GNUNET_SCHEDULER_add_now (&schedule_guest_leave, NULL);
-    break;
-
   default:
     GNUNET_assert (0);
   }
@@ -480,11 +473,7 @@ host_recv_eom (void *cls,
     break;
 
   case TEST_GUEST_TALK:
-    test = TEST_GUEST_TALK_END;
-    break;
-
-  case TEST_GUEST_TALK_END:
-    GNUNET_SCHEDULER_add_now (&schedule_guest_leave, NULL);
+    guest_leave ();
     break;
 
   default:
@@ -509,10 +498,10 @@ guest_talk ()
   tmit.data[2] = "testing ten nine eight";
   tmit.data_count = 3;
 
-  tmit.host_ann
-    = GNUNET_SOCIAL_host_announce (hst, "_message_guest", tmit.env,
-                                   &notify_data, &tmit,
-                                   GNUNET_SOCIAL_TALK_NONE);
+  tmit.guest_talk
+    = GNUNET_SOCIAL_guest_talk (gst, "_message_guest", tmit.env,
+                                &notify_data, &tmit,
+                                GNUNET_SOCIAL_TALK_NONE);
 }
 
 void