Revise CACEP API

The information passed to CACEP is split between the information about
the connection and the information to be used during the
authentication exchange.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/ipcpd/normal/enroll.c b/src/ipcpd/normal/enroll.c
index ce6768fb..78bc4d51 100644
--- a/src/ipcpd/normal/enroll.c
+++ b/src/ipcpd/normal/enroll.c
@@ -44,7 +44,7 @@
 int enroll_handle(int fd)
 {
         struct cdap_flow * flow;
-        struct cacep_info  info;
+        struct conn_info  info;
         cdap_key_t         key;
         enum cdap_opcode   oc;
         char *             name;
@@ -61,11 +61,11 @@ int enroll_handle(int fd)
         char * members_ro = MEMBERS_PATH;
         char * dif_ro     = DIF_PATH;
 
-        cacep_info_init(&info);
+        conn_info_init(&info);
 
         info.proto.protocol = strdup(CDAP_PROTO);
         if (info.proto.protocol == NULL) {
-                cacep_info_fini(&info);
+                conn_info_fini(&info);
                 return -ENOMEM;
         }
 
@@ -75,12 +75,12 @@ int enroll_handle(int fd)
         flow = cdap_flow_arr(fd, 0, ANONYMOUS_AUTH, &info);
         if (flow == NULL) {
                 log_err("Failed to auth enrollment request.");
-                cacep_info_fini(&info);
+                conn_info_fini(&info);
                 flow_dealloc(fd);
                 return -1;
         }
 
-        cacep_info_fini(&info);
+        conn_info_fini(&info);
 
         while (!(boot_r && members_r && dif_name_r)) {
                 key = cdap_request_wait(flow->ci, &oc, &name, &data,
@@ -156,7 +156,7 @@ int enroll_handle(int fd)
 int enroll_boot(char * dst_name)
 {
         struct cdap_flow * flow;
-        struct cacep_info  info;
+        struct conn_info  info;
         cdap_key_t         key;
         uint8_t *          data;
         size_t             len;
@@ -170,11 +170,11 @@ int enroll_boot(char * dst_name)
         char * members_ro = MEMBERS_PATH;
         char * dif_ro     = DIF_PATH;
 
-        cacep_info_init(&info);
+        conn_info_init(&info);
 
         info.proto.protocol = strdup(CDAP_PROTO);
         if (info.proto.protocol == NULL) {
-                cacep_info_fini(&info);
+                conn_info_fini(&info);
                 return -ENOMEM;
         }
 
@@ -185,11 +185,11 @@ int enroll_boot(char * dst_name)
                                &info);
         if (flow == NULL) {
                 log_err("Failed to allocate flow for enrollment request.");
-                cacep_info_fini(&info);
+                conn_info_fini(&info);
                 return -1;
         }
 
-        cacep_info_fini(&info);
+        conn_info_fini(&info);
 
         log_dbg("Getting boot information from %s.", dst_name);