diff options
Diffstat (limited to 'src/conversation/conversation_api_call.c')
-rw-r--r-- | src/conversation/conversation_api_call.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c index 728b495b3..ad83288b9 100644 --- a/src/conversation/conversation_api_call.c +++ b/src/conversation/conversation_api_call.c | |||
@@ -154,7 +154,7 @@ struct GNUNET_CONVERSATION_Call | |||
154 | * @param call call to reconnect | 154 | * @param call call to reconnect |
155 | */ | 155 | */ |
156 | static void | 156 | static void |
157 | reconnect_call (struct GNUNET_CONVERSATION_Call *call); | 157 | fail_call (struct GNUNET_CONVERSATION_Call *call); |
158 | 158 | ||
159 | 159 | ||
160 | /** | 160 | /** |
@@ -198,11 +198,11 @@ handle_call_suspend (void *cls, | |||
198 | { | 198 | { |
199 | case CS_LOOKUP: | 199 | case CS_LOOKUP: |
200 | GNUNET_break (0); | 200 | GNUNET_break (0); |
201 | reconnect_call (call); | 201 | fail_call (call); |
202 | break; | 202 | break; |
203 | case CS_RINGING: | 203 | case CS_RINGING: |
204 | GNUNET_break_op (0); | 204 | GNUNET_break_op (0); |
205 | reconnect_call (call); | 205 | fail_call (call); |
206 | break; | 206 | break; |
207 | case CS_SUSPENDED_CALLER: | 207 | case CS_SUSPENDED_CALLER: |
208 | call->state = CS_SUSPENDED_BOTH; | 208 | call->state = CS_SUSPENDED_BOTH; |
@@ -243,11 +243,11 @@ handle_call_resume (void *cls, | |||
243 | { | 243 | { |
244 | case CS_LOOKUP: | 244 | case CS_LOOKUP: |
245 | GNUNET_break (0); | 245 | GNUNET_break (0); |
246 | reconnect_call (call); | 246 | fail_call (call); |
247 | break; | 247 | break; |
248 | case CS_RINGING: | 248 | case CS_RINGING: |
249 | GNUNET_break_op (0); | 249 | GNUNET_break_op (0); |
250 | reconnect_call (call); | 250 | fail_call (call); |
251 | break; | 251 | break; |
252 | case CS_SUSPENDED_CALLER: | 252 | case CS_SUSPENDED_CALLER: |
253 | GNUNET_break_op (0); | 253 | GNUNET_break_op (0); |
@@ -292,7 +292,7 @@ handle_call_picked_up (void *cls, | |||
292 | { | 292 | { |
293 | case CS_LOOKUP: | 293 | case CS_LOOKUP: |
294 | GNUNET_break (0); | 294 | GNUNET_break (0); |
295 | reconnect_call (call); | 295 | fail_call (call); |
296 | break; | 296 | break; |
297 | case CS_RINGING: | 297 | case CS_RINGING: |
298 | call->state = CS_ACTIVE; | 298 | call->state = CS_ACTIVE; |
@@ -308,7 +308,7 @@ handle_call_picked_up (void *cls, | |||
308 | case CS_SUSPENDED_BOTH: | 308 | case CS_SUSPENDED_BOTH: |
309 | case CS_ACTIVE: | 309 | case CS_ACTIVE: |
310 | GNUNET_break (0); | 310 | GNUNET_break (0); |
311 | reconnect_call (call); | 311 | fail_call (call); |
312 | break; | 312 | break; |
313 | case CS_SHUTDOWN: | 313 | case CS_SHUTDOWN: |
314 | GNUNET_CONVERSATION_call_stop (call); | 314 | GNUNET_CONVERSATION_call_stop (call); |
@@ -335,7 +335,7 @@ handle_call_hangup (void *cls, | |||
335 | { | 335 | { |
336 | case CS_LOOKUP: | 336 | case CS_LOOKUP: |
337 | GNUNET_break (0); | 337 | GNUNET_break (0); |
338 | reconnect_call (call); | 338 | fail_call (call); |
339 | break; | 339 | break; |
340 | case CS_RINGING: | 340 | case CS_RINGING: |
341 | case CS_SUSPENDED_CALLER: | 341 | case CS_SUSPENDED_CALLER: |
@@ -386,11 +386,11 @@ handle_call_audio (void *cls, | |||
386 | { | 386 | { |
387 | case CS_LOOKUP: | 387 | case CS_LOOKUP: |
388 | GNUNET_break (0); | 388 | GNUNET_break (0); |
389 | reconnect_call (call); | 389 | fail_call (call); |
390 | break; | 390 | break; |
391 | case CS_RINGING: | 391 | case CS_RINGING: |
392 | GNUNET_break (0); | 392 | GNUNET_break (0); |
393 | reconnect_call (call); | 393 | fail_call (call); |
394 | break; | 394 | break; |
395 | case CS_SUSPENDED_CALLER: | 395 | case CS_SUSPENDED_CALLER: |
396 | /* can happen: we suspended, other peer did not yet | 396 | /* can happen: we suspended, other peer did not yet |
@@ -482,17 +482,17 @@ call_error_handler (void *cls, | |||
482 | } | 482 | } |
483 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, | 483 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, |
484 | _("Connection to conversation service lost, trying to reconnect\n")); | 484 | _("Connection to conversation service lost, trying to reconnect\n")); |
485 | reconnect_call (call); | 485 | fail_call (call); |
486 | } | 486 | } |
487 | 487 | ||
488 | 488 | ||
489 | /** | 489 | /** |
490 | * The call got disconnected, reconnect to the service. | 490 | * The call got disconnected, destroy the handle. |
491 | * | 491 | * |
492 | * @param call call to reconnect | 492 | * @param call call to reconnect |
493 | */ | 493 | */ |
494 | static void | 494 | static void |
495 | reconnect_call (struct GNUNET_CONVERSATION_Call *call) | 495 | fail_call (struct GNUNET_CONVERSATION_Call *call) |
496 | { | 496 | { |
497 | if (CS_ACTIVE == call->state) | 497 | if (CS_ACTIVE == call->state) |
498 | { | 498 | { |