Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up a little.

This commit is contained in:
mycroft 1995-02-21 10:14:53 +00:00
parent 715c38c819
commit 3757efcbfc
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/lib/libsa/bootp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bootp.c,v 1.3 1995/02/20 11:04:04 mycroft Exp $ */ /* $NetBSD: bootp.c,v 1.4 1995/02/21 10:14:53 mycroft Exp $ */
/* /*
* Copyright (c) 1992 Regents of the University of California. * Copyright (c) 1992 Regents of the University of California.
@ -94,15 +94,18 @@ bootp(sock)
if (debug) if (debug)
printf("bootp: d=%x\n", (u_int)d); printf("bootp: d=%x\n", (u_int)d);
#endif #endif
bp = &wbuf.wbootp; bp = &wbuf.wbootp;
bzero(bp, sizeof(*bp)); bzero(bp, sizeof(*bp));
bp->bp_op = BOOTREQUEST; bp->bp_op = BOOTREQUEST;
bp->bp_htype = 1; /* 10Mb Ethernet (48 bits) */ bp->bp_htype = 1; /* 10Mb Ethernet (48 bits) */
bp->bp_hlen = 6; bp->bp_hlen = 6;
bp->bp_xid = d->xid;
MACPY(d->myea, bp->bp_chaddr); MACPY(d->myea, bp->bp_chaddr);
bzero(bp->bp_file, sizeof(bp->bp_file));
bcopy(vm_rfc1048, bp->bp_vend, sizeof(vm_rfc1048));
d->xid = 0;
d->myip = myip; d->myip = myip;
d->myport = IPPORT_BOOTPC; d->myport = IPPORT_BOOTPC;
d->destip = INADDR_BROADCAST; d->destip = INADDR_BROADCAST;
@ -111,6 +114,9 @@ bootp(sock)
(void)sendrecv(d, (void)sendrecv(d,
bootpsend, bp, sizeof(*bp), bootpsend, bp, sizeof(*bp),
bootprecv, &rbuf.rbootp, sizeof(rbuf.rbootp)); bootprecv, &rbuf.rbootp, sizeof(rbuf.rbootp));
/* Bump xid so next request will be unique. */
++d->xid;
} }
/* Transmit a bootp request */ /* Transmit a bootp request */
@ -128,10 +134,6 @@ bootpsend(d, pkt, len)
#endif #endif
bp = pkt; bp = pkt;
bzero(bp->bp_file, sizeof(bp->bp_file));
bcopy(vm_rfc1048, bp->bp_vend, sizeof(long));
bp->bp_xid = d->xid;
bp->bp_secs = (u_long)(getsecs() - bot); bp->bp_secs = (u_long)(getsecs() - bot);
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
@ -179,9 +181,6 @@ bootprecv(d, pkt, len, tleft)
goto bad; goto bad;
} }
/* Bump xid so next request will be unique. */
++d->xid;
#ifdef BOOTP_DEBUG #ifdef BOOTP_DEBUG
if (debug) if (debug)
printf("bootprecv: got one!\n"); printf("bootprecv: got one!\n");