1 files changed, 15 insertions, 13 deletions
diff --git a/src/ipcpd/unicast/addr-auth/flat.c b/src/ipcpd/unicast/addr-auth/flat.c
index c4562935..34ca1cef 100644
--- a/src/ipcpd/unicast/addr-auth/flat.c
+++ b/src/ipcpd/unicast/addr-auth/flat.c
@@ -31,17 +31,18 @@
 #include <ouroboros/logs.h>
 #include <ouroboros/random.h>
 
+#include "addr-auth.h"
 #include "ipcp.h"
 #include "flat.h"
 
-#define NAME_LEN 8
+#define NAME_LEN        8
+#define INVALID_ADDRESS 0
 
 struct {
-        uint8_t addr_size;
+        uint8_t  addr_size;
+        uint32_t addr;
 } flat;
 
-#define INVALID_ADDRESS 0
-
 struct addr_auth_ops flat_ops = {
         .init    = flat_init,
         .fini    = flat_fini,
@@ -57,6 +58,15 @@ int flat_init(const void * info)
                 return -1;
         }
 
+#if defined (CONFIG_OUROBOROS_DEBUG) && defined (IPCP_DEBUG_LOCAL)
+        flat.addr = getpid();
+#else
+        while (flat.addr == INVALID_ADDRESS)
+                random_buffer(&flat.addr,sizeof(flat.addr));
+#endif
+        log_dbg("Flat address initialized to " ADDR_FMT32 ".",
+                ADDR_VAL32((uint8_t *) &flat.addr));
+
         return 0;
 }
 
@@ -67,13 +77,5 @@ int flat_fini(void)
 
 uint64_t flat_address(void)
 {
-        uint32_t addr = INVALID_ADDRESS;
-
-#if defined (CONFIG_OUROBOROS_DEBUG) && defined (IPCP_DEBUG_LOCAL)
-        addr = getpid();
-#else
-        while (addr == INVALID_ADDRESS)
-                random_buffer(&addr,sizeof(addr));
-#endif
-        return addr;
+        return (uint64_t) flat.addr;
 }