emuld: remove sending message to guest-server

Do not communicate with guest-server anymore.
ecs does.

Change-Id: I221428aeafb20867780b92e0fc2b879a41846197
Signed-off-by: Munkyu Im <munkyu.im@samsung.com>

diff --git a/include/emuld_common.h b/include/emuld_common.h
index b31a5a9..0597bc4 100644 (file)
--- a/include/emuld_common.h
+++ b/include/emuld_common.h
@@ -115,8 +115,6 @@ int is_mounted(void);
 void* mount_sdcard(void* data);
 int umount_sdcard(const int fd);
 
-void send_guest_server(char* databuf);
-
 struct _auto_mutex
 {
     _auto_mutex(pthread_mutex_t* t)

diff --git a/packaging/emuld.spec b/packaging/emuld.spec
index 4e98846..0ee1149 100644 (file)
--- a/packaging/emuld.spec
+++ b/packaging/emuld.spec
@@ -1,5 +1,5 @@
 Name: emuld
-Version: 0.4.3
+Version: 0.4.4
 Release: 0
 Summary: Emulator daemon
 License: Apache-2.0

diff --git a/src/emuld_proc.cpp b/src/emuld_proc.cpp
index 6dc9163..0c7dedc 100644 (file)
--- a/src/emuld_proc.cpp
+++ b/src/emuld_proc.cpp
@@ -163,7 +163,6 @@ void* mount_sdcard(void* data)
             else
                 packet->action = 5; // failed
 
-            //
             LOGDEBUG("SDpath is %s", SDpath);
 
             const int tmplen = HEADER_SIZE + packet->length;
@@ -266,7 +265,7 @@ int umount_sdcard(const int fd, bool is_evdi)
 
                 memcpy(tmp, packet, HEADER_SIZE);
                 memcpy(tmp + HEADER_SIZE, SDpath, packet->length);
-
+                LOGDEBUG("send to evdi!!");
                 ijmsg_send_to_evdi(g_fd[fdtype_device], IJTYPE_SDCARD, (const char*) tmp, tmplen);
 
                 free(tmp);
@@ -668,8 +667,11 @@ bool msgproc_sdcard(const int sockfd, ijcommand* ijcmd, const bool is_evdi)
         case 0:                         // umount
             {
                 mount_status = umount_sdcard(sockfd, is_evdi);
-                if (mount_status == 0)
-                    send_guest_server(ijcmd->data);
+                if (mount_status == 0) {
+                    LOGDEBUG("succeeded to umount");
+                } else {
+                    LOGDEBUG("failed to umount");
+                }
             }
             break;
         case 1:                         // mount
@@ -679,8 +681,6 @@ bool msgproc_sdcard(const int sockfd, ijcommand* ijcmd, const bool is_evdi)
                 strcpy(SDpath, ret);
                 LOGDEBUG("sdcard path is %s", SDpath);
 
-                send_guest_server(ijcmd->data);
-
                 mount_param* param = new mount_param(sockfd);
                 if (!param)
                     break;
@@ -796,65 +796,3 @@ bool msgproc_sdcard(const int sockfd, ijcommand* ijcmd, const bool is_evdi)
     }
     return true;
 }
-
-//sdcard event
-void send_guest_server(char* databuf)
-{
-    if (!databuf)
-    {
-        LOGERR("invalid data buf");
-        return;
-    }
-
-    char buf[32];
-    struct sockaddr_in si_other;
-    int s, slen=sizeof(si_other);
-    FILE* fd;
-    char fbuf[16];
-    int port = 3581;
-
-    fd = fopen(SDB_PORT_FILE, "r");
-    if(!fd)
-    {
-        LOGERR("fail to open %s file", SDB_PORT_FILE);
-        return;
-    }
-
-    if (fgets(fbuf, 16, fd))
-    {
-        port = atoi(fbuf) + 3;
-    }
-    else
-    {
-        LOGERR("guest port fgets failure");
-        return;
-    }
-
-    fclose(fd);
-
-    s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
-    if (s == -1)
-    {
-        LOGERR("socket error!");
-        return;
-    }
-
-    memset((char *) &si_other, 0, sizeof(si_other));
-    si_other.sin_family = AF_INET;
-    si_other.sin_port = htons(port);
-    if (inet_aton(SRV_IP, &si_other.sin_addr) == 0)
-    {
-          LOGERR("inet_aton() failed");
-    }
-
-    memset(buf, '\0', sizeof(buf));
-    snprintf(buf, sizeof(buf), "4\n%s", databuf);
-    LOGDEBUG("sendGuestServer msg: %s", buf);
-    if (sendto(s, buf, sizeof(buf), 0, (struct sockaddr*)&si_other, slen) == -1)
-    {
-        LOGERR("sendto error!");
-    }
-
-    close(s);
-}
-