From 9ae8e5a57300932a762e4a8465a58ee44b4cb306 Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@ugent.be>
Date: Fri, 1 Sep 2017 13:58:05 +0200
Subject: ipcpd: normal: Simplify enroll API

This will remove the dst parameter from enroll_boot, since it was only
being used in logging. It also turns some other debug logs into info
logs, and makes the component names as they are used in logs all
lowercase.
---
 src/ipcpd/normal/connmgr.c | 2 +-
 src/ipcpd/normal/dir.c     | 4 ++--
 src/ipcpd/normal/enroll.c  | 9 ++++-----
 src/ipcpd/normal/enroll.h  | 3 +--
 src/ipcpd/normal/main.c    | 4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/ipcpd/normal/connmgr.c b/src/ipcpd/normal/connmgr.c
index fa43b97a..9feac0f6 100644
--- a/src/ipcpd/normal/connmgr.c
+++ b/src/ipcpd/normal/connmgr.c
@@ -22,7 +22,7 @@
 
 #define _POSIX_C_SOURCE 200112L
 
-#define OUROBOROS_PREFIX "Connection manager"
+#define OUROBOROS_PREFIX "connection-manager"
 
 #include <ouroboros/dev.h>
 #include <ouroboros/cacep.h>
diff --git a/src/ipcpd/normal/dir.c b/src/ipcpd/normal/dir.c
index 2e2c113a..d2cda4f9 100644
--- a/src/ipcpd/normal/dir.c
+++ b/src/ipcpd/normal/dir.c
@@ -69,7 +69,7 @@ int dir_bootstrap(void) {
                 return -ENOMEM;
         }
 
-        log_dbg("Directory bootstrapped.");
+        log_info("Directory bootstrapped.");
 
         return 0;
 }
@@ -85,7 +85,7 @@ int dir_enroll(uint64_t addr) {
                 sleep(ENROL_INTV);
         }
 
-        log_dbg("Directory enrolled.");
+        log_info("Directory enrolled.");
 
         return 0;
 }
diff --git a/src/ipcpd/normal/enroll.c b/src/ipcpd/normal/enroll.c
index fc541859..cad14fd8 100644
--- a/src/ipcpd/normal/enroll.c
+++ b/src/ipcpd/normal/enroll.c
@@ -22,7 +22,7 @@
 
 #define _POSIX_C_SOURCE 199309L
 
-#define OUROBOROS_PREFIX "Enrollment"
+#define OUROBOROS_PREFIX "enrollment"
 
 #include <ouroboros/endian.h>
 #include <ouroboros/errno.h>
@@ -64,7 +64,7 @@ struct {
         pthread_t          listener;
 } enroll;
 
-static int  send_rcv_enroll_msg(int fd)
+static int send_rcv_enroll_msg(int fd)
 {
         enroll_msg_t    req = ENROLL_MSG__INIT;
         enroll_msg_t *  reply;
@@ -277,10 +277,9 @@ static void * enroll_handle(void * o)
         return 0;
 }
 
-int enroll_boot(struct conn * conn,
-                const char *  dst)
+int enroll_boot(struct conn * conn)
 {
-        log_dbg("Getting boot information from %s.", dst);
+        log_dbg("Getting boot information.");
 
         if (send_rcv_enroll_msg(conn->flow_info.fd)) {
                 log_err("Failed to enroll.");
diff --git a/src/ipcpd/normal/enroll.h b/src/ipcpd/normal/enroll.h
index 3b277e44..7622447f 100644
--- a/src/ipcpd/normal/enroll.h
+++ b/src/ipcpd/normal/enroll.h
@@ -37,8 +37,7 @@ void                 enroll_stop(void);
 
 void                 enroll_bootstrap(const struct ipcp_config * conf);
 
-int                  enroll_boot(struct conn * conn,
-                                 const char *  dst);
+int                  enroll_boot(struct conn * conn);
 
 int                  enroll_done(struct conn * conn,
                                  int           result);
diff --git a/src/ipcpd/normal/main.c b/src/ipcpd/normal/main.c
index fa31b9be..bc135c31 100644
--- a/src/ipcpd/normal/main.c
+++ b/src/ipcpd/normal/main.c
@@ -237,7 +237,7 @@ static int normal_ipcp_enroll(const char *      dst,
         }
 
         /* Get boot state from peer. */
-        if (enroll_boot(&er_conn, dst)) {
+        if (enroll_boot(&er_conn)) {
                 log_err("Failed to get boot information.");
                 goto fail_enroll_boot;
         }
@@ -277,7 +277,7 @@ static int normal_ipcp_enroll(const char *      dst,
         if (connmgr_dealloc(AEID_ENROLL, &er_conn))
                 log_warn("Failed to deallocate enrollment flow.");
 
-        log_dbg("Enrolled with %s.", dst);
+        log_info("Enrolled with %s.", dst);
 
         info->dir_hash_algo = ipcpi.dir_hash_algo;
         strcpy(info->dif_name, ipcpi.dif_name);
-- 
cgit v1.2.3