enough 64-bit fixes to make network booting work on the Alpha. In general,
these are hacks (s/long/int/, etc.), but this code really needs a heavy cleaning (including fixed-size typing) and I don't have time to give it one now.
This commit is contained in:
parent
f496a53cbf
commit
bbfe67624b
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: bootp.c,v 1.7 1995/09/18 21:19:20 pk Exp $ */
|
||||
/* $NetBSD: bootp.c,v 1.8 1996/09/26 23:22:01 cgd Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992 Regents of the University of California.
|
||||
|
@ -304,7 +304,7 @@ vend_rfc1048(cp, len)
|
|||
ep = cp + len;
|
||||
|
||||
/* Step over magic cookie */
|
||||
cp += sizeof(long);
|
||||
cp += sizeof(int);
|
||||
|
||||
while (cp < ep) {
|
||||
tag = *cp++;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: bootp.h,v 1.2 1994/10/26 05:44:39 cgd Exp $ */
|
||||
/* $NetBSD: bootp.h,v 1.3 1996/09/26 23:22:01 cgd Exp $ */
|
||||
|
||||
/*
|
||||
* Bootstrap Protocol (BOOTP). RFC951 and RFC1048.
|
||||
|
@ -26,7 +26,7 @@ struct bootp {
|
|||
unsigned char bp_htype; /* hardware addr type */
|
||||
unsigned char bp_hlen; /* hardware addr length */
|
||||
unsigned char bp_hops; /* gateway hops */
|
||||
unsigned long bp_xid; /* transaction ID */
|
||||
unsigned int bp_xid; /* transaction ID */
|
||||
unsigned short bp_secs; /* seconds since boot began */
|
||||
unsigned short bp_unused;
|
||||
struct in_addr bp_ciaddr; /* client IP address */
|
||||
|
@ -94,7 +94,7 @@ struct bootp {
|
|||
|
||||
struct cmu_vend {
|
||||
unsigned char v_magic[4]; /* magic number */
|
||||
unsigned long v_flags; /* flags/opcodes, etc. */
|
||||
unsigned int v_flags; /* flags/opcodes, etc. */
|
||||
struct in_addr v_smask; /* Subnet mask */
|
||||
struct in_addr v_dgate; /* Default gateway */
|
||||
struct in_addr v_dns1, v_dns2; /* Domain name servers */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rpc.c,v 1.13 1996/07/10 18:41:38 cgd Exp $ */
|
||||
/* $NetBSD: rpc.c,v 1.14 1996/09/26 23:22:02 cgd Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992 Regents of the University of California.
|
||||
|
@ -241,7 +241,7 @@ recvrpc(d, pkt, len, tleft)
|
|||
{
|
||||
register struct rpc_reply *reply;
|
||||
ssize_t n;
|
||||
long x;
|
||||
int x;
|
||||
|
||||
errno = 0;
|
||||
#ifdef RPC_DEBUG
|
||||
|
@ -320,8 +320,8 @@ rpc_fromaddr(pkt, addr, port)
|
|||
int rpc_pmap_num;
|
||||
struct pmap_list {
|
||||
struct in_addr addr; /* server, net order */
|
||||
u_long prog; /* host order */
|
||||
u_long vers; /* host order */
|
||||
u_int prog; /* host order */
|
||||
u_int vers; /* host order */
|
||||
int port; /* host order */
|
||||
} rpc_pmap_list[PMAP_NUM];
|
||||
|
||||
|
@ -329,8 +329,8 @@ struct pmap_list {
|
|||
int
|
||||
rpc_pmap_getcache(addr, prog, vers)
|
||||
struct in_addr addr; /* server, net order */
|
||||
u_long prog; /* host order */
|
||||
u_long vers; /* host order */
|
||||
u_int prog; /* host order */
|
||||
u_int vers; /* host order */
|
||||
{
|
||||
struct pmap_list *pl;
|
||||
|
||||
|
@ -347,8 +347,8 @@ rpc_pmap_getcache(addr, prog, vers)
|
|||
void
|
||||
rpc_pmap_putcache(addr, prog, vers, port)
|
||||
struct in_addr addr; /* server, net order */
|
||||
u_long prog; /* host order */
|
||||
u_long vers; /* host order */
|
||||
u_int prog; /* host order */
|
||||
u_int vers; /* host order */
|
||||
int port; /* host order */
|
||||
{
|
||||
struct pmap_list *pl;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: rpc.h,v 1.7 1995/09/23 03:36:12 gwr Exp $ */
|
||||
/* $NetBSD: rpc.h,v 1.8 1996/09/26 23:22:03 cgd Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1992 Regents of the University of California.
|
||||
|
@ -52,8 +52,8 @@
|
|||
ssize_t rpc_call __P((struct iodesc *, n_long, n_long, n_long,
|
||||
void *, size_t, void *, size_t));
|
||||
void rpc_fromaddr __P((void *, struct in_addr *, u_short *));
|
||||
int rpc_pmap_getcache __P((struct in_addr, u_long, u_long));
|
||||
void rpc_pmap_putcache __P((struct in_addr, u_long, u_long, int));
|
||||
int rpc_pmap_getcache __P((struct in_addr, u_int, u_int));
|
||||
void rpc_pmap_putcache __P((struct in_addr, u_int, u_int, int));
|
||||
|
||||
extern int rpc_port; /* decrement before bind */
|
||||
|
||||
|
|
Loading…
Reference in New Issue