Fix address byte ordering issue, ho@ ok

2 files changed, 6 insertions, 5 deletions

diff --git a/sbin/isakmpd/udp.c b/sbin/isakmpd/udp.c
index 3ee603eb361..7b228c62ec8 100644
--- a/sbin/isakmpd/udp.c
+++ b/sbin/isakmpd/udp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: udp.c,v 1.37 2001/06/29 22:43:40 ho Exp $	*/
+/*	$OpenBSD: udp.c,v 1.38 2001/06/29 22:59:40 angelos Exp $	*/
 /*	$EOM: udp.c,v 1.57 2001/01/26 10:09:57 niklas Exp $	*/
 
 /*
@@ -520,6 +520,8 @@ udp_init ()
 
   LIST_INIT (&udp_listen_list);
 
+  transport_method_add (&udp_transport_vtbl);
+
   /* Bind the ISAKMP UDP port on all network interfaces we have.  */
   /* XXX need to check errors */
   if_map (udp_bind_if, port);
@@ -556,8 +558,6 @@ udp_init ()
     log_error ("udp_init: could not allocate default IPv6 ISAKMP UDP port");
   else if (conf_get_str ("General", "Listen-on"))
     default_transport6->flags &= ~TRANSPORT_LISTEN;
-
-  transport_method_add (&udp_transport_vtbl);
 }
 
 /*
diff --git a/sbin/isakmpd/util.c b/sbin/isakmpd/util.c
index 33b6c17a0b0..3c95c74e218 100644
--- a/sbin/isakmpd/util.c
+++ b/sbin/isakmpd/util.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: util.c,v 1.16 2001/06/29 04:52:22 ho Exp $	*/
+/*	$OpenBSD: util.c,v 1.17 2001/06/29 22:59:41 angelos Exp $	*/
 /*	$EOM: util.c,v 1.23 2000/11/23 12:22:08 niklas Exp $	*/
 
 /*
@@ -434,7 +434,8 @@ util_ntoa (char **buf, int af, u_int8_t *addr)
     case AF_INET:
       sfrom->sa_len = sizeof (struct sockaddr_in);
       memcpy (&ip4_buf, addr, sizeof (struct in_addr));
-      ((struct sockaddr_in *)sfrom)->sin_addr.s_addr = htonl (ip4_buf);
+/*      ((struct sockaddr_in *)sfrom)->sin_addr.s_addr = htonl (ip4_buf);*/
+      ((struct sockaddr_in *)sfrom)->sin_addr.s_addr = ip4_buf;
       break;
     case AF_INET6:
       sfrom->sa_len = sizeof (struct sockaddr_in6);