Move media-server-ipc.h to media-util-ipc.h

Both are IPC common codes.
So we merge with media-util-ipc.h.

Change-Id: Icbb17c5e2211d45703513c7f4860550622243f77
Signed-off-by: minje.ahn <minje.ahn@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index d4fc044..ebe1530 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -224,5 +224,4 @@ includeheaders_HEADERS = lib/include/media-util-noti.h \
                          lib/include/media-util-ipc.h \
                          lib/include/media-util-cynara.h \
                          lib/include/media-util.h \
-                         lib/include/media-server-ipc.h \
                          lib/include/media-util-user.h

diff --git a/lib/include/media-server-ipc.h b/lib/include/media-server-ipc.h
deleted file mode 100644 (file)
index ab047a8..0000000
--- a/lib/include/media-server-ipc.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Media Utility
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef _MEDIA_SERVER_IPC_H_
-#define _MEDIA_SERVER_IPC_H_
-
-#define MS_TIMEOUT_SEC 10
-
-typedef enum {
-       MS_SCAN_DAEMON_PORT = 0,                /**< Port of communication between scanner and server */
-       MS_SCANNER_PORT,                                /**< Directory Scanner */
-       MS_DB_UPDATE_PORT,                      /**< Media DB Update */
-       MS_PORT_MAX,
-} ms_msg_port_type_e;
-
-#define MAX_MSG_SIZE                           4096*2
-#define MAX_FILEPATH_LEN                       4096
-
-typedef enum {
-       MS_MSG_DB_UPDATE = 0,           /**< Media DB Update */
-       MS_MSG_DIRECTORY_SCANNING,                      /**< Non recursive Directory Scan and Media DB Update*/
-       MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE,/**< Recursive Directory Scan and Media DB Update*/
-       MS_MSG_BULK_INSERT,                                     /**< Request bulk insert */
-       MS_MSG_STORAGE_ALL,
-       MS_MSG_STORAGE_PARTIAL,
-       MS_MSG_STORAGE_INVALID,
-       MS_MSG_SCANNER_READY,                           /**< Ready from media scanner */
-       MS_MSG_SCANNER_RESULT,                          /**< Result of directory scanning */
-       MS_MSG_SCANNER_BULK_RESULT,                     /**< Request bulk insert */
-       MS_MSG_DIRECTORY_SCANNING_CANCEL,       /**< Request cancel directory scan*/
-       MS_MSG_STORAGE_SCANNER_COMPLETE,        /**< Storage Scanner complete */
-       MS_MSG_DIRECTORY_SCANNER_COMPLETE,      /**< Directory Scanner complete */
-       MS_MSG_SCANNER_PARTIAL,
-       MS_MSG_SCANNER_COMPLETE,
-       MS_MSG_EXTRACTOR_COMPLETE,
-       MS_MSG_RECURSIVE_START,
-       MS_MSG_MEDIA_DB_RESET,  /**< media DB is reset*/
-       MS_MSG_MEDIA_DB_MALFORMED,
-       MS_MSG_MAX                                                      /**< Invalid msg type */
-} ms_msg_type_e;
-
-#define MS_SCANNER_FIFO_PATH_REQ "/tmp/media-scanner-fifo-req"
-#define MS_SCANNER_FIFO_PATH_RES "/tmp/media-scanner-fifo-res"
-#define MS_SCANNER_FIFO_MODE 0664
-#define MS_UUID_SIZE 37 /* size of uuid + NULL */
-
-typedef struct {
-       ms_msg_type_e msg_type;
-       int pid;
-       uid_t uid;
-       int result;
-       char storage_id[MS_UUID_SIZE];
-       char msg[MAX_MSG_SIZE];
-       int noti_type;
-} ms_comm_msg_s;
-
-#endif /*_MEDIA_SERVER_IPC_H_*/

