summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/CMakeLists.txt52
-rw-r--r--src/lib/ipcp.c94
-rw-r--r--src/lib/ipcpd_messages.proto14
-rw-r--r--src/lib/sockets.c245
4 files changed, 96 insertions, 309 deletions
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index 0427e236..52061645 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -3,48 +3,48 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_SOURCE_DIR}/include)
include_directories(${CMAKE_BINARY_DIR}/include)
-find_package(ProtobufC REQUIRED)
+find_package(ProtobufC REQUIRED)
include_directories(${PROTOBUF_INCLUDE_DIRS})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-protobuf_generate_c(PROTO_SRCS PROTO_HDRS irmd_messages.proto)
+protobuf_generate_c(IRM_PROTO_SRCS IRM_PROTO_HDRS irmd_messages.proto)
+protobuf_generate_c(IPCP_PROTO_SRCS IPCP_PROTO_HDRS ipcpd_messages.proto)
find_library(LIBRT_LIBRARIES rt)
if(NOT LIBRT_LIBRARIES)
- message(FATAL_ERROR "librt not found")
+ message(FATAL_ERROR "librt not found")
endif()
find_library(LIBPTHREAD_LIBRARIES pthread)
if(NOT LIBPTHREAD_LIBRARIES)
- message(FATAL_ERROR "libpthread not found")
+ message(FATAL_ERROR "libpthread not found")
endif()
set(SOURCE_FILES
- # Add source files here
- bitmap.c
- cdap.c
- da.c
- dev.c
- du_buff.c
- ipcp.c
- irm.c
- list.c
- rina_name.c
- shm_du_map.c
- sockets.c
- utils.c
- )
-
-install(FILES ${PROTO_HDRS}
- DESTINATION include/ouroboros)
-
-add_library(ouroboros SHARED ${SOURCE_FILES} ${PROTO_SRCS})
+ # Add source files here
+ bitmap.c
+ cdap.c
+ da.c
+ dev.c
+ du_buff.c
+ ipcp.c
+ irm.c
+ list.c
+ rina_name.c
+ shm_du_map.c
+ sockets.c
+ utils.c
+ )
+
+install(FILES ${IRM_PROTO_HDRS} ${IPCP_PROTO_HDRS}
+ DESTINATION include/ouroboros)
+
+add_library(ouroboros SHARED ${SOURCE_FILES}
+ ${IRM_PROTO_SRCS} ${IPCP_PROTO_SRCS})
target_link_libraries(ouroboros rt pthread ${PROTOBUF_C_LIBRARY})
include(MacroAddCompileFlags)
if (CMAKE_BUILD_TYPE MATCHES Debug)
- MACRO_ADD_COMPILE_FLAGS(ouroboros -DCONFIG_OUROBOROS_DEBUG)
+ MACRO_ADD_COMPILE_FLAGS(ouroboros -DCONFIG_OUROBOROS_DEBUG)
endif (CMAKE_BUILD_TYPE MATCHES Debug)
install(TARGETS ouroboros LIBRARY DESTINATION lib)
diff --git a/src/lib/ipcp.c b/src/lib/ipcp.c
index 53d717ba..445160f0 100644
--- a/src/lib/ipcp.c
+++ b/src/lib/ipcp.c
@@ -40,10 +40,10 @@
#include <sys/wait.h>
static int send_ipcp_msg(pid_t pid,
- struct ipcp_msg * msg)
+ ipcp_msg_t * msg)
{
int sockfd = 0;
- buffer_t * buf = NULL;
+ buffer_t buf;
char * sock_path;
sock_path = ipcp_sock_path(pid);
@@ -56,24 +56,31 @@ static int send_ipcp_msg(pid_t pid,
return -1;
}
- buf = serialize_ipcp_msg(msg);
- if (buf == NULL) {
- free(sock_path);
+ buf.size = ipcp_msg__get_packed_size(msg);
+ if (buf.size == 0) {
close(sockfd);
+ free(sock_path);
return -1;
}
- if (write(sockfd, buf->data, buf->size) == -1) {
+ buf.data = malloc(buf.size);
+ if (buf.data == NULL) {
+ close(sockfd);
+ free(sock_path);
+ return -ENOMEM;
+ }
+
+ ipcp_msg__pack(msg, buf.data);
+
+ if (write(sockfd, buf.data, buf.size) == -1) {
free(sock_path);
- free(buf->data);
- free(buf);
+ free(buf.data);
close(sockfd);
return -1;
}
- free(buf->data);
- free(buf);
-
+ free(buf.data);
+ free(sock_path);
close(sockfd);
return 0;
}
@@ -158,14 +165,16 @@ int ipcp_reg(pid_t pid,
char ** difs,
size_t difs_size)
{
- struct ipcp_msg msg;
+ ipcp_msg_t msg = IPCP_MSG__INIT;
- if (difs == NULL)
- return -1;
+ if (difs == NULL ||
+ difs_size == 0 ||
+ difs[0] == NULL)
+ return -EINVAL;
- msg.code = IPCP_REG;
- msg.difs = difs;
- msg.difs_size = difs_size;
+ msg.code = IPCP_MSG_CODE__IPCP_REG;
+ msg.dif_name = difs;
+ msg.n_dif_name = difs_size;
if (send_ipcp_msg(pid, &msg)) {
LOG_ERR("Failed to send message to daemon");
@@ -179,14 +188,16 @@ int ipcp_unreg(pid_t pid,
char ** difs,
size_t difs_size)
{
- struct ipcp_msg msg;
+ ipcp_msg_t msg = IPCP_MSG__INIT;
- if (difs == NULL)
- return -1;
+ if (difs == NULL ||
+ difs_size == 0 ||
+ difs[0] == NULL)
+ return -EINVAL;
- msg.code = IPCP_UNREG;
- msg.difs = difs;
- msg.difs_size = difs_size;
+ msg.code = IPCP_MSG_CODE__IPCP_UNREG;
+ msg.dif_name = difs;
+ msg.n_dif_name = difs_size;
if (send_ipcp_msg(pid, &msg)) {
LOG_ERR("Failed to send message to daemon");
@@ -197,12 +208,11 @@ int ipcp_unreg(pid_t pid,
}
int ipcp_bootstrap(pid_t pid,
- struct dif_config conf)
+ struct dif_config * conf)
{
- struct ipcp_msg msg;
+ ipcp_msg_t msg = IPCP_MSG__INIT;
- msg.code = IPCP_BOOTSTRAP;
- msg.conf = &conf;
+ msg.code = IPCP_MSG_CODE__IPCP_BOOTSTRAP;
if (send_ipcp_msg(pid, &msg)) {
LOG_ERR("Failed to send message to daemon");
@@ -218,24 +228,32 @@ int ipcp_enroll(pid_t pid,
char ** n_1_difs,
ssize_t n_1_difs_size)
{
- struct ipcp_msg msg;
-
- if (n_1_difs == NULL)
- return -1;
-
- if (dif_name == NULL)
+ ipcp_msg_t msg = IPCP_MSG__INIT;
+
+ if (n_1_difs == NULL ||
+ n_1_difs_size == 0 ||
+ n_1_difs[0] == NULL ||
+ dif_name == NULL ||
+ member_name == NULL)
+ return -EINVAL;
+
+ msg.code = IPCP_MSG_CODE__IPCP_ENROLL;
+ msg.dif_name = malloc(sizeof(*(msg.dif_name)));
+ if (msg.dif_name == NULL) {
+ LOG_ERR("Failed to malloc");
return -1;
-
- msg.code = IPCP_ENROLL;
- msg.dif_name = dif_name;
+ }
+ msg.dif_name[0] = dif_name;
msg.ap_name = member_name;
- msg.difs = n_1_difs;
- msg.difs_size = n_1_difs_size;
+ msg.n_1_dif_name = n_1_difs;
+ msg.n_n_1_dif_name = n_1_difs_size;
if (send_ipcp_msg(pid, &msg)) {
LOG_ERR("Failed to send message to daemon");
+ free(msg.dif_name);
return -1;
}
+ free(msg.dif_name);
return 0;
}
diff --git a/src/lib/ipcpd_messages.proto b/src/lib/ipcpd_messages.proto
new file mode 100644
index 00000000..0715fbe0
--- /dev/null
+++ b/src/lib/ipcpd_messages.proto
@@ -0,0 +1,14 @@
+enum ipcp_msg_code {
+ IPCP_BOOTSTRAP = 1;
+ IPCP_ENROLL = 2;
+ IPCP_REG = 3;
+ IPCP_UNREG = 4;
+};
+
+message ipcp_msg {
+ required ipcp_msg_code code = 1;
+ optional string ap_name = 2;
+ // Missing dif_config field here
+ repeated string dif_name = 4;
+ repeated string n_1_dif_name = 5;
+};
diff --git a/src/lib/sockets.c b/src/lib/sockets.c
index fcd5d55a..a699206d 100644
--- a/src/lib/sockets.c
+++ b/src/lib/sockets.c
@@ -111,7 +111,6 @@ int send_irm_msg(irm_msg_t * msg)
return -1;
}
- LOG_DBG("Size will be %lu", buf.size);
buf.data = malloc(buf.size);
if (buf.data == NULL) {
close(sockfd);
@@ -214,247 +213,3 @@ char * ipcp_sock_path(pid_t pid)
return full_name;
}
-
-static int serialized_string_len(uint8_t * data)
-{
- uint8_t * seek = data;
-
- while (*seek != '\0')
- seek++;
-
- return (seek - data) + 1;
-}
-
-static void ser_copy_value(size_t flen,
- void * dst,
- void * src,
- int * offset)
-{
- memcpy(dst + *offset, src, flen);
- *offset += flen;
-}
-
-static void deser_copy_value(size_t flen,
- void * dst,
- void * src,
- int * offset)
-{
- memcpy(dst, src + *offset, flen);
- *offset += flen;
-}
-
-static int deser_copy_string(uint8_t * data,
- char ** dst,
- int * offset)
-{
- size_t flen;
-
- flen = serialized_string_len(data + *offset);
- *dst = malloc(sizeof(**dst) * (flen + 1));
- if (*dst == NULL)
- return -1;
- deser_copy_value(flen, *dst, data, offset);
- return 0;
-}
-
-static void deser_copy_size_t(uint8_t * data,
- size_t * dst,
- int * offset)
-{
- *dst = 0;
- deser_copy_value(sizeof(size_t), dst, data, offset);
-}
-
-/* Move these to a separate file? */
-static buffer_t * buffer_create()
-{
- buffer_t * buf;
-
- buf = malloc(sizeof(*buf));
- if (buf == NULL)
- return NULL;
-
- buf->data = malloc(IRM_MSG_BUF_SIZE);
- if (buf->data == NULL) {
- free(buf);
- return NULL;
- }
-
- return buf;
-}
-
-static void buffer_destroy(buffer_t * buf)
-{
- if (buf->data != NULL)
- free(buf->data);
-
- if (buf != NULL)
- free(buf);
-}
-
-buffer_t * serialize_ipcp_msg(struct ipcp_msg * msg)
-{
- buffer_t * buf = NULL;
- uint8_t * data = NULL;
- int offset = 0;
- char ** pos = NULL;
- int i = 0;
-
- if (msg == NULL)
- return NULL;
-
- buf = buffer_create();
- if (buf == NULL)
- return NULL;
-
- data = buf->data;
-
- ser_copy_value(sizeof(enum ipcp_msg_code),
- data, &msg->code, &offset);
-
- switch (msg->code) {
- case IPCP_BOOTSTRAP:
- break;
- case IPCP_ENROLL:
- if (msg->dif_name == NULL) {
- buffer_destroy(buf);
- return NULL;
- }
-
- ser_copy_value(strlen(msg->dif_name) + 1, data,
- msg->dif_name, &offset);
-
- if (msg->ap_name == NULL) {
- LOG_ERR("Null pointer passed");
- buffer_destroy(buf);
- return NULL;
- }
- ser_copy_value(strlen(msg->ap_name) + 1, data,
- msg->ap_name, &offset);
-
- /* All these operations end with a list of DIFs */
- case IPCP_REG:
- case IPCP_UNREG:
- if (msg->difs == NULL || msg->difs[0] == NULL) {
- buffer_destroy(buf);
- return NULL;
- }
-
- ser_copy_value(sizeof(size_t), data, &msg->difs_size, &offset);
-
- pos = msg->difs;
- for (i = 0; i < msg->difs_size; i++) {
- ser_copy_value(strlen(*pos) + 1, data, *pos, &offset);
- pos++;
- }
- break;
- default:
- LOG_ERR("Don't know that code");
- buffer_destroy(buf);
- return NULL;
- }
-
- buf->size = offset;
-
- return buf;
-}
-
-struct ipcp_msg * deserialize_ipcp_msg(buffer_t * data)
-{
- struct ipcp_msg * msg;
- int i, j;
- int offset = 0;
- size_t difs_size;
-
- if (data == NULL || data->data == NULL) {
- LOG_ERR("Got a null pointer");
- return NULL;
- }
-
- msg = malloc(sizeof(*msg));
- if (msg == NULL) {
- LOG_ERR("Failed to allocate memory");
- return NULL;
- }
-
- deser_copy_value(sizeof(enum ipcp_msg_code),
- &msg->code, data->data, &offset);
-
- switch (msg->code) {
- case IPCP_BOOTSTRAP:
- break;
- case IPCP_ENROLL:
- if (deser_copy_string(data->data,
- &msg->dif_name,
- &offset)) {
- free(msg);
- return NULL;
- }
-
- deser_copy_string(data->data,
- &msg->ap_name,
- &offset);
- if (msg->ap_name == NULL) {
- LOG_ERR("Failed to reconstruct name");
- free(msg->dif_name);
- free(msg);
- return NULL;
- }
-
- deser_copy_size_t(data->data, &difs_size, &offset);
- msg->difs_size = difs_size;
-
- msg->difs = malloc(sizeof(*(msg->difs)) * difs_size);
- if (msg->difs == NULL) {
- free(msg->ap_name);
- free(msg->dif_name);
- free(msg);
- return NULL;
- }
-
- for (i = 0; i < difs_size; i++) {
- if (deser_copy_string(data->data,
- &msg->difs[i],
- &offset)) {
- for (j = 0; j < i; j++)
- free(msg->difs[j]);
- free(msg->dif_name);
- free(msg->difs);
- free(msg->ap_name);
- free(msg);
- return NULL;
- }
- }
- break;
- case IPCP_REG:
- case IPCP_UNREG:
- deser_copy_size_t(data->data, &difs_size, &offset);
- msg->difs_size = difs_size;
-
- msg->difs = malloc(sizeof(*(msg->difs)) * difs_size);
- if (msg->difs == NULL) {
- free(msg);
- return NULL;
- }
-
- for (i = 0; i < difs_size; i++) {
- if (deser_copy_string(data->data,
- &msg->difs[i],
- &offset)) {
- for (j = 0; j < i; j++)
- free(msg->difs[j]);
- free(msg->difs);
- free(msg);
- return NULL;
- }
- }
-
- break;
- default:
- LOG_ERR("Don't know that code");
- free(msg);
- return NULL;
- }
-
- return msg;
-}
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-31 01:16:02 +0000