aboutsummaryrefslogtreecommitdiff
path: root/src/conversation/gnunet-service-conversation.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-05 18:17:37 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-05 18:17:37 +0000
commit23fe13890f31317cc2ab86ef55264622ed72375f (patch)
treeb07ba0c79131fcc4cb524f8870dc98b09226dbfb /src/conversation/gnunet-service-conversation.c
parent7de0ce15a52e32e4258d8008f8bbab3c71599a0e (diff)
downloadgnunet-23fe13890f31317cc2ab86ef55264622ed72375f.tar.gz
gnunet-23fe13890f31317cc2ab86ef55264622ed72375f.zip
-fix message type
Diffstat (limited to 'src/conversation/gnunet-service-conversation.c')
-rw-r--r--src/conversation/gnunet-service-conversation.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index b2d8af2c3..1e6fb10d9 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -1010,8 +1010,8 @@ inbound_tunnel (void *cls,
1010 uint32_t port) 1010 uint32_t port)
1011{ 1011{
1012 GNUNET_log (GNUNET_ERROR_TYPE_INFO, 1012 GNUNET_log (GNUNET_ERROR_TYPE_INFO,
1013 _("Received incoming tunnel on port %d\n"), 1013 _("Received incoming tunnel on port %u\n"),
1014 port); 1014 (unsigned int) port);
1015 return NULL; 1015 return NULL;
1016} 1016}
1017 1017
@@ -1040,6 +1040,10 @@ inbound_end (void *cls,
1040 line->tunnel_unreliable = NULL; 1040 line->tunnel_unreliable = NULL;
1041 return; 1041 return;
1042 } 1042 }
1043 GNUNET_assert (line->tunnel_reliable == tunnel);
1044 line->tunnel_reliable = NULL;
1045 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1046 "Mesh tunnel destroyed by mesh\n");
1043 hup.header.size = sizeof (hup); 1047 hup.header.size = sizeof (hup);
1044 hup.header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP); 1048 hup.header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_HANG_UP);
1045 switch (line->status) 1049 switch (line->status)
@@ -1095,6 +1099,8 @@ handle_client_disconnect (void *cls,
1095{ 1099{
1096 struct Line *line; 1100 struct Line *line;
1097 1101
1102 if (NULL == client)
1103 return;
1098 line = GNUNET_SERVER_client_get_user_context (client, struct Line); 1104 line = GNUNET_SERVER_client_get_user_context (client, struct Line);
1099 if (NULL == line) 1105 if (NULL == line)
1100 return; 1106 return;