[GNUnet-SVN] r31671 - gnunet/src/conversation

[gnunet]

Author: harsha
Date: 2013-12-22 11:30:23 +0100 (Sun, 22 Dec 2013)
New Revision: 31671

Modified:
   gnunet/src/conversation/conversation_api_call.c
   gnunet/src/conversation/test_conversation_api.c
Log:
- fix #3217


Modified: gnunet/src/conversation/conversation_api_call.c
===================================================================
--- gnunet/src/conversation/conversation_api_call.c     2013-12-22 08:25:41 UTC 
(rev 31670)
+++ gnunet/src/conversation/conversation_api_call.c     2013-12-22 10:30:23 UTC 
(rev 31671)
@@ -417,7 +417,7 @@
   struct ClientCallMessage *ccm;
 
   GNUNET_break (NULL != call->gns_lookup);
-  GNUNET_break (CS_LOOKUP == call->gns_lookup);
+  GNUNET_break (CS_LOOKUP == call->state);
   call->gns_lookup = NULL;
   for (i=0;i<rd_count;i++)
   {

Modified: gnunet/src/conversation/test_conversation_api.c
===================================================================
--- gnunet/src/conversation/test_conversation_api.c     2013-12-22 08:25:41 UTC 
(rev 31670)
+++ gnunet/src/conversation/test_conversation_api.c     2013-12-22 10:30:23 UTC 
(rev 31671)
@@ -131,14 +131,14 @@
       const void *data)
 {
   const char *origin = cls;
-  static unsigned int phone_i;
+  static unsigned int phone_i = 1;
   static unsigned int call_i;
   char buf[32];
 
   if (0 == strcmp (origin, "phone"))
+    GNUNET_snprintf (buf, sizeof (buf), "call-%u", call_i++);
+  else
     GNUNET_snprintf (buf, sizeof (buf), "phone-%u", phone_i++);
-  else
-    GNUNET_snprintf (buf, sizeof (buf), "call-%u", call_i++);
   if ( (data_size != strlen (buf) + 1) ||
        (0 != strncmp (buf, data, data_size)) )
   {
@@ -148,6 +148,10 @@
              (int) data_size,
              (const char *) data);
   }
+  else
+  {
+    fprintf (stderr, ".");
+  }
   if ( (20 < call_i) &&
        (20 < phone_i) &&
        (NULL != call) )