1 files changed, 28 insertions, 8 deletions

diff --git a/toxcore/network.c b/toxcore/network.c
index c0bd366d..39483b42 100644
--- a/toxcore/network.c
+++ b/toxcore/network.c
@@ -207,7 +207,13 @@ void networking_poll(Networking_Core *net)
     while (receivepacket(net->sock, &ip_port, data, &length) != -1) {
         if (length < 1) continue;
 
-        if (!(net->packethandlers[data[0]].function)) continue;
+        if (!(net->packethandlers[data[0]].function)) {
+#ifdef LOGGING
+                        sprintf(logbuffer, "[%02u] -- Packet has no handler.\n", data[0]);
+                        loglog(logbuffer);
+#endif
+                        continue;
+                }
 
         net->packethandlers[data[0]].function(net->packethandlers[data[0]].object, ip_port, data, length);
     }
@@ -661,16 +667,18 @@ int addr_parse_ip(const char *address, IP *to)
  *
  * input
  *  address: a hostname (or something parseable to an IP address)
- *  ip: ip.family MUST be initialized, either set to a specific IP version
+ *  to: to.family MUST be initialized, either set to a specific IP version
  *     (AF_INET/AF_INET6) or to the unspecified AF_UNSPEC (= 0), if both
  *     IP versions are acceptable
+ *  extra can be NULL and is only set in special circumstances, see returns
  *
- * returns in ip a valid IPAny (v4/v6),
+ * returns in *to a valid IPAny (v4/v6),
  *     prefers v6 if ip.family was AF_UNSPEC and both available
+ * returns in *extra an IPv4 address, if family was AF_UNSPEC and *to is AF_INET6
  * returns 0 on failure
  */
 
-int addr_resolve(const char *address, IP *to)
+int addr_resolve(const char *address, IP *to, IP *extra)
 {
     if (!address || !to)
         return 0;
@@ -772,6 +780,10 @@ int addr_resolve(const char *address, IP *to)
         if (rc & 2) {
             to->family = AF_INET6;
             to->ip6 = ip6;
+            if ((rc & 1) && (extra != NULL)) {
+                extra->family = AF_INET;
+                extra->ip4 = ip4;
+            }
         }
         else if (rc & 1) {
             to->family = AF_INET;
@@ -794,12 +806,20 @@ int addr_resolve(const char *address, IP *to)
  * addr_resolve_or_parse_ip
  *  resolves string into an IP address
  *
- * to->family MUST be set (AF_UNSPEC, AF_INET, AF_INET6)
- * returns 1 on success, 0 on failure
+ *  address: a hostname (or something parseable to an IP address)
+ *  to: to.family MUST be initialized, either set to a specific IP version
+ *     (AF_INET/AF_INET6) or to the unspecified AF_UNSPEC (= 0), if both
+ *     IP versions are acceptable
+ *  extra can be NULL and is only set in special circumstances, see returns
+ *
+ *  returns in *tro a matching address (IPv6 or IPv4)
+ *  returns in *extra, if not NULL, an IPv4 address, if to->family was AF_UNSPEC
+ *  returns 1 on success
+ *  returns 0 on failure
  */
-int addr_resolve_or_parse_ip(const char *address, IP *to)
+int addr_resolve_or_parse_ip(const char *address, IP *to, IP *extra)
 {
-    if (!addr_resolve(address, to))
+    if (!addr_resolve(address, to, extra))
         if (!addr_parse_ip(address, to))
             return 0;