X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fipcp.c;h=7d7146302dbeb1ebff80f855d89773a723f8e200;hb=641e6003d6cb48bf970a590914d30ded6bc0952f;hp=94929cc6a8b38d47845cbea8510abe1f951fe47e;hpb=f42b7328c73feeedf045f02e02e2c7e86cccbd15;p=ppp.git diff --git a/pppd/ipcp.c b/pppd/ipcp.c index 94929cc..7d71463 100644 --- a/pppd/ipcp.c +++ b/pppd/ipcp.c @@ -18,7 +18,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: ipcp.c,v 1.4 1994/04/11 07:19:06 paulus Exp $"; +static char rcsid[] = "$Id: ipcp.c,v 1.7 1994/05/24 11:21:52 paulus Exp $"; #endif /* @@ -26,18 +26,13 @@ static char rcsid[] = "$Id: ipcp.c,v 1.4 1994/04/11 07:19:06 paulus Exp $"; */ #include +#include #include -#include #include #include -#include #include #include -#include -#include - -#include #include "pppd.h" #include "ppp.h" @@ -498,10 +493,6 @@ ipcp_nakci(f, p, len) len -= cilen; \ INCPTR(2, p); \ GETSHORT(cishort, p); \ - if (cilen == CILEN_VJ) { \ - GETCHAR(cimaxslotindex, p); \ - GETCHAR(cicflag, p); \ - } \ no.neg = 1; \ code \ } @@ -531,6 +522,8 @@ ipcp_nakci(f, p, len) */ NAKCIVJ(CI_COMPRESSTYPE, neg_vj, if (cilen == CILEN_VJ) { + GETCHAR(cimaxslotindex, p); + GETCHAR(cicflag, p); if (cishort == IPCP_VJ_COMP) { try.old_vj = 0; if (cimaxslotindex < go->maxslotindex) @@ -1157,9 +1150,9 @@ ipcp_printpkt(p, plen, printer, arg) if (olen == CILEN_ADDRS) { p += 2; GETLONG(cilong, p); - printer(arg, "addrs %s", ip_ntoa(cilong)); + printer(arg, "addrs %s", ip_ntoa(htonl(cilong))); GETLONG(cilong, p); - printer(arg, " %s", ip_ntoa(cilong)); + printer(arg, " %s", ip_ntoa(htonl(cilong))); } break; case CI_COMPRESSTYPE: @@ -1183,7 +1176,7 @@ ipcp_printpkt(p, plen, printer, arg) if (olen == CILEN_ADDR) { p += 2; GETLONG(cilong, p); - printer(arg, "addr %s", ip_ntoa(cilong)); + printer(arg, "addr %s", ip_ntoa(htonl(cilong))); } break; }