svn commit: r186629 - user/kmacy/HEAD_fast_net/sys/net

[Kip Macy]

Author: kmacy
Date: Wed Dec 31 04:56:17 2008
New Revision: 186629
URL: http://svn.freebsd.org/changeset/base/186629

Log:
  make flowtable_lookup handle case of NULL mbuf

Modified:
  user/kmacy/HEAD_fast_net/sys/net/flowtable.c

Modified: user/kmacy/HEAD_fast_net/sys/net/flowtable.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/net/flowtable.c	Wed Dec 31 03:38:16 2008	(r186628)
+++ user/kmacy/HEAD_fast_net/sys/net/flowtable.c	Wed Dec 31 04:56:17 2008	(r186629)
@@ -333,26 +333,32 @@ ipv4_flow_lookup_hash_internal(struct mb
     uint32_t *key, uint16_t *flags, uint8_t *protop)
 {
 	uint16_t sport = 0, dport = 0;
-	struct ip *ip = mtod(m, struct ip *);
-	uint8_t proto = ip->ip_p;
-	int iphlen = ip->ip_hl << 2;
+	struct ip *ip;
+	uint8_t proto = 0;
+	int iphlen;
 	uint32_t hash;
 	struct sockaddr_in *sin;
 	struct tcphdr *th;
 	struct udphdr *uh;
 	struct sctphdr *sh;
 
-	key[0] = 0;
-	key[1] = ip->ip_src.s_addr;
-	key[2] = ip->ip_dst.s_addr;	
+	if (flowtable_enable == 0)
+		return (0);
 
 	sin = (struct sockaddr_in *)&ro->ro_dst;
-	sin->sin_family = AF_INET;
-	sin->sin_len = sizeof(*sin);
-	sin->sin_addr = ip->ip_dst;
+	KASSERT(sin->sin_family == AF_INET,
+	    ("bad address passed"));
+	key[0] = 0;
+	key[1] = 0;
+	key[2] = sin->sin_addr.s_addr;
 
-	if (flowtable_enable == 0)
-		return (0);
+	if (m == NULL || (*flags & FL_HASH_PORTS) == 0)
+		goto skipports;
+
+	ip = mtod(m, struct ip *);
+	proto = ip->ip_p;
+	iphlen = ip->ip_hl << 2; /* XXX options? */
+	key[1] = ip->ip_src.s_addr;
 	
 	switch (proto) {
 	case IPPROTO_TCP:
@@ -393,8 +399,9 @@ ipv4_flow_lookup_hash_internal(struct mb
 	((uint16_t *)key)[0] = sport;
 	((uint16_t *)key)[1] = dport; 
 
+skipports:
 	hash = hashword(key, 3, hashjitter + proto);
-	if ((m->m_flags & M_FLOWID) == 0)
+	if (m != NULL && (m->m_flags & M_FLOWID) == 0)
 		m->m_pkthdr.flowid = hash;
 	
 	CTR5(KTR_SPARE3, "proto=%d hash=%x key[0]=%x sport=%d dport=%d\n", proto, hash, key[0], sport, dport);
@@ -563,7 +570,7 @@ flowtable_lookup(struct flowtable *ft, s
 	struct flentry *fle;
 	uint16_t flags;
 	uint8_t proto = 0;
-	int cache = 1, error = 0;
+	int cache = 1, error = 0, fib = 0;
 	struct rtentry *rt;
 	struct llentry *lle;
 
@@ -619,7 +626,10 @@ uncached:
 	 * of arpresolve with an rt_check variant that expected to
 	 * receive the route locked
 	 */
-	ft->ft_rtalloc(ro, hash, M_GETFIB(m));
+	if (m != NULL)
+		fib = M_GETFIB(m);
+
+	ft->ft_rtalloc(ro, hash, fib);
 	if (ro->ro_rt == NULL) 
 		error = ENETUNREACH;
 	else {