Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_ipc
Modified Files:
Makefile.am ecore_ipc.c
Added Files:
Ecore_Ipc.h.in
Removed Files:
Ecore_Ipc.h
Log Message:
ecore_ipc now supports ssl too
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_ipc/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 23 Sep 2003 08:09:31 -0000 1.2
+++ Makefile.am 6 Apr 2004 06:20:39 -0000 1.3
@@ -2,7 +2,8 @@
INCLUDES = \
-I$(top_srcdir)/src/lib/ecore \
--I$(top_srcdir)/src/lib/ecore_con
+-I$(top_srcdir)/src/lib/ecore_con \
[EMAIL PROTECTED]@
libecore_ipc_la_LDFLAGS = -version-info 1:0:0 \
-L$(top_builddir)/src/lib/ecore/.libs \
@@ -20,7 +21,8 @@
libecore_ipc_la_LIBADD = \
$(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_con/libecore_con.la
+$(top_builddir)/src/lib/ecore_con/libecore_con.la \
[EMAIL PROTECTED]@
libecore_ipc_la_DEPENDENCIES = \
$(top_builddir)/src/lib/ecore/libecore.la \
@@ -29,6 +31,6 @@
endif
EXTRA_DIST = \
-Ecore_Ipc.h \
+Ecore_Ipc.h.in \
ecore_ipc.c \
ecore_ipc_private.h
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/src/lib/ecore_ipc/ecore_ipc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore_ipc.c 20 Feb 2004 07:06:28 -0000 1.3
+++ ecore_ipc.c 6 Apr 2004 06:20:39 -0000 1.4
@@ -1,4 +1,5 @@
#include "Ecore.h"
+#include "config.h"
#include "Ecore_Con.h"
#include "ecore_private.h"
#include "ecore_ipc_private.h"
@@ -93,12 +94,19 @@
* FIXME: To be fixed.
*/
Ecore_Ipc_Server *
-ecore_ipc_server_add(Ecore_Ipc_Type type, char *name, int port, const void *data)
+ecore_ipc_server_add(Ecore_Ipc_Type compl_type, char *name, int port, const void
*data)
{
Ecore_Ipc_Server *svr;
+ Ecore_Ipc_Type type;
+ Ecore_Con_Type extra = 0;
svr = calloc(1, sizeof(Ecore_Ipc_Server));
if (!svr) return NULL;
+ type = compl_type;
+#if USE_OPENSSL
+ type &= ~ECORE_IPC_USE_SSL;
+ if (compl_type & ECORE_IPC_USE_SSL) extra = ECORE_CON_USE_SSL;
+#endif
switch (type)
{
case ECORE_IPC_LOCAL_USER:
@@ -108,7 +116,7 @@
svr->server = ecore_con_server_add(ECORE_CON_LOCAL_SYSTEM, name, port, svr);
break;
case ECORE_IPC_REMOTE_SYSTEM:
- svr->server = ecore_con_server_add(ECORE_CON_REMOTE_SYSTEM, name, port, svr);
+ svr->server = ecore_con_server_add(ECORE_CON_REMOTE_SYSTEM | extra, name,
port, svr);
break;
default:
free(svr);
@@ -131,12 +139,19 @@
* FIXME: To be fixed.
*/
Ecore_Ipc_Server *
-ecore_ipc_server_connect(Ecore_Ipc_Type type, char *name, int port, const void *data)
+ecore_ipc_server_connect(Ecore_Ipc_Type compl_type, char *name, int port, const void
*data)
{
Ecore_Ipc_Server *svr;
+ Ecore_Ipc_Type type;
+ Ecore_Con_Type extra = 0;
svr = calloc(1, sizeof(Ecore_Ipc_Server));
if (!svr) return NULL;
+ type = compl_type;
+#if USE_OPENSSL
+ type &= ~ECORE_IPC_USE_SSL;
+ if (compl_type & ECORE_IPC_USE_SSL) extra = ECORE_CON_USE_SSL;
+#endif
switch (type)
{
case ECORE_IPC_LOCAL_USER:
@@ -146,7 +161,7 @@
svr->server = ecore_con_server_connect(ECORE_CON_LOCAL_SYSTEM, name, port,
svr);
break;
case ECORE_IPC_REMOTE_SYSTEM:
- svr->server = ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM, name, port,
svr);
+ svr->server = ecore_con_server_connect(ECORE_CON_REMOTE_SYSTEM | extra, name,
port, svr);
break;
default:
free(svr);
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
