* OR MODIFICATIONS.
*/
-#ifndef lint
-static char rcsid[] = "$Id: ccp.c,v 1.25 1999/03/16 03:15:12 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 "ccp.h"
#include <net/ppp-comp.h>
+static const char rcsid[] = RCSID;
+
/*
* Command-line options.
*/
"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,
{ "-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,
ccp_datainput,
1,
"CCP",
+ "Compressed",
ccp_option_list,
NULL,
NULL,
/*
* 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;
if (go->method == ho->method) {
notice("%s compression enabled", method_name(go, ho));
} else {
- strlcpy(method1, sizeof(method1), method_name(go, NULL));
+ strlcpy(method1, method_name(go, NULL), sizeof(method1));
notice("%s / %s compression enabled",
method1, method_name(ho, NULL));
}
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;
}