Author: melifaro
Date: Sun Jul 8 21:13:04 2012
New Revision: 238265
URL: http://svn.freebsd.org/changeset/base/238265
Log:
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: kib(mentor)
MFC after: 3 days
Sponsored by: Shtorm ISP
Modified:
head/sys/netinet/ipfw/ip_fw_table.c
Modified: head/sys/netinet/ipfw/ip_fw_table.c
==============================================================================
--- head/sys/netinet/ipfw/ip_fw_table.c Sun Jul 8 20:41:54 2012
(r238264)
+++ head/sys/netinet/ipfw/ip_fw_table.c Sun Jul 8 21:13:04 2012
(r238265)
@@ -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
@@ -569,7 +572,7 @@ ipfw_lookup_table_extended(struct ip_fw_
case IPFW_TABLE_INTERFACE:
KEY_LEN(iface) = KEY_LEN_IFACE +
- strlcpy(iface.ifname, (char *)paddr, IF_NAMESIZE);
+ 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));
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
