static gboolean __thumb_server_send_msg_to_agent(int msg_type)
{
int sock;
- ms_sock_info_s sock_info;
struct sockaddr_un serv_addr;
ms_thumb_server_msg send_msg;
- sock_info.port = MS_THUMB_COMM_PORT;
- if (ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info) < 0) {
+ if (ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock) < 0) {
thumb_err("ms_ipc_create_server_socket failed");
return FALSE;
}
memset(&serv_addr, 0, sizeof(serv_addr));
- sock = sock_info.sock_fd;
serv_addr.sun_family = AF_UNIX;
SAFE_STRLCPY(serv_addr.sun_path, THUMB_COMM_SOCK_PATH, sizeof(serv_addr.sun_path));
/* Connecting to the thumbnail server */
if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {
thumb_stderror("connect");
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return MS_MEDIA_ERR_SOCKET_CONN;
}
if (send(sock, &send_msg, sizeof(ms_thumb_server_msg), 0) != sizeof(ms_thumb_server_msg)) {
thumb_stderror("sendto failed");
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return FALSE;
}
thumb_dbg("Sending msg to thumbnail agent[%d] is successful", send_msg.msg_type);
-
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return TRUE;
}
gboolean _thumb_server_prepare_socket(int *sock_fd)
{
int sock;
- unsigned short serv_port;
-
- thumbMsg recv_msg;
- thumbMsg res_msg;
-
- memset((void *)&recv_msg, 0, sizeof(recv_msg));
- memset((void *)&res_msg, 0, sizeof(res_msg));
- serv_port = MS_THUMB_DAEMON_PORT;
- if (ms_ipc_create_server_socket(serv_port, &sock) < 0) {
+ if (ms_ipc_create_server_socket(MS_THUMB_DAEMON_PORT, &sock) < 0) {
thumb_err("ms_ipc_create_server_socket failed");
return FALSE;
}
{
int sock = -1;
struct sockaddr_un serv_addr;
- ms_sock_info_s sock_info;
int recv_str_len = 0;
int err = MS_MEDIA_ERR_NONE;
int pid;
- sock_info.port = MS_THUMB_CREATOR_PORT;
- err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info);
+ err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock);
if (err != MS_MEDIA_ERR_NONE) {
thumb_err("ms_ipc_create_client_socket failed");
return err;
}
memset(&serv_addr, 0, sizeof(serv_addr));
- sock = sock_info.sock_fd;
serv_addr.sun_family = AF_UNIX;
SAFE_STRLCPY(serv_addr.sun_path, THUMB_IPC_PATH, sizeof(serv_addr.sun_path));
/* Connecting to the thumbnail server */
if (connect(sock, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) {
thumb_stderror("connect");
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return MS_MEDIA_ERR_SOCKET_CONN;
}
if (req_msg.origin_path_size > MAX_PATH_SIZE || req_msg.dest_path_size > MAX_PATH_SIZE) {
thumb_err("path's length exceeds %d", MAX_PATH_SIZE);
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return MS_MEDIA_ERR_INVALID_PARAMETER;
}
if (send(sock, buf, buf_size, 0) != buf_size) {
thumb_err("sendto failed: %d", errno);
SAFE_FREE(buf);
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return MS_MEDIA_ERR_SOCKET_SEND;
}
if ((err = _media_thumb_recv_msg(sock, header_size, &recv_msg)) < 0) {
thumb_err("_media_thumb_recv_msg failed ");
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return err;
}
recv_str_len = strlen(recv_msg.org_path);
thumb_dbg_slog("recv %s(%d) from thumb daemon is successful", recv_msg.org_path, recv_str_len);
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
if (recv_str_len > max_length) {
thumb_err("user buffer is too small. Output's length is %d", recv_str_len);
int err = MS_MEDIA_ERR_NONE;
int sock = -1;
struct sockaddr_un serv_addr;
- ms_sock_info_s sock_info;
thumbReq *req_manager = NULL;
int pid;
- sock_info.port = MS_THUMB_CREATOR_PORT;
- err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info);
+ err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock);
if (err != MS_MEDIA_ERR_NONE) {
thumb_err("ms_ipc_create_client_socket failed");
return err;
}
memset(&serv_addr, 0, sizeof(serv_addr));
- sock = sock_info.sock_fd;
serv_addr.sun_family = AF_UNIX;
SAFE_STRLCPY(serv_addr.sun_path, THUMB_IPC_PATH, sizeof(serv_addr.sun_path));
g_io_channel_shutdown(channel, TRUE, NULL);
g_io_channel_unref(channel);
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return err;
}
thumb_err("queue pop fail");
g_io_channel_shutdown(channel, TRUE, NULL);
g_io_channel_unref(channel);
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return MS_MEDIA_ERR_INVALID_PARAMETER;
}
thumb_err("path's length exceeds %d", MAX_PATH_SIZE);
g_io_channel_shutdown(channel, TRUE, NULL);
g_io_channel_unref(channel);
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return MS_MEDIA_ERR_INVALID_PARAMETER;
}
g_source_destroy(g_main_context_find_source_by_id(g_main_context_get_thread_default(), source_id));
g_io_channel_shutdown(channel, TRUE, NULL);
g_io_channel_unref(channel);
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return MS_MEDIA_ERR_SOCKET_SEND;
}
int err = MS_MEDIA_ERR_NONE;
int sock = -1;
struct sockaddr_un serv_addr;
- ms_sock_info_s sock_info;
thumbRawReq *req_manager = NULL;
int pid;
- sock_info.port = MS_THUMB_CREATOR_PORT;
- err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock_info);
+ err = ms_ipc_create_client_socket(MS_TIMEOUT_SEC_10, &sock);
if (err != MS_MEDIA_ERR_NONE) {
thumb_err("ms_ipc_create_client_socket failed");
return err;
}
memset(&serv_addr, 0, sizeof(serv_addr));
- sock = sock_info.sock_fd;
serv_addr.sun_family = AF_UNIX;
SAFE_STRLCPY(serv_addr.sun_path, THUMB_IPC_PATH, sizeof(serv_addr.sun_path));
g_io_channel_shutdown(channel, TRUE, NULL);
g_io_channel_unref(channel);
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return err;
}
thumb_err("queue pop fail");
g_io_channel_shutdown(channel, TRUE, NULL);
g_io_channel_unref(channel);
- ms_ipc_delete_client_socket(&sock_info);
+ close(sock);
return MS_MEDIA_ERR_INVALID_PARAMETER;
}