[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r29871 - gnunet/src/conversation
From: |
gnunet |
Subject: |
[GNUnet-SVN] r29871 - gnunet/src/conversation |
Date: |
Sat, 5 Oct 2013 20:17:37 +0200 |
Author: grothoff
Date: 2013-10-05 20:17:37 +0200 (Sat, 05 Oct 2013)
New Revision: 29871
Modified:
gnunet/src/conversation/conversation_api.c
gnunet/src/conversation/gnunet-conversation.c
gnunet/src/conversation/gnunet-service-conversation.c
Log:
-fix message type
Modified: gnunet/src/conversation/conversation_api.c
===================================================================
--- gnunet/src/conversation/conversation_api.c 2013-10-05 18:02:27 UTC (rev
29870)
+++ gnunet/src/conversation/conversation_api.c 2013-10-05 18:17:37 UTC (rev
29871)
@@ -980,8 +980,15 @@
0 },
{ NULL, 0, 0 }
};
- if (NULL != call->mq)
+ struct GNUNET_CRYPTO_EccPublicSignKey my_zone;
+
+ if (CS_ACTIVE == call->state)
{
+ call->speaker->disable_speaker (call->speaker->cls);
+ call->mic->disable_microphone (call->mic->cls);
+ }
+ if (NULL != call->mq)
+ {
GNUNET_MQ_destroy (call->mq);
call->mq = NULL;
}
@@ -990,6 +997,7 @@
GNUNET_CLIENT_disconnect (call->client);
call->client = NULL;
}
+ call->state = CS_SHUTDOWN;
call->client = GNUNET_CLIENT_connect ("conversation", call->cfg);
if (NULL == call->client)
return;
@@ -997,6 +1005,17 @@
handlers,
&call_error_handler,
call);
+ call->state = CS_LOOKUP;
+ GNUNET_IDENTITY_ego_get_public_key (call->caller_id,
+ &my_zone);
+ call->gns_lookup = GNUNET_GNS_lookup (call->gns,
+ call->callee,
+ &my_zone,
+ GNUNET_NAMESTORE_TYPE_PHONE,
+ GNUNET_NO,
+ NULL /* FIXME: add shortening support
*/,
+ &handle_gns_response, call);
+ GNUNET_assert (NULL != call->gns_lookup);
}
@@ -1024,10 +1043,7 @@
void *event_handler_cls)
{
struct GNUNET_CONVERSATION_Call *call;
- struct GNUNET_CRYPTO_EccPublicSignKey my_zone;
- GNUNET_IDENTITY_ego_get_public_key (caller_id,
- &my_zone);
call = GNUNET_new (struct GNUNET_CONVERSATION_Call);
call->cfg = cfg;
call->caller_id = caller_id;
@@ -1045,13 +1061,6 @@
GNUNET_CONVERSATION_call_stop (call, NULL);
return NULL;
}
- call->gns_lookup = GNUNET_GNS_lookup (call->gns, callee,
- &my_zone,
- GNUNET_NAMESTORE_TYPE_PHONE,
- GNUNET_NO,
- NULL /* FIXME: add shortening support
*/,
- &handle_gns_response, call);
- GNUNET_assert (NULL != call->gns_lookup);
return call;
}
@@ -1105,7 +1114,7 @@
GNUNET_GNS_disconnect (call->gns);
call->gns = NULL;
}
-
+ GNUNET_free (call->callee);
GNUNET_free (call);
}
Modified: gnunet/src/conversation/gnunet-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-conversation.c 2013-10-05 18:02:27 UTC
(rev 29870)
+++ gnunet/src/conversation/gnunet-conversation.c 2013-10-05 18:17:37 UTC
(rev 29871)
@@ -286,15 +286,16 @@
case GNUNET_CONVERSATION_EC_READY:
GNUNET_break (CS_RINGING == state);
FPRINTF (stdout,
- _("Connection established: %s\n"),
+ _("Connection established to `%s': %s\n"),
+ peer_name,
va_arg (va, const char *));
state = CS_CONNECTED;
break;
case GNUNET_CONVERSATION_EC_GNS_FAIL:
GNUNET_break (CS_RESOLVING == state);
FPRINTF (stdout,
- "%s",
- _("Failed to resolve name\n"));
+ _("Failed to resolve `%s'\n"),
+ ego_name);
GNUNET_CONVERSATION_call_stop (call, NULL);
call = NULL;
start_phone ();
Modified: gnunet/src/conversation/gnunet-service-conversation.c
===================================================================
--- gnunet/src/conversation/gnunet-service-conversation.c 2013-10-05
18:02:27 UTC (rev 29870)
+++ gnunet/src/conversation/gnunet-service-conversation.c 2013-10-05
18:17:37 UTC (rev 29871)
@@ -1010,8 +1010,8 @@
uint32_t port)
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- _("Received incoming tunnel on port %d\n"),
- port);
+ _("Received incoming tunnel on port %u\n"),
+ (unsigned int) port);
return NULL;
}
@@ -1040,6 +1040,10 @@
line->tunnel_unreliable = NULL;
return;
}
+ GNUNET_assert (line->tunnel_reliable == tunnel);
+ line->tunnel_reliable = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Mesh tunnel destroyed by mesh\n");
hup.header.size = sizeof (hup);
hup.header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP);
switch (line->status)
@@ -1095,6 +1099,8 @@
{
struct Line *line;
+ if (NULL == client)
+ return;
line = GNUNET_SERVER_client_get_user_context (client, struct Line);
if (NULL == line)
return;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r29871 - gnunet/src/conversation,
gnunet <=