summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorGDR! <gdr@gdr.name>2014-12-24 15:35:32 +0100
committerGDR! <gdr@gdr.name>2014-12-24 15:35:32 +0100
commit898e5bf826e78c22ac27c2f476e1e746aadebe9a (patch)
treea829e1f970eda40b6d3dfab91df43638e81d6d9b /main.c
parent4280af5e82fad6296d3581a5f62700da34ccd3ea (diff)
parent22255a6e942862705505192cb5842ee18966282b (diff)
Merge branch 'raspbian'
Diffstat (limited to 'main.c')
-rw-r--r--main.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/main.c b/main.c
index d7d97ed..9ee98ba 100644
--- a/main.c
+++ b/main.c
@@ -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 */
486int parse_lossless_packet(void *sender_uc, const uint8_t *data, uint32_t len) 486int 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))