API names are changed.

Rename put_handle with remove_handle
Rename secom with secure_socket

Change-Id: Ia306c817463e846a3b7a482521e15e0241b7cd04

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddf0f27..ea87f01 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ ADD_LIBRARY(${PROJECT_NAME} SHARED
        src/util.c
        src/packet.c
        src/connector_packet.c
-       src/secom_socket.c
+       src/secure_socket.c
 )
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION})
@@ -47,7 +47,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION lib)
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/secom_socket.h DESTINATION include/${PROJECT_NAME})
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/secure_socket.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/connector.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/connector_packet.h DESTINATION include/${PROJECT_NAME})
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/packet.h DESTINATION include/${PROJECT_NAME})

diff --git a/debian/libconnector-dev.install.in b/debian/libconnector-dev.install.in
index 025babe..8246b57 100644 (file)
--- a/debian/libconnector-dev.install.in
+++ b/debian/libconnector-dev.install.in
@@ -1,5 +1,5 @@
 @PREFIX@/include/@PROJECT_NAME@/connector.h
 @PREFIX@/include/@PROJECT_NAME@/packet.h
 @PREFIX@/include/@PROJECT_NAME@/connector_packet.h
-@PREFIX@/include/@PROJECT_NAME@/secom_socket.h
+@PREFIX@/include/@PROJECT_NAME@/secure_socket.h
 @PREFIX@/lib/pkgconfig/*.pc

diff --git a/include/secom_socket.h b/include/secure_socket.h
similarity index 71%
rename from include/secom_socket.h
rename to include/secure_socket.h
index dfdca53..70d2485 100644 (file)
--- a/include/secom_socket.h
+++ b/include/secure_socket.h
@@ -27,33 +27,33 @@ extern "C" {
 /*
  * Create client connection
  */
-extern int secom_create_client(const char *peer);
+extern int secure_socket_create_client(const char *peer);
 
 /*
  * Create server connection
  */
-extern int secom_create_server(const char *peer);
+extern int secure_socket_create_server(const char *peer);
 
 /*
  * Get the raw handle to use it for non-blocking mode.
  */
-extern int secom_get_connection_handle(int server_handle);
-extern int secom_put_connection_handle(int conn_handle);
+extern int secure_socket_get_connection_handle(int server_handle);
+extern int secure_socket_remove_connection_handle(int conn_handle);
 
 /*
  * Send data to the connected peer.
  */
-extern int secom_send(int conn, const char *buffer, int size);
+extern int secure_socket_send(int conn, const char *buffer, int size);
 
 /*
  * Recv data from the connected peer. and its PID value
  */
-extern int secom_recv(int conn, char *buffer, int size, int *sender_pid);
+extern int secure_socket_recv(int conn, char *buffer, int size, int *sender_pid);
 
 /*
  * Destroy a connection
  */
-extern int secom_destroy(int conn);
+extern int secure_socket_destroy(int conn);
 
 #ifdef __cplusplus
 }

diff --git a/packaging/libconnector.spec b/packaging/libconnector.spec
index 9f2d529..f4bfffc 100644 (file)
--- a/packaging/libconnector.spec
+++ b/packaging/libconnector.spec
@@ -42,5 +42,5 @@ rm -rf %{buildroot}
 /usr/include/connector/connector.h
 /usr/include/connector/packet.h
 /usr/include/connector/connector_packet.h
