diff options
-rw-r--r-- | main.c | 11 | ||||
-rw-r--r-- | main.h | 2 |
2 files changed, 7 insertions, 6 deletions
@@ -483,7 +483,7 @@ int handle_frame(protocol_frame *frame) | |||
483 | * It checks for basic inconsistiencies and allocates the | 483 | * It checks for basic inconsistiencies and allocates the |
484 | * protocol_frame structure. | 484 | * protocol_frame structure. |
485 | */ | 485 | */ |
486 | int parse_lossless_packet(void *sender_uc, const uint8_t *data, uint32_t len) | 486 | int parse_lossless_packet(Tox *tox, int32_t friendnumber, const uint8_t *data, uint32_t len, void *sender_uc) |
487 | { | 487 | { |
488 | protocol_frame *frame = NULL; | 488 | protocol_frame *frame = NULL; |
489 | 489 | ||
@@ -859,6 +859,11 @@ int main(int argc, char *argv[]) | |||
859 | } | 859 | } |
860 | } | 860 | } |
861 | 861 | ||
862 | if(!client_mode && min_log_level == L_UNSET) | ||
863 | { | ||
864 | min_log_level = L_INFO; | ||
865 | } | ||
866 | |||
862 | on_exit(cleanup, NULL); | 867 | on_exit(cleanup, NULL); |
863 | 868 | ||
864 | print_version(); | 869 | print_version(); |
@@ -904,10 +909,6 @@ int main(int argc, char *argv[]) | |||
904 | } | 909 | } |
905 | else | 910 | else |
906 | { | 911 | { |
907 | if(min_log_level == L_UNSET) | ||
908 | { | ||
909 | min_log_level = L_INFO; | ||
910 | } | ||
911 | /* Connect to the forwarded service */ | 912 | /* Connect to the forwarded service */ |
912 | // client_socket = get_client_socket(); | 913 | // client_socket = get_client_socket(); |
913 | if(!load_save(tox)) | 914 | if(!load_save(tox)) |
@@ -85,7 +85,7 @@ extern int local_port; | |||
85 | extern int select_nfds; | 85 | extern int select_nfds; |
86 | extern tunnel *by_id; | 86 | extern tunnel *by_id; |
87 | 87 | ||
88 | int parse_lossless_packet(void *sender_uc, const uint8_t *data, uint32_t len); | 88 | int parse_lossless_packet(Tox *tox, int32_t friendnumber, const uint8_t *data, uint32_t len, void *sender_uc); |
89 | tunnel *tunnel_create(int sockfd, int connid, uint32_t friendnumber); | 89 | tunnel *tunnel_create(int sockfd, int connid, uint32_t friendnumber); |
90 | void tunnel_delete(tunnel *t); | 90 | void tunnel_delete(tunnel *t); |
91 | 91 | ||