From 0a071a42d4e80f54e92f34911cafda3d666d35d5 Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@intec.ugent.be>
Date: Sun, 8 Jan 2017 11:14:43 +0100
Subject: ipcpd: Let IPCPs bind a name

This allows IPCPs to bind a name, so that they can announce their name
to neighbors which can then allocate a flow to them. Registering of
the name happens by an administrator. It also moves the irmd_api to
common ground, since it is used by all IPCPs.
---
 src/irmd/ipcp.c | 14 +++++++-------
 src/irmd/ipcp.h |  8 ++++----
 src/irmd/main.c |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/irmd')

diff --git a/src/irmd/ipcp.c b/src/irmd/ipcp.c
index 07ae0dc2..f16587e1 100644
--- a/src/irmd/ipcp.c
+++ b/src/irmd/ipcp.c
@@ -1,5 +1,5 @@
 /*
- * Ouroboros - Copyright (C) 2016
+ * Ouroboros - Copyright (C) 2016 - 2017
  *
  * The API to instruct IPCPs
  *
@@ -100,7 +100,7 @@ ipcp_msg_t * send_recv_ipcp_msg(pid_t api, ipcp_msg_t * msg)
        return recv_msg;
 }
 
-pid_t ipcp_create(enum ipcp_type ipcp_type)
+pid_t ipcp_create(char * name, enum ipcp_type ipcp_type)
 {
         pid_t api = -1;
         char irmd_api[10];
@@ -109,7 +109,7 @@ pid_t ipcp_create(enum ipcp_type ipcp_type)
         char * full_name = NULL;
         char * exec_name = NULL;
         char * log_file = NULL;
-        char * argv[4];
+        char * argv[5];
 
         sprintf(irmd_api, "%u", getpid());
 
@@ -119,9 +119,8 @@ pid_t ipcp_create(enum ipcp_type ipcp_type)
                 return api;
         }
 
-        if (api != 0) {
+        if (api != 0)
                 return api;
-        }
 
         if (ipcp_type == IPCP_NORMAL)
                 exec_name = IPCP_NORMAL_EXEC;
@@ -162,8 +161,9 @@ pid_t ipcp_create(enum ipcp_type ipcp_type)
         /* log_file to be placed at the end */
         argv[0] = full_name;
         argv[1] = irmd_api;
-        argv[2] = log_file;
-        argv[3] = NULL;
+        argv[2] = name;
+        argv[3] = log_file;
+        argv[4] = NULL;
 
         execv(argv[0], &argv[0]);
 
diff --git a/src/irmd/ipcp.h b/src/irmd/ipcp.h
index a3c2e89a..658aa2ea 100644
--- a/src/irmd/ipcp.h
+++ b/src/irmd/ipcp.h
@@ -1,5 +1,5 @@
 /*
- * Ouroboros - Copyright (C) 2016
+ * Ouroboros - Copyright (C) 2016 - 2017
  *
  * The API for the IRM to instruct IPCPs
  *
@@ -28,8 +28,8 @@
 #ifndef OUROBOROS_IPCP_H
 #define OUROBOROS_IPCP_H
 
-/* Returns the process id */
-pid_t ipcp_create(enum ipcp_type ipcp_type);
+pid_t ipcp_create(char *         name,
+                  enum ipcp_type ipcp_type);
 
 int   ipcp_destroy(pid_t api);
 
@@ -45,7 +45,7 @@ int   ipcp_name_reg(pid_t  api,
 int   ipcp_name_unreg(pid_t  api,
                       char * name);
 
-int   ipcp_name_query(pid_t api,
+int   ipcp_name_query(pid_t  api,
                       char * name);
 
 int   ipcp_flow_alloc(pid_t     api,
diff --git a/src/irmd/main.c b/src/irmd/main.c
index b7292e74..ceeb7184 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -1,5 +1,5 @@
 /*
- * Ouroboros - Copyright (C) 2016
+ * Ouroboros - Copyright (C) 2016 - 2017
  *
  * The IPC Resource Manager
  *
@@ -245,7 +245,7 @@ static pid_t create_ipcp(char * name, enum ipcp_type ipcp_type)
 
         pthread_rwlock_wrlock(&irmd->reg_lock);
 
-        api->pid = ipcp_create(ipcp_type);
+        api->pid = ipcp_create(name, ipcp_type);
         if (api->pid == -1) {
                 pthread_rwlock_unlock(&irmd->reg_lock);
                 pthread_rwlock_unlock(&irmd->state_lock);
-- 
cgit v1.2.3