summaryrefslogtreecommitdiff
path: root/legacy/ecore/src/lib/ecore_ipc
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2004-10-22 03:41:49 +0000
committerCarsten Haitzler <raster@rasterman.com>2004-10-22 03:41:49 +0000
commitacfe99556391c320a887150cf028e7cc0c0eb1fd (patch)
treea4e9c273174a03b43d69602b5bd08032ea2f0363 /legacy/ecore/src/lib/ecore_ipc
parent0e38160623944e26f396a18cf7cf6c1e2f684e1e (diff)
ok fix some things with SSL and ecore_evas. you ALWYAs have at least the api
to do ssl and al fo ecorE_evas stuff BUt ecore_* may not be BUILT with that support so the api stub exists but it may just return NULL. theres calls to query for support here. SVN revision: 11957
Diffstat (limited to '')
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h (renamed from legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h.in)14
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/Makefile.am9
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c14
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h4
4 files changed, 22 insertions, 19 deletions
diff --git a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h.in b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
index c322a90e3d..407c6a3575 100644
--- a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h.in
+++ b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
@@ -6,12 +6,6 @@
6 * @brief Ecore inter-process communication functions. 6 * @brief Ecore inter-process communication functions.
7 */ 7 */
8 8
9#define HAVE_ECORE_IPC_OPENSSL @USE_OPENSSL@
10
11#if HAVE_ECORE_IPC_OPENSSL
12#include <openssl/ssl.h>
13#endif
14
15#ifdef __cplusplus 9#ifdef __cplusplus
16extern "C" { 10extern "C" {
17#endif 11#endif
@@ -25,10 +19,8 @@ extern "C" {
25 { 19 {
26 ECORE_IPC_LOCAL_USER, 20 ECORE_IPC_LOCAL_USER,
27 ECORE_IPC_LOCAL_SYSTEM, 21 ECORE_IPC_LOCAL_SYSTEM,
28 ECORE_IPC_REMOTE_SYSTEM 22 ECORE_IPC_REMOTE_SYSTEM,
29#if HAVE_ECORE_IPC_OPENSSL 23 ECORE_IPC_USE_SSL = 16
30 ,ECORE_IPC_USE_SSL = 16
31#endif
32 } Ecore_Ipc_Type; 24 } Ecore_Ipc_Type;
33 25
34 typedef struct _Ecore_Ipc_Event_Client_Add Ecore_Ipc_Event_Client_Add; 26 typedef struct _Ecore_Ipc_Event_Client_Add Ecore_Ipc_Event_Client_Add;
@@ -111,6 +103,8 @@ extern "C" {
111 void *ecore_ipc_client_del(Ecore_Ipc_Client *cl); 103 void *ecore_ipc_client_del(Ecore_Ipc_Client *cl);
112 void ecore_ipc_client_data_set(Ecore_Ipc_Client *cl, const void *data); 104 void ecore_ipc_client_data_set(Ecore_Ipc_Client *cl, const void *data);
113 void *ecore_ipc_client_data_get(Ecore_Ipc_Client *cl); 105 void *ecore_ipc_client_data_get(Ecore_Ipc_Client *cl);
106
107 int ecore_ipc_ssl_available_get(void);
114 108
115#ifdef __cplusplus 109#ifdef __cplusplus
116} 110}
diff --git a/legacy/ecore/src/lib/ecore_ipc/Makefile.am b/legacy/ecore/src/lib/ecore_ipc/Makefile.am
index a3e349c904..d3236115f6 100644
--- a/legacy/ecore/src/lib/ecore_ipc/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_ipc/Makefile.am
@@ -1,15 +1,15 @@
1## Process this file with automake to produce Makefile.in 1## Process this file with automake to produce Makefile.in
2 2
3INCLUDES = \ 3INCLUDES = \
4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_srcdir)/src/lib/ecore_con \
6-I$(top_srcdir)/src/lib/ecore_ipc \
7-I$(top_builddir)/src/lib/ecore \ 4-I$(top_builddir)/src/lib/ecore \
8-I$(top_builddir)/src/lib/ecore_con \ 5-I$(top_builddir)/src/lib/ecore_con \
9-I$(top_builddir)/src/lib/ecore_ipc \ 6-I$(top_builddir)/src/lib/ecore_ipc \
7-I$(top_srcdir)/src/lib/ecore \
8-I$(top_srcdir)/src/lib/ecore_con \
9-I$(top_srcdir)/src/lib/ecore_ipc \
10@SSL_CFLAGS@ 10@SSL_CFLAGS@
11 11
12libecore_ipc_la_LDFLAGS = -version-info 1:0:0 \ 12libecore_ipc_la_LDFLAGS = $(LDFLAGS) -version-info 1:0:0 \
13-L$(top_builddir)/src/lib/ecore/.libs \ 13-L$(top_builddir)/src/lib/ecore/.libs \
14-L$(top_builddir)/src/lib/ecore_con/.libs 14-L$(top_builddir)/src/lib/ecore_con/.libs
15 15
@@ -35,6 +35,5 @@ $(top_builddir)/src/lib/ecore_con/libecore_con.la
35endif 35endif
36 36
37EXTRA_DIST = \ 37EXTRA_DIST = \
38Ecore_Ipc.h.in \
39ecore_ipc.c \ 38ecore_ipc.c \
40ecore_ipc_private.h 39ecore_ipc_private.h
diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
index 87859348d6..d027e35324 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c
@@ -280,10 +280,8 @@ ecore_ipc_server_add(Ecore_Ipc_Type compl_type, char *name, int port, const void
280 svr = calloc(1, sizeof(Ecore_Ipc_Server)); 280 svr = calloc(1, sizeof(Ecore_Ipc_Server));
281 if (!svr) return NULL; 281 if (!svr) return NULL;
282 type = compl_type; 282 type = compl_type;
283#if USE_OPENSSL
284 type &= ~ECORE_IPC_USE_SSL; 283 type &= ~ECORE_IPC_USE_SSL;
285 if (compl_type & ECORE_IPC_USE_SSL) extra = ECORE_CON_USE_SSL; 284 if (compl_type & ECORE_IPC_USE_SSL) extra = ECORE_CON_USE_SSL;
286#endif
287 switch (type) 285 switch (type)
288 { 286 {
289 case ECORE_IPC_LOCAL_USER: 287 case ECORE_IPC_LOCAL_USER:
@@ -337,10 +335,8 @@ ecore_ipc_server_connect(Ecore_Ipc_Type compl_type, char *name, int port, const
337 svr = calloc(1, sizeof(Ecore_Ipc_Server)); 335 svr = calloc(1, sizeof(Ecore_Ipc_Server));
338 if (!svr) return NULL; 336 if (!svr) return NULL;
339 type = compl_type; 337 type = compl_type;
340#if USE_OPENSSL
341 type &= ~ECORE_IPC_USE_SSL; 338 type &= ~ECORE_IPC_USE_SSL;
342 if (compl_type & ECORE_IPC_USE_SSL) extra = ECORE_CON_USE_SSL; 339 if (compl_type & ECORE_IPC_USE_SSL) extra = ECORE_CON_USE_SSL;
343#endif
344 switch (type) 340 switch (type)
345 { 341 {
346 case ECORE_IPC_LOCAL_USER: 342 case ECORE_IPC_LOCAL_USER:
@@ -702,6 +698,16 @@ ecore_ipc_client_data_get(Ecore_Ipc_Client *cl)
702 return cl->data; 698 return cl->data;
703} 699}
704 700
701/**
702 * * Returns if SSL support is available
703 * * @return 1 if SSL is available, 0 if it is not.
704 * * @ingroup Ecore_Con_Client_Group
705 * */
706int
707ecore_ipc_ssl_available_get(void)
708{
709 return ecore_con_ssl_available_get();
710}
705 711
706 712
707static int 713static int
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 2e7e58c4ad..b46ee52eb8 100644
--- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
+++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h
@@ -1,6 +1,10 @@
1#ifndef _ECORE_IPC_PRIVATE_H 1#ifndef _ECORE_IPC_PRIVATE_H
2#define _ECORE_IPC_PRIVATE_H 2#define _ECORE_IPC_PRIVATE_H
3 3
4#if USE_OPENSSL
5#include <openssl/ssl.h>
6#endif
7
4#define ECORE_MAGIC_IPC_SERVER 0x87786556 8#define ECORE_MAGIC_IPC_SERVER 0x87786556
5#define ECORE_MAGIC_IPC_CLIENT 0x78875665 9#define ECORE_MAGIC_IPC_CLIENT 0x78875665
6 10