Merge branch 'be' of bitbucket.org:ouroboros-rina/ouroboros into be

5 files changed, 297 insertions, 2 deletions

diff --git a/include/ouroboros/cdap.h b/include/ouroboros/cdap.h
new file mode 100644
index 00000000..f1abeff5
--- /dev/null
+++ b/include/ouroboros/cdap.h
@@ -0,0 +1,171 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * The Common Distributed Application Protocol
+ *
+ *    Sander Vrijders <[email protected]>
+ *
+ * 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.
+ */
+
+#ifndef OUROBOROS_CDAP_H
+#define OUROBOROS_CDAP_H
+
+#include "common.h"
+#include <stdbool.h>
+
+struct cdap;
+
+struct cdap_ops {
+        /* Sender related callbacks */
+        int (* handle_connect_r)(port_id_t id,
+                                 int invoke_id,
+                                 int result);
+        int (* handle_release_r)(port_id_t id,
+                                 int invoke_id,
+                                 int result);
+        int (* handle_read_r)(port_id_t id,
+                              int invoke_id,
+                              int result,
+                              char * reason,
+                              char * obj_val,
+                              bool complete);
+        int (* handle_cancelread_r)(port_id_t id,
+                                    int invoke_id,
+                                    int result);
+        int (* handle_write_r)(port_id_t id,
+                               int invoke_id,
+                               int result,
+                               char * reason,
+                               char * obj_val);
+        int (* handle_create_r)(port_id_t id,
+                                int invoke_id,
+                                int result);
+        int (* handle_delete_r)(port_id_t id,
+                                int invoke_id,
+                                int result);
+        int (* handle_start_r)(port_id_t id,
+                               int invoke_id,
+                               int result);
+        int (* handle_stop_r)(port_id_t id,
+                              int invoke_id,
+                              int result);
+
+        /* Receiver related callbacks */
+        int (* handle_connect)(port_id_t id,
+                               int invoke_id,
+                               rina_name_t src,
+                               rina_name_t dst,
+                               char * auth_mech,
+                               char * auth_val);
+        int (* handle_release)(port_id_t id,
+                               int invoke_id);
+        int (* handle_cancelread)(port_id_t id,
+                                  int invoke_id);
+        int (* handle_write)(port_id_t id,
+                             int invoke_id,
+                             char * obj_name,
+                             char * obj_val);
+        int (* handle_create)(port_id_t id,
+                              int invoke_id,
+                              char * obj_class,
+                              char * obj_name,
+                              char * obj_val);
+        int (* handle_delete)(port_id_t id,
+                              int invoke_id,
+                              char * obj_name);
+        int (* handle_start)(port_id_t id,
+                             int invoke_id,
+                             char * obj_name,
+                             char * obj_val);
+        int (* handle_stop)(port_id_t id,
+                            int invoke_id,
+                            char * obj_name,
+                            char * obj_val);
+};
+
+struct cdap * cdap_create(struct cdap_ops ops,
+                          port_id_t id);
+int           cdap_destroy(struct cdap * instance);
+
+/* Sender related functions */
+int           cdap_send_connect(struct cdap * instance,
+                                int invoke_id,
+                                rina_name_t src,
+                                rina_name_t dst,
+                                char * auth_mech,
+                                char * auth_val);
+int           cdap_send_release(struct cdap * instance,
+                                int invoke_id);
+int           cdap_send_read(struct cdap * instance,
+                             int invoke_id,
+                             char * obj_name);
+int           cdap_send_cancelread(struct cdap * instance,
+                                   int invoke_id,
+                                   char * obj_name);
+int           cdap_send_write(struct cdap * instance,
+                              int invoke_id,
+                              char * obj_name,
+                              char * obj_val);
+int           cdap_send_create(struct cdap * instance,
+                               int invoke_id,
+                               char * obj_name,
+                               char * obj_val);
+int           cdap_send_delete(struct cdap * instance,
+                               int invoke_id,
+                               char * obj_name);
+int           cdap_send_start(struct cdap * instance,
+                              int invoke_id,
+                              char * obj_name,
+                              char * obj_val);
+int           cdap_send_stop(struct cdap * instance,
+                             int invoke_id,
+                             char * obj_name,
+                             char * obj_val);
+
+/* Receiver related functions */
+int           cdap_send_connect_r(struct cdap * instance,
+                                  int invoke_id,
+                                  int result);
+int           cdap_send_release_r(struct cdap * instance,
+                                  int invoke_id,
+                                  int result);
+int           cdap_send_read_r(struct cdap * instance,
+                               int invoke_id,
+                               int result,
+                               char * reason,
+                               char * obj_val,
+                               bool complete);
+int           cdap_send_cancelread_r(struct cdap * instance,
+                                     int invoke_id,
+                                     int result);
+int           cdap_send_write_r(struct cdap * instance,
+                                int invoke_id,
+                                int result,
+                                char * obj_name,
+                                char * obj_val);
+int           cdap_send_create_r(struct cdap * instance,
+                                 int invoke_id,
+                                 int result);
+int           cdap_send_delete_r(struct cdap * instance,
+                                 int invoke_id,
+                                 int result);
+int           cdap_send_start_r(struct cdap * instance,
+                                int invoke_id,
+                                int result);
+int           cdap_send_stop_r(struct cdap * instance,
+                               int invoke_id,
+                               int result);
+#endif
diff --git a/include/ouroboros/common.h b/include/ouroboros/common.h
index 4d76d230..f2be815f 100644
--- a/include/ouroboros/common.h
+++ b/include/ouroboros/common.h
@@ -35,9 +35,9 @@ typedef struct {
 
 typedef struct {
         char * ap_name;
-        int ap_id;
+        int api_id;
         char * ae_name;
-        int ae_id;
+        int aei_id;
 } rina_name_t;
 
 /* FIXME: To be extended to have all QoS params */
@@ -48,4 +48,9 @@ struct qos_spec {
         double jitter;
 };
 
+/* FIXME: What should be configurable in the DIF? */
+struct dif_info {
+        int cep_id_size;
+};
+
 #endif
diff --git a/include/ouroboros/da.h b/include/ouroboros/da.h
new file mode 100644
index 00000000..62bc66e5
--- /dev/null
+++ b/include/ouroboros/da.h
@@ -0,0 +1,31 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * The API to consult the DIF Allocator
+ *
+ *    Sander Vrijders <[email protected]>
+ *
+ * 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.
+ */
+
+#ifndef OUROBOROS_DA_H
+#define OUROBOROS_DA_H
+
+#include "common.h"
+
+rina_name_t da_resolve_daf(char * daf_name);
+char **     da_resolve_dap(rina_name_t * name);
+
+#endif
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
new file mode 100644
index 00000000..91223bec
--- /dev/null
+++ b/include/ouroboros/ipcp.h
@@ -0,0 +1,43 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * The API for the IRM to instruct IPCPs
+ *
+ *    Sander Vrijders <[email protected]>
+ *
+ * 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.
+ */
+
+#ifndef OUROBOROS_IPCP_H
+#define OUROBOROS_IPCP_H
+
+#include "common.h"
+
+int ipcp_create(rina_name_t name,
+                char * ipcp_type);
+int ipcp_destroy(int instance);
+
+int ipcp_reg(int instance,
+             char ** difs);
+int ipcp_unreg(int instance,
+               char ** difs);
+
+int ipcp_bootstrap(int instance,
+                   struct dif_info info);
+int ipcp_enroll(int instance,
+                char * dif_name,
+                rina_name_t member);
+
+#endif
diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h
new file mode 100644
index 00000000..954e4b2d
--- /dev/null
+++ b/include/ouroboros/irm.h
@@ -0,0 +1,45 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * The API to instruct the IRM
+ *
+ *    Sander Vrijders <[email protected]>
+ *
+ * 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.
+ */
+
+#ifndef OUROBOROS_IRM_H
+#define OUROBOROS_IRM_H
+
+#include "common.h"
+
+int     irm_create_ipcp(rina_name_t name,
+                        char * ipcp_type);
+int     irm_destroy_ipcp(int ipcp_id);
+
+int     irm_bootstrap_ipcp(int ipcp_id,
+                           struct dif_info info);
+int     irm_enroll_ipcp(int ipcp_id,
+                        char * dif_name);
+
+int     irm_reg_ipcp(int ipcp_id,
+                     char ** difs);
+int     irm_unreg_ipcp(int ipcp_id,
+                       char ** difs);
+
+char ** irm_list_ipcps();
+char ** irm_list_ipcp_types();
+
+#endif