Break out sendudp and readudp from net.c. This is for PXE, so it

can use its own UDP interface.

1 files changed, 1 insertions, 213 deletions

diff --git a/lib/libstand/net.c b/lib/libstand/net.c
index 978bd70..b01c3c6 100644
--- a/lib/libstand/net.c
+++ b/lib/libstand/net.c
@@ -37,6 +37,7 @@
  * SUCH DAMAGE.
  *
  * @(#) Header: net.c,v 1.9 93/08/06 19:32:15 leres Exp  (LBL)
+ *	$FreeBSD$
  */
 
 #include <sys/param.h>
@@ -57,219 +58,6 @@
 #include "stand.h"
 #include "net.h"
 
-/* Caller must leave room for ethernet, ip and udp headers in front!! */
-ssize_t
-sendudp(d, pkt, len)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
-{
-	register ssize_t cc;
-	register struct ip *ip;
-	register struct udphdr *uh;
-	register u_char *ea;
-
-#ifdef NET_DEBUG
- 	if (debug) {
-		printf("sendudp: d=%lx called.\n", (long)d);
-		if (d) {
-			printf("saddr: %s:%d",
-			    inet_ntoa(d->myip), ntohs(d->myport));
-			printf(" daddr: %s:%d\n",
-			    inet_ntoa(d->destip), ntohs(d->destport));
-		}
-	}
-#endif
-
-	uh = (struct udphdr *)pkt - 1;
-	ip = (struct ip *)uh - 1;
-	len += sizeof(*ip) + sizeof(*uh);
-
-	bzero(ip, sizeof(*ip) + sizeof(*uh));
-
-	ip->ip_v = IPVERSION;			/* half-char */
-	ip->ip_hl = sizeof(*ip) >> 2;		/* half-char */
-	ip->ip_len = htons(len);
-	ip->ip_p = IPPROTO_UDP;			/* char */
-	ip->ip_ttl = IP_TTL;			/* char */
-	ip->ip_src = d->myip;
-	ip->ip_dst = d->destip;
-	ip->ip_sum = in_cksum(ip, sizeof(*ip));	 /* short, but special */
-
-	uh->uh_sport = d->myport;
-	uh->uh_dport = d->destport;
-	uh->uh_ulen = htons(len - sizeof(*ip));
-
-#ifndef UDP_NO_CKSUM
-	{
-		register struct udpiphdr *ui;
-		struct ip tip;
-
-		/* Calculate checksum (must save and restore ip header) */
-		tip = *ip;
-		ui = (struct udpiphdr *)ip;
-		bzero(&ui->ui_x1, sizeof(ui->ui_x1));
-		ui->ui_len = uh->uh_ulen;
-		uh->uh_sum = in_cksum(ui, len);
-		*ip = tip;
-	}
-#endif
-
-	if (ip->ip_dst.s_addr == INADDR_BROADCAST || ip->ip_src.s_addr == 0 ||
-	    netmask == 0 || SAMENET(ip->ip_src, ip->ip_dst, netmask))
-		ea = arpwhohas(d, ip->ip_dst);
-	else
-		ea = arpwhohas(d, gateip);
-
-	cc = sendether(d, ip, len, ea, ETHERTYPE_IP);
-	if (cc == -1)
-		return (-1);
-	if (cc != len)
-		panic("sendudp: bad write (%d != %d)", cc, len);
-	return (cc - (sizeof(*ip) + sizeof(*uh)));
-}
-
-/*
- * Receive a UDP packet and validate it is for us.
- * Caller leaves room for the headers (Ether, IP, UDP)
- */
-ssize_t
-readudp(d, pkt, len, tleft)
-	register struct iodesc *d;
-	register void *pkt;
-	register size_t len;
-	time_t tleft;
-{
-	register ssize_t n;
-	register size_t hlen;
-	register struct ip *ip;
-	register struct udphdr *uh;
-	u_int16_t etype;	/* host order */
-
-#ifdef NET_DEBUG
-	if (debug)
-		printf("readudp: called\n");
-#endif
-
-	uh = (struct udphdr *)pkt - 1;
-	ip = (struct ip *)uh - 1;
-
-	n = readether(d, ip, len + sizeof(*ip) + sizeof(*uh), tleft, &etype);
-	if (n == -1 || n < sizeof(*ip) + sizeof(*uh))
-		return -1;
-
-	/* Ethernet address checks now in readether() */
-
-	/* Need to respond to ARP requests. */
-	if (etype == ETHERTYPE_ARP) {
-		struct arphdr *ah = (void *)ip;
-		if (ah->ar_op == htons(ARPOP_REQUEST)) {
-			/* Send ARP reply */
-			arp_reply(d, ah);
-		}
-		return -1;
-	}
-
-	if (etype != ETHERTYPE_IP) {
-#ifdef NET_DEBUG
-		if (debug)
-			printf("readudp: not IP. ether_type=%x\n", etype);
-#endif
-		return -1;
-	}
-
-	/* Check ip header */
-	if (ip->ip_v != IPVERSION ||
-	    ip->ip_p != IPPROTO_UDP) {	/* half char */
-#ifdef NET_DEBUG
-		if (debug)
-			printf("readudp: IP version or not UDP. ip_v=%d ip_p=%d\n", ip->ip_v, ip->ip_p);
-#endif
-		return -1;
-	}
-
-	hlen = ip->ip_hl << 2;
-	if (hlen < sizeof(*ip) ||
-	    in_cksum(ip, hlen) != 0) {
-#ifdef NET_DEBUG
-		if (debug)
-			printf("readudp: short hdr or bad cksum.\n");
-#endif
-		return -1;
-	}
-	if (n < ntohs(ip->ip_len)) {
-#ifdef NET_DEBUG
-		if (debug)
-			printf("readudp: bad length %d < %d.\n",
-			       (int)n, ntohs(ip->ip_len));
-#endif
-		return -1;
-	}
-	if (d->myip.s_addr && ip->ip_dst.s_addr != d->myip.s_addr) {
-#ifdef NET_DEBUG
-		if (debug) {
-			printf("readudp: bad saddr %s != ", inet_ntoa(d->myip));
-			printf("%s\n", inet_ntoa(ip->ip_dst));
-		}
-#endif
-		return -1;
-	}
-
-	/* If there were ip options, make them go away */
-	if (hlen != sizeof(*ip)) {
-		bcopy(((u_char *)ip) + hlen, uh, len - hlen);
-		ip->ip_len = htons(sizeof(*ip));
-		n -= hlen - sizeof(*ip);
-	}
-	if (uh->uh_dport != d->myport) {
-#ifdef NET_DEBUG
-		if (debug)
-			printf("readudp: bad dport %d != %d\n",
-				d->myport, ntohs(uh->uh_dport));
-#endif
-		return -1;
-	}
-
-#ifndef UDP_NO_CKSUM
-	if (uh->uh_sum) {
-		register struct udpiphdr *ui;
-		struct ip tip;
-
-		n = ntohs(uh->uh_ulen) + sizeof(*ip);
-		if (n > RECV_SIZE - ETHER_SIZE) {
-			printf("readudp: huge packet, udp len %d\n", (int)n);
-			return -1;
-		}
-
-		/* Check checksum (must save and restore ip header) */
-		tip = *ip;
-		ui = (struct udpiphdr *)ip;
-		bzero(&ui->ui_x1, sizeof(ui->ui_x1));
-		ui->ui_len = uh->uh_ulen;
-		if (in_cksum(ui, n) != 0) {
-#ifdef NET_DEBUG
-			if (debug)
-				printf("readudp: bad cksum\n");
-#endif
-			*ip = tip;
-			return -1;
-		}
-		*ip = tip;
-	}
-#endif
-	if (ntohs(uh->uh_ulen) < sizeof(*uh)) {
-#ifdef NET_DEBUG
-		if (debug)
-			printf("readudp: bad udp len %d < %d\n",
-				ntohs(uh->uh_ulen), (int)sizeof(*uh));
-#endif
-		return -1;
-	}
-
-	n -= sizeof(*ip) + sizeof(*uh);
-	return (n);
-}
-
 /*
  * Send a packet and wait for a reply, with exponential backoff.
  *