Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/framework/appfw/com-core... accepted/tizen/20131022.083606 accepted/tizen/20131022.163214 submit/tizen/20131022.035758 submit/tizen/20131022.035853
authorSung-jae Park <nicesj.park@samsung.com>
Tue, 22 Oct 2013 02:26:32 +0000 (11:26 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Tue, 22 Oct 2013 02:26:32 +0000 (11:26 +0900)
Applying socket activation should be supported by new API or Schema.
The latest com-core supports the inet & ipc socket communication using schema.
To open/connect a socket, user can select inet or ipc using schema.

remote://IPADDR:port
local://SOCKET_FILE_PATH

practical example

remote://192.168.0.1:1234
local:///tmp/.my.socket

So I just discards the systemd socket activation code now.

I think, it should be supported by new socket URI.
such as

systemd://SOCKET_FILE

This new schema should be added to handle the socket activation mode.

Conflicts:
src/secure_socket.c

Change-Id: Ib2c0d1c7f2d6b0337cd408cba11164626ca87ff4

1  2 
CMakeLists.txt
packaging/libcom-core.spec
src/com-core_packet-router.c
src/com-core_thread.c

diff --cc CMakeLists.txt
Simple merge
@@@ -1,11 -1,10 +1,11 @@@
  Name: libcom-core
  Summary: Library for the light-weight IPC 
- Version: 0.3.14
+ Version: 0.5.3
  Release: 1
 -Group: HomeTF/Framework
 -License: Apache License
 +Group: Base/IPC
 +License: Apache-2.0
  Source0: %{name}-%{version}.tar.gz
 +Source1001:   libcom-core.manifest
  BuildRequires: cmake, gettext-tools, coreutils
  BuildRequires: pkgconfig(dlog)
  BuildRequires: pkgconfig(glib-2.0)
@@@ -24,10 -22,15 +24,16 @@@ Light-weight IPC supporting library fo
  
  %prep
  %setup -q
 +cp %{SOURCE1001} .
  
  %build
- %cmake
+ %if 0%{?tizen_build_binary_release_type_eng}
+ export CFLAGS="${CFLAGS} -DTIZEN_ENGINEER_MODE"
+ export CXXFLAGS="${CXXFLAGS} -DTIZEN_ENGINEER_MODE"
+ export FFLAGS="${FFLAGS} -DTIZEN_ENGINEER_MODE"
+ %endif
+ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
  make %{?jobs:-j%jobs}
  
  %install
Simple merge
@@@ -378,10 -398,11 +398,11 @@@ static void *client_cb(void *data
        DbgPrint("Client CB is terminated (%d)\n", tcb->handle);
        /* Wake up main thread to get disconnected event */
        event_ch = EVENT_TERM;
-       if (write(tcb->evt_pipe[PIPE_WRITE], &event_ch, sizeof(event_ch)) != sizeof(event_ch))
+       if (write(tcb->evt_pipe[PIPE_WRITE], &event_ch, sizeof(event_ch)) != sizeof(event_ch)) {
                ErrPrint("write: %s\n", strerror(errno));
+       }
  
 -      return (void *)ret;
 +      return (void *)(unsigned long)ret;
  }
  
  /*!