From owner-svn-src-projects@freebsd.org Wed Dec 7 09:36:10 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2B79DC69636 for ; Wed, 7 Dec 2016 09:36:10 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D5D57339; Wed, 7 Dec 2016 09:36:09 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uB79a9o4081093; Wed, 7 Dec 2016 09:36:09 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uB79a8u3081090; Wed, 7 Dec 2016 09:36:08 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201612070936.uB79a8u3081090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Wed, 7 Dec 2016 09:36:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r309671 - projects/ipsec/sys/netipsec X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Dec 2016 09:36:10 -0000 Author: ae Date: Wed Dec 7 09:36:08 2016 New Revision: 309671 URL: https://svnweb.freebsd.org/changeset/base/309671 Log: TCP-MD5 SAs can not contain initialized ports, so remove unneded checks and initializations. Modified: projects/ipsec/sys/netipsec/key.c projects/ipsec/sys/netipsec/xform_tcp.c Modified: projects/ipsec/sys/netipsec/key.c ============================================================================== --- projects/ipsec/sys/netipsec/key.c Wed Dec 7 08:12:02 2016 (r309670) +++ projects/ipsec/sys/netipsec/key.c Wed Dec 7 09:36:08 2016 (r309671) @@ -777,13 +777,7 @@ key_allocsa_tcpmd5(struct secasindex *sa kdebug_secash(sah, " ")); if (sah->saidx.proto != IPPROTO_TCP) continue; - /* - * addrhash uses only IP addresses without ports, but if - * SA contains TCP port, use ports in comparison for exact - * match. - */ - if (!key_sockaddrcmp(&saidx->dst.sa, &sah->saidx.dst.sa, - key_portfromsaddr(&sah->saidx.dst.sa))) + if (!key_sockaddrcmp(&saidx->dst.sa, &sah->saidx.dst.sa, 0)) break; } if (sah != NULL) { @@ -4747,8 +4741,7 @@ key_getsav_tcpmd5(struct secasindex *sai LIST_FOREACH(sah, SAHADDRHASH_HASH(saidx), addrhash) { if (sah->saidx.proto != IPPROTO_TCP) continue; - if (!key_sockaddrcmp(&saidx->dst.sa, &sah->saidx.dst.sa, - key_portfromsaddr(&sah->saidx.dst.sa))) + if (!key_sockaddrcmp(&saidx->dst.sa, &sah->saidx.dst.sa, 0)) break; } if (sah != NULL) { @@ -5098,7 +5091,6 @@ key_add(struct socket *so, struct mbuf * /* * Make sure the port numbers are zero. * In case of NAT-T we will update them later if needed. - * XXXAE: TCP-MD5 may set dst port. */ key_porttosaddr(&saidx.src.sa, 0); key_porttosaddr(&saidx.dst.sa, 0); Modified: projects/ipsec/sys/netipsec/xform_tcp.c ============================================================================== --- projects/ipsec/sys/netipsec/xform_tcp.c Wed Dec 7 08:12:02 2016 (r309670) +++ projects/ipsec/sys/netipsec/xform_tcp.c Wed Dec 7 09:36:08 2016 (r309671) @@ -245,7 +245,6 @@ tcp_ipsec_input(struct mbuf *m, struct t */ tcp_fields_to_net(th); ipsec_setsockaddrs(m, &saidx.src, &saidx.dst); - key_porttosaddr(&saidx.dst.sa, th->th_dport); saidx.proto = IPPROTO_TCP; saidx.mode = IPSEC_MODE_TCPMD5; saidx.reqid = 0; @@ -282,7 +281,6 @@ tcp_ipsec_output(struct mbuf *m, struct struct secasvar *sav; ipsec_setsockaddrs(m, &saidx.src, &saidx.dst); - key_porttosaddr(&saidx.dst.sa, th->th_dport); saidx.proto = IPPROTO_TCP; saidx.mode = IPSEC_MODE_TCPMD5; saidx.reqid = 0;