--- gvpe/src/sockinfo.C	2012/01/17 21:25:50	1.27
+++ gvpe/src/sockinfo.C	2012/12/04 13:51:45	1.30
@@ -31,8 +31,14 @@
 
 #include "config.h"
 
+// for gethostbyname
 #include <netdb.h>
 
+// for inet_aton
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+
 #include "gettext.h"
 
 #include "sockinfo.h"
@@ -42,13 +48,13 @@
 #include <cstdio>
 
 // all ipv4-based protocols
-#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4 | PROT_IPv42)
+#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
 
 void
 sockinfo::set (const sockaddr_in *sa, u8 prot_)
 {
   host = sa->sin_addr.s_addr;
-  port = prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42) ? 0 : sa->sin_port;
+  port = prot_ & (PROT_IPv4 | PROT_ICMPv4) ? 0 : sa->sin_port;
   prot = prot_;
 }
 
@@ -62,14 +68,16 @@
   if (prot & PROTv4
       && hostname)
     {
-      struct hostent *he = gethostbyname (hostname);
+      struct in_addr in;
+      struct hostent *he;
 
-      if (he
-          && he->h_addrtype == AF_INET && he->h_length == 4 && he->h_addr_list[0])
-        {
-          //sa->sin_family = he->h_addrtype;
-          memcpy (&host, he->h_addr_list[0], 4);
-        }
+      if (inet_aton (hostname, &in))
+        host = in.s_addr;
+      else if ((he = gethostbyname (hostname))
+               && he->h_addrtype == AF_INET
+               && he->h_length == 4
+               && he->h_addr_list[0])
+        memcpy (&host, he->h_addr_list[0], 4); //sa->sin_family = he->h_addrtype;
       else
         slog (L_NOTICE, _("unable to resolve host '%s'"), hostname);
     }
@@ -135,8 +143,8 @@
 {
   u8 protocols = prot;
 
-  if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4 | PROT_IPv42))
-    protocols |= PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42;
+  if (prot & (PROT_IPv4 | PROT_ICMPv4 | PROT_UDPv4 | PROT_TCPv4))
+    protocols |= PROT_IPv4 | PROT_ICMPv4;
 
   if (conf && prot & PROTv4)
     {
@@ -162,7 +170,7 @@
   if (prot & PROTv4
       && prot_ & PROTv4)
     {
-      if (prot_ & (PROT_IPv4 | PROT_ICMPv4 | PROT_IPv42))
+      if (prot_ & (PROT_IPv4 | PROT_ICMPv4))
         {
           prot = prot_;
           port = 0;