aboutsummaryrefslogtreecommitdiff
path: root/src/conversation/gnunet-service-conversation.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2016-05-06 14:44:08 +0000
committerChristian Grothoff <christian@grothoff.org>2016-05-06 14:44:08 +0000
commite8cf81fdb3fdaef59b49da8f6e952a3225ab326e (patch)
tree4e5f75d44a9121b32895fdfc5a4177052a7d923d /src/conversation/gnunet-service-conversation.c
parentae8cb91d9961899075a892a3110204bc139c2eb6 (diff)
downloadgnunet-e8cf81fdb3fdaef59b49da8f6e952a3225ab326e.tar.gz
gnunet-e8cf81fdb3fdaef59b49da8f6e952a3225ab326e.zip
fixing compiler warnings
Diffstat (limited to 'src/conversation/gnunet-service-conversation.c')
-rw-r--r--src/conversation/gnunet-service-conversation.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/conversation/gnunet-service-conversation.c b/src/conversation/gnunet-service-conversation.c
index 10f169105..d12fbdc56 100644
--- a/src/conversation/gnunet-service-conversation.c
+++ b/src/conversation/gnunet-service-conversation.c
@@ -779,7 +779,9 @@ transmit_line_audio (void *cls,
779 ch->audio_data = NULL; 779 ch->audio_data = NULL;
780 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 780 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
781 "Sending %u bytes of audio data from line %u to remote line %u via cadet\n", 781 "Sending %u bytes of audio data from line %u to remote line %u via cadet\n",
782 ch->audio_size, ch->line->local_line, ch->remote_line); 782 (unsigned int) ch->audio_size,
783 ch->line->local_line,
784 ch->remote_line);
783 return sizeof (struct CadetAudioMessage) + ch->audio_size; 785 return sizeof (struct CadetAudioMessage) + ch->audio_size;
784} 786}
785 787
@@ -1291,21 +1293,25 @@ handle_cadet_audio_message (void *cls,
1291 { 1293 {
1292 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1294 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1293 "Received %u bytes of AUDIO data for non-existing line %u, dropping.\n", 1295 "Received %u bytes of AUDIO data for non-existing line %u, dropping.\n",
1294 msize, ntohl (msg->remote_line)); 1296 (unsigned int) msize,
1297 ntohl (msg->remote_line));
1295 return GNUNET_SYSERR; 1298 return GNUNET_SYSERR;
1296 } 1299 }
1297 if (NULL == ch) 1300 if (NULL == ch)
1298 { 1301 {
1299 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1302 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1300 "Received %u bytes of AUDIO data for unknown sender.\n", 1303 "Received %u bytes of AUDIO data for unknown sender.\n",
1301 msize); 1304 (unsigned int) msize);
1302 return GNUNET_SYSERR; 1305 return GNUNET_SYSERR;
1303 } 1306 }
1304 if ((GNUNET_YES == ch->suspended_local) || (GNUNET_YES == ch->suspended_remote)) 1307 if ((GNUNET_YES == ch->suspended_local) || (GNUNET_YES == ch->suspended_remote))
1305 { 1308 {
1306 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1309 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1307 "Received %u bytes of AUDIO data on suspended channel CID %u:(%u:%u); dropping\n", 1310 "Received %u bytes of AUDIO data on suspended channel CID %u:(%u:%u); dropping\n",
1308 msize, ch->cid, ch->remote_line, line->local_line); 1311 (unsigned int) msize,
1312 ch->cid,
1313 ch->remote_line,
1314 line->local_line);
1309 GNUNET_CADET_receive_done (channel); 1315 GNUNET_CADET_receive_done (channel);
1310 return GNUNET_OK; 1316 return GNUNET_OK;
1311 } 1317 }
@@ -1315,7 +1321,10 @@ handle_cadet_audio_message (void *cls,
1315 GNUNET_CADET_receive_done (channel); 1321 GNUNET_CADET_receive_done (channel);
1316 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, 1322 GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
1317 "Forwarding %u bytes of AUDIO data to client CID %u:(%u:%u)\n", 1323 "Forwarding %u bytes of AUDIO data to client CID %u:(%u:%u)\n",
1318 msize, ch->cid, ch->remote_line, ch->line->local_line); 1324 (unsigned int) msize,
1325 ch->cid,
1326 ch->remote_line,
1327 ch->line->local_line);
1319 cam = (struct ClientAudioMessage *) buf; 1328 cam = (struct ClientAudioMessage *) buf;
1320 cam->header.size = htons (sizeof (buf)); 1329 cam->header.size = htons (sizeof (buf));
1321 cam->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO); 1330 cam->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_CS_AUDIO);