diff --git a/lib/include/media-util-ipc.h b/lib/include/media-util-ipc.h
index 56744f6..e5ecd2b 100644 (file)
--- a/lib/include/media-util-ipc.h
+++ b/lib/include/media-util-ipc.h
@@ -29,7 +29,50 @@ extern "C" {
 #include <arpa/inet.h>
 #include <stdbool.h>
 
-#include "media-server-ipc.h"
+typedef enum {
+       MS_SCANNER_PORT = 0,    /**< Directory Scanner */
+       MS_DB_UPDATE_PORT,              /**< Media DB Update */
+} ms_msg_port_type_e;
+
+typedef enum {
+       MS_MSG_DB_UPDATE = 0,           /**< Media DB Update */
+       MS_MSG_DIRECTORY_SCANNING,                      /**< Non recursive Directory Scan and Media DB Update*/
+       MS_MSG_DIRECTORY_SCANNING_NON_RECURSIVE,/**< Recursive Directory Scan and Media DB Update*/
+       MS_MSG_BULK_INSERT,                                     /**< Request bulk insert */
+       MS_MSG_STORAGE_ALL,
+       MS_MSG_STORAGE_PARTIAL,
+       MS_MSG_STORAGE_INVALID,
+       MS_MSG_SCANNER_READY,                           /**< Ready from media scanner */
+       MS_MSG_SCANNER_RESULT,                          /**< Result of directory scanning */
+       MS_MSG_SCANNER_BULK_RESULT,                     /**< Request bulk insert */
+       MS_MSG_DIRECTORY_SCANNING_CANCEL,       /**< Request cancel directory scan*/
+       MS_MSG_STORAGE_SCANNER_COMPLETE,        /**< Storage Scanner complete */
+       MS_MSG_DIRECTORY_SCANNER_COMPLETE,      /**< Directory Scanner complete */
+       MS_MSG_SCANNER_PARTIAL,
+       MS_MSG_SCANNER_COMPLETE,
+       MS_MSG_EXTRACTOR_COMPLETE,
+       MS_MSG_RECURSIVE_START,
+       MS_MSG_MEDIA_DB_RESET,  /**< media DB is reset*/
+       MS_MSG_MEDIA_DB_MALFORMED,
+       MS_MSG_MAX                                                      /**< Invalid msg type */
+} ms_msg_type_e;
+
+#define MS_SCANNER_FIFO_PATH_REQ "/tmp/media-scanner-fifo-req"
+#define MS_SCANNER_FIFO_PATH_RES "/tmp/media-scanner-fifo-res"
+#define MS_SCANNER_FIFO_MODE 0664
+#define MS_UUID_SIZE 37 /* size of uuid + NULL */
+#define MAX_MSG_SIZE                           4096*2
+#define MAX_FILEPATH_LEN                       4096
+
+typedef struct {
+       ms_msg_type_e msg_type;
+       int pid;
+       uid_t uid;
+       int result;
+       char storage_id[MS_UUID_SIZE];
+       char msg[MAX_MSG_SIZE];
+       int noti_type;
+} ms_comm_msg_s;
 
 int ms_ipc_create_client_socket(int timeout_sec, int *sock_fd);
 int ms_ipc_create_server_socket(ms_msg_port_type_e port, int *sock_fd);

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index 0c1de4d..0d75c4c 100644 (file)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -26,11 +26,12 @@
 #include <unicode/ustring.h>
 #include <vconf.h>
 
-#include "media-server-ipc.h"
 #include "media-util-dbg.h"
 #include "media-util-internal.h"
 #include "media-util.h"
 
+#define MS_TIMEOUT_SEC 10
+
 static int __media_db_request_recovery(uid_t uid);
 
 static int __media_db_busy_handler(void *pData, int count)

diff --git a/lib/media-util-ipc.c b/lib/media-util-ipc.c
index 5c874c0..ad6cccc 100644 (file)
--- a/lib/media-util-ipc.c
+++ b/lib/media-util-ipc.c
@@ -27,7 +27,6 @@
 #include "media-util-internal.h"
 
 char MEDIA_IPC_PATH[][70] = {
-       {"media-server/media_ipc_scandaemon.socket"},
        {"media-server/media_ipc_scanner.socket"},
        {"media-server/media_ipc_dbupdate.socket"},
 };

diff --git a/lib/media-util-register.c b/lib/media-util-register.c
index f4bd833..424dc73 100644 (file)
--- a/lib/media-util-register.c
+++ b/lib/media-util-register.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-#include "media-server-ipc.h"
 #include "media-util-internal.h"
 #include "media-util-dbg.h"
 #include "media-util.h"

diff --git a/src/common/media-common-utils-tv.c b/src/common/media-common-utils-tv.c
index 7a47c2e..f290639 100644 (file)
--- a/src/common/media-common-utils-tv.c
+++ b/src/common/media-common-utils-tv.c
@@ -28,7 +28,6 @@
 #include <system_info.h>
 
 #include "media-util.h"
-#include "media-server-ipc.h"
 #include "media-common-dbg.h"
 #include "media-common-system.h"
 #include "media-common-utils.h"

diff --git a/src/common/media-common-utils.c b/src/common/media-common-utils.c
index a6262df..184190f 100644 (file)
--- a/src/common/media-common-utils.c
+++ b/src/common/media-common-utils.c
@@ -20,7 +20,6 @@
 #include <device/power.h>
 
 #include "media-util.h"
-#include "media-server-ipc.h"
 #include "media-common-dbg.h"
 #include "media-common-system.h"
 #include "media-common-utils.h"

diff --git a/src/scanner-v2/include/media-scanner-socket-v2.h b/src/scanner-v2/include/media-scanner-socket-v2.h
index 208df9f..9d12e5c 100644 (file)
--- a/src/scanner-v2/include/media-scanner-socket-v2.h
+++ b/src/scanner-v2/include/media-scanner-socket-v2.h
@@ -21,7 +21,7 @@
 #define _MEDIA_SCANNER_SOCKET_V2_H_
 
 #include "media-common-types.h"
-#include "media-server-ipc.h"
+#include "media-util-ipc.h"
 
 gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer data);
 int msc_send_ready(void);

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index effc329..8172709 100644 (file)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -20,7 +20,6 @@
 #include <malloc.h>
 #include <cpu-boosting.h>
 #include "media-util.h"
