List of addresses in the About dialog

src/Ipv6Helpers.cpp

@@ -86,10 +86,10 @@ static bool IsIpv4OnLocalSubnet(uint32_t ipv4Addres)
 }
 
 bool pipedal::ParseHttpAddress(const std::string address,
-        std::string *pUser,
-        std::string *pServer, 
-        int *pPort, 
-        int defaultPort)
+                               std::string *pUser,
+                               std::string *pServer,
+                               int *pPort,
+                               int defaultPort)
 {
     // strip user.
     auto start = address.find_first_of('@');
@@ -97,10 +97,12 @@ bool pipedal::ParseHttpAddress(const std::string address,
     {
         if (pUser)
         {
-            *pUser = address.substr(0,start);
+            *pUser = address.substr(0, start);
         }
-        start = start+1;
-    } else {
+        start = start + 1;
+    }
+    else
+    {
         start = 0;
         if (pUser)
         {
@@ -109,9 +111,9 @@ bool pipedal::ParseHttpAddress(const std::string address,
     }
     // find the port address.
     int port = address.length();
-    while (port > 0 && address[port-1] != ':')
+    while (port > 0 && address[port - 1] != ':')
     {
-        if (address[port-1] != ']')
+        if (address[port - 1] != ']')
         {
             port = address.length();
             break;
@@ -121,7 +123,7 @@ bool pipedal::ParseHttpAddress(const std::string address,
     int portNumber = defaultPort;
     if (port < address.length() && address[port] == ':')
     {
-        const char*p = address.c_str()+port+1;
+        const char *p = address.c_str() + port + 1;
         if (*p)
         {
             portNumber = 0;
@@ -129,8 +131,10 @@ bool pipedal::ParseHttpAddress(const std::string address,
             {
                 if (*p >= '0' && *p <= '9')
                 {
-                    portNumber = portNumber*10 + *p -'0';
-                } else {
+                    portNumber = portNumber * 10 + *p - '0';
+                }
+                else
+                {
                     return false;
                 }
             }
@@ -142,7 +146,7 @@ bool pipedal::ParseHttpAddress(const std::string address,
     }
     if (pServer)
     {
-        *pServer = address.substr(start,port-start);
+        *pServer = address.substr(start, port - start);
     }
     return true;
 }
@@ -349,12 +353,12 @@ static std::string GetLinkLocalAddressForInterface(const std::string &name)
     freeifaddrs(ifap);
     return result;
 }
-static std::string GetLinkLocalAddressForIp4Interface(const std::string&name)
+static std::string GetLinkLocalAddressForIp4Interface(const std::string &name)
 {
     struct ifaddrs *ifap = nullptr;
     if (getifaddrs(&ifap) != 0)
         return "";
-    std::string result = "notlocalsubnet.error";
+    std::string result = "";
     for (ifaddrs *p = ifap; p != nullptr; p = p->ifa_next)
     {
         if (p->ifa_addr->sa_family == AF_INET && p->ifa_addr != nullptr && p->ifa_netmask != nullptr)
@@ -423,11 +427,13 @@ std::string pipedal::GetLinkLocalAddress(const std::string fromAddress)
             //   others?
             if (IN6_IS_ADDR_V4MAPPED(&inetAddr6))
             {
-                int8_t*pAddr = (int8_t*)&inetAddr6;
-                uint32_t remoteAddress = htonl(*(int32_t*)(pAddr+12));
+                int8_t *pAddr = (int8_t *)&inetAddr6;
+                uint32_t remoteAddress = htonl(*(int32_t *)(pAddr + 12));
                 std::string interfaceName = GetInterfaceForIp4Address(remoteAddress);
                 result = GetLinkLocalAddressForIp4Interface(interfaceName);
-            } else {
+            }
+            else
+            {
 
                 std::string interfaceName;
                 if (IsIpv4MappedAddress(inetAddr6))
@@ -449,3 +455,8 @@ std::string pipedal::GetLinkLocalAddress(const std::string fromAddress)
     }
     return result;
 }
+
+std::string pipedal::GetInterfaceIpv4Address(const std::string& interfaceName)
+{
+    return GetLinkLocalAddressForIp4Interface(interfaceName);
+}

src/Ipv6Helpers.hpp

@@ -24,6 +24,9 @@
 namespace pipedal {
 
 
+    std::string GetInterfaceIpv4Address(const std::string& interfaceName);
+
+
     std::string GetLinkLocalAddress(const std::string fromAddress);
 
     bool IsOnLocalSubnet(const std::string&fromAddress);

src/PiPedalModel.hpp

@@ -154,7 +154,7 @@ public:
     PiPedalModel();
     virtual ~PiPedalModel();
 
-
+    uint16_t GetWebPort() const { return webPort; }
     void Close();
 
     void UpdateDnsSd();

src/PiPedalSocket.cpp

@@ -926,7 +926,7 @@ public:
         }
         else if (message == "version")
         {
-            PiPedalVersion version;
+            PiPedalVersion version(this->model);
 
             Reply(replyTo, "version", version);
         }

src/PiPedalVersion.cpp

@@ -18,8 +18,10 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "pch.h"
+#include "PiPedalModel.hpp"
 #include "config.hpp"
 #include "PiPedalVersion.hpp"
+#include "Ipv6Helpers.hpp"
 
 #ifdef _WIN32
 #include "windows.h"
@@ -36,9 +38,21 @@ JSON_MAP_BEGIN(PiPedalVersion)
     JSON_MAP_REFERENCE(PiPedalVersion,operatingSystem)
     JSON_MAP_REFERENCE(PiPedalVersion,osVersion)
     JSON_MAP_REFERENCE(PiPedalVersion,debug)
+    JSON_MAP_REFERENCE(PiPedalVersion,webAddresses)
 JSON_MAP_END()
 
-PiPedalVersion::PiPedalVersion()
+
+static std::string MakeWebAddress(const std::string &address, uint16_t port)
+{
+    if (port == 80)
+    {
+        return SS("http://" << address  << '/');
+    } else {
+        return SS("http://" << address  << ':' << port << '/');
+    }
+}
+
+PiPedalVersion::PiPedalVersion(PiPedalModel&model)
 {
     server_ = "PiPedal Server";
     // defined on build command line.
@@ -71,4 +85,31 @@ PiPedalVersion::PiPedalVersion()
 #else
     debug_ = false;
 #endif
+
+    uint16_t port = model.GetWebPort();
+
+    char hostName[512];
+    gethostname(hostName,sizeof(hostName));
+
+    this->webAddresses_.push_back(MakeWebAddress(SS(hostName << ".local"),port));
+
+    std::string ethAddr = GetInterfaceIpv4Address("eth0");
+    if (ethAddr.length() != 0) 
+    {
+        this->webAddresses_.push_back(MakeWebAddress(ethAddr,port));
+    }
+    std::string wlanAddr = GetInterfaceIpv4Address("wlan0");
+    if (wlanAddr.length() != 0)
+    {
+        this->webAddresses_.push_back(MakeWebAddress(wlanAddr,port));
+
+    }
+    std::string p2pAddr = GetInterfaceIpv4Address("p2p-wlan0-0");
+    if (p2pAddr.length() != 0)
+    {
+        this->webAddresses_.push_back(MakeWebAddress(p2pAddr,port));
+
+    }
+
+
 }

src/PiPedalVersion.hpp

@@ -21,6 +21,8 @@
 #include "json.hpp"
 
 namespace  pipedal {
+
+class PiPedalModel;
     
 class PiPedalVersion {
 private:
@@ -28,10 +30,11 @@ private:
     std::string serverVersion_;
     std::string operatingSystem_;
     std::string osVersion_;
+    std::vector<std::string> webAddresses_;
     bool debug_;
 
 public:
-    PiPedalVersion();
+    PiPedalVersion(PiPedalModel&model);
     ~PiPedalVersion() = default;