summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/ouroboros/CMakeLists.txt1
-rw-r--r--include/ouroboros/common.h24
-rw-r--r--include/ouroboros/dif_config.h61
-rw-r--r--include/ouroboros/ipcp.h10
-rw-r--r--include/ouroboros/irm.h12
-rw-r--r--include/ouroboros/sockets.h3
-rw-r--r--include/ouroboros/utils.h2
7 files changed, 81 insertions, 32 deletions
diff --git a/include/ouroboros/CMakeLists.txt b/include/ouroboros/CMakeLists.txt
index 0b52a2bc..fb4884b7 100644
--- a/include/ouroboros/CMakeLists.txt
+++ b/include/ouroboros/CMakeLists.txt
@@ -8,6 +8,7 @@ set(HEADER_FILES
common.h
da.h
dev.h
+ dif_config.h
du_buff.h
flow.h
instance_name.h
diff --git a/include/ouroboros/common.h b/include/ouroboros/common.h
index 658c3618..971a382a 100644
--- a/include/ouroboros/common.h
+++ b/include/ouroboros/common.h
@@ -42,28 +42,4 @@ struct qos_spec {
uint32_t jitter;
};
-/* FIXME: What should be configurable in the DIF? */
-struct dif_config {
- /* general data */
- char * dif_name;
-
- /* TODO: efficient policies */
-
- /* dt field sizes in octets */
- uint8_t addr_size;
- uint8_t cep_id_size;
- uint8_t pdu_length_size;
- uint8_t qos_id_size;
- uint8_t seqno_size;
-
- /* constants for dup */
- uint8_t ttl_size;
- uint8_t chk_size;
-
- /* values, octets */
- uint32_t min_pdu_size;
- uint32_t max_pdu_size;
-
-};
-
#endif /* OUROBOROS_COMMON_H */
diff --git a/include/ouroboros/dif_config.h b/include/ouroboros/dif_config.h
new file mode 100644
index 00000000..91b44cb1
--- /dev/null
+++ b/include/ouroboros/dif_config.h
@@ -0,0 +1,61 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * DIF configurations for each IPCP type
+ *
+ * Sander Vrijders <sander.vrijders@intec.ugent.be>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <ouroboros/utils.h>
+
+#ifndef OUROBOROS_DIF_CONFIG_H
+#define OUROBOROS_DIF_CONFIG_H
+
+enum ipcp_type {
+ IPCP_NORMAL = 1,
+ IPCP_SHIM_UDP
+};
+
+struct dif_config {
+ char * dif_name;
+ enum ipcp_type type;
+
+ union {
+ /* Normal DIF */
+ struct {
+ uint8_t addr_size;
+ uint8_t cep_id_size;
+ uint8_t pdu_length_size;
+ uint8_t qos_id_size;
+ uint8_t seqno_size;
+
+ /* DUP constants */
+ uint8_t ttl_size;
+ uint8_t chk_size;
+
+ uint32_t min_pdu_size;
+ uint32_t max_pdu_size;
+ };
+ /* Shim UDP */
+ struct {
+ uint32_t ip_addr;
+ };
+ };
+};
+
+
+#endif /* OUROBOROS_DIF_CONFIG_H */
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index fdaf5c4a..3198a882 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.h
@@ -24,7 +24,9 @@
#define OUROBOROS_IPCP_H
#include <ouroboros/common.h>
+#include <ouroboros/dif_config.h>
#include <ouroboros/instance_name.h>
+#include <ouroboros/sockets.h>
#include <sys/types.h>
@@ -32,7 +34,8 @@ struct ipcp;
/* Returns the process id */
pid_t ipcp_create(instance_name_t * api,
- char * ipcp_type);
+ enum ipcp_type ipcp_type);
+
int ipcp_destroy(pid_t pid);
int ipcp_reg(pid_t pid,
@@ -42,12 +45,13 @@ int ipcp_unreg(pid_t pid,
char ** difs,
size_t difs_size);
-int ipcp_bootstrap(pid_t pid,
- struct dif_config * conf);
int ipcp_enroll(pid_t pid,
char * member_name,
char * n_1_dif);
+int ipcp_bootstrap(pid_t pid,
+ dif_config_msg_t * conf);
+
/* Flow related ops, these go from IRMd to IPCP */
int ipcp_ap_reg(pid_t pid,
diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h
index 780bf77b..24bb2c42 100644
--- a/include/ouroboros/irm.h
+++ b/include/ouroboros/irm.h
@@ -23,18 +23,20 @@
#ifndef OUROBOROS_IRM_H
#define OUROBOROS_IRM_H
-#include "common.h"
-#include "instance_name.h"
+#include <ouroboros/instance_name.h>
+#include <ouroboros/dif_config.h>
int irm_create_ipcp(instance_name_t * api,
- char * ipcp_type);
+ enum ipcp_type ipcp_type);
+
int irm_destroy_ipcp(instance_name_t * api);
-int irm_bootstrap_ipcp(instance_name_t * api,
- struct dif_config * conf);
int irm_enroll_ipcp(instance_name_t * api,
char * dif_name);
+int irm_bootstrap_ipcp(instance_name_t * api,
+ struct dif_config * conf);
+
int irm_reg_ipcp(instance_name_t * api,
char ** difs,
size_t difs_size);
diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h
index 0c517bd4..be5ae651 100644
--- a/include/ouroboros/sockets.h
+++ b/include/ouroboros/sockets.h
@@ -27,6 +27,9 @@
#include <sys/types.h>
+#include "dif_config.pb-c.h"
+typedef DifConfigMsg dif_config_msg_t;
+
#include "irmd_messages.pb-c.h"
typedef IrmMsg irm_msg_t;
diff --git a/include/ouroboros/utils.h b/include/ouroboros/utils.h
index 2eaccae9..2e5a4944 100644
--- a/include/ouroboros/utils.h
+++ b/include/ouroboros/utils.h
@@ -20,6 +20,8 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#define MAX(a,b) (a > b ? a : b)
+
/*
* Returns the number of characters a uint would
* need when represented as a string