diff options
author | slvr <slvr@unsafeio.com> | 2013-08-10 00:54:43 +0100 |
---|---|---|
committer | slvr <slvr@unsafeio.com> | 2013-08-10 00:54:43 +0100 |
commit | 951dbc1258b094e307957b4fd423e81c9a4778ee (patch) | |
tree | 4f82602c8ab46fdfe38d6cdbe7ea36430390e4c0 | |
parent | 448d0124cdb98142a0fa89087a6b49b0c6063700 (diff) |
Updated initMessenger
-rw-r--r-- | core/Messenger.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/core/Messenger.c b/core/Messenger.c index 082b10d2..a7d21e1a 100644 --- a/core/Messenger.c +++ b/core/Messenger.c | |||
@@ -517,6 +517,11 @@ int initMessenger(void) | |||
517 | if(init_networking(ip,PORT) == -1) | 517 | if(init_networking(ip,PORT) == -1) |
518 | return -1; | 518 | return -1; |
519 | 519 | ||
520 | DHT_init(); | ||
521 | LosslessUDP_init(); | ||
522 | friendreq_init(); | ||
523 | LANdiscovery_init(); | ||
524 | |||
520 | return 0; | 525 | return 0; |
521 | } | 526 | } |
522 | 527 | ||
@@ -684,7 +689,7 @@ static void LANdiscovery(void) | |||
684 | void doMessenger(void) | 689 | void doMessenger(void) |
685 | { | 690 | { |
686 | networking_poll(); | 691 | networking_poll(); |
687 | 692 | ||
688 | doDHT(); | 693 | doDHT(); |
689 | doLossless_UDP(); | 694 | doLossless_UDP(); |
690 | doNetCrypto(); | 695 | doNetCrypto(); |
@@ -693,14 +698,6 @@ void doMessenger(void) | |||
693 | LANdiscovery(); | 698 | LANdiscovery(); |
694 | } | 699 | } |
695 | 700 | ||
696 | void Messenger_init(void) | ||
697 | { | ||
698 | DHT_init(); | ||
699 | LosslessUDP_init(); | ||
700 | friendreq_init(); | ||
701 | LANdiscovery_init(); | ||
702 | } | ||
703 | |||
704 | /* returns the size of the messenger data (for saving) */ | 701 | /* returns the size of the messenger data (for saving) */ |
705 | uint32_t Messenger_size(void) | 702 | uint32_t Messenger_size(void) |
706 | { | 703 | { |