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.

3 files changed, 20 insertions, 42 deletions

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;
 
diff --git a/src/lib/ipcpd_messages.proto b/src/lib/ipcpd_messages.proto
index 827bd370..da817944 100644
--- a/src/lib/ipcpd_messages.proto
+++ b/src/lib/ipcpd_messages.proto
@@ -45,11 +45,10 @@ message ipcp_msg {
         optional string name         =  5;
         optional sint32 port_id      =  6;
         optional string dst_name     =  7;
-        optional string src_ae_name  =  8;
-        optional sint32 qoscube      =  9;
-        optional dif_config_msg conf = 10;
-        optional sint32 fd           = 11;
-        optional sint32 api          = 12;
-        optional sint32 response     = 13;
-        optional sint32 result       = 14;
+        optional sint32 qoscube      =  8;
+        optional dif_config_msg conf =  9;
+        optional sint32 fd           = 10;
+        optional sint32 api          = 11;
+        optional sint32 response     = 12;
+        optional sint32 result       = 13;
 };
diff --git a/src/lib/irmd_messages.proto b/src/lib/irmd_messages.proto
index a0965f43..c25d2c18 100644
--- a/src/lib/irmd_messages.proto
+++ b/src/lib/irmd_messages.proto
@@ -52,17 +52,16 @@ enum irm_msg_code {
 message irm_msg {
         required irm_msg_code code   =  1;
         optional string ap_name      =  2;
-        optional string ae_name      =  3;
-        optional sint32 api          =  4;
-        optional uint32 ipcp_type    =  5;
-        repeated string dif_name     =  6;
-        repeated string args         =  7;
-        optional sint32 response     =  8;
-        optional string dst_name     =  9;
-        optional sint32 port_id      = 10;
-        optional sint32 qoscube      = 11;
-        optional dif_config_msg conf = 12;
-        optional uint32 opts         = 13;
-        repeated sint32 apis         = 14;
-        optional sint32 result       = 15;
+        optional sint32 api          =  3;
+        optional uint32 ipcp_type    =  4;
+        repeated string dif_name     =  5;
+        repeated string args         =  6;
+        optional sint32 response     =  7;
+        optional string dst_name     =  8;
+        optional sint32 port_id      =  9;
+        optional sint32 qoscube      = 10;
+        optional dif_config_msg conf = 11;
+        optional uint32 opts         = 12;
+        repeated sint32 apis         = 13;
+        optional sint32 result       = 14;
 };