Fix up ms-wins codes
authorPaul Mackerras <paulus@samba.org>
Tue, 28 Apr 1998 23:38:11 +0000 (23:38 +0000)
committerPaul Mackerras <paulus@samba.org>
Tue, 28 Apr 1998 23:38:11 +0000 (23:38 +0000)
pppd/ipcp.c
pppd/ipcp.h

index fee6757439d76df99299c58f2312c9be1059639a..6250c7e6921bd9813b1da35d6a51bbb12c991343 100644 (file)
@@ -18,7 +18,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint
-static char rcsid[] = "$Id: ipcp.c,v 1.33 1998/03/25 03:08:47 paulus Exp $";
+static char rcsid[] = "$Id: ipcp.c,v 1.34 1998/04/28 23:38:09 paulus Exp $";
 #endif
 
 /*
 #endif
 
 /*
@@ -1411,9 +1411,9 @@ ipcp_printpkt(p, plen, printer, arg)
                if (olen == CILEN_ADDRS) {
                    p += 2;
                    GETLONG(cilong, p);
                if (olen == CILEN_ADDRS) {
                    p += 2;
                    GETLONG(cilong, p);
-                   printer(arg, "addrs %s", ip_ntoa(htonl(cilong)));
+                   printer(arg, "addrs %I", htonl(cilong));
                    GETLONG(cilong, p);
                    GETLONG(cilong, p);
-                   printer(arg, " %s", ip_ntoa(htonl(cilong)));
+                   printer(arg, " %I", htonl(cilong));
                }
                break;
            case CI_COMPRESSTYPE:
                }
                break;
            case CI_COMPRESSTYPE:
@@ -1437,20 +1437,20 @@ ipcp_printpkt(p, plen, printer, arg)
                if (olen == CILEN_ADDR) {
                    p += 2;
                    GETLONG(cilong, p);
                if (olen == CILEN_ADDR) {
                    p += 2;
                    GETLONG(cilong, p);
-                   printer(arg, "addr %s", ip_ntoa(htonl(cilong)));
+                   printer(arg, "addr %I", htonl(cilong));
                }
                break;
            case CI_MS_DNS1:
            case CI_MS_DNS2:
                p += 2;
                GETLONG(cilong, p);
                }
                break;
            case CI_MS_DNS1:
            case CI_MS_DNS2:
                p += 2;
                GETLONG(cilong, p);
-               printer(arg, "dns-addr %s", ip_ntoa(htonl(cilong)));
+               printer(arg, "ms-dns %I", htonl(cilong));
                break;
            case CI_MS_WINS1:
            case CI_MS_WINS2:
                p += 2;
                GETLONG(cilong, p);
                break;
            case CI_MS_WINS1:
            case CI_MS_WINS2:
                p += 2;
                GETLONG(cilong, p);
-               printer(arg, "wins-addr %s", ip_ntoa(htonl(cilong)));
+               printer(arg, "ms-wins %I", htonl(cilong));
                break;
            }
            while (p < optend) {
                break;
            }
            while (p < optend) {
index 470c9ef0068515d336ff6551a9f485455f1d47a5..01eb422a8a827004f5e3474f14a3a4a29311a911 100644 (file)
@@ -16,7 +16,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
- * $Id: ipcp.h,v 1.10 1997/03/04 03:39:20 paulus Exp $
+ * $Id: ipcp.h,v 1.11 1998/04/28 23:38:11 paulus Exp $
  */
 
 /*
  */
 
 /*
 #define CI_COMPRESSTYPE        2       /* Compression Type */
 #define        CI_ADDR         3
 
 #define CI_COMPRESSTYPE        2       /* Compression Type */
 #define        CI_ADDR         3
 
-#define CI_MS_WINS1    128     /* Primary WINS value */
 #define CI_MS_DNS1     129     /* Primary DNS value */
 #define CI_MS_DNS1     129     /* Primary DNS value */
-#define CI_MS_WINS2    130     /* Secondary WINS value */
+#define CI_MS_WINS1    130     /* Primary WINS value */
 #define CI_MS_DNS2     131     /* Secondary DNS value */
 #define CI_MS_DNS2     131     /* Secondary DNS value */
+#define CI_MS_WINS2    132     /* Secondary WINS value */
 
 #define MAX_STATES 16          /* from slcompress.h */
 
 
 #define MAX_STATES 16          /* from slcompress.h */