From cdab533860ba69423695e1d08acc25b074a0e065 Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@intec.ugent.be>
Date: Fri, 24 Feb 2017 16:03:28 +0100
Subject: lib: Remove application entity name

The AE name should not be passed over the layer boundaries. If an
application has more than one AE it should exchange this in CACEP.
---
 src/lib/dev.c | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

(limited to 'src/lib/dev.c')

diff --git a/src/lib/dev.c b/src/lib/dev.c
index 4d85a5d9..cb8044cf 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -382,8 +382,7 @@ void ap_fini()
         pthread_rwlock_destroy(&ai.data_lock);
 }
 
-int flow_accept(char **     ae_name,
-                qosspec_t * spec)
+int flow_accept(qosspec_t * spec)
 {
         irm_msg_t msg = IRM_MSG__INIT;
         irm_msg_t * recv_msg = NULL;
@@ -451,18 +450,6 @@ int flow_accept(char **     ae_name,
                 return -1;
         }
 
-        if (ae_name != NULL) {
-                *ae_name = strdup(recv_msg->ae_name);
-                if (*ae_name == NULL) {
-                        reset_flow(fd);
-                        bmp_release(ai.fds, fd);
-                        pthread_rwlock_unlock(&ai.flows_lock);
-                        pthread_rwlock_unlock(&ai.data_lock);
-                        irm_msg__free_unpacked(recv_msg, NULL);
-                        return -ENOMEM;
-                }
-        }
-
         ai.flows[fd].port_id = recv_msg->port_id;
         ai.flows[fd].oflags  = FLOW_O_DEFAULT;
         ai.flows[fd].api     = recv_msg->api;
@@ -531,7 +518,6 @@ int flow_alloc_resp(int fd,
 }
 
 int flow_alloc(const char * dst_name,
-               const char * src_ae_name,
                qosspec_t *  spec)
 {
         irm_msg_t msg = IRM_MSG__INIT;
@@ -541,12 +527,8 @@ int flow_alloc(const char * dst_name,
         if (dst_name == NULL)
                 return -EINVAL;
 
-        if (src_ae_name == NULL)
-                src_ae_name  = UNKNOWN_AE;
-
         msg.code        = IRM_MSG_CODE__IRM_FLOW_ALLOC;
         msg.dst_name    = (char *) dst_name;
-        msg.ae_name     = (char *) src_ae_name;
         msg.has_api     = true;
         msg.has_qoscube = true;
         msg.qoscube     = spec_to_cube(spec);
@@ -1270,7 +1252,6 @@ int ipcp_create_r(pid_t api,
 
 int ipcp_flow_req_arr(pid_t     api,
                       char *    dst_name,
-                      char *    src_ae_name,
                       qoscube_t cube)
 {
         irm_msg_t msg = IRM_MSG__INIT;
@@ -1278,14 +1259,13 @@ int ipcp_flow_req_arr(pid_t     api,
         int port_id = -1;
         int fd = -1;
 
-        if (dst_name == NULL || src_ae_name == NULL)
+        if (dst_name == NULL)
                 return -EINVAL;
 
         msg.code        = IRM_MSG_CODE__IPCP_FLOW_REQ_ARR;
         msg.has_api     = true;
         msg.api         = api;
         msg.dst_name    = dst_name;
-        msg.ae_name     = src_ae_name;
         msg.has_qoscube = true;
         msg.qoscube     = cube;
 
-- 
cgit v1.2.3