summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-03-31 18:32:28 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-03-31 18:34:50 +0200
commit151adbc851c9b2a218f2be9409199c1baa62bd8d (patch)
tree5d13c9aa547018f70adfa054076fc4af8099b04b /include
parentb0dfdd839e0704af4f4bf4d4271688af9294e8c9 (diff)
downloadouroboros-151adbc851c9b2a218f2be9409199c1baa62bd8d.tar.gz
ouroboros-151adbc851c9b2a218f2be9409199c1baa62bd8d.zip
lib: Implementation of flow related ops
This adds the messages that are sent to the IPCPs related to flows. Some messages are also sent to the IRMd (e.g. when a new flow arrives).
Diffstat (limited to 'include')
-rw-r--r--include/ouroboros/ipcp.h18
-rw-r--r--include/ouroboros/sockets.h2
2 files changed, 9 insertions, 11 deletions
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index b39a6b0d..fdaf5c4a 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.h
@@ -23,10 +23,10 @@
#ifndef OUROBOROS_IPCP_H
#define OUROBOROS_IPCP_H
-#include <sys/types.h>
+#include <ouroboros/common.h>
+#include <ouroboros/instance_name.h>
-#include "common.h"
-#include "instance_name.h"
+#include <sys/types.h>
struct ipcp;
@@ -44,19 +44,17 @@ int ipcp_unreg(pid_t pid,
int ipcp_bootstrap(pid_t pid,
struct dif_config * conf);
-int ipcp_enroll(pid_t pid,
- char * dif_name,
- char * member_name,
- char ** n_1_difs,
- ssize_t n_1_difs_size);
+int ipcp_enroll(pid_t pid,
+ char * member_name,
+ char * n_1_dif);
/* Flow related ops, these go from IRMd to IPCP */
int ipcp_ap_reg(pid_t pid,
uint32_t reg_api_id,
char * ap_name);
-int ipcp_ap_unreg(pid_t pid,
- char * ap_name);
+int ipcp_ap_unreg(pid_t pid,
+ uint32_t reg_api_id);
int ipcp_flow_alloc(pid_t pid,
uint32_t port_id,
diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h
index 9904eecd..0c517bd4 100644
--- a/include/ouroboros/sockets.h
+++ b/include/ouroboros/sockets.h
@@ -37,7 +37,7 @@ typedef IpcpMsg ipcp_msg_t;
#define IRM_MSG_BUF_SIZE 256
#define IPCP_SOCK_PATH_PREFIX "/tmp/ipcp_sock"
-#define IPCP_MSG_BUFS_SIZE IRM_MSG_BUF_SIZE
+#define IPCP_MSG_BUF_SIZE IRM_MSG_BUF_SIZE
/* Returns the full socket path of an IPCP */
char * ipcp_sock_path(pid_t pid);