Move all the send functions to new 'pdu_sender'

diff --git a/src/Makefile.am b/src/Makefile.am
index feba0bc6b5ae012a58096044c89aa890619722dc..25e66db30bf61cdc5d4e698fbee7ab20ccbbfabc 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,6 +13,7 @@ rtr_server_SOURCES += line_file.c line_file.h
 rtr_server_SOURCES += vrps.c vrps.h
 
 rtr_server_SOURCES += rtr/pdu_handler.c rtr/pdu_handler.h
+rtr_server_SOURCES += rtr/pdu_sender.c rtr/pdu_sender.h
 rtr_server_SOURCES += rtr/pdu_serializer.c rtr/pdu_serializer.h
 rtr_server_SOURCES += rtr/pdu.c rtr/pdu.h
 rtr_server_SOURCES += rtr/primitive_reader.c rtr/primitive_reader.h

diff --git a/src/rtr/pdu_handler.c b/src/rtr/pdu_handler.c
index 50046b9a549234dc4233eabb525a2cc9cb7366c7..38476382047d4feba2446c72ed31b6d2418f7b55 100644 (file)
--- a/src/rtr/pdu_handler.c
+++ b/src/rtr/pdu_handler.c
@@ -2,40 +2,12 @@
 
 #include <err.h>
 #include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
-#include "configuration.h"
 #include "pdu.h"
-#include "pdu_serializer.h"
-
-/* Header without length field is always 32 bits long */
-#define HEADER_LENGTH 4
-
-#define BUFFER_SIZE 32
-
-struct buffer {
-       size_t len;
-       size_t capacity;
-       char *data;
-};
+#include "pdu_sender.h"
 
 static int warn_unexpected_pdu(char *);
 
-static void
-init_buffer(struct buffer *buffer)
-{
-       buffer->capacity = BUFFER_SIZE;
-       buffer->data = malloc(BUFFER_SIZE);
-}
-
-static void
-free_buffer(struct buffer *buffer)
-{
-       free(buffer->data);
-}
-
 static int
 warn_unexpected_pdu(char *pdu_name)
 {
@@ -44,117 +16,6 @@ warn_unexpected_pdu(char *pdu_name)
        return -EINVAL;
 }
 
