diff options
author | Sree Harsha Totakura <totakura@in.tum.de> | 2013-12-22 10:30:23 +0000 |
---|---|---|
committer | Sree Harsha Totakura <totakura@in.tum.de> | 2013-12-22 10:30:23 +0000 |
commit | a4577fd45b434e5fc84af6e6daf293779785f5c8 (patch) | |
tree | 888c6b60049cc13db81ff352027f92994c70bb6a /src/conversation | |
parent | 4fc3c362cc3f182c156bc5989cf92432d534c961 (diff) | |
download | gnunet-a4577fd45b434e5fc84af6e6daf293779785f5c8.tar.gz gnunet-a4577fd45b434e5fc84af6e6daf293779785f5c8.zip |
- fix #3217
Diffstat (limited to 'src/conversation')
-rw-r--r-- | src/conversation/conversation_api_call.c | 2 | ||||
-rw-r--r-- | src/conversation/test_conversation_api.c | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c index 7cd723c2c..befbbc910 100644 --- a/src/conversation/conversation_api_call.c +++ b/src/conversation/conversation_api_call.c | |||
@@ -417,7 +417,7 @@ handle_gns_response (void *cls, | |||
417 | struct ClientCallMessage *ccm; | 417 | struct ClientCallMessage *ccm; |
418 | 418 | ||
419 | GNUNET_break (NULL != call->gns_lookup); | 419 | GNUNET_break (NULL != call->gns_lookup); |
420 | GNUNET_break (CS_LOOKUP == call->gns_lookup); | 420 | GNUNET_break (CS_LOOKUP == call->state); |
421 | call->gns_lookup = NULL; | 421 | call->gns_lookup = NULL; |
422 | for (i=0;i<rd_count;i++) | 422 | for (i=0;i<rd_count;i++) |
423 | { | 423 | { |
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c index 04700ef54..cad1a8d13 100644 --- a/src/conversation/test_conversation_api.c +++ b/src/conversation/test_conversation_api.c | |||
@@ -131,14 +131,14 @@ play (void *cls, | |||
131 | const void *data) | 131 | const void *data) |
132 | { | 132 | { |
133 | const char *origin = cls; | 133 | const char *origin = cls; |
134 | static unsigned int phone_i; | 134 | static unsigned int phone_i = 1; |
135 | static unsigned int call_i; | 135 | static unsigned int call_i; |
136 | char buf[32]; | 136 | char buf[32]; |
137 | 137 | ||
138 | if (0 == strcmp (origin, "phone")) | 138 | if (0 == strcmp (origin, "phone")) |
139 | GNUNET_snprintf (buf, sizeof (buf), "phone-%u", phone_i++); | ||
140 | else | ||
141 | GNUNET_snprintf (buf, sizeof (buf), "call-%u", call_i++); | 139 | GNUNET_snprintf (buf, sizeof (buf), "call-%u", call_i++); |
140 | else | ||
141 | GNUNET_snprintf (buf, sizeof (buf), "phone-%u", phone_i++); | ||
142 | if ( (data_size != strlen (buf) + 1) || | 142 | if ( (data_size != strlen (buf) + 1) || |
143 | (0 != strncmp (buf, data, data_size)) ) | 143 | (0 != strncmp (buf, data, data_size)) ) |
144 | { | 144 | { |
@@ -148,6 +148,10 @@ play (void *cls, | |||
148 | (int) data_size, | 148 | (int) data_size, |
149 | (const char *) data); | 149 | (const char *) data); |
150 | } | 150 | } |
151 | else | ||
152 | { | ||
153 | fprintf (stderr, "."); | ||
154 | } | ||
151 | if ( (20 < call_i) && | 155 | if ( (20 < call_i) && |
152 | (20 < phone_i) && | 156 | (20 < phone_i) && |
153 | (NULL != call) ) | 157 | (NULL != call) ) |