diff options
Diffstat (limited to 'server/thumb-server-internal.c')
-rwxr-xr-x | server/thumb-server-internal.c | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/server/thumb-server-internal.c b/server/thumb-server-internal.c index 117de96..16d58f3 100755 --- a/server/thumb-server-internal.c +++ b/server/thumb-server-internal.c @@ -38,7 +38,7 @@ #define LOG_TAG "MEDIA_THUMBNAIL_SERVER" #define THUMB_DEFAULT_WIDTH 320 #define THUMB_DEFAULT_HEIGHT 240 -#define THUMB_BLOCK_SIZE 512 +#define THUMB_BLOCK_SIZE 10240 #define THUMB_COMM_SOCK_PATH tzplatform_mkpath(TZ_SYS_RUN, "media-server/media_ipc_thumbcomm.socket") #define THUMB_EMPTY_STR "" @@ -125,6 +125,11 @@ gboolean _thumb_server_read_socket(GIOChannel *src, GIOCondition condition, gpoi close(client_sock); return TRUE; } + } else { + thumb_warn("Shutting down..."); + g_main_loop_quit(g_thumb_server_mainloop); + close(client_sock); + return TRUE; } SAFE_FREE(credentials.smack); @@ -132,8 +137,7 @@ gboolean _thumb_server_read_socket(GIOChannel *src, GIOCondition condition, gpoi thumb_warn_slog("Received [%d] %.*s(%d) from PID(%d)", recv_msg.msg_type, MAX_FILEPATH_LEN, recv_msg.org_path, strlen(recv_msg.org_path), recv_msg.pid); - if (recv_msg.msg_type != THUMB_REQUEST_KILL_SERVER) - _thumb_daemon_process_job(&recv_msg, &res_msg); + _thumb_daemon_process_job(&recv_msg, &res_msg); if (res_msg.msg_type == 0) res_msg.msg_type = recv_msg.msg_type; @@ -154,8 +158,8 @@ gboolean _thumb_server_read_socket(GIOChannel *src, GIOCondition condition, gpoi if (buf_size < THUMB_BLOCK_SIZE) block_size = buf_size; - if (send(client_sock, buf+sending_block, block_size, 0) != block_size) { - thumb_stderror("sendto failed"); + if (send(client_sock, buf+sending_block, block_size, 0) < 0) { + thumb_stderror("send failed"); } sending_block += block_size; @@ -164,16 +168,9 @@ gboolean _thumb_server_read_socket(GIOChannel *src, GIOCondition condition, gpoi block_size = THUMB_BLOCK_SIZE; } - thumb_dbg_slog("Sent data(%d) from %s", res_msg.thumb_size, res_msg.org_path); - SAFE_FREE(buf); SAFE_FREE(res_msg.thumb_data); - if (recv_msg.msg_type == THUMB_REQUEST_KILL_SERVER) { - thumb_warn("Shutting down..."); - g_main_loop_quit(g_thumb_server_mainloop); - } - close(client_sock); return TRUE; @@ -204,8 +201,8 @@ static gboolean __thumb_server_send_msg_to_agent(int msg_type) send_msg.msg_type = msg_type; - if (send(sock, &send_msg, sizeof(ms_thumb_server_msg), 0) != sizeof(ms_thumb_server_msg)) { - thumb_stderror("sendto failed"); + if (send(sock, &send_msg, sizeof(ms_thumb_server_msg), 0) < 0) { + thumb_stderror("send failed"); close(sock); return FALSE; } @@ -224,7 +221,7 @@ static gboolean _thumb_server_send_deny_message(int sockfd) msg.msg_type = THUMB_RESPONSE; msg.status = MS_MEDIA_ERR_PERMISSION_DENIED; - if (send(sockfd, &msg, bytes_to_send, 0) != bytes_to_send) { + if (send(sockfd, &msg, bytes_to_send, 0) < 0) { thumb_stderror("send failed"); return FALSE; } |