summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--legacy/ecore/configure.in5
-rw-r--r--legacy/ecore/src/lib/ecore_con/Makefile.am6
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h.in (renamed from legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h)11
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/Makefile.am8
-rw-r--r--legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c23
5 files changed, 42 insertions, 11 deletions
diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index 6f5b3faee0..fa76a3faf7 100644
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -622,6 +622,8 @@ AC_SUBST(PERL)
622AC_SUBST(ecore_config_cflags) 622AC_SUBST(ecore_config_cflags)
623AC_SUBST(ecore_config_libs) 623AC_SUBST(ecore_config_libs)
624 624
625AC_SUBST(USE_OPENSSL)
626
625AC_OUTPUT([ 627AC_OUTPUT([
626Makefile 628Makefile
627ecore-config 629ecore-config
@@ -636,6 +638,7 @@ src/lib/ecore_evas/Ecore_Evas.h
636src/lib/ecore_evas/Makefile 638src/lib/ecore_evas/Makefile
637src/lib/ecore_con/Ecore_Con.h 639src/lib/ecore_con/Ecore_Con.h
638src/lib/ecore_con/Makefile 640src/lib/ecore_con/Makefile
641src/lib/ecore_ipc/Ecore_Ipc.h
639src/lib/ecore_ipc/Makefile 642src/lib/ecore_ipc/Makefile
640src/lib/ecore_txt/Makefile 643src/lib/ecore_txt/Makefile
641src/lib/ecore_config/Makefile 644src/lib/ecore_config/Makefile
@@ -658,7 +661,7 @@ echo " Ecore_FB................: $have_ecore_fb"
658echo " Ecore_Evas..............: $have_ecore_evas" 661echo " Ecore_Evas..............: $have_ecore_evas"
659echo " Ecore_Evas GL Support...: $have_ecore_evas_gl" 662echo " Ecore_Evas GL Support...: $have_ecore_evas_gl"
660echo " Ecore_Evas FB Support...: $have_ecore_evas_fb" 663echo " Ecore_Evas FB Support...: $have_ecore_evas_fb"
661echo " Ecore_Ipc...............: $have_ecore_ipc" 664echo " Ecore_Ipc...............: $have_ecore_ipc (OpenSSL: $use_openssl)"
662echo " Ecore_Config............: $have_ecore_config" 665echo " Ecore_Config............: $have_ecore_config"
663echo 666echo
664echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE." 667echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE."
diff --git a/legacy/ecore/src/lib/ecore_con/Makefile.am b/legacy/ecore/src/lib/ecore_con/Makefile.am
index 28e23cf51e..1e90a6c9b6 100644
--- a/legacy/ecore/src/lib/ecore_con/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_con/Makefile.am
@@ -1,7 +1,8 @@
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 @SSL_CFLAGS@ 4-I$(top_srcdir)/src/lib/ecore \
5@SSL_CFLAGS@
5 6
6libecore_con_la_LDFLAGS = -version-info 1:0:0 \ 7libecore_con_la_LDFLAGS = -version-info 1:0:0 \
7-L$(top_builddir)/src/lib/ecore/.libs 8-L$(top_builddir)/src/lib/ecore/.libs
@@ -17,7 +18,8 @@ ecore_con.c \
17ecore_con_private.h 18ecore_con_private.h
18 19
19libecore_con_la_LIBADD = \ 20libecore_con_la_LIBADD = \
20$(top_builddir)/src/lib/ecore/libecore.la @SSL_LIBS@ 21$(top_builddir)/src/lib/ecore/libecore.la \
22@SSL_LIBS@
21 23
22libecore_con_la_DEPENDENCIES = \ 24libecore_con_la_DEPENDENCIES = \
23$(top_builddir)/src/lib/ecore/libecore.la 25$(top_builddir)/src/lib/ecore/libecore.la
diff --git a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h.in
index 9c01e26de6..ede65fde08 100644
--- a/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h
+++ b/legacy/ecore/src/lib/ecore_ipc/Ecore_Ipc.h.in
@@ -1,6 +1,12 @@
1#ifndef _ECORE_IPC_H 1#ifndef _ECORE_IPC_H
2#define _ECORE_IPC_H 2#define _ECORE_IPC_H
3 3
4#define HAVE_ECORE_IPC_OPENSSL @USE_OPENSSL@
5
6#if HAVE_ECORE_IPC_OPENSSL
7#include <openssl/ssl.h>
8#endif
9
4#ifdef __cplusplus 10#ifdef __cplusplus
5extern "C" { 11extern "C" {
6#endif 12#endif
@@ -14,7 +20,10 @@ extern "C" {
14 { 20 {
15 ECORE_IPC_LOCAL_USER, 21 ECORE_IPC_LOCAL_USER,
16 ECORE_IPC_LOCAL_SYSTEM, 22 ECORE_IPC_LOCAL_SYSTEM,
17 ECORE_IPC_REMOTE_SYSTEM, 23 ECORE_IPC_REMOTE_SYSTEM
24#if HAVE_ECORE_IPC_OPENSSL
25 ,ECORE_IPC_USE_SSL = 16
26#endif
18 } Ecore_Ipc_Type; 27 } Ecore_Ipc_Type;
19 28
20 typedef struct _Ecore_Ipc_Event_Client_Add Ecore_Ipc_Event_Client_Add; 29 typedef struct _Ecore_Ipc_Event_Client_Add Ecore_Ipc_Event_Client_Add;
diff --git a/legacy/ecore/src/lib/ecore_ipc/Makefile.am b/legacy/ecore/src/lib/ecore_ipc/Makefile.am
index c84b9d32e5..404c4943e2 100644
--- a/legacy/ecore/src/lib/ecore_ipc/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_ipc/Makefile.am
@@ -2,7 +2,8 @@
2 2
3INCLUDES = \ 3INCLUDES = \
4-I$(top_srcdir)/src/lib/ecore \ 4-I$(top_srcdir)/src/lib/ecore \
5-I$(top_srcdir)/src/lib/ecore_con 5-I$(top_srcdir)/src/lib/ecore_con \
6@SSL_CFLAGS@
6 7
7libecore_ipc_la_LDFLAGS = -version-info 1:0:0 \ 8libecore_ipc_la_LDFLAGS = -version-info 1:0:0 \
8-L$(top_builddir)/src/lib/ecore/.libs \ 9-L$(top_builddir)/src/lib/ecore/.libs \
@@ -20,7 +21,8 @@ ecore_ipc_private.h
20 21
21libecore_ipc_la_LIBADD = \ 22libecore_ipc_la_LIBADD = \
22$(top_builddir)/src/lib/ecore/libecore.la \ 23$(top_builddir)/src/lib/ecore/libecore.la \
23$(top_builddir)/src/lib/ecore_con/libecore_con.la 24$(top_builddir)/src/lib/ecore_con/libecore_con.la \
25@SSL_LIBS@
24 26
25libecore_ipc_la_DEPENDENCIES = \ 27libecore_ipc_la_DEPENDENCIES = \
26$(top_builddir)/src/lib/ecore/libecore.la \ 28$(top_builddir)/src/lib/ecore/libecore.la \
@@ -29,6 +31,6 @@ $(top_builddir)/src/lib/ecore_con/libecore_con.la
29endif 31endif
30 32
31EXTRA_DIST = \ 33EXTRA_DIST = \
32Ecore_Ipc.h \ 34Ecore_Ipc.h.in \
33ecore_ipc.c \ 35ecore_ipc.c \
34ecore_ipc_private.h 36ecore_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 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);