diff options
Diffstat (limited to 'src/espik_net.c')
-rw-r--r-- | src/espik_net.c | 48 |
1 files changed, 17 insertions, 31 deletions
diff --git a/src/espik_net.c b/src/espik_net.c index 4c0ce1f..ec11430 100644 --- a/src/espik_net.c +++ b/src/espik_net.c @@ -15,28 +15,25 @@ typedef int (*Handler_Func) (void* data, int ev_type, void* ev); -static int ret_int; /* For debug */ -char connected = 0; - Ecore_Con_Server* con_sock; - Ecore_Event_Handler* ret; +int connected = 0; + void espik_con_init (t_info serv_info) { int nb_launch; nb_launch = ecore_con_init (); - com_active = 0; - /* espik_debug_printf ("nb_launch = %d", nb_launch); */ + /* printff ("nb_launch = %d", nb_launch); */ con_sock = ecore_con_server_connect (ECORE_CON_REMOTE_SYSTEM, serv_info.server->host, (int)serv_info.server->port, NULL); if (!con_sock) { - espik_debug_print ("ecore_con_server_connect failed " + printf ("ecore_con_server_connect failed " "(ECORE_CON_REMOTE_SYSTEM)"); exit (-1); } @@ -45,7 +42,7 @@ void espik_con_init (t_info serv_info) if (! (ret = ecore_event_handler_add (ECORE_CON_EVENT_SERVER_DATA, (Handler_Func) server_data, NULL))) { - espik_debug_print ("ecore_event_handler_add " + printf ("ecore_event_handler_add " "(ECORE_CON_EVENT_SERVER_DATA)"); exit (-1); } @@ -54,7 +51,7 @@ void espik_con_init (t_info serv_info) if (! (ret = ecore_event_handler_add (ECORE_CON_EVENT_SERVER_ADD, (Handler_Func) espik_con_up, NULL))) { - espik_debug_print ("ecore_event_handler_add " + printf ("ecore_event_handler_add " "(ECORE_CON_EVENT_SERVER_ADD)"); exit (-1); } @@ -63,16 +60,16 @@ void espik_con_init (t_info serv_info) if (! (ret = ecore_event_handler_add (ECORE_CON_EVENT_SERVER_DEL, (Handler_Func) espik_con_shutdown, NULL))) { - espik_debug_print ("ecore_event_handler_add " + printf ("ecore_event_handler_add " "(ECORE_CON_EVENT_SERVER_DEL)"); exit (-1); } espik_free (ret); } -void send_login() +void send_login (void) { -/* espik_debug_print ("<<<<<<<< DUMMMMY CODE >>>>>>>"); */ +/* printf ("<<<<<<<< DUMMMMY CODE >>>>>>>"); */ char *tmp, *tmp2; @@ -88,15 +85,13 @@ void send_login() a_infos.client->nickname, a_infos.server->host, a_infos.client->realname); - espik_debug_print("tmp: %s", tmp); + printf("tmp: %s", tmp); espik_raw_send (tmp); - espik_debug_print("tmp2: %s", tmp2); + printf("tmp2: %s", tmp2); espik_raw_send (tmp2); espik_raw_send ("JOIN #e.fr"); - com_active = 1; - -/* espik_debug_print ("<<<<<<<< DUMMMMY CODE >>>>>>>"); */ +/* printf ("<<<<<<<< DUMMMMY CODE >>>>>>>"); */ free (tmp); free (tmp2); @@ -104,17 +99,17 @@ void send_login() connected++; } -void espik_con_up() +void espik_con_up(void) { printf ("Connected\n"); } -void espik_con_shutdown () +void espik_con_shutdown (void) { if (!connected) - espik_debug_print ("Unable to connect to server"); + printf ("Unable to connect to server"); - espik_debug_print ("ecore_con_server_del: %p", + printf ("ecore_con_server_del: %p", ecore_con_server_del (con_sock)); ecore_con_shutdown (); @@ -126,7 +121,6 @@ void espik_con_shutdown () */ ecore_main_loop_quit (); - espik_free (server_dns); } void espik_raw_send (const char *msg) @@ -138,25 +132,17 @@ void espik_raw_send (const char *msg) snprintf (buf.buf, buf.len, "%s\r\n", msg); /* Override trailing \0 */ - espik_debug_print("strlen(msg): %d", strlen(msg)); - espik_debug_print("buf.len: %d", buf.len); buf.buf[buf.len-1] = '\n'; /* buf.buf[buf.len] = '\0'; */ - espik_debug_print ("\n\nmsg(%d): %s\n\nout(%d-%d): %s\n", strlen(msg), msg, strlen(buf.buf), buf.len, buf.buf); /* printf ("out[len-3]: 0x%X\n", out[len - 3]); printf ("out[len-2]: 0x%X\n", out[len - 2]); printf ("out[len-1]: 0x%X\n", out[len - 1]); */ - for (i = 0 ; buf.buf[i] != 0 ; i++) - espik_debug_print ("buf.buf[%d]: '%d'", i, buf.buf[i]); - - - ret_int = ecore_con_server_send (con_sock, buf.buf, buf.len); + ecore_con_server_send (con_sock, buf.buf, buf.len); - espik_debug_print ("ret_int: %d", ret_int); free (buf.buf); /* free (msg); */ } |