1 files changed, 15 insertions, 28 deletions

diff --git a/core/Messenger.c b/core/Messenger.c
index 5f33886f..082b10d2 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -683,35 +683,22 @@ static void LANdiscovery(void)
 /* the main loop that needs to be run at least 200 times per second. */
 void doMessenger(void)
 {
-    IP_Port ip_port;
-    uint8_t data[MAX_UDP_PACKET_SIZE];
-    uint32_t length;
-    while (receivepacket(&ip_port, data, &length) != -1) {
-#ifdef DEBUG
-        /* if(rand() % 3 != 1) //simulate packet loss */
-        /* { */
-        if (DHT_handlepacket(data, length, ip_port) && LosslessUDP_handlepacket(data, length, ip_port) &&
-            friendreq_handlepacket(data, length, ip_port) && LANdiscovery_handlepacket(data, length, ip_port))
-            /* if packet is discarded */
-            printf("Received unhandled packet with length: %u\n", length);
-        else
-            printf("Received handled packet with length: %u\n", length);
-        /* } */
-        printf("Status: %u %u %u\n",friendlist[0].status ,is_cryptoconnected(friendlist[0].crypt_connection_id),  friendlist[0].crypt_connection_id);
-#else
-        DHT_handlepacket(data, length, ip_port);
-        LosslessUDP_handlepacket(data, length, ip_port);
-        friendreq_handlepacket(data, length, ip_port);
-        LANdiscovery_handlepacket(data, length, ip_port);
-#endif
+        networking_poll();
 
-    }
-    doDHT();
-    doLossless_UDP();
-    doNetCrypto();
-    doInbound();
-    doFriends();
-    LANdiscovery();
+        doDHT();
+        doLossless_UDP();
+        doNetCrypto();
+        doInbound();
+        doFriends();
+        LANdiscovery();
+}
+
+void Messenger_init(void)
+{
+        DHT_init();
+        LosslessUDP_init();
+        friendreq_init();
+        LANdiscovery_init();
 }
 
 /* returns the size of the messenger data (for saving) */