summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-04-27 15:40:50 +0200
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-04-27 15:40:50 +0200
commit34c40b7ba465382cfc3ef83af00793dfbb8fa943 (patch)
tree9f64215f326c3847699ae8856ae9cd0d609cbfac /include
parentb6dc5ba9576d61d42db82c3da8cb0c039fac7179 (diff)
parent6809a2beea07a661a9c651cae1e100537c401bb7 (diff)
downloadouroboros-34c40b7ba465382cfc3ef83af00793dfbb8fa943.tar.gz
ouroboros-34c40b7ba465382cfc3ef83af00793dfbb8fa943.zip
Merge remote-tracking branch 'upstream/be' into be
Diffstat (limited to 'include')
-rw-r--r--include/ouroboros/ipcp.h25
-rw-r--r--include/ouroboros/irm.h6
2 files changed, 16 insertions, 15 deletions
diff --git a/include/ouroboros/ipcp.h b/include/ouroboros/ipcp.h
index 3198a882..e3c17bda 100644
--- a/include/ouroboros/ipcp.h
+++ b/include/ouroboros/ipcp.h
@@ -33,8 +33,8 @@
struct ipcp;
/* Returns the process id */
-pid_t ipcp_create(instance_name_t * api,
- enum ipcp_type ipcp_type);
+pid_t ipcp_create(char * ipcp_name,
+ enum ipcp_type ipcp_type);
int ipcp_destroy(pid_t pid);
@@ -54,15 +54,14 @@ int ipcp_bootstrap(pid_t pid,
/* 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,
- uint32_t reg_api_id);
+int ipcp_name_reg(pid_t pid,
+ char * name);
+int ipcp_name_unreg(pid_t pid,
+ char * name);
int ipcp_flow_alloc(pid_t pid,
uint32_t port_id,
- char * dst_ap_name,
+ char * dst_name,
char * src_ap_name,
char * src_ae_name,
struct qos_spec * qos);
@@ -73,13 +72,13 @@ int ipcp_flow_alloc_resp(pid_t pid,
/* These operations go from the IPCP to the IRMd */
/* Returns the port_id */
-int ipcp_flow_req_arr(pid_t pid,
- uint32_t reg_api_id,
- char * ap_name,
- char * ae_name);
+int ipcp_flow_req_arr(pid_t pid,
+ char * dst_name,
+ char * src_ap_name,
+ char * src_ae_name);
int ipcp_flow_alloc_reply(pid_t pid,
uint32_t port_id,
- int result);
+ int response);
/*
* This operation can go both ways
diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h
index 24bb2c42..37524098 100644
--- a/include/ouroboros/irm.h
+++ b/include/ouroboros/irm.h
@@ -26,8 +26,10 @@
#include <ouroboros/instance_name.h>
#include <ouroboros/dif_config.h>
-int irm_create_ipcp(instance_name_t * api,
- enum ipcp_type ipcp_type);
+#include <sys/types.h>
+
+pid_t irm_create_ipcp(char * ipcp_name,
+ enum ipcp_type ipcp_type);
int irm_destroy_ipcp(instance_name_t * api);