summaryrefslogtreecommitdiff
path: root/legacy/ecore/src/lib/ecore_ipc
diff options
context:
space:
mode:
authorMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-04 09:03:04 +0000
committerMike Blumenkrantz <michael.blumenkrantz@gmail.com>2012-06-04 09:03:04 +0000
commitf472e919e287d2efe09fc2edd7316877a2cb1d28 (patch)
treecb52cd35c8ae45758c7d233893af38e345aad170 /legacy/ecore/src/lib/ecore_ipc
parent9dc6c51fa0420f21d5de65971e4060fabdd6e1e8 (diff)
add ECORE_{CON,IPC}_NO_PROXY flag to disable proxying on specified connections
SVN revision: 71681
Diffstat (limited to '')
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h3
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c10
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h3
3 files changed, 11 insertions, 5 deletions
diff --git a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
index 999340328f..f77870f84d 100644
--- a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
+++ b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
@@ -222,7 +222,8 @@ typedef enum _Ecore_Ipc_Type
222 ECORE_IPC_LOCAL_USER, 222 ECORE_IPC_LOCAL_USER,
223 ECORE_IPC_LOCAL_SYSTEM, 223 ECORE_IPC_LOCAL_SYSTEM,
224 ECORE_IPC_REMOTE_SYSTEM, 224 ECORE_IPC_REMOTE_SYSTEM,
225 ECORE_IPC_USE_SSL = 16 225 ECORE_IPC_USE_SSL = (1 << 4),
226 ECORE_IPC_NO_PROXY = (1 << 5)
226} Ecore_Ipc_Type; 227} Ecore_Ipc_Type;
227 228
228typedef struct _Ecore_Ipc_Event_Client_Add Ecore_Ipc_Event_Client_Add; 229typedef struct _Ecore_Ipc_Event_Client_Add Ecore_Ipc_Event_Client_Add;
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
index 54ee3ad053..339ca5a218 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
@@ -412,12 +412,16 @@ ecore_ipc_server_connect(Ecore_Ipc_Type compl_type, char *name, int port, const
412 Ecore_Ipc_Server *svr; 412 Ecore_Ipc_Server *svr;
413 Ecore_Ipc_Type type; 413 Ecore_Ipc_Type type;
414 Ecore_Con_Type extra = 0; 414 Ecore_Con_Type extra = 0;
415 int features;
415 416
416 svr = calloc(1, sizeof(Ecore_Ipc_Server)); 417 svr = calloc(1, sizeof(Ecore_Ipc_Server));
417 if (!svr) return NULL; 418 if (!svr) return NULL;
418 type = compl_type; 419 type = compl_type & ECORE_IPC_TYPE;
419 type &= ~ECORE_IPC_USE_SSL; 420 features = compl_type & ECORE_IPC_SSL;
420 if (compl_type & ECORE_IPC_USE_SSL) extra = ECORE_CON_USE_SSL; 421 if ((features & ECORE_IPC_USE_SSL) == ECORE_IPC_USE_SSL)
422 extra |= ECORE_CON_USE_SSL;
423 if ((features & ECORE_IPC_NO_PROXY) == ECORE_IPC_NO_PROXY)
424 extra |= ECORE_CON_NO_PROXY;
421 switch (type) 425 switch (type)
422 { 426 {
423 case ECORE_IPC_LOCAL_USER: 427 case ECORE_IPC_LOCAL_USER:
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
index 57f784976d..d8c663c95d 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
@@ -38,7 +38,8 @@ extern int _ecore_ipc_log_dom;
38#define ECORE_MAGIC_IPC_CLIENT 0x78875665 38#define ECORE_MAGIC_IPC_CLIENT 0x78875665
39 39
40typedef struct _Ecore_Ipc_Msg_Head Ecore_Ipc_Msg_Head; 40typedef struct _Ecore_Ipc_Msg_Head Ecore_Ipc_Msg_Head;
41 41#define ECORE_IPC_TYPE 0x0f
42#define ECORE_IPC_SSL 0xf0
42 43
43#if defined (_MSC_VER) || (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100) 44#if defined (_MSC_VER) || (defined (__SUNPRO_C) && __SUNPRO_C < 0x5100)
44# pragma pack(1) 45# pragma pack(1)