lib, irmd, tools, ipcpd: updates to dev API.

The registration function has been moved to the irm tool, applications
now need to be registered by an administrator. Currently only supports
one instance per registered name, and an AP can be registered under
only one name.

The irmd can now start a registered server application on demand.

For the full functionality of the tool, execute "irm register".

AP name removed from flow allocation. Flow allocation does not send
the source ap name as it is quite useless. The accept() call now only
returns the AE name.

5 files changed, 4 insertions, 17 deletions

diff --git a/src/ipcpd/ipcp-ops.h b/src/ipcpd/ipcp-ops.h
index 72c57595..ffbc9cd7 100644
--- a/src/ipcpd/ipcp-ops.h
+++ b/src/ipcpd/ipcp-ops.h
@@ -41,7 +41,6 @@ struct ipcp_ops {
         int   (* ipcp_flow_alloc)(pid_t         n_pid,
                                   int           port_id,
                                   char *        dst_ap_name,
-                                  char *        src_ap_name,
                                   char *        src_ae_name,
                                   enum qos_cube qos);
         int   (* ipcp_flow_alloc_resp)(pid_t n_pid,
diff --git a/src/ipcpd/ipcp.c b/src/ipcpd/ipcp.c
index e0dd1b60..09dfa449 100644
--- a/src/ipcpd/ipcp.c
+++ b/src/ipcpd/ipcp.c
@@ -206,7 +206,6 @@ void * ipcp_main_loop(void * o)
                                 _ipcp->ops->ipcp_flow_alloc(msg->pid,
                                                             msg->port_id,
                                                             msg->dst_name,
-                                                            msg->src_ap_name,
                                                             msg->src_ae_name,
                                                             msg->qos_cube);
                         break;
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index 4a0ad683..cb20a336 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -341,7 +341,6 @@ static int ipcp_local_name_unreg(char * name)
 static int ipcp_local_flow_alloc(pid_t         n_pid,
                                  int           port_id,
                                  char *        dst_name,
-                                 char *        src_ap_name,
                                  char *        src_ae_name,
                                  enum qos_cube qos)
 {
@@ -350,9 +349,9 @@ static int ipcp_local_flow_alloc(pid_t         n_pid,
 
         struct shm_ap_rbuff * rb;
 
-        LOG_INFO("Allocating flow from %s to %s.", src_ap_name, dst_name);
+        LOG_INFO("Allocating flow to %s.", dst_name);
 
-        if (dst_name == NULL || src_ap_name == NULL || src_ae_name == NULL)
+        if (dst_name == NULL || src_ae_name == NULL)
                 return -1;
 
         /* This ipcpd has all QoS */
@@ -387,7 +386,6 @@ static int ipcp_local_flow_alloc(pid_t         n_pid,
         /* reply to IRM */
         port_id = ipcp_flow_req_arr(getpid(),
                                     dst_name,
-                                    src_ap_name,
                                     src_ae_name);
 
         if (port_id < 0) {
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index 48fa141e..99fb134d 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -384,7 +384,6 @@ static int send_shim_udp_msg(shim_udp_msg_t * msg,
 static int ipcp_udp_port_alloc(uint32_t dst_ip_addr,
                                uint32_t src_udp_port,
                                char *   dst_name,
-                               char *   src_ap_name,
                                char *   src_ae_name)
 {
         shim_udp_msg_t msg = SHIM_UDP_MSG__INIT;
@@ -392,7 +391,6 @@ static int ipcp_udp_port_alloc(uint32_t dst_ip_addr,
         msg.code         = SHIM_UDP_MSG_CODE__FLOW_REQ;
         msg.src_udp_port = src_udp_port;
         msg.dst_name     = dst_name;
-        msg.src_ap_name  = src_ap_name;
         msg.src_ae_name  = src_ae_name;
 
         return send_shim_udp_msg(&msg, dst_ip_addr);
@@ -428,7 +426,6 @@ static int ipcp_udp_port_dealloc(uint32_t dst_ip_addr,
 
 static int ipcp_udp_port_req(struct sockaddr_in * c_saddr,
                              char * dst_name,
-                             char * src_ap_name,
                              char * src_ae_name)
 {
         int  fd;
@@ -486,7 +483,6 @@ static int ipcp_udp_port_req(struct sockaddr_in * c_saddr,
         /* reply to IRM */
         port_id = ipcp_flow_req_arr(getpid(),
                                     dst_name,
-                                    src_ap_name,
                                     src_ae_name);
 
         if (port_id < 0) {
@@ -682,7 +678,6 @@ static void * ipcp_udp_listener()
                         c_saddr.sin_port = msg->src_udp_port;
                         ipcp_udp_port_req(&c_saddr,
                                           msg->dst_name,
-                                          msg->src_ap_name,
                                           msg->src_ae_name);
                         break;
                 case SHIM_UDP_MSG_CODE__FLOW_REPLY:
@@ -1214,7 +1209,6 @@ static int ipcp_udp_name_unreg(char * name)
 static int ipcp_udp_flow_alloc(pid_t         n_pid,
                                int           port_id,
                                char *        dst_name,
-                               char *        src_ap_name,
                                char *        src_ae_name,
                                enum qos_cube qos)
 {
@@ -1229,12 +1223,11 @@ static int ipcp_udp_flow_alloc(pid_t         n_pid,
 #endif
         struct shm_ap_rbuff * rb;
 
-        LOG_INFO("Allocating flow from %s to %s.", src_ap_name, dst_name);
+        LOG_INFO("Allocating flow to %s.", dst_name);
 
-        if (dst_name == NULL || src_ap_name == NULL || src_ae_name == NULL)
+        if (dst_name == NULL || src_ae_name == NULL)
                 return -1;
         if (strlen(dst_name) > 255
-            || strlen(src_ap_name) > 255
             || strlen(src_ae_name) > 255) {
                 LOG_ERR("Name too long for this shim.");
                 return -1;
@@ -1332,7 +1325,6 @@ static int ipcp_udp_flow_alloc(pid_t         n_pid,
         if (ipcp_udp_port_alloc(ip_addr,
                                 f_saddr.sin_port,
                                 dst_name,
-                                src_ap_name,
                                 src_ae_name) < 0) {
                 LOG_DBGF("Port alloc returned -1.");
                 rw_lock_rdlock(&_ipcp->state_lock);
diff --git a/src/ipcpd/shim-udp/shim_udp_messages.proto b/src/ipcpd/shim-udp/shim_udp_messages.proto
index a15fc18c..e6bac908 100644
--- a/src/ipcpd/shim-udp/shim_udp_messages.proto
+++ b/src/ipcpd/shim-udp/shim_udp_messages.proto
@@ -7,7 +7,6 @@ enum shim_udp_msg_code {
 message shim_udp_msg {
         required shim_udp_msg_code code  = 1;
         optional string dst_name         = 2;
-        optional string src_ap_name      = 3;
         optional string src_ae_name      = 4;
         required sint32 src_udp_port     = 5;
         optional sint32 dst_udp_port     = 6;