aboutsummaryrefslogtreecommitdiff
path: root/src/conversation/conversation_api_call.c
diff options
context:
space:
mode:
authorSree Harsha Totakura <totakura@in.tum.de>2013-12-20 17:48:59 +0000
committerSree Harsha Totakura <totakura@in.tum.de>2013-12-20 17:48:59 +0000
commitd984072da3e10cd711cf63791767083dd65e3c29 (patch)
tree3908ec2d48e6b8e754c2baf29246b8ba39b126c4 /src/conversation/conversation_api_call.c
parent8058812229c45f8757e9118ff508743e03fd51ae (diff)
downloadgnunet-d984072da3e10cd711cf63791767083dd65e3c29.tar.gz
gnunet-d984072da3e10cd711cf63791767083dd65e3c29.zip
- do not send a PHONE_HANG_UP message while terminating a caller connection
Diffstat (limited to 'src/conversation/conversation_api_call.c')
-rw-r--r--src/conversation/conversation_api_call.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/src/conversation/conversation_api_call.c b/src/conversation/conversation_api_call.c
index c3d414a50..418af0b73 100644
--- a/src/conversation/conversation_api_call.c
+++ b/src/conversation/conversation_api_call.c
@@ -583,21 +583,6 @@ GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg,
583 583
584 584
585/** 585/**
586 * We've sent the hang up message, now finish terminating the call.
587 *
588 * @param cls the `struct GNUNET_CONVERSATION_Call` to terminate
589 */
590static void
591finish_stop (void *cls)
592{
593 struct GNUNET_CONVERSATION_Call *call = cls;
594
595 GNUNET_assert (CS_SHUTDOWN == call->state);
596 GNUNET_CONVERSATION_call_stop (call);
597}
598
599
600/**
601 * Terminate a call. The call may be ringing or ready at this time. 586 * Terminate a call. The call may be ringing or ready at this time.
602 * 587 *
603 * @param call call to terminate 588 * @param call call to terminate
@@ -605,9 +590,6 @@ finish_stop (void *cls)
605void 590void
606GNUNET_CONVERSATION_call_stop (struct GNUNET_CONVERSATION_Call *call) 591GNUNET_CONVERSATION_call_stop (struct GNUNET_CONVERSATION_Call *call)
607{ 592{
608 struct GNUNET_MQ_Envelope *e;
609 struct ClientPhoneHangupMessage *hang;
610
611 if ( (NULL != call->speaker) && 593 if ( (NULL != call->speaker) &&
612 (CS_ACTIVE == call->state) ) 594 (CS_ACTIVE == call->state) )
613 call->speaker->disable_speaker (call->speaker->cls); 595 call->speaker->disable_speaker (call->speaker->cls);
@@ -617,10 +599,6 @@ GNUNET_CONVERSATION_call_stop (struct GNUNET_CONVERSATION_Call *call)
617 if (CS_SHUTDOWN != call->state) 599 if (CS_SHUTDOWN != call->state)
618 { 600 {
619 call->state = CS_SHUTDOWN; 601 call->state = CS_SHUTDOWN;
620 e = GNUNET_MQ_msg (hang, GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP);
621 GNUNET_MQ_notify_sent (e, &finish_stop, call);
622 GNUNET_MQ_send (call->mq, e);
623 return;
624 } 602 }
625 if (NULL != call->mq) 603 if (NULL != call->mq)
626 { 604 {