Submitted by: Mike Mitchell (mitchell@ref.tfs.com)
these patches bring the ipx code up to the point that it compiles cleanly with the -W arguments suggested by bruce.
This commit is contained in:
parent
9f65f104f5
commit
1b3f472e51
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=11991
@ -2,7 +2,7 @@
|
||||
# LINT -- config file for checking all the sources, tries to pull in
|
||||
# as much of the source tree as it can.
|
||||
#
|
||||
# $Id: LINT,v 1.209 1995/10/31 17:00:03 joerg Exp $
|
||||
# $Id: LINT,v 1.210 1995/10/31 18:27:45 phk Exp $
|
||||
#
|
||||
# NB: You probably don't want to try running a kernel built from this
|
||||
# file. Instead, you should start from GENERIC, and add options from
|
||||
@ -132,8 +132,8 @@ options NS #Xerox NS communications protocols
|
||||
options IPX #IPX/SPX communications protocols
|
||||
options IPXIP #IPX in IP encapsulation (not available)
|
||||
options IPTUNNEL #IP in IPX encapsulation (not available)
|
||||
#options "IPXPRINTFS=0" #Console Debugging Information
|
||||
#options "IPX_ERRPRINTFS=0" #Console Debugging Information
|
||||
options "IPXPRINTFS=0" #IPX/SPX Console Debugging Information
|
||||
options "IPX_ERRPRINTFS=0" #IPX/SPX Console Debugging Information
|
||||
|
||||
# These are currently broken and don't compile
|
||||
#options ISO
|
||||
|
@ -2,7 +2,7 @@
|
||||
# LINT -- config file for checking all the sources, tries to pull in
|
||||
# as much of the source tree as it can.
|
||||
#
|
||||
# $Id: LINT,v 1.209 1995/10/31 17:00:03 joerg Exp $
|
||||
# $Id: LINT,v 1.210 1995/10/31 18:27:45 phk Exp $
|
||||
#
|
||||
# NB: You probably don't want to try running a kernel built from this
|
||||
# file. Instead, you should start from GENERIC, and add options from
|
||||
@ -132,8 +132,8 @@ options NS #Xerox NS communications protocols
|
||||
options IPX #IPX/SPX communications protocols
|
||||
options IPXIP #IPX in IP encapsulation (not available)
|
||||
options IPTUNNEL #IP in IPX encapsulation (not available)
|
||||
#options "IPXPRINTFS=0" #Console Debugging Information
|
||||
#options "IPX_ERRPRINTFS=0" #Console Debugging Information
|
||||
options "IPXPRINTFS=0" #IPX/SPX Console Debugging Information
|
||||
options "IPX_ERRPRINTFS=0" #IPX/SPX Console Debugging Information
|
||||
|
||||
# These are currently broken and don't compile
|
||||
#options ISO
|
||||
|
@ -2,7 +2,7 @@
|
||||
# LINT -- config file for checking all the sources, tries to pull in
|
||||
# as much of the source tree as it can.
|
||||
#
|
||||
# $Id: LINT,v 1.209 1995/10/31 17:00:03 joerg Exp $
|
||||
# $Id: LINT,v 1.210 1995/10/31 18:27:45 phk Exp $
|
||||
#
|
||||
# NB: You probably don't want to try running a kernel built from this
|
||||
# file. Instead, you should start from GENERIC, and add options from
|
||||
@ -132,8 +132,8 @@ options NS #Xerox NS communications protocols
|
||||
options IPX #IPX/SPX communications protocols
|
||||
options IPXIP #IPX in IP encapsulation (not available)
|
||||
options IPTUNNEL #IP in IPX encapsulation (not available)
|
||||
#options "IPXPRINTFS=0" #Console Debugging Information
|
||||
#options "IPX_ERRPRINTFS=0" #Console Debugging Information
|
||||
options "IPXPRINTFS=0" #IPX/SPX Console Debugging Information
|
||||
options "IPX_ERRPRINTFS=0" #IPX/SPX Console Debugging Information
|
||||
|
||||
# These are currently broken and don't compile
|
||||
#options ISO
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx.c
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx.h
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#ifndef _NETIPX_IPX_H_
|
||||
@ -156,8 +156,6 @@ struct ipx {
|
||||
|
||||
#ifdef KERNEL
|
||||
|
||||
#include <net/route.h>
|
||||
|
||||
extern int ipxcksum;
|
||||
extern struct domain ipxdomain;
|
||||
extern struct sockaddr_ipx ipx_netmask;
|
||||
@ -173,6 +171,9 @@ extern long ipx_pexseq;
|
||||
extern u_char ipxctlerrmap[];
|
||||
extern struct ipxpcb ipxrawpcb;
|
||||
|
||||
#include <net/if.h>
|
||||
#include <net/route.h>
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
|
||||
__BEGIN_DECLS
|
||||
|
@ -31,12 +31,14 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_cksum.c
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/mbuf.h>
|
||||
|
||||
#include <netipx/ipx.h>
|
||||
|
||||
/*
|
||||
* Checksum routine for Network Systems Protocol Packets (Big-Endian).
|
||||
*
|
||||
@ -49,8 +51,8 @@
|
||||
|
||||
u_short
|
||||
ipx_cksum(m, len)
|
||||
register struct mbuf *m;
|
||||
register int len;
|
||||
struct mbuf *m;
|
||||
int len;
|
||||
{
|
||||
register u_short *w;
|
||||
register int sum = 0;
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_error.c
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_error.h
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#ifndef _NETIPX_IPX_ERROR_H_
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_if.h
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#ifndef _NETIPX_IPX_IF_H_
|
||||
@ -69,7 +69,13 @@ struct ipx_aliasreq {
|
||||
#define IA_SIPX(ia) (&(((struct ipx_ifaddr *)(ia))->ia_addr))
|
||||
|
||||
/* This is not the right place for this but where is? */
|
||||
#define ETHERTYPE_IPX 0x8137
|
||||
|
||||
#define ETHERTYPE_IPX_8022 0x00e0 /* Ethernet_802.2 */
|
||||
#define ETHERTYPE_IPX_8023 0x0000 /* Ethernet_802.3 */
|
||||
#define ETHERTYPE_IPX_II 0x8137 /* Ethernet_II */
|
||||
#define ETHERTYPE_IPX_SNAP 0x8137 /* Ethernet_SNAP */
|
||||
|
||||
#define ETHERTYPE_IPX 0x8137 /* Only Ethernet_II Available */
|
||||
|
||||
#ifdef IPXIP
|
||||
struct ipxip_req {
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_input.c
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_ip.c
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -226,12 +226,13 @@ ipxip_input(m, ifp)
|
||||
|
||||
/* ARGSUSED */
|
||||
int
|
||||
ipxipoutput(ifn, m, dst)
|
||||
struct ifnet_en *ifn;
|
||||
ipxipoutput(ifn_en, m, dst, rt)
|
||||
struct ifnet *ifn_en;
|
||||
register struct mbuf *m;
|
||||
struct sockaddr *dst;
|
||||
struct rtentry *rt;
|
||||
{
|
||||
|
||||
register struct ifnet_en *ifn = (struct ifnet_en *)ifn_en;
|
||||
register struct ip *ip;
|
||||
register struct route *ro = &(ifn->ifen_route);
|
||||
register int len = 0;
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipxip.h
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#ifndef __NETIPX_IPXIP_H_
|
||||
@ -59,7 +59,7 @@ void ipxip_rtchange __P((struct in_addr *dst));
|
||||
struct ifnet_en *ipxipattach __P((void));
|
||||
int ipxipioctl __P((struct ifnet *ifp, int cmd, caddr_t data));
|
||||
void ipxip_input __P((struct mbuf *m, struct ifnet *ifp));
|
||||
int ipxipoutput __P((struct ifnet_en *ifn, struct mbuf *m, struct sockaddr *dst));
|
||||
int ipxipoutput __P((struct ifnet *ifn, struct mbuf *m, struct sockaddr *dst, struct rtentry *rt));
|
||||
void ipxipstart __P((struct ifnet *ifp));
|
||||
int ipxip_route __P((struct mbuf *m));
|
||||
int ipxip_free __P((struct ifnet *ifp));
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_outputfl.c
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_pcb.c
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -284,8 +284,9 @@ ipx_setpeeraddr(ipxp, nam)
|
||||
void
|
||||
ipx_pcbnotify(dst, errno, notify, param)
|
||||
register struct ipx_addr *dst;
|
||||
int errno;
|
||||
void (*notify)(struct ipxpcb *);
|
||||
long param;
|
||||
int errno, (*notify)();
|
||||
{
|
||||
register struct ipxpcb *ipxp, *oinp;
|
||||
int s = splimp();
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_pcb.h
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#ifndef _NETIPX_IPX_PCB_H_
|
||||
@ -91,7 +91,7 @@ void ipx_pcbdisconnect __P((struct ipxpcb *ipxp));
|
||||
void ipx_pcbdetach __P((struct ipxpcb *ipxp));
|
||||
void ipx_setsockaddr __P((struct ipxpcb *ipxp, struct mbuf *nam));
|
||||
void ipx_setpeeraddr __P((struct ipxpcb *ipxp, struct mbuf *nam));
|
||||
void ipx_pcbnotify __P((struct ipx_addr *dst, int errno, int (*notify)(), long param));
|
||||
void ipx_pcbnotify __P((struct ipx_addr *dst, int errno, void (*notify)(struct ipxpcb *), long param));
|
||||
struct ipxpcb *ipx_pcblookup __P((struct ipx_addr *faddr, int lport, int wildp));
|
||||
__END_DECLS
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_proto.c
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_tun.c
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
/*
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_usrreq.c
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)ipx_var.h
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#ifndef _NETIPX_IPX_VAR_H_
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)spx.h
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#ifndef _NETIPX_SPX_H_
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)spx_debug.c
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)spx_debug.h
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#ifndef _NETIPX_SPX_DEBUG_H_
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)spx_timer.h
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#ifndef _NETIPX_SPX_TIMER_H_
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)spx_usrreq.h
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -620,7 +620,7 @@ spx_ctlinput(cmd, arg)
|
||||
switch (type) {
|
||||
|
||||
case IPX_ERR_UNREACH_HOST:
|
||||
ipx_pcbnotify(na, (int)ipxctlerrmap[cmd], spx_abort, (long) 0);
|
||||
ipx_pcbnotify(na, (int)ipxctlerrmap[cmd], spx_abort, NULL);
|
||||
break;
|
||||
|
||||
case IPX_ERR_TOO_BIG:
|
||||
@ -637,7 +637,7 @@ spx_ctlinput(cmd, arg)
|
||||
break;
|
||||
|
||||
case IPX_ERR_FULLUP:
|
||||
ipx_pcbnotify(na, 0, spx_quench, (long) 0);
|
||||
ipx_pcbnotify(na, 0, spx_quench, NULL);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -31,7 +31,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)spx_var.h
|
||||
* @(#)$Id$
|
||||
*/
|
||||
|
||||
#ifndef _NETIPX_SPX_VAR_H_
|
||||
|
Loading…
Reference in New Issue
Block a user