summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSander Vrijders <sander.vrijders@intec.ugent.be>2016-03-01 15:43:41 +0100
committerSander Vrijders <sander.vrijders@intec.ugent.be>2016-03-01 15:43:41 +0100
commit52a5113760802e16b07d9d954237871d52cff70a (patch)
tree07b806048cc9a792b5127bd5decb81b7ca907197 /include
parente5bfc52e93654a8be7893cf5573c9c04e9c96c55 (diff)
parent45ad14035a06e4947b1cc1d908bb665646c1f2a0 (diff)
downloadouroboros-52a5113760802e16b07d9d954237871d52cff70a.tar.gz
ouroboros-52a5113760802e16b07d9d954237871d52cff70a.zip
Merged in sandervrijders/ouroboros/be (pull request #17)
lib, irmd, tools: Provide more IRM messages
Diffstat (limited to 'include')
-rw-r--r--include/ouroboros/irm.h19
-rw-r--r--include/ouroboros/sockets.h16
2 files changed, 17 insertions, 18 deletions
diff --git a/include/ouroboros/irm.h b/include/ouroboros/irm.h
index 954e4b2d..819675d1 100644
--- a/include/ouroboros/irm.h
+++ b/include/ouroboros/irm.h
@@ -27,19 +27,18 @@
int irm_create_ipcp(rina_name_t name,
char * ipcp_type);
-int irm_destroy_ipcp(int ipcp_id);
+int irm_destroy_ipcp(rina_name_t name);
-int irm_bootstrap_ipcp(int ipcp_id,
+int irm_bootstrap_ipcp(rina_name_t name,
struct dif_info info);
-int irm_enroll_ipcp(int ipcp_id,
+int irm_enroll_ipcp(rina_name_t name,
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();
+int irm_reg_ipcp(rina_name_t name,
+ char ** difs,
+ size_t difs_size);
+int irm_unreg_ipcp(rina_name_t name,
+ char ** difs,
+ size_t difs_size);
#endif
diff --git a/include/ouroboros/sockets.h b/include/ouroboros/sockets.h
index fe7ddb28..88e9564b 100644
--- a/include/ouroboros/sockets.h
+++ b/include/ouroboros/sockets.h
@@ -24,6 +24,7 @@
#define OUROBOROS_SOCKETS_H
#define IRM_SOCK_PATH "/tmp/irm_sock"
+#define IRM_MSG_BUF_SIZE 256
enum irm_msg_code {
IRM_CREATE_IPCP,
@@ -31,18 +32,17 @@ enum irm_msg_code {
IRM_BOOTSTRAP_IPCP,
IRM_ENROLL_IPCP,
IRM_REG_IPCP,
- IRM_UNREG_IPCP,
- IRM_LIST_IPCPS
+ IRM_UNREG_IPCP
};
struct irm_msg {
enum irm_msg_code code;
- union {
- struct {
- rina_name_t * name;
- char * ipcp_type;
- } create_ipcp;
- } msgs;
+ rina_name_t * name;
+ char * ipcp_type;
+ struct dif_info * info;
+ char * dif_name;
+ char ** difs;
+ size_t difs_size;
};
int client_socket_open(char * file_name);