From 630cf99bae9fab7fa9fe08245b2a975a1ad3835f Mon Sep 17 00:00:00 2001
From: despair86 <despair@rvx86.net>
Date: Mon, 8 Oct 2018 20:38:25 -0500
Subject: [PATCH] fix inet4 to inet6 transition bug

---
 include/llarp/net.hpp |  2 +-
 llarp/router.cpp      | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/llarp/net.hpp b/include/llarp/net.hpp
index 82ceddffa..d582f2825 100644
--- a/include/llarp/net.hpp
+++ b/include/llarp/net.hpp
@@ -383,7 +383,7 @@ namespace llarp
           out << "]";
       }
 
-      return out << ":" << a.port();
+      return out << ":" << ntohs(a.port());
     }
 
     operator const sockaddr*() const
diff --git a/llarp/router.cpp b/llarp/router.cpp
index 669c5af63..10003f17c 100644
--- a/llarp/router.cpp
+++ b/llarp/router.cpp
@@ -12,6 +12,7 @@
 #include "str.hpp"
 
 #include <fstream>
+#include <cstdlib>
 
 namespace llarp
 {
@@ -666,8 +667,8 @@ llarp_router::Run()
 
   routerProfiling.Load(routerProfilesFile.c_str());
   // zero out router contact
-  sockaddr *dest = (sockaddr *)&this->ip4addr;
-  llarp::Addr publicAddr(*dest);
+  //sockaddr *dest = (sockaddr *)&this->ip4addr;
+  llarp::Addr publicAddr(this->addrInfo);
 
   if(this->publicOverride)
   {
@@ -1245,8 +1246,9 @@ namespace llarp
       if(StrEq(key, "public-port"))
       {
         llarp::LogInfo("Setting public port ", val);
-        self->ip4addr.sin_port = htons(atoi(val));
-        self->addrInfo.port    = htons(atoi(val));
+        int p = atoi(val);
+        self->ip4addr.sin_port = htons(p);
+        self->addrInfo.port    = htons(p);
         self->publicOverride   = true;
       }
     }