Fixes to compile under non-CVS Linux 2.1.126
This commit is contained in:
parent
7fe274e31f
commit
01761af0b3
|
@ -1,4 +1,7 @@
|
||||||
Here are some notes about RADIUS extension to ipppd.
|
Here are some notes about RADIUS extension to ipppd.
|
||||||
|
Radius related stuff should be reported to
|
||||||
|
|
||||||
|
Matjaz Godec <gody@master.slon.net>.
|
||||||
|
|
||||||
1. Current extensions are based on Lars's radiusclient-0.3-alpha-4. Don't be
|
1. Current extensions are based on Lars's radiusclient-0.3-alpha-4. Don't be
|
||||||
scared because of aplha in the name. So before enabling RADIUS features in
|
scared because of aplha in the name. So before enabling RADIUS features in
|
||||||
|
|
|
@ -25,21 +25,19 @@
|
||||||
* OR MODIFICATIONS.
|
* OR MODIFICATIONS.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char ccp_rcsid[] = "$Id: ccp.c,v 1.8 1998/10/16 12:37:45 keil Exp $";
|
char ccp_rcsid[] = "$Id: ccp.c,v 1.9 1998/10/29 17:28:45 hipp Exp $";
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <syslog.h>
|
#include <syslog.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#if 0
|
|
||||||
#include </usr/include/net/ppp_defs.h>
|
|
||||||
#endif
|
|
||||||
#include <linux/ppp-comp.h>
|
|
||||||
|
|
||||||
#include "fsm.h"
|
#include "fsm.h"
|
||||||
#include "ipppd.h"
|
#include "ipppd.h"
|
||||||
#include "ccp.h"
|
#include "ccp.h"
|
||||||
|
|
||||||
|
#include <linux/ppp-comp.h>
|
||||||
|
|
||||||
#include "compressions.h"
|
#include "compressions.h"
|
||||||
|
|
||||||
#ifdef HAVE_LZSCOMP_H
|
#ifdef HAVE_LZSCOMP_H
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
*
|
*
|
||||||
* $Id: ipppd.h,v 1.16 1998/05/05 08:51:21 hipp Exp $
|
* $Id: ipppd.h,v 1.17 1998/10/29 17:28:46 hipp Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -66,7 +66,12 @@ struct isdn_ppp_comp_data {
|
||||||
#ifndef IPPP_COMP_FLAG_LINK
|
#ifndef IPPP_COMP_FLAG_LINK
|
||||||
#define IPPP_COMP_FLAG_LINK 0x2
|
#define IPPP_COMP_FLAG_LINK 0x2
|
||||||
#endif
|
#endif
|
||||||
|
/* Old Linux Kernels don't have VERSION defined */
|
||||||
|
#ifndef IPPP_VERSION
|
||||||
|
#define IPPP_VERSION "2.2.0"
|
||||||
|
#else
|
||||||
|
#define NEW_VERS
|
||||||
|
#endif
|
||||||
|
|
||||||
#define NUM_PPP 64 /* 64 PPP interface supported (per process) */
|
#define NUM_PPP 64 /* 64 PPP interface supported (per process) */
|
||||||
|
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char options_rcsid[] = "$Id: options.c,v 1.12 1998/10/16 12:37:53 keil Exp $";
|
char options_rcsid[] = "$Id: options.c,v 1.13 1998/10/29 17:28:47 hipp Exp $";
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
@ -2463,6 +2463,7 @@ static int resetipxproto(int slot)
|
||||||
static int setforcedriver(int dummy)
|
static int setforcedriver(int dummy)
|
||||||
{
|
{
|
||||||
force_driver = 1;
|
force_driver = 1;
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
char sys_rcsid[] = "$Id: sys-linux.c,v 1.14 1998/07/08 16:48:24 hipp Exp $";
|
char sys_rcsid[] = "$Id: sys-linux.c,v 1.15 1998/10/29 17:28:49 hipp Exp $";
|
||||||
|
|
||||||
#define _LINUX_STRING_H_
|
#define _LINUX_STRING_H_
|
||||||
|
|
||||||
|
@ -409,6 +409,7 @@ void ppp_recv_config (int unit,int mru,u_int32_t asyncmap,int pcomp,int accomp)
|
||||||
*/
|
*/
|
||||||
int ccp_test (int ccp_unit, u_char *opt_ptr, int opt_len, int for_transmit)
|
int ccp_test (int ccp_unit, u_char *opt_ptr, int opt_len, int for_transmit)
|
||||||
{
|
{
|
||||||
|
#ifdef NEW_VERS
|
||||||
struct isdn_ppp_comp_data data;
|
struct isdn_ppp_comp_data data;
|
||||||
int linkunit = ccp_fsm[ccp_unit].unit;
|
int linkunit = ccp_fsm[ccp_unit].unit;
|
||||||
|
|
||||||
|
@ -429,8 +430,11 @@ int ccp_test (int ccp_unit, u_char *opt_ptr, int opt_len, int for_transmit)
|
||||||
|
|
||||||
if (ioctl(lns[linkunit].fd, PPPIOCSCOMPRESSOR, (caddr_t) &data) >= 0)
|
if (ioctl(lns[linkunit].fd, PPPIOCSCOMPRESSOR, (caddr_t) &data) >= 0)
|
||||||
return 1;
|
return 1;
|
||||||
|
|
||||||
return (errno == ENOBUFS)? 0: -1;
|
return (errno == ENOBUFS)? 0: -1;
|
||||||
|
#else
|
||||||
|
return -1;
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int ccp_get_compressors(int ccp_unit,unsigned long *protos)
|
int ccp_get_compressors(int ccp_unit,unsigned long *protos)
|
||||||
|
|
Loading…
Reference in New Issue