Module Name: src
Committed By: zoltan
Date: Wed May 11 16:23:40 UTC 2011
Modified Files:
src/sys/lib/libsa: Makefile bootp.c net.h rarp.c tftp.c udp.c
Added Files:
src/sys/lib/libsa: ip.c
Log Message:
Separate the IP and UDP code paths inside libsa, so I can add HTTP booting
later.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/lib/libsa/Makefile
cvs rdiff -u -r1.37 -r1.38 src/sys/lib/libsa/bootp.c
cvs rdiff -u -r0 -r1.1 src/sys/lib/libsa/ip.c
cvs rdiff -u -r1.25 -r1.26 src/sys/lib/libsa/net.h
cvs rdiff -u -r1.30 -r1.31 src/sys/lib/libsa/rarp.c src/sys/lib/libsa/tftp.c
cvs rdiff -u -r1.10 -r1.11 src/sys/lib/libsa/udp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libsa/Makefile
diff -u src/sys/lib/libsa/Makefile:1.71 src/sys/lib/libsa/Makefile:1.72
--- src/sys/lib/libsa/Makefile:1.71 Wed Feb 10 21:54:47 2010
+++ src/sys/lib/libsa/Makefile Wed May 11 16:23:40 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2010/02/10 21:54:47 martin Exp $
+# $NetBSD: Makefile,v 1.72 2011/05/11 16:23:40 zoltan Exp $
LIB= sa
NOPIC= # defined
@@ -54,7 +54,7 @@
.if (${SA_INCLUDE_NET} == "yes")
# network routines
-SRCS+= arp.c ether.c ether_sprintf.c ip_cksum.c net.c netif.c rpc.c udp.c
+SRCS+= arp.c ether.c ether_sprintf.c ip_cksum.c net.c netif.c rpc.c udp.c ip.c
# network info services:
SRCS+= bootp.c rarp.c bootparam.c
Index: src/sys/lib/libsa/bootp.c
diff -u src/sys/lib/libsa/bootp.c:1.37 src/sys/lib/libsa/bootp.c:1.38
--- src/sys/lib/libsa/bootp.c:1.37 Fri Jul 10 12:16:31 2009
+++ src/sys/lib/libsa/bootp.c Wed May 11 16:23:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: bootp.c,v 1.37 2009/07/10 12:16:31 roy Exp $ */
+/* $NetBSD: bootp.c,v 1.38 2011/05/11 16:23:40 zoltan Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -123,11 +123,11 @@
struct iodesc *d;
struct bootp *bp;
struct {
- u_char header[HEADER_SIZE];
+ u_char header[UDP_TOTAL_HEADER_SIZE];
struct bootp wbootp;
} wbuf;
struct {
- u_char header[HEADER_SIZE];
+ u_char header[UDP_TOTAL_HEADER_SIZE];
struct bootp rbootp;
} rbuf;
unsigned int index;
Index: src/sys/lib/libsa/net.h
diff -u src/sys/lib/libsa/net.h:1.25 src/sys/lib/libsa/net.h:1.26
--- src/sys/lib/libsa/net.h:1.25 Sun Jan 18 02:59:02 2009
+++ src/sys/lib/libsa/net.h Wed May 11 16:23:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: net.h,v 1.25 2009/01/18 02:59:02 tsutsui Exp $ */
+/* $NetBSD: net.h,v 1.26 2011/05/11 16:23:40 zoltan Exp $ */
/*
* Copyright (c) 1993 Adam Glass
@@ -67,14 +67,27 @@
#define RECV_SIZE 1536 /* XXX delete this */
/*
- * How much room to leave for headers:
+ * How much room to leave for headers in UDP packets:
* 14: struct ether_header
* 20: struct ip
* 8: struct udphdr
* That's 42 but let's pad it out to 48 bytes.
*/
-#define ETHER_SIZE 14
-#define HEADER_SIZE 48
+#define ETHERNET_HEADER_SIZE 14
+#define IP_HEADER_SIZE 20
+#define UDP_HEADER_SIZE 8
+
+#define UDP_TOTAL_HEADER_SIZE (ETHERNET_HEADER_SIZE + IP_HEADER_SIZE + UDP_HEADER_SIZE)
+
+/*
+ * How much room to leave for headers in TCP packets:
+ * 14: struct ether_header
+ * 20: struct ip
+ * 20: struct tcphdr
+ */
+#define TCP_HEADER_SIZE 20
+
+#define TCP_TOTAL_HEADER_SIZE (ETHERNET_HEADER_SIZE + IP_HEADER_SIZE + TCP_HEADER_SIZE)
extern u_char bcea[6];
extern char rootpath[FNAME_SIZE];
@@ -98,8 +111,16 @@
ssize_t sendether(struct iodesc *, void *, size_t, u_char *, int);
ssize_t readether(struct iodesc *, void *, size_t, saseconds_t, u_int16_t *);
+ssize_t sendip __P((struct iodesc *, void *, size_t, u_int8_t));
+ssize_t readip __P((struct iodesc *, void *, size_t, time_t, u_int8_t));
+
ssize_t sendudp(struct iodesc *, void *, size_t);
ssize_t readudp(struct iodesc *, void *, size_t, saseconds_t);
+
+int tcp_connect __P((struct iodesc *));
+ssize_t sendtcp __P((struct iodesc *, void *, size_t));
+ssize_t readtcp __P((struct iodesc *, void *, size_t, time_t));
+
ssize_t sendrecv(struct iodesc *, ssize_t (*)(struct iodesc *, void *, size_t),
void *, size_t, ssize_t (*)(struct iodesc *, void *, size_t, saseconds_t),
void *, size_t);
Index: src/sys/lib/libsa/rarp.c
diff -u src/sys/lib/libsa/rarp.c:1.30 src/sys/lib/libsa/rarp.c:1.31
--- src/sys/lib/libsa/rarp.c:1.30 Sat Jan 17 14:00:36 2009
+++ src/sys/lib/libsa/rarp.c Wed May 11 16:23:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rarp.c,v 1.30 2009/01/17 14:00:36 tsutsui Exp $ */
+/* $NetBSD: rarp.c,v 1.31 2011/05/11 16:23:40 zoltan Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -88,14 +88,14 @@
struct iodesc *d;
struct ether_arp *ap;
struct {
- u_char header[ETHER_SIZE];
+ u_char header[ETHERNET_HEADER_SIZE];
struct {
struct ether_arp arp;
u_char pad[18]; /* 60 - sizeof(arp) */
} data;
} wbuf;
struct {
- u_char header[ETHER_SIZE];
+ u_char header[ETHERNET_HEADER_SIZE];
struct {
struct ether_arp arp;
u_char pad[24]; /* extra space */
Index: src/sys/lib/libsa/tftp.c
diff -u src/sys/lib/libsa/tftp.c:1.30 src/sys/lib/libsa/tftp.c:1.31
--- src/sys/lib/libsa/tftp.c:1.30 Wed Jan 13 10:56:17 2010
+++ src/sys/lib/libsa/tftp.c Wed May 11 16:23:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tftp.c,v 1.30 2010/01/13 10:56:17 drochner Exp $ */
+/* $NetBSD: tftp.c,v 1.31 2011/05/11 16:23:40 zoltan Exp $ */
/*
* Copyright (c) 1996
@@ -73,7 +73,7 @@
int off;
const char *path; /* saved for re-requests */
struct {
- u_char header[HEADER_SIZE];
+ u_char header[UDP_TOTAL_HEADER_SIZE];
struct tftphdr t;
u_char space[RSPACE];
} lastdata;
@@ -153,7 +153,7 @@
tftp_makereq(struct tftp_handle *h)
{
struct {
- u_char header[HEADER_SIZE];
+ u_char header[UDP_TOTAL_HEADER_SIZE];
struct tftphdr t;
u_char space[FNAME_SIZE + 6];
} wbuf;
@@ -196,7 +196,7 @@
tftp_getnextblock(struct tftp_handle *h)
{
struct {
- u_char header[HEADER_SIZE];
+ u_char header[UDP_TOTAL_HEADER_SIZE];
struct tftphdr t;
} wbuf;
char *wtail;
@@ -229,7 +229,7 @@
tftp_terminate(struct tftp_handle *h)
{
struct {
- u_char header[HEADER_SIZE];
+ u_char header[UDP_TOTAL_HEADER_SIZE];
struct tftphdr t;
} wbuf;
char *wtail;
Index: src/sys/lib/libsa/udp.c
diff -u src/sys/lib/libsa/udp.c:1.10 src/sys/lib/libsa/udp.c:1.11
--- src/sys/lib/libsa/udp.c:1.10 Sun Dec 26 23:55:52 2010
+++ src/sys/lib/libsa/udp.c Wed May 11 16:23:40 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: udp.c,v 1.10 2010/12/26 23:55:52 christos Exp $ */
+/* $NetBSD: udp.c,v 1.11 2011/05/11 16:23:40 zoltan Exp $ */
/*
* Copyright (c) 1992 Regents of the University of California.
@@ -67,9 +67,7 @@
sendudp(struct iodesc *d, void *pkt, size_t len)
{
ssize_t cc;
- struct ip *ip;
struct udphdr *uh;
- u_char *ea;
#ifdef NET_DEBUG
if (debug) {
@@ -84,51 +82,20 @@
#endif
uh = (struct udphdr *)pkt - 1;
- ip = (struct ip *)uh - 1;
- len += sizeof(*ip) + sizeof(*uh);
+ len += sizeof(*uh);
- (void)memset(ip, 0, 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 = IPDEFTTL; /* char */
- ip->ip_src = d->myip;
- ip->ip_dst = d->destip;
- ip->ip_sum = ip_cksum(ip, sizeof(*ip)); /* short, but special */
+ (void)memset(uh, 0, sizeof(*uh));
uh->uh_sport = d->myport;
uh->uh_dport = d->destport;
- uh->uh_ulen = htons(len - sizeof(*ip));
-
-#ifndef UDP_NO_CKSUM
- {
- struct udpiphdr *ui;
- struct ip tip;
-
- /* Calculate checksum (must save and restore ip header) */
- tip = *ip;
- ui = (struct udpiphdr *)ip;
- (void)memset(ui->ui_x1, 0, sizeof(ui->ui_x1));
- ui->ui_len = uh->uh_ulen;
- uh->uh_sum = ip_cksum(ui, len);
- *ip = tip;
- }
-#endif
+ uh->uh_ulen = htons(len);
- 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);
+ cc = sendip(d, uh, len, IPPROTO_UDP);
if (cc == -1)
return -1;
if ((size_t)cc != len)
panic("sendudp: bad write (%zd != %zu)", cc, len);
- return (cc - (sizeof(*ip) + sizeof(*uh)));
+ return (cc - sizeof(*uh));
}
/*
@@ -139,87 +106,13 @@
readudp(struct iodesc *d, void *pkt, size_t len, saseconds_t tleft)
{
ssize_t n;
- size_t hlen;
- struct ip *ip;
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 || (size_t)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
+ n = readip(d, uh, len + sizeof(*uh), tleft, IPPROTO_UDP);
+ if (n == -1 || (size_t)n < sizeof(*uh))
return -1;
- }
- hlen = ip->ip_hl << 2;
- if (hlen < sizeof(*ip) || ip_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)) {
- (void)memcpy(uh, ((u_char *)ip) + hlen, len - hlen);
- ip->ip_len = htons(sizeof(*ip));
- n -= hlen - sizeof(*ip);
- }
if (uh->uh_dport != d->myport) {
#ifdef NET_DEBUG
if (debug)
@@ -229,33 +122,6 @@
return -1;
}
-#ifndef UDP_NO_CKSUM
- if (uh->uh_sum) {
- 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;
- (void)memset(ui->ui_x1, 0, sizeof(ui->ui_x1));
- ui->ui_len = uh->uh_ulen;
- if (ip_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)
@@ -265,6 +131,6 @@
return -1;
}
- n -= sizeof(*ip) + sizeof(*uh);
+ n -= sizeof(*uh);
return n;
}
Added files:
Index: src/sys/lib/libsa/ip.c
diff -u /dev/null src/sys/lib/libsa/ip.c:1.1
--- /dev/null Wed May 11 16:23:40 2011
+++ src/sys/lib/libsa/ip.c Wed May 11 16:23:40 2011
@@ -0,0 +1,190 @@
+/* $NetBSD: ip.c,v 1.1 2011/05/11 16:23:40 zoltan Exp $ */
+
+/*
+ * Copyright (c) 1992 Regents of the University of California.
+ * Copyright (c) 2010 Zoltan Arnold NAGY
+ * All rights reserved.
+ *
+ * This software was developed by the Computer Systems Engineering group
+ * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
+ * contributed to Berkeley.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the University of
+ * California, Lawrence Berkeley Laboratory and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ */
+
+#include <sys/param.h>
+#include <sys/socket.h>
+#include <net/if.h>
+#include <net/if_ether.h>
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/ip_var.h>
+#include <netinet/udp.h>
+#include <netinet/udp_var.h>
+
+#ifdef _STANDALONE
+#include <lib/libkern/libkern.h>
+#else
+#include <string.h>
+#endif
+
+#include "stand.h"
+#include "net.h"
+
+/*
+ * sends an IP packet, if it's alredy constructed
+*/
+static ssize_t
+_sendip(struct iodesc * d, struct ip * ip, size_t len)
+{
+ u_char *ea;
+
+ 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);
+ }
+
+ return sendether(d, ip, len, ea, ETHERTYPE_IP);
+}
+
+/*
+ * fills out the IP header
+ * Caller must leave room for ethernet, ip and udp headers in front!
+*/
+ssize_t
+sendip(struct iodesc * d, void *pkt, size_t len, u_int8_t proto)
+{
+ ssize_t cc;
+ struct ip *ip;
+
+ ip = (struct ip *) pkt - 1;
+ len += sizeof(*ip);
+
+ (void) memset(ip, 0, sizeof(*ip));
+
+ ip->ip_v = IPVERSION;
+ ip->ip_hl = sizeof(*ip) >> 2;
+ ip->ip_len = htons(len);
+ ip->ip_p = proto;
+ ip->ip_ttl = IPDEFTTL;
+ ip->ip_src = d->myip;
+ ip->ip_dst = d->destip;
+ ip->ip_sum = ip_cksum(ip, sizeof(*ip));
+
+ cc = _sendip(d, ip, len);
+
+ if (cc == -1)
+ return -1;
+ if ((size_t) cc != len)
+ panic("sendip: bad write (%d != %d)", cc, len);
+ return (cc - (sizeof(*ip)));
+}
+
+/*
+ * reads an IP packet
+ * WARNING: the old version stripped the IP options, if there were
+ * any. Because we have absolutely no idea if the upper layer needs
+ * these or not, it's best to leave them there.
+ *
+ * The size returned is the size indicated in the header.
+ */
+ssize_t
+readip(struct iodesc * d, void *pkt, size_t len, time_t tleft, u_int8_t proto)
+{
+ ssize_t n;
+ size_t hlen;
+ struct ip *ip;
+ u_int16_t etype;
+
+ ip = (struct ip *) pkt - 1;
+
+ n = readether(d, ip, len + sizeof(*ip), tleft, &etype);
+ if (n == -1 || (size_t) n < sizeof(*ip))
+ return -1;
+
+ 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("readip: not IP. ether_type=%x\n", etype);
+#endif
+ return -1;
+ }
+
+ /* Check ip header */
+ if (ip->ip_v != IPVERSION ||
+ ip->ip_p != proto) { /* half char */
+#ifdef NET_DEBUG
+ if (debug) {
+ printf("readip: wrong IP version or wrong proto "
+ "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) || ip_cksum(ip, hlen) != 0) {
+#ifdef NET_DEBUG
+ if (debug)
+ printf("readip: short hdr or bad cksum.\n");
+#endif
+ return -1;
+ }
+ if (n < ntohs(ip->ip_len)) {
+#ifdef NET_DEBUG
+ if (debug)
+ printf("readip: 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("readip: bad saddr %s != ", inet_ntoa(d->myip));
+ printf("%s\n", inet_ntoa(ip->ip_dst));
+ }
+#endif
+ return -1;
+ }
+ return (ntohs(ip->ip_len) - 20);
+}
