X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=pppd%2Fccp.c;h=7cfd692fd3558409bcf64c3f117db725c56a8437;hb=2b0e16c59c832c53545eba4ad3b2857334c1b2ff;hp=c93e963c4d2709e1c43e18b6a0cd6869113780f2;hpb=1fae28ce79350b03f0cf8a69ad06dd68637cd6b1;p=ppp.git

diff --git a/pppd/ccp.c b/pppd/ccp.c
index c93e963..7cfd692 100644
--- a/pppd/ccp.c
+++ b/pppd/ccp.c
@@ -25,21 +25,18 @@
  * OR MODIFICATIONS.
  */
 
-#ifndef lint
-static char rcsid[] = "$Id: ccp.c,v 1.24 1999/03/12 06:07:14 paulus Exp $";
-#endif
+#define RCSID	"$Id: ccp.c,v 1.30 2000/04/15 01:27:11 masputra Exp $"
 
 #include <stdlib.h>
 #include <string.h>
-#include <syslog.h>
-#include <sys/ioctl.h>
-#include <sys/types.h>
 
 #include "pppd.h"
 #include "fsm.h"
 #include "ccp.h"
 #include <net/ppp-comp.h>
 
+static const char rcsid[] = RCSID;
+
 /*
  * Command-line options.
  */
@@ -51,7 +48,7 @@ static option_t ccp_option_list[] = {
       "Disable CCP negotiation" },
     { "-ccp", o_bool, &ccp_protent.enabled_flag,
       "Disable CCP negotiation" },
-    { "bsdcomp", o_special, setbsdcomp,
+    { "bsdcomp", o_special, (void *)setbsdcomp,
       "Request BSD-Compress packet compression" },
     { "nobsdcomp", o_bool, &ccp_wantoptions[0].bsd_compress,
       "don't allow BSD-Compress", OPT_A2COPY,
@@ -59,7 +56,7 @@ static option_t ccp_option_list[] = {
     { "-bsdcomp", o_bool, &ccp_wantoptions[0].bsd_compress,
       "don't allow BSD-Compress", OPT_A2COPY,
       &ccp_allowoptions[0].bsd_compress },
-    { "deflate", 1, setdeflate,
+    { "deflate", 1, (void *)setdeflate,
       "request Deflate compression" },
     { "nodeflate", o_bool, &ccp_wantoptions[0].deflate,
       "don't allow Deflate compression", OPT_A2COPY,
@@ -110,6 +107,7 @@ struct protent ccp_protent = {
     ccp_datainput,
     1,
     "CCP",
+    "Compressed",
     ccp_option_list,
     NULL,
     NULL,
@@ -359,7 +357,7 @@ ccp_input(unit, p, len)
     oldstate = f->state;
     fsm_input(f, p, len);
     if (oldstate == OPENED && p[0] == TERMREQ && f->state != OPENED)
-	syslog(LOG_NOTICE, "Compression disabled by peer.");
+	notice("Compression disabled by peer.");
 
     /*
      * If we get a terminate-ack and we're not asking for compression,
@@ -710,12 +708,9 @@ ccp_nakci(f, p, len)
     /*
      * Predictor-1 and 2 have no options, so they can't be Naked.
      *
-     * XXX What should we do with any remaining options?
+     * There may be remaining options but we ignore them.
      */
 
-    if (len != 0)
-	return 0;
-
     if (f->state != OPENED)
 	*go = try;
     return 1;
@@ -993,27 +988,28 @@ method_name(opt, opt2)
     case CI_DEFLATE:
     case CI_DEFLATE_DRAFT:
 	if (opt2 != NULL && opt2->deflate_size != opt->deflate_size)
-	    sprintf(result, "Deflate%s (%d/%d)",
-		    (opt->method == CI_DEFLATE_DRAFT? "(old#)": ""),
-		    opt->deflate_size, opt2->deflate_size);
+	    slprintf(result, sizeof(result), "Deflate%s (%d/%d)",
+		     (opt->method == CI_DEFLATE_DRAFT? "(old#)": ""),
+		     opt->deflate_size, opt2->deflate_size);
 	else
-	    sprintf(result, "Deflate%s (%d)",
-		    (opt->method == CI_DEFLATE_DRAFT? "(old#)": ""),
-		    opt->deflate_size);
+	    slprintf(result, sizeof(result), "Deflate%s (%d)",
+		     (opt->method == CI_DEFLATE_DRAFT? "(old#)": ""),
+		     opt->deflate_size);
 	break;
     case CI_BSD_COMPRESS:
 	if (opt2 != NULL && opt2->bsd_bits != opt->bsd_bits)
-	    sprintf(result, "BSD-Compress (%d/%d)", opt->bsd_bits,
-		    opt2->bsd_bits);
+	    slprintf(result, sizeof(result), "BSD-Compress (%d/%d)",
+		     opt->bsd_bits, opt2->bsd_bits);
 	else
-	    sprintf(result, "BSD-Compress (%d)", opt->bsd_bits);
+	    slprintf(result, sizeof(result), "BSD-Compress (%d)",
+		     opt->bsd_bits);
 	break;
     case CI_PREDICTOR_1:
 	return "Predictor 1";
     case CI_PREDICTOR_2:
 	return "Predictor 2";
     default:
-	sprintf(result, "Method %d", opt->method);
+	slprintf(result, sizeof(result), "Method %d", opt->method);
     }
     return result;
 }
@@ -1033,19 +1029,16 @@ ccp_up(f)
     if (ANY_COMPRESS(*go)) {
 	if (ANY_COMPRESS(*ho)) {
 	    if (go->method == ho->method) {
-		syslog(LOG_NOTICE, "%s compression enabled",
-		       method_name(go, ho));
+		notice("%s compression enabled", method_name(go, ho));
 	    } else {
-		strlcpy(method1, sizeof(method1), method_name(go, NULL));
-		syslog(LOG_NOTICE, "%s / %s compression enabled",
+		strlcpy(method1, method_name(go, NULL), sizeof(method1));
+		notice("%s / %s compression enabled",
 		       method1, method_name(ho, NULL));
 	    }
 	} else
-	    syslog(LOG_NOTICE, "%s receive compression enabled",
-		   method_name(go, NULL));
+	    notice("%s receive compression enabled", method_name(go, NULL));
     } else if (ANY_COMPRESS(*ho))
-	syslog(LOG_NOTICE, "%s transmit compression enabled",
-	       method_name(ho, NULL));
+	notice("%s transmit compression enabled", method_name(ho, NULL));
 }
 
 /*
@@ -1157,7 +1150,7 @@ ccp_printpkt(p, plen, printer, arg)
     case TERMACK:
     case TERMREQ:
 	if (len > 0 && *p >= ' ' && *p < 0x7f) {
-	    print_string(p, len, printer, arg);
+	    print_string((char *)p, len, printer, arg);
 	    p += len;
 	    len = 0;
 	}
@@ -1197,7 +1190,7 @@ ccp_datainput(unit, pkt, len)
 	    /*
 	     * Disable compression by taking CCP down.
 	     */
-	    syslog(LOG_ERR, "Lost compression sync: disabling compression");
+	    error("Lost compression sync: disabling compression");
 	    ccp_close(unit, "Lost compression sync");
 	} else {
 	    /*