Change from INET tcp to Unix domain socket

[framework/multimedia/media-server.git] / lib / media-util-ipc.c

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index 7c0af35..eb49c12 100755 (executable)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -31,6 +31,8 @@
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "media-util-dbg.h"
 #include "media-util.h"
@@ -57,6 +59,11 @@ char MEDIA_IPC_PATH_CLIENT[][50] ={
        {"/tmp/media_ipc_thumbcomm_client.dat"},
        {"/tmp/media_ipc_thumbdaemon_client.dat"},
 };
+#elif defined(_USE_UDS_SOCKET_TCP_)
+char MEDIA_IPC_PATH[][50] ={
+       {"/tmp/media_ipc_dbbatchupdate.dat"},
+       {"/tmp/media_ipc_thumbcreator.dat"},
+};
 #endif
 
 #ifdef _USE_UDS_SOCKET_
@@ -126,6 +133,90 @@ int ms_ipc_create_client_socket(ms_protocol_e protocol, int timeout_sec, int *so
        return MS_MEDIA_ERR_NONE;
 }
 
+#ifdef _USE_UDS_SOCKET_TCP_
+int ms_ipc_create_client_tcp_socket(ms_protocol_e protocol, int timeout_sec, int *sock_fd, int port)
+{
+       int sock = -1;
+
+       struct timeval tv_timeout = { timeout_sec, 0 };
+
+       /*Create TCP Socket*/
+       if ((sock = socket(PF_FILE, SOCK_STREAM, 0)) < 0) {
+                       MSAPI_DBG_ERR("socket failed: %s", strerror(errno));
+                       return MS_MEDIA_ERR_SOCKET_CONN;
+       }
+
+       if (timeout_sec > 0) {
+               if (setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv_timeout, sizeof(tv_timeout)) == -1) {
+                       MSAPI_DBG_ERR("setsockopt failed: %s", strerror(errno));
+                       close(sock);
+                       return MS_MEDIA_ERR_SOCKET_CONN;
+               }
+       }
+
+       *sock_fd = sock;
+
+       return MS_MEDIA_ERR_NONE;
+}
+
+int ms_ipc_create_server_tcp_socket(ms_protocol_e protocol, int port, int *sock_fd)
+{
+       int i;
+       bool bind_success = false;
+       int sock = -1;
+
+       struct sockaddr_un serv_addr;
+       mode_t orig_mode;
+       orig_mode = umask(0);
+
+       /* Create a TCP socket */
+       if ((sock = socket(PF_FILE, SOCK_STREAM, 0)) < 0) {
+               MSAPI_DBG_ERR("socket failed: %s", strerror(errno));
+               return MS_MEDIA_ERR_SOCKET_CONN;
+       }
+
+       memset(&serv_addr, 0, sizeof(serv_addr));
+
+       serv_addr.sun_family = AF_UNIX;
+       MSAPI_DBG("%s", MEDIA_IPC_PATH[port]);
+       unlink(MEDIA_IPC_PATH[port]);
+       strcpy(serv_addr.sun_path, MEDIA_IPC_PATH[port]);
+
+       /* Bind to the local address */
+       for (i = 0; i < 20; i ++) {
+               if (bind(sock, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) == 0) {
+                       bind_success = true;
+                       break;
+               }
+               MSAPI_DBG("%d",i);
+               usleep(250000);
+       }
+
+       if (bind_success == false) {
+               MSAPI_DBG_ERR("bind failed : %s %d_", strerror(errno), errno);
+               close(sock);
+               return MS_MEDIA_ERR_SOCKET_CONN;
+       }
+
+       MSAPI_DBG("bind success");
+
+       /* Listening */
+       if (listen(sock, SOMAXCONN) < 0) {
+               MSAPI_DBG_ERR("listen failed : %s", strerror(errno));
+               close(sock);
+               return MS_MEDIA_ERR_SOCKET_CONN;
+       }
+
+       MSAPI_DBG("Listening...");
+
+       *sock_fd = sock;
+
+       umask(orig_mode);
+       return MS_MEDIA_ERR_NONE;
+}
+
+#endif
+
 int ms_ipc_create_server_socket(ms_protocol_e protocol, int port, int *sock_fd)
 {
        int i;
@@ -181,8 +272,8 @@ int ms_ipc_create_server_socket(ms_protocol_e protocol, int port, int *sock_fd)
        strcpy(serv_addr.sun_path, MEDIA_IPC_PATH[serv_port]);
 #else
        serv_addr.sin_family = AF_INET;
-//     serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-       serv_addr.sin_addr.s_addr = inet_addr(SERVER_IP);
+       serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+//     serv_addr.sin_addr.s_addr = inet_addr(SERVER_IP);
        serv_addr.sin_port = htons(serv_port);
 #endif
        /* Bind to the local address */