summaryrefslogtreecommitdiff
path: root/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c23
1 files changed, 19 insertions, 4 deletions
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
index b7eda60105..09889c5846 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
@@ -1,4 +1,5 @@
1#include "Ecore.h" 1#include "Ecore.h"
2#include "config.h"
2#include "Ecore_Con.h" 3#include "Ecore_Con.h"
3#include "ecore_private.h" 4#include "ecore_private.h"
4#include "ecore_ipc_private.h" 5#include "ecore_ipc_private.h"
@@ -93,12 +94,19 @@ ecore_ipc_shutdown(void)
93 * FIXME: To be fixed. 94 * FIXME: To be fixed.
94 */ 95 */
95Ecore_Ipc_Server * 96Ecore_Ipc_Server *
96ecore_ipc_server_add(Ecore_Ipc_Type type, char *name, int port, const void *data) 97ecore_ipc_server_add(Ecore_Ipc_Type compl_type, char *name, int port, const void *data)
97{ 98{
98 Ecore_Ipc_Server *svr; 99 Ecore_Ipc_Server *svr;
100 Ecore_Ipc_Type type;
101 Ecore_Con_Type extra = 0;
99 102
100 svr = calloc(1, sizeof(Ecore_Ipc_Server)); 103 svr = calloc(1, sizeof(Ecore_Ipc_Server));
101 if (!svr) return NULL; 104 if (!svr) return NULL;
105 type = compl_type;
106#if USE_OPENSSL
107 type &= ~ECORE_IPC_USE_SSL;
108 if (compl_type & ECORE_IPC_USE_SSL) extra = ECORE_CON_USE_SSL;
109#endif
102 switch (type) 110 switch (type)
103 { 111 {
104 case ECORE_IPC_LOCAL_USER: 112 case ECORE_IPC_LOCAL_USER:
@@ -108,7 +116,7 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, char *name, int port, const void *data
108 svr->server = ecore_con_server_add(ECORE_CON_LOCAL_SYSTEM, name, port, svr); 116 svr->server = ecore_con_server_add(ECORE_CON_LOCAL_SYSTEM, name, port, svr);
109 break; 117 break;
110 case ECORE_IPC_REMOTE_SYSTEM: 118 case ECORE_IPC_REMOTE_SYSTEM:
111 svr->server = ecore_con_server_add(ECORE_CON_REMOTE_SYSTEM, name, port, svr); 119 svr->server = ecore_con_server_add(ECORE_CON_REMOTE_SYSTEM | extra, name, port, svr);
112 break; 120 break;
113 default: 121 default:
114 free(svr); 122 free(svr);
@@ -131,12 +139,19 @@ ecore_ipc_server_add(Ecore_Ipc_Type type, char *name, int port, const void *data
131 * FIXME: To be fixed. 139 * FIXME: To be fixed.
132 */ 140 */
133Ecore_Ipc_Server * 141Ecore_Ipc_Server *
134ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *data) 142ecore_ipc_server_connect(Ecore_Ipc_Type compl_type, char *name, int port, const void *data)
135{ 143{
136 Ecore_Ipc_Server *svr; 144 Ecore_Ipc_Server *svr;
145 Ecore_Ipc_Type type;
146 Ecore_Con_Type extra = 0;
137 147
138 svr = calloc(1, sizeof(Ecore_Ipc_Server)); 148 svr = calloc(1, sizeof(Ecore_Ipc_Server));
139 if (!svr) return NULL; 149 if (!svr) return NULL;
150 type = compl_type;
151#if USE_OPENSSL
152 type &= ~ECORE_IPC_USE_SSL;
153 if (compl_type & ECORE_IPC_USE_SSL) extra = ECORE_CON_USE_SSL;
154#endif
140 switch (type) 155 switch (type)
141 { 156 {
142 case ECORE_IPC_LOCAL_USER: 157 case ECORE_IPC_LOCAL_USER:
@@ -146,7 +161,7 @@ ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *
146 svr->server = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM, name, port, svr); 161 svr->server = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM, name, port, svr);
147 break; 162 break;
148 case ECORE_IPC_REMOTE_SYSTEM: 163 case ECORE_IPC_REMOTE_SYSTEM:
149 svr->server = ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM, name, port, svr); 164 svr->server = ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM | extra, name, port, svr);
150 break; 165 break;
151 default: 166 default:
152 free(svr); 167 free(svr);