1 files changed, 60 insertions, 9 deletions

diff --git a/src/irmd/main.c b/src/irmd/main.c
index 13076cd1..374bfb6c 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -87,6 +87,24 @@ static struct ipcp_entry * find_ipcp_by_name(instance_name_t * api)
         return tmp;
 }
 
+static pid_t find_pid_by_dif_name(char * dif_name)
+{
+        struct list_head * pos = NULL;
+
+        list_for_each(pos, &instance->ipcps) {
+                struct ipcp_entry * tmp =
+                        list_entry(pos, struct ipcp_entry, next);
+
+                if (tmp->dif_name == NULL)
+                        return tmp->pid;
+
+                if (strcmp(dif_name, tmp->dif_name) == 0)
+                        return tmp->pid;
+        }
+
+        return 0;
+}
+
 static int create_ipcp(instance_name_t * api,
                        enum ipcp_type    ipcp_type)
 {
@@ -266,7 +284,41 @@ static int ap_reg(char * ap_name,
                   char ** difs,
                   size_t difs_size)
 {
-        return -1;
+        pid_t pid = 0;
+        int i;
+        int ret = 0;
+
+        if (instance->ipcps.next == NULL)
+                LOG_ERR("No IPCPs in this system.");
+
+        /*
+         * FIXME: this should be resolved by NSM
+         * Now it just takes the first DIF
+         */
+
+        if (strcmp(difs[0], "*") == 0) {
+                difs[0] = list_entry(instance->ipcps.next,
+                                     struct ipcp_entry,
+                                     next)->dif_name;
+                difs_size = 1;
+        }
+
+        for (i = 0; i < difs_size; ++i) {
+                pid = find_pid_by_dif_name(difs[i]);
+                if (pid == 0) {
+                        LOG_ERR("%s: No such DIF.", difs[i]);
+                        continue;
+                }
+
+                /* FIXME: get proper reg_ap_id */
+                if (ipcp_ap_reg(pid, rand(),ap_name)) {
+                        LOG_ERR("Could not register %s in DIF %s.",
+                                ap_name, difs[i]);
+                        ret = -1;
+                }
+        }
+
+        return ret;
 }
 
 static int ap_unreg(char * ap_name,
@@ -366,7 +418,6 @@ int main()
         sigaction(SIGTERM, &sig_act, NULL);
         sigaction(SIGHUP,  &sig_act, NULL);
 
-
         if (access("/dev/shm/" SHM_DU_MAP_FILENAME, F_OK) != -1)
                 unlink("/dev/shm/" SHM_DU_MAP_FILENAME);
 
@@ -480,8 +531,8 @@ int main()
                                                 msg->oflags);
                         break;
                 case IRM_MSG_CODE__IRM_FLOW_ALLOC_RES:
-                        ret_msg.has_result = true;
-                        ret_msg.result = flow_alloc_res(msg->fd);
+                        ret_msg.has_response = true;
+                        ret_msg.response = flow_alloc_res(msg->fd);
                         break;
                 case IRM_MSG_CODE__IRM_FLOW_DEALLOC:
                         ret_msg.has_result = true;
@@ -493,15 +544,15 @@ int main()
                                                    msg->oflags);
                         break;
                 case IRM_MSG_CODE__IPCP_FLOW_REQ_ARR:
-                        ret_msg.has_fd = true;
-                        ret_msg.fd = flow_req_arr(msg->port_id,
-                                                  msg->ap_name,
-                                                  msg->ae_name);
+                        ret_msg.has_port_id = true;
+                        ret_msg.port_id = flow_req_arr(msg->port_id,
+                                                       msg->ap_name,
+                                                       msg->ae_name);
                         break;
                 case IRM_MSG_CODE__IPCP_FLOW_ALLOC_REPLY:
                         ret_msg.has_result = true;
                         ret_msg.result = flow_alloc_reply(msg->port_id,
-                                                          msg->result);
+                                                          msg->response);
                         break;
                 case IRM_MSG_CODE__IPCP_FLOW_DEALLOC:
                         ret_msg.has_result = true;