-#include "media-server-ipc.h"
 #include "media-common-utils.h"
 #include "media-common-db-svc.h"
 #include "media-scanner-dbg-v2.h"

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index ac5064a..8e76437 100644 (file)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -21,7 +21,6 @@
 #include <dirent.h>
 #include <cpu-boosting.h>
 #include "media-util.h"
-#include "media-server-ipc.h"
 #include "media-common-utils.h"
 #include "media-common-external-storage.h"
 #include "media-common-db-svc.h"

diff --git a/src/scanner-v2/media-scanner-socket-v2.c b/src/scanner-v2/media-scanner-socket-v2.c
index c70b0a4..b8bcdb2 100644 (file)
--- a/src/scanner-v2/media-scanner-socket-v2.c
+++ b/src/scanner-v2/media-scanner-socket-v2.c
@@ -22,7 +22,6 @@
 #include <malloc.h>
 
 #include "media-util.h"
-#include "media-server-ipc.h"
 #include "media-common-types.h"
 #include "media-scanner-dbg-v2.h"
 #include "media-scanner-scan-v2.h"

diff --git a/src/scanner/include/media-scanner-socket.h b/src/scanner/include/media-scanner-socket.h
index 482df48..362c6e6 100644 (file)
--- a/src/scanner/include/media-scanner-socket.h
+++ b/src/scanner/include/media-scanner-socket.h
@@ -21,7 +21,7 @@
 #define _MEDIA_SCANNER_SOCKET_H_
 
 #include "media-common-types.h"
-#include "media-server-ipc.h"
+#include "media-util-ipc.h"
 
 gboolean msc_receive_request(GIOChannel *src, GIOCondition condition, gpointer data);
 

diff --git a/src/scanner/media-scanner-scan.c b/src/scanner/media-scanner-scan.c
index f7b4e8a..92b09fd 100644 (file)
--- a/src/scanner/media-scanner-scan.c
+++ b/src/scanner/media-scanner-scan.c
@@ -21,7 +21,6 @@
 #include <dirent.h>
 
 #include "media-util.h"
-#include "media-server-ipc.h"
 #include "media-common-utils.h"
 #include "media-common-db-svc.h"
 #include "media-scanner-dbg.h"

diff --git a/src/scanner/media-scanner-socket.c b/src/scanner/media-scanner-socket.c
index d8c358d..f79c2c2 100644 (file)
--- a/src/scanner/media-scanner-socket.c
+++ b/src/scanner/media-scanner-socket.c
@@ -22,7 +22,6 @@
 #include <malloc.h>
 
 #include "media-util.h"
-#include "media-server-ipc.h"
 #include "media-common-types.h"
 #include "media-scanner-dbg.h"
 #include "media-scanner-socket.h"

diff --git a/src/server/include/media-server-socket.h b/src/server/include/media-server-socket.h
index 9df15f5..f66834c 100644 (file)
--- a/src/server/include/media-server-socket.h
+++ b/src/server/include/media-server-socket.h
@@ -21,7 +21,7 @@
 #define _MEDIA_SERVER_SOCKET_H_
 
 #include "media-common-types.h"
-#include "media-server-ipc.h"
+#include "media-util-ipc.h"
 
 gboolean ms_read_socket(GIOChannel *src, GIOCondition condition, gpointer user_data);
 gboolean ms_read_db_tcp_socket(GIOChannel *src, GIOCondition condition, gpointer data);

diff --git a/src/server/media-server-db-manage.c b/src/server/media-server-db-manage.c
index 98c45f0..8946566 100644 (file)
--- a/src/server/media-server-db-manage.c
+++ b/src/server/media-server-db-manage.c
@@ -24,7 +24,6 @@
 #include "media-common-db-svc.h"
 #include "media-common-system.h"
 #include "media-common-utils.h"
-#include "media-server-ipc.h"
 #include "media-server-dbg.h"
 #include "media-server-scanner.h"
 #include "media-server-db-manage.h"

diff --git a/src/server/media-server-db.c b/src/server/media-server-db.c
index a822bbe..0b4b3bc 100644 (file)
--- a/src/server/media-server-db.c
+++ b/src/server/media-server-db.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 
 #include "media-util.h"
-#include "media-server-ipc.h"
 #include "media-common-types.h"
 
 #include "media-server-dbg.h"

diff --git a/src/server/media-server-scanner.c b/src/server/media-server-scanner.c
index c8851df..3b98bda 100644 (file)
--- a/src/server/media-server-scanner.c
+++ b/src/server/media-server-scanner.c
@@ -23,7 +23,6 @@
 #include <fcntl.h>
 
 #include "media-util.h"
-#include "media-server-ipc.h"
 #include "media-common-types.h"
 #include "media-common-utils.h"
 #include "media-server-dbg.h"

diff --git a/src/server/media-server-socket.c b/src/server/media-server-socket.c
index 7b2a8ff..c9680b4 100644 (file)
--- a/src/server/media-server-socket.c
+++ b/src/server/media-server-socket.c
@@ -22,7 +22,6 @@
 
 #include "media-util.h"
 #include "media-util-internal.h"
-#include "media-server-ipc.h"
 #include "media-common-utils.h"
 #include "media-common-db-svc.h"
 #include "media-common-system.h"