-detect tunnel creation error

[oweals/gnunet.git] / src / conversation / speaker.c

diff --git a/src/conversation/speaker.c b/src/conversation/speaker.c
index 5fdfff3eef560fdbdf98a0ef0f2508f126d9fcae..d67346f1fd03a0bd35650169f8836580adde0f0f 100644 (file)
--- a/src/conversation/speaker.c
+++ b/src/conversation/speaker.c
@@ -130,20 +130,18 @@ play (void *cls,
       const void *data)
 {
   struct Speaker *spe = cls;
-  const struct AudioMessage *am;
+  char buf[sizeof (struct AudioMessage) + data_size];
+  struct AudioMessage *am;
 
   if (NULL == spe->playback_helper)
   {
     GNUNET_break (0);
     return;
   }
-  // FIXME: box here, instead of expecting boxed data!
-  if (sizeof (struct AudioMessage) > data_size)
-  {
-    GNUNET_break (0);
-    return;
-  }
-  am = (const struct AudioMessage *) data;
+  am = (struct AudioMessage *) buf;
+  am->header.size = htons (sizeof (struct AudioMessage) + data_size);
+  am->header.type = htons (GNUNET_MESSAGE_TYPE_CONVERSATION_AUDIO);
+  memcpy (&am[1], data, data_size);
   (void) GNUNET_HELPER_send (spe->playback_helper,
                             &am->header, 
                             GNUNET_NO,