From 6be9ae98877f23b05f69e6006036fec0f6c9d338 Mon Sep 17 00:00:00 2001
From: dimitri staessens <dimitri.staessens@intec.ugent.be>
Date: Tue, 26 Apr 2016 14:42:05 +0200
Subject: lib: instance ID's are now set to the process PID

All instance-id's in ouroboros will be set by the system to the pid of
the process associated with this application process instance. This
means that the user has no way to choose the instance id's. Function
calls that assumed manually defined instance id's have been replaced
throughout the system.
---
 src/ipcpd/shim-udp/main.c | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

(limited to 'src/ipcpd/shim-udp/main.c')

diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index f67c66ca..785f2344 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -96,7 +96,7 @@ void ipcp_sig_handler(int sig, siginfo_t * info, void * c)
         case SIGHUP:
                 LOG_DBG("Terminating by order of %d. Bye.", info->si_pid);
                 if (info->si_pid == irmd_pid) {
-                        shm_du_map_close(_ipcp->data->dum);
+                        /* shm_du_map_close(_ipcp->data->dum); */
                         exit(0);
                 }
         default:
@@ -104,29 +104,13 @@ void ipcp_sig_handler(int sig, siginfo_t * info, void * c)
         }
 }
 
-struct ipcp_udp_data * ipcp_udp_data_create(char * ap_name,
-                                            char * ap_id)
+struct ipcp_udp_data * ipcp_udp_data_create(char * ap_name)
 {
         struct ipcp_udp_data * udp_data;
         struct ipcp_data *     data;
-        instance_name_t *      instance_name;
         enum ipcp_type         ipcp_type;
         int                    n;
 
-        instance_name = instance_name_create();
-        if (instance_name  == NULL) {
-                LOG_ERR("Failed to create instance name struct.");
-                return NULL;
-        }
-
-        instance_name = instance_name_init_with(
-                instance_name, ap_name, (uint16_t) atoi(ap_id));
-
-        if (instance_name == NULL) {
-                LOG_ERR("Failed to create instance name struct.");
-                return NULL;
-        }
-
         udp_data = malloc(sizeof *udp_data);
         if (udp_data == NULL) {
                 LOG_DBGF("Failed to allocate.");
@@ -135,7 +119,7 @@ struct ipcp_udp_data * ipcp_udp_data_create(char * ap_name,
 
         ipcp_type = THIS_TYPE;
         data = (struct ipcp_data *) udp_data;
-        if (ipcp_data_init(data, instance_name, ipcp_type) == NULL) {
+        if (ipcp_data_init(data, ap_name, ipcp_type) == NULL) {
                 free(udp_data);
                 return NULL;
         }
@@ -548,7 +532,7 @@ int ipcp_udp_du_read(uint32_t port_id,
         return 0;
 }
 
-struct ipcp * ipcp_udp_create(char * ap_name, char * i_id)
+struct ipcp * ipcp_udp_create(char * ap_name)
 {
         struct ipcp * i;
         struct ipcp_udp_data * data;
@@ -558,7 +542,7 @@ struct ipcp * ipcp_udp_create(char * ap_name, char * i_id)
         if (i == NULL)
                 return NULL;
 
-        data = ipcp_udp_data_create(ap_name, i_id);
+        data = ipcp_udp_data_create(ap_name);
         if (data == NULL) {
                 free(i);
                 return NULL;
@@ -597,7 +581,6 @@ int main (int argc, char * argv[])
 {
         /* argument 1: pid of irmd ? */
         /* argument 2: ap name */
-        /* argument 3: instance id */
         struct sigaction sig_act;
 
         if (ipcp_arg_check(argc, argv)) {
@@ -619,7 +602,7 @@ int main (int argc, char * argv[])
         sigaction(SIGTERM, &sig_act, NULL);
         sigaction(SIGHUP,  &sig_act, NULL);
 
-        _ipcp = ipcp_udp_create(argv[2], argv[3]);
+        _ipcp = ipcp_udp_create(argv[2]);
         if (_ipcp == NULL) {
                 LOG_ERR("Won't.");
                 exit(1);
-- 
cgit v1.2.3