-/*
- * Set all the header values, EXCEPT length field.
- */
-static void
-set_header_values(struct pdu_header *header, u_int8_t version, u_int8_t type,
-    u_int16_t reserved)
-{
-       header->protocol_version = version;
-       header->pdu_type = type;
-       header->reserved = reserved;
-}
-
-static u_int32_t
-length_cache_response_pdu(struct cache_response_pdu *pdu)
-{
-       /* This PDU has no payload, consider 32 bits of the length field */
-       return HEADER_LENGTH + sizeof(u_int32_t);
-}
-
-static u_int32_t
-length_end_of_data_pdu(struct end_of_data_pdu *pdu)
-{
-       u_int32_t len;
-
-       /* Consider 32 bits of the length field */
-       len = HEADER_LENGTH + sizeof(u_int32_t);
-       len += sizeof(pdu->serial_number);
-       if (pdu->header.protocol_version == RTR_V1) {
-               len += sizeof(pdu->refresh_interval);
-               len += sizeof(pdu->retry_interval);
-               len += sizeof(pdu->expire_interval);
-       }
-
-       return len;
-}
-
-static int
-send_response(int fd, struct buffer *buffer)
-{
-       int error;
-
-       /*
-        * FIXME Check for buffer overflow
-        */
-
-       error = write(fd, buffer->data, buffer->len);
-       if (error < 0) {
-               err(error, "Error sending response");
-               /*
-                * TODO Send error PDU here depending on error type?
-                */
-               return error;
-       }
-
-       return 0;
-}
-
-static int
-send_cache_response_pdu(int fd, u_int8_t version, u_int16_t session_id)
-{
-       struct cache_response_pdu pdu;
-       struct buffer buffer;
-       int error;
-
-       init_buffer(&buffer);
-       set_header_values(&pdu.header, version,
-           CACHE_RESPONSE_PDU_TYPE, session_id);
-       pdu.header.length = length_cache_response_pdu(&pdu);
-
-       buffer.len = serialize_cache_response_pdu(&pdu, buffer.data);
-       error = send_response(fd, &buffer);
-       free_buffer(&buffer);
-       if (error)
-               return error;
-
-       return 0;
-}
-
-static int
-send_payload_pdus(int fd, u_int8_t version)
-{
-       // FIXME Complete me!!
-       return 0;
-}
-
-static int
-send_end_of_data_pdu(int fd, u_int8_t version, u_int16_t session_id)
-{
-       struct end_of_data_pdu pdu;
-       struct buffer buffer;
-       int error;
-
-       init_buffer(&buffer);
-       set_header_values(&pdu.header, version, END_OF_DATA_PDU_TYPE, session_id);
-       pdu.serial_number = 16;
-       if (version == RTR_V1) {
-               pdu.refresh_interval = config_get_refresh_interval();
-               pdu.retry_interval = config_get_retry_interval();
-               pdu.expire_interval = config_get_expire_interval();
-       }
-       pdu.header.length = length_end_of_data_pdu(&pdu);
-
-       buffer.len = serialize_end_of_data_pdu(&pdu, buffer.data);
-       error = send_response(fd, &buffer);
-       free_buffer(&buffer);
-       if (error)
-               return error;
-
-       return 0;
-}
-
 int
 handle_serial_notify_pdu(int fd, void *pdu)
 {

diff --git a/src/rtr/pdu_sender.c b/src/rtr/pdu_sender.c
new file mode 100644 (file)
index 0000000..31aef7e
--- /dev/null
+++ b/src/rtr/pdu_sender.c
@@ -0,0 +1,144 @@
+#include "pdu_sender.h"
+
+#include <err.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "configuration.h"
+#include "pdu.h"
+#include "pdu_serializer.h"
+
+/* Header without length field is always 32 bits long */
+#define HEADER_LENGTH 4
+
+#define BUFFER_SIZE 32
+
+struct buffer {
+       size_t len;
+       size_t capacity;
+       char *data;
+};
+
+static void
+init_buffer(struct buffer *buffer)
+{
+       buffer->capacity = BUFFER_SIZE;
+       buffer->data = malloc(BUFFER_SIZE);
+}
+
+static void
+free_buffer(struct buffer *buffer)
+{
+       free(buffer->data);
+}
+
+/*
+ * Set all the header values, EXCEPT length field.
+ */
+static void
+set_header_values(struct pdu_header *header, u_int8_t version, u_int8_t type,
+    u_int16_t reserved)
+{
+       header->protocol_version = version;
+       header->pdu_type = type;
+       header->reserved = reserved;
+}
+
+static u_int32_t
+length_cache_response_pdu(struct cache_response_pdu *pdu)
+{
+       /* This PDU has no payload, consider 32 bits of the length field */
+       return HEADER_LENGTH + sizeof(u_int32_t);
+}
+
+static u_int32_t
+length_end_of_data_pdu(struct end_of_data_pdu *pdu)
+{
+       u_int32_t len;
+
+       /* Consider 32 bits of the length field */
+       len = HEADER_LENGTH + sizeof(u_int32_t);
+       len += sizeof(pdu->serial_number);
+       if (pdu->header.protocol_version == RTR_V1) {
+               len += sizeof(pdu->refresh_interval);
+               len += sizeof(pdu->retry_interval);
+               len += sizeof(pdu->expire_interval);
+       }
+
+       return len;
+}
+
+static int
+send_response(int fd, struct buffer *buffer)
+{
+       int error;
+
+       /*
+        * FIXME Check for buffer overflow
+        */
+
+       error = write(fd, buffer->data, buffer->len);
+       if (error < 0) {
+               err(error, "Error sending response");
+               /*
+                * TODO Send error PDU here depending on error type?
+                */
+               return error;
+       }
+
+       return 0;
+}
+
+int
+send_cache_response_pdu(int fd, u_int8_t version, u_int16_t session_id)
+{
+       struct cache_response_pdu pdu;
+       struct buffer buffer;
+       int error;
+
+       init_buffer(&buffer);
+       set_header_values(&pdu.header, version,
+           CACHE_RESPONSE_PDU_TYPE, session_id);
+       pdu.header.length = length_cache_response_pdu(&pdu);
+
+       buffer.len = serialize_cache_response_pdu(&pdu, buffer.data);
+       error = send_response(fd, &buffer);
+       free_buffer(&buffer);
+       if (error)
+               return error;
+
+       return 0;
+}
+
+int
+send_payload_pdus(int fd, u_int8_t version)
+{
+       // FIXME Complete me!!
+       return 0;
+}
+
+int
+send_end_of_data_pdu(int fd, u_int8_t version, u_int16_t session_id)
+{
+       struct end_of_data_pdu pdu;
+       struct buffer buffer;
+       int error;
+
+       init_buffer(&buffer);
+       set_header_values(&pdu.header, version, END_OF_DATA_PDU_TYPE, session_id);
+       pdu.serial_number = 16;
+       if (version == RTR_V1) {
+               pdu.refresh_interval = config_get_refresh_interval();
+               pdu.retry_interval = config_get_retry_interval();
+               pdu.expire_interval = config_get_expire_interval();
+       }
+       pdu.header.length = length_end_of_data_pdu(&pdu);
+
+       buffer.len = serialize_end_of_data_pdu(&pdu, buffer.data);
+       error = send_response(fd, &buffer);
+       free_buffer(&buffer);
+       if (error)
+               return error;
+
+       return 0;
+}

diff --git a/src/rtr/pdu_sender.h b/src/rtr/pdu_sender.h
new file mode 100644 (file)
index 0000000..ba7815e
--- /dev/null
+++ b/src/rtr/pdu_sender.h
@@ -0,0 +1,12 @@
+#ifndef SRC_RTR_PDU_SENDER_H_
+#define SRC_RTR_PDU_SENDER_H_
+
+#include <sys/types.h>
+
+
+int send_cache_response_pdu(int, u_int8_t, u_int16_t);
+int send_payload_pdus(int, u_int8_t);
+int send_end_of_data_pdu(int, u_int8_t, u_int16_t);
+
+
+#endif /* SRC_RTR_PDU_SENDER_H_ */