have IPPacket::srcv6 and IPPacket::dstv6 check for ipv4 packets and expand them to ipv6

llarp/handlers/exit.cpp

@@ -242,12 +242,12 @@ namespace llarp
       m_InetToNetwork.Process([&](Pkt_t &pkt) {
         PubKey pk;
         {
-          auto itr = m_IPToKey.find(net::IPPacket::ExpandV4(pkt.dstv4()));
+          auto itr = m_IPToKey.find(pkt.dstv6());
           if(itr == m_IPToKey.end())
           {
             // drop
             LogWarn(Name(), " dropping packet, has no session at ",
-                    pkt.dstv4());
+                    pkt.dstv6());
             return;
           }
           pk = itr->second;

llarp/net/ip.cpp

@@ -69,13 +69,19 @@ namespace llarp
     huint128_t
     IPPacket::srcv6() const
     {
-      return In6ToHUInt(HeaderV6()->srcaddr);
+      if(IsV6())
+        return In6ToHUInt(HeaderV6()->srcaddr);
+      else
+        return ExpandV4(srcv4());
     }
 
     huint128_t
     IPPacket::dstv6() const
     {
-      return In6ToHUInt(HeaderV6()->dstaddr);
+      if(IsV6())
+        return In6ToHUInt(HeaderV6()->dstaddr);
+      else
+        return ExpandV4(dstv4());
     }
 
     bool