X-Git-Url: http://git.sameswireless.fr/l2tpns.git/blobdiff_plain/3d69475f08445a4b846b4809e7fa783e8755cc6b..9eead72450da7ff7d5eae58979edab5d8121c4ca:/ppp.c

diff --git a/ppp.c b/ppp.c
index b906967..c69c603 100644
--- a/ppp.c
+++ b/ppp.c
@@ -1,6 +1,6 @@
 // L2TPNS PPP Stuff
 
-char const *cvs_id_ppp = "$Id: ppp.c,v 1.35 2004-11-30 01:08:21 bodea Exp $";
+char const *cvs_id_ppp = "$Id: ppp.c,v 1.38 2004-11-30 19:34:57 bodea Exp $";
 
 #include <stdio.h>
 #include <string.h>
@@ -401,7 +401,7 @@ void processlcp(tunnelidt t, sessionidt s, u8 *p, u16 l)
 					*q++ = 6;
 					memset(q, 0, 4); // asyncmap 0
 					q += 4;
-					*((u16 *) (response + 2)) = q - response; // LCP header length
+					*((u16 *) (response + 2)) = htons(q - response); // LCP header length
 					break;
 
 				case 3: // Authentication-Protocol
@@ -438,7 +438,7 @@ void processlcp(tunnelidt t, sessionidt s, u8 *p, u16 l)
 						memcpy(q, o, length);
 						*(u16 *)(q += 2) = htons(PPPPAP); // NAK -> Use PAP instead
 						q += length;
-						*((u16 *) (response + 2)) = q - response;
+						*((u16 *) (response + 2)) = htons(q - response);
 					}
 					break;
 
@@ -469,7 +469,7 @@ void processlcp(tunnelidt t, sessionidt s, u8 *p, u16 l)
 
 					memcpy(q, o, length);
 					q += length;
-					*((u16 *) (response + 2)) = q - response; // LCP header length
+					*((u16 *) (response + 2)) = htons(q - response); // LCP header length
 			}
 			x -= length;
 			o += length;
@@ -483,7 +483,7 @@ void processlcp(tunnelidt t, sessionidt s, u8 *p, u16 l)
 			*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