aboutsummaryrefslogtreecommitdiff
path: root/src/conversation/gnunet-service-conversation.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-10-05 19:25:51 +0000
committerChristian Grothoff <christian@grothoff.org>2013-10-05 19:25:51 +0000
commit1388aef05980aca3e4973863da73e08885f05054 (patch)
treed11a62d99ad895e7d218b7aacddc8dda476f2d4d /src/conversation/gnunet-service-conversation.c
parent99f7bc8650e09914047613c9a211c1e2c986d9f0 (diff)
downloadgnunet-1388aef05980aca3e4973863da73e08885f05054.tar.gz
gnunet-1388aef05980aca3e4973863da73e08885f05054.zip
-fix double-free, clarify API
Diffstat (limited to 'src/conversation/gnunet-service-conversation.c')
-rw-r--r--src/conversation/gnunet-service-conversation.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index 4b06ef3e8..4e2b1455d 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -295,7 +295,7 @@ handle_client_pickup_message (void *cls,
295 } 295 }
296 line->status = LS_CALLEE_CONNECTED; 296 line->status = LS_CALLEE_CONNECTED;
297 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 297 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
298 "Sending PICK_UP message to client with meta data `%s'\n", 298 "Sending PICK_UP message to mesh with meta data `%s'\n",
299 meta); 299 meta);
300 e = GNUNET_MQ_msg_extra (mppm, 300 e = GNUNET_MQ_msg_extra (mppm,
301 len, 301 len,
@@ -880,7 +880,7 @@ handle_mesh_pickup_message (void *cls,
880 pick->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP); 880 pick->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_CS_PHONE_PICKED_UP);
881 memcpy (&pick[1], metadata, len); 881 memcpy (&pick[1], metadata, len);
882 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 882 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
883 "Sending PICK UP message via mesh with metadata `%s'\n", 883 "Sending PICKED UP message to client with metadata `%s'\n",
884 metadata); 884 metadata);
885 GNUNET_SERVER_notification_context_unicast (nc, 885 GNUNET_SERVER_notification_context_unicast (nc,
886 line->client, 886 line->client,
@@ -895,7 +895,7 @@ handle_mesh_pickup_message (void *cls,
895 if (NULL == line->tunnel_unreliable) 895 if (NULL == line->tunnel_unreliable)
896 { 896 {
897 GNUNET_break (0); 897 GNUNET_break (0);
898 } 898 }
899 return GNUNET_OK; 899 return GNUNET_OK;
900} 900}
901 901