diff options
Diffstat (limited to 'src/lib/ecore_ipc')
-rw-r--r-- | src/lib/ecore_ipc/ecore_ipc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/ecore_ipc/ecore_ipc.c b/src/lib/ecore_ipc/ecore_ipc.c index 7dbdb92d16..c0fcd8be63 100644 --- a/src/lib/ecore_ipc/ecore_ipc.c +++ b/src/lib/ecore_ipc/ecore_ipc.c | |||
@@ -382,7 +382,7 @@ EAPI Ecore_Ipc_Server * | |||
382 | ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void *data) | 382 | ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void *data) |
383 | { | 383 | { |
384 | Ecore_Ipc_Server *svr; | 384 | Ecore_Ipc_Server *svr; |
385 | Eo *loop = ecore_main_loop_get(); | 385 | Eo *loop = efl_main_loop_get(); |
386 | char *address = NULL; | 386 | char *address = NULL; |
387 | Eina_Error err; | 387 | Eina_Error err; |
388 | #ifdef EFL_NET_SERVER_UNIX_CLASS | 388 | #ifdef EFL_NET_SERVER_UNIX_CLASS |
@@ -404,7 +404,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void | |||
404 | 404 | ||
405 | new_mask = S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH; | 405 | new_mask = S_IRGRP | S_IWGRP | S_IXGRP | S_IROTH | S_IWOTH | S_IXOTH; |
406 | 406 | ||
407 | svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, ecore_main_loop_get(), | 407 | svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, efl_main_loop_get(), |
408 | efl_net_server_unix_leading_directories_create_set(efl_added, EINA_TRUE, S_IRUSR | S_IWUSR | S_IXUSR)); | 408 | efl_net_server_unix_leading_directories_create_set(efl_added, EINA_TRUE, S_IRUSR | S_IWUSR | S_IXUSR)); |
409 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); | 409 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); |
410 | } | 410 | } |
@@ -418,7 +418,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void | |||
418 | new_mask = 0; | 418 | new_mask = 0; |
419 | local_system = EINA_TRUE; | 419 | local_system = EINA_TRUE; |
420 | 420 | ||
421 | svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, ecore_main_loop_get()); | 421 | svr->server = efl_add(EFL_NET_SERVER_UNIX_CLASS, efl_main_loop_get()); |
422 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); | 422 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); |
423 | } | 423 | } |
424 | #endif /* EFL_NET_SERVER_UNIX_CLASS */ | 424 | #endif /* EFL_NET_SERVER_UNIX_CLASS */ |
@@ -431,7 +431,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void | |||
431 | // TODO: specify SECURITY_ATTRIBUTES to use or some | 431 | // TODO: specify SECURITY_ATTRIBUTES to use or some |
432 | // Efl_Net_Server_Windows API to limit access | 432 | // Efl_Net_Server_Windows API to limit access |
433 | 433 | ||
434 | svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, ecore_main_loop_get()); | 434 | svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, efl_main_loop_get()); |
435 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); | 435 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); |
436 | } | 436 | } |
437 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) | 437 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) |
@@ -442,7 +442,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, const char *name, int port, const void | |||
442 | // TODO: specify SECURITY_ATTRIBUTES to use or some | 442 | // TODO: specify SECURITY_ATTRIBUTES to use or some |
443 | // Efl_Net_Server_Windows API to limit access | 443 | // Efl_Net_Server_Windows API to limit access |
444 | 444 | ||
445 | svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, ecore_main_loop_get()); | 445 | svr->server = efl_add(EFL_NET_SERVER_WINDOWS_CLASS, efl_main_loop_get()); |
446 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); | 446 | EINA_SAFETY_ON_NULL_GOTO(svr->server, error_server); |
447 | } | 447 | } |
448 | #endif /* EFL_NET_SERVER_WINDOWS_CLASS */ | 448 | #endif /* EFL_NET_SERVER_WINDOWS_CLASS */ |
@@ -653,7 +653,7 @@ EAPI Ecore_Ipc_Server * | |||
653 | ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *data) | 653 | ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *data) |
654 | { | 654 | { |
655 | Ecore_Ipc_Server *svr; | 655 | Ecore_Ipc_Server *svr; |
656 | Eo *loop = ecore_main_loop_get(); | 656 | Eo *loop = efl_main_loop_get(); |
657 | char *address = NULL; | 657 | char *address = NULL; |
658 | Eina_Error err; | 658 | Eina_Error err; |
659 | 659 | ||
@@ -681,7 +681,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void * | |||
681 | goto error_dialer; | 681 | goto error_dialer; |
682 | } | 682 | } |
683 | 683 | ||
684 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, ecore_main_loop_get()); | 684 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, efl_main_loop_get()); |
685 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); | 685 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); |
686 | } | 686 | } |
687 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) | 687 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) |
@@ -689,7 +689,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void * | |||
689 | address = ecore_con_local_path_new(EINA_TRUE, name, port); | 689 | address = ecore_con_local_path_new(EINA_TRUE, name, port); |
690 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); | 690 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); |
691 | 691 | ||
692 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, ecore_main_loop_get()); | 692 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_UNIX_CLASS, efl_main_loop_get()); |
693 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); | 693 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); |
694 | } | 694 | } |
695 | #endif /* EFL_NET_DIALER_UNIX_CLASS */ | 695 | #endif /* EFL_NET_DIALER_UNIX_CLASS */ |
@@ -699,7 +699,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void * | |||
699 | address = ecore_con_local_path_new(EINA_FALSE, name, port); | 699 | address = ecore_con_local_path_new(EINA_FALSE, name, port); |
700 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); | 700 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); |
701 | 701 | ||
702 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, ecore_main_loop_get()); | 702 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, efl_main_loop_get()); |
703 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); | 703 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); |
704 | } | 704 | } |
705 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) | 705 | else if ((type & ECORE_IPC_TYPE) == ECORE_IPC_LOCAL_SYSTEM) |
@@ -707,7 +707,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void * | |||
707 | address = ecore_con_local_path_new(EINA_TRUE, name, port); | 707 | address = ecore_con_local_path_new(EINA_TRUE, name, port); |
708 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); | 708 | EINA_SAFETY_ON_NULL_GOTO(address, error_dialer); |
709 | 709 | ||
710 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, ecore_main_loop_get()); | 710 | svr->dialer.dialer = efl_add(EFL_NET_DIALER_WINDOWS_CLASS, efl_main_loop_get()); |
711 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); | 711 | EINA_SAFETY_ON_NULL_GOTO(svr->dialer.dialer, error_dialer); |
712 | } | 712 | } |
713 | #endif /* EFL_NET_DIALER_WINDOWS_CLASS */ | 713 | #endif /* EFL_NET_DIALER_WINDOWS_CLASS */ |