Date: Mon, 6 Oct 2014 12:29:07 +0000 (UTC) From: "Alexander V. Chernikov" <melifaro@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r272614 - head/sys/netpfil/ipfw Message-ID: <201410061229.s96CT7gZ050760@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: melifaro Date: Mon Oct 6 12:29:06 2014 New Revision: 272614 URL: https://svnweb.freebsd.org/changeset/base/272614 Log: Improve r272609 (O_TCPOPTS). MFC after: 3 dayes Modified: head/sys/netpfil/ipfw/ip_fw2.c Modified: head/sys/netpfil/ipfw/ip_fw2.c ============================================================================== --- head/sys/netpfil/ipfw/ip_fw2.c Mon Oct 6 12:20:46 2014 (r272613) +++ head/sys/netpfil/ipfw/ip_fw2.c Mon Oct 6 12:29:06 2014 (r272614) @@ -1722,12 +1722,10 @@ do { \ break; case O_TCPOPTS: - if (proto == IPPROTO_TCP && ulp != NULL) { + if (proto == IPPROTO_TCP && offset == 0 && ulp){ PULLUP_LEN(hlen, ulp, (TCP(ulp)->th_off << 2)); - match = (proto == IPPROTO_TCP && - offset == 0 && - tcpopts_match(TCP(ulp), cmd)); + match = tcpopts_match(TCP(ulp), cmd); } break;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410061229.s96CT7gZ050760>