svn commit: r238557 - stable/9/sys/netinet/ipfw

[Alexander V. Chernikov]

Author: melifaro
Date: Tue Jul 17 19:29:32 2012
New Revision: 238557
URL: http://svn.freebsd.org/changeset/base/238557

Log:
  MFC r237479, r238265
  
  Finally fix lookup (account remaining '\0') and deletion
  (provide valid key length for radix lookup).
  
  Submitted by:    Ihor Kaharlichenko<madkinder at gmail.com>  (prev version)
  Approved by:     re(hrs), kib(mentor)
  Sponsored by:    Shtorm ISP

Modified:
  stable/9/sys/netinet/ipfw/ip_fw_table.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/ipfw/ip_fw_table.c
==============================================================================
--- stable/9/sys/netinet/ipfw/ip_fw_table.c	Tue Jul 17 19:14:12 2012	(r238556)
+++ stable/9/sys/netinet/ipfw/ip_fw_table.c	Tue Jul 17 19:29:32 2012	(r238557)
@@ -344,9 +344,12 @@ ipfw_del_table_entry(struct ip_fw_chain 
 		struct xaddr_iface ifname, ifmask;
 		memset(&ifname, 0, sizeof(ifname));
 
+		/* Include last \0 into comparison */
+		mlen++;
+
 		/* Set 'total' structure length */
-		KEY_LEN(ifname) = mlen;
-		KEY_LEN(ifmask) = mlen;
+		KEY_LEN(ifname) = KEY_LEN_IFACE + mlen;
+		KEY_LEN(ifmask) = KEY_LEN_IFACE + mlen;
 		/* Assume direct match */
 		/* FIXME: Add interface pattern matching */
 #if 0
@@ -568,7 +571,8 @@ ipfw_lookup_table_extended(struct ip_fw_
 		break;
 
 	case IPFW_TABLE_INTERFACE:
-		KEY_LEN(iface) = strlcpy(iface.ifname, (char *)paddr, IF_NAMESIZE);
+		KEY_LEN(iface) = KEY_LEN_IFACE +
+		    strlcpy(iface.ifname, (char *)paddr, IF_NAMESIZE) + 1;
 		/* Assume direct match */
 		/* FIXME: Add interface pattern matching */
 		xent = (struct table_xentry *)(rnh->rnh_lookup(&iface, NULL, rnh));