Merged in sandervrijders/ouroboros/be (pull request #170)

Be

5 files changed, 126 insertions, 4 deletions

diff --git a/src/ipcpd/ipcp-ops.h b/src/ipcpd/ipcp-ops.h
index 8f444a79..e43c2c38 100644
--- a/src/ipcpd/ipcp-ops.h
+++ b/src/ipcpd/ipcp-ops.h
@@ -30,8 +30,7 @@
 
 struct ipcp_ops {
         int   (* ipcp_bootstrap)(struct dif_config * conf);
-        int   (* ipcp_enroll)(char * dif_name,
-                              char * n_1_dif);
+        int   (* ipcp_enroll)(char * dif_name);
         int   (* ipcp_name_reg)(char *   name);
         int   (* ipcp_name_unreg)(char * name);
         int   (* ipcp_flow_alloc)(pid_t         n_api,
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index 444d17bb..fb31cf1b 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -184,8 +184,7 @@ void * ipcp_main_loop(void * o)
                         }
                         ret_msg.has_result = true;
                         ret_msg.result =
-                                _ipcp->ops->ipcp_enroll(msg->dif_name,
-                                                        msg->n_1_dif);
+                                _ipcp->ops->ipcp_enroll(msg->dif_name);
 
                         break;
                 case IPCP_MSG_CODE__IPCP_NAME_REG:
diff --git a/src/ipcpd/normal/fmgr.h b/src/ipcpd/normal/fmgr.h
new file mode 100644
index 00000000..8a335e77
--- /dev/null
+++ b/src/ipcpd/normal/fmgr.h
@@ -0,0 +1,52 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * Flow manager of the IPC Process
+ *
+ *    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.
+ */
+
+#ifndef OUROBOROS_IPCP_FMGR_H
+#define OUROBOROS_IPCP_FMGR_H
+
+#include <ouroboros/qos.h>
+#include <ouroboros/shared.h>
+
+int fmgr_init();
+int fmgr_fini();
+
+/* N-flow ops */
+int fmgr_mgmt_flow(char * dst_name);
+int fmgr_dt_flow(char * dst_name);
+
+/* N+1-flow ops */
+int fmgr_flow_alloc(pid_t         n_api,
+                    int           port_id,
+                    char *        dst_ap_name,
+                    char *        src_ae_name,
+                    enum qos_cube qos);
+
+int fmgr_flow_alloc_resp(pid_t n_api,
+                         int   port_id,
+                         int   response);
+
+int fmgr_flow_dealloc(int port_id);
+
+/* RIB Manager calls this (param will be of type fmgr_msg_t) */
+int fmgr_flow_msg();
+
+#endif
diff --git a/src/ipcpd/normal/frct.h b/src/ipcpd/normal/frct.h
new file mode 100644
index 00000000..2ac66652
--- /dev/null
+++ b/src/ipcpd/normal/frct.h
@@ -0,0 +1,37 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * The Flow and Retransmission control component
+ *
+ *    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.
+ */
+
+#ifndef OUROBOROS_IPCP_FRCT_H
+#define OUROBOROS_IPCP_FRCT_H
+
+struct frct_i;
+
+int             frct_init(struct dt_const * const);
+int             frct_fini();
+
+struct frct_i * frct_i_create(int port_id,
+                              enum qos_cube cube);
+int             frct_i_destroy(struct frct_i * instance);
+
+int             frct_dt_flow(int fd);
+
+#endif
diff --git a/src/ipcpd/normal/ribmgr.h b/src/ipcpd/normal/ribmgr.h
new file mode 100644
index 00000000..b39aba63
--- /dev/null
+++ b/src/ipcpd/normal/ribmgr.h
@@ -0,0 +1,35 @@
+/*
+ * Ouroboros - Copyright (C) 2016
+ *
+ * RIB manager of the IPC Process
+ *
+ *    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.
+ */
+
+#ifndef OUROBOROS_IPCP_RIBMGR_H
+#define OUROBOROS_IPCP_RIBMGR_H
+
+int rib_init();
+int rib_fini();
+
+int rib_mgmt_flow(int fd);
+int rib_bootstrap(struct dif_config * conf);
+
+/* Called by Flow Manager (param of type fmgr_msg_t) */
+int rib_fmgr_msg();
+
+#endif