X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/216303288a46d87fd5e5fd0489ebd7f061cfd076..8d5653a922ae5934b2ca74fdf0e7a8018b550626:/ppp.c

diff --git a/ppp.c b/ppp.c
index 3b8839d..ee62470 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.34 2004-11-30 00:50:03 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.37 2004-11-30 01:35:19 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -478,12 +478,12 @@ void processlcp(tunnelidt t, sessionidt s, u8 *p, u16 l)
 		if (!response)
 		{
 			// Send back a ConfigAck
-			q = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
+			q = response = makeppp(b, sizeof(b), p, l, t, s, PPPLCP);
 			if (!q) return;
-			response = *q = ConfigAck;
+			*q = ConfigAck;
 		}
 
-		LOG(3, s, t, "Sending %s\n", ppp_lcp_types[response]);
+		LOG(3, s, t, "Sending %s\n", ppp_lcp_types[*response]);
 		tunnelsend(b, l + (q - b), t);
 
 		if (!(session[s].flags & SF_LCP_ACKED))
@@ -666,7 +666,8 @@ void processipcp(tunnelidt t, sessionidt s, u8 *p, u16 l)
 				{
 					*(u32 *) (i + 2) = htonl(session[s].dns1);
 					*p = ConfigNak;
-					LOG(5, s, t, "   DNS1 = %s\n", fmtaddr(session[s].dns1, 0));
+					LOG(5, s, t, "   DNS1 = %s\n",
+						fmtaddr(htonl(session[s].dns1), 0));
 				}
 			}
 			if ((i = findppp(p, 0x83))) // Secondary DNS address (TBA, is it)
@@ -675,7 +676,8 @@ void processipcp(tunnelidt t, sessionidt s, u8 *p, u16 l)
 				{
 					*(u32 *) (i + 2) = htonl(session[s].dns2);
 					*p = ConfigNak;
-					LOG(5, s, t, "   DNS2 = %s\n", fmtaddr(session[s].dns2, 0));
+					LOG(5, s, t, "   DNS2 = %s\n",
+						fmtaddr(htonl(session[s].dns2), 0));
 				}
 			}
 			i = findppp(p, 3);		// IP address