-/usr/include/connector/secom_socket.h
+/usr/include/connector/secure_socket.h
 /usr/lib/pkgconfig/*.pc

diff --git a/src/connector.c b/src/connector.c
index 5f1143f..9aa3bfc 100644 (file)
--- a/src/connector.c
+++ b/src/connector.c
@@ -11,7 +11,7 @@
 #include <dlog.h>
 
 #include "dlist.h"
-#include "secom_socket.h"
+#include "secure_socket.h"
 #include "packet.h"
 #include "debug.h"
 #include "connector.h"
@@ -75,14 +75,14 @@ static gboolean client_cb(GIOChannel *src, GIOCondition cond, gpointer data)
        if (!(cond & G_IO_IN)) {
                DbgPrint("Client is disconencted\n");
                invoke_disconn_cb_list(client_fd);
-               secom_put_connection_handle(client_fd);
+               secure_socket_remove_connection_handle(client_fd);
                return FALSE;
        }
 
        if (ioctl(client_fd, FIONREAD, &readsize) < 0 || readsize == 0) {
                DbgPrint("Client is disconencted (readsize: %d)\n", readsize);
                invoke_disconn_cb_list(client_fd);
-               secom_put_connection_handle(client_fd);
+               secure_socket_remove_connection_handle(client_fd);
                return FALSE;
        }
 
@@ -90,7 +90,7 @@ static gboolean client_cb(GIOChannel *src, GIOCondition cond, gpointer data)
        if (ret < 0) {
                DbgPrint("service callback returns < 0\n");
                invoke_disconn_cb_list(client_fd);
-               secom_put_connection_handle(client_fd);
+               secure_socket_remove_connection_handle(client_fd);
                return FALSE;
        }
 
@@ -111,7 +111,7 @@ static gboolean accept_cb(GIOChannel *src, GIOCondition cond, gpointer data)
                return FALSE;
        }
 
-       client_fd = secom_get_connection_handle(socket_fd);
+       client_fd = secure_socket_get_connection_handle(socket_fd);
        if (client_fd < 0) {
                free(data);
                return FALSE;
@@ -126,7 +126,7 @@ static gboolean accept_cb(GIOChannel *src, GIOCondition cond, gpointer data)
        gio = g_io_channel_unix_new(client_fd);
        if (!gio) {
                ErrPrint("Failed to get gio\n");
-               secom_put_connection_handle(client_fd);
+               secure_socket_remove_connection_handle(client_fd);
                free(data);
                return FALSE;
        }
@@ -136,7 +136,7 @@ static gboolean accept_cb(GIOChannel *src, GIOCondition cond, gpointer data)
                GError *err = NULL;
                g_io_channel_unref(gio);
                g_io_channel_shutdown(gio, TRUE, &err);
-               secom_put_connection_handle(client_fd);
+               secure_socket_remove_connection_handle(client_fd);
                free(data);
                return FALSE;
        }
@@ -164,7 +164,7 @@ EAPI int connector_server_create(const char *addr, int is_sync, int (*service_cb
        cbdata->service_cb = service_cb;
        cbdata->data = data;
 
-       fd = secom_create_server(addr);
+       fd = secure_socket_create_server(addr);
        if (fd < 0) {
                free(cbdata);
                return fd;
@@ -215,7 +215,7 @@ EAPI int connector_client_create(const char *addr, int is_sync, int (*service_cb
        cbdata->service_cb = service_cb;
        cbdata->data = data;
 
-       client_fd = secom_create_client(addr);
+       client_fd = secure_socket_create_client(addr);
        if (client_fd < 0) {
                free(cbdata);
                return client_fd;

diff --git a/src/connector_packet.c b/src/connector_packet.c
index 15f4a8d..7205684 100644 (file)
--- a/src/connector_packet.c
+++ b/src/connector_packet.c
@@ -10,7 +10,7 @@
 #include "debug.h"
 #include "connector.h"
 #include "packet.h"
-#include "secom_socket.h"
+#include "secure_socket.h"
 #include "dlist.h"
 #include "connector_packet.h"
 #include "util.h"
@@ -161,7 +161,7 @@ static inline void packet_ready(int handle, const struct recv_ctx *receive, stru
                        result = table[i].handler(receive->pid, handle, receive->packet);
                        if (result) {
                                int ret;
-                               ret = secom_send(handle, (void *)packet_data(result), packet_size(result));
+                               ret = secure_socket_send(handle, (void *)packet_data(result), packet_size(result));
                                if (ret < 0)
                                        ErrPrint("Failed to send an ack packet\n");
                                packet_destroy(result);
@@ -250,7 +250,7 @@ static int service_cb(int handle, int readsize, void *data)
                                return -ENOMEM;
                        }
 
-                       ret = secom_recv(handle, ptr, size, &pid);
+                       ret = secure_socket_recv(handle, ptr, size, &pid);
                        if (ret < 0 || (receive->pid != -1 && receive->pid != pid)) {
                                ErrPrint("Recv[%d], pid[%d :: %d]\n", ret, receive->pid, pid);
                                free(ptr);
@@ -294,7 +294,7 @@ static int service_cb(int handle, int readsize, void *data)
                                return -ENOMEM;
                        }
 
-                       ret = secom_recv(handle, ptr, size, &pid);
+                       ret = secure_socket_recv(handle, ptr, size, &pid);
                        if (ret < 0 || receive->pid != pid) {
                                ErrPrint("Recv[%d], pid[%d :: %d]\n", ret, receive->pid, pid);
                                free(ptr);
@@ -349,7 +349,7 @@ EAPI int connector_packet_async_send(int handle, struct packet *packet, int (*re
        ctx->data = data;
        ctx->packet = packet_ref(packet);
 
-       ret = secom_send(handle, (void *)packet_data(packet), packet_size(packet));
+       ret = secure_socket_send(handle, (void *)packet_data(packet), packet_size(packet));
        if (ret != packet_size(packet)) {
                ErrPrint("Send failed. %d <> %d (handle: %d)\n", ret, packet_size(packet), handle);
                destroy_request_ctx(ctx);
@@ -363,7 +363,7 @@ EAPI int connector_packet_send_only(int handle, struct packet *packet)
 {
        int ret;
 
-       ret = secom_send(handle, (void *)packet_data(packet), packet_size(packet));
+       ret = secure_socket_send(handle, (void *)packet_data(packet), packet_size(packet));
        if (ret != packet_size(packet))
                return -EIO;
 
@@ -379,30 +379,30 @@ EAPI struct packet *connector_packet_oneshot_send(const char *addr, struct packe
        struct packet *result = NULL;
        void *ptr;
 
-       fd = secom_create_client(addr);
+       fd = secure_socket_create_client(addr);
        if (fd < 0)
                return NULL;
 
        if (fcntl(fd, F_SETFD, FD_CLOEXEC) < 0)
                ErrPrint("fcntl: %s\n", strerror(errno));
 
-       ret = secom_send(fd, (void *)packet_data(packet), packet_size(packet));
+       ret = secure_socket_send(fd, (void *)packet_data(packet), packet_size(packet));
        if (ret != packet_size(packet)) {
-               secom_destroy(fd);
+               secure_socket_destroy(fd);
                return NULL;
        }
 
        offset = 0;
        ptr = malloc(packet_header_size());
        if (!ptr) {
-               secom_destroy(fd);
+               secure_socket_destroy(fd);
                return NULL;
        }
 
-       ret = secom_recv(fd, ptr, packet_header_size(), &pid);
+       ret = secure_socket_recv(fd, ptr, packet_header_size(), &pid);
        if (ret < 0) {
                free(ptr);
-               secom_destroy(fd);
+               secure_socket_destroy(fd);
                return NULL;
        }
        result = packet_build(result, offset, ptr, ret);
@@ -411,20 +411,20 @@ EAPI struct packet *connector_packet_oneshot_send(const char *addr, struct packe
 
        ptr = malloc(packet_payload_size(result));
        if (!ptr) {
-               secom_destroy(fd);
+               secure_socket_destroy(fd);
                return NULL;
        }
 
-       ret = secom_recv(fd, ptr, packet_payload_size(result), &pid);
+       ret = secure_socket_recv(fd, ptr, packet_payload_size(result), &pid);
        if (ret < 0) {
                free(ptr);
-               secom_destroy(fd);
+               secure_socket_destroy(fd);
                return NULL;
        }
        result = packet_build(result, offset, ptr, ret);
        offset += ret;
        free(ptr);
-       secom_destroy(fd);
+       secure_socket_destroy(fd);
        return result;
 }
 

diff --git a/src/secom_socket.c b/src/secure_socket.c
similarity index 89%
rename from src/secom_socket.c
rename to src/secure_socket.c
index 54c92b7..56c3dbb 100644 (file)
--- a/src/secom_socket.c
+++ b/src/secure_socket.c
@@ -12,7 +12,7 @@
 
 #include <dlog.h>
 
-#include "secom_socket.h"
+#include "secure_socket.h"
 #include "debug.h"
 #include "util.h"
 
@@ -46,7 +46,7 @@ static inline int create_socket(const char *peer, struct sockaddr_un *addr)
        return handle;
 }
 
-EAPI int secom_create_client(const char *peer)
+EAPI int secure_socket_create_client(const char *peer)
 {
        struct sockaddr_un addr;
        int handle;
@@ -73,7 +73,7 @@ EAPI int secom_create_client(const char *peer)
        return handle;
 }
 
-EAPI int secom_create_server(const char *peer)
+EAPI int secure_socket_create_server(const char *peer)
 {
        int handle;
        int state;
@@ -109,7 +109,7 @@ EAPI int secom_create_server(const char *peer)
        return handle;
 }
 
-EAPI int secom_get_connection_handle(int server_handle)
+EAPI int secure_socket_get_connection_handle(int server_handle)
 {
        struct sockaddr_un addr;
        int handle;
@@ -128,7 +128,7 @@ EAPI int secom_get_connection_handle(int server_handle)
        return handle;
 }
 
-EAPI int secom_put_connection_handle(int conn_handle)
+EAPI int secure_socket_remove_connection_handle(int conn_handle)
 {
        if (close(conn_handle) < 0) {
                ErrPrint("Close a handle: %s\n", strerror(errno));
@@ -138,7 +138,7 @@ EAPI int secom_put_connection_handle(int conn_handle)
        return 0;
 }
 
-EAPI int secom_send(int handle, const char *buffer, int size)
+EAPI int secure_socket_send(int handle, const char *buffer, int size)
 {
        struct msghdr msg;
        struct iovec iov;
@@ -159,7 +159,7 @@ EAPI int secom_send(int handle, const char *buffer, int size)
        return iov.iov_len;
 }
 
-EAPI int secom_recv(int handle, char *buffer, int size, int *sender_pid)
+EAPI int secure_socket_recv(int handle, char *buffer, int size, int *sender_pid)
 {
        struct msghdr msg;
        struct cmsghdr *cmsg;
@@ -197,7 +197,7 @@ EAPI int secom_recv(int handle, char *buffer, int size, int *sender_pid)
        return iov.iov_len;
 }
 
-EAPI int secom_destroy(int handle)
+EAPI int secure_socket_destroy(int handle)
 {
        if (close(handle) < 0) {
                ErrPrint("Failed to close a handle\n");