From owner-cvs-src@FreeBSD.ORG Thu Mar 15 15:59:28 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E547516A406; Thu, 15 Mar 2007 15:59:28 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D586D13C469; Thu, 15 Mar 2007 15:59:28 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l2FFxSlC088257; Thu, 15 Mar 2007 15:59:28 GMT (envelope-from andre@repoman.freebsd.org) Received: (from andre@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l2FFxSG7088256; Thu, 15 Mar 2007 15:59:28 GMT (envelope-from andre) Message-Id: <200703151559.l2FFxSG7088256@repoman.freebsd.org> From: Andre Oppermann Date: Thu, 15 Mar 2007 15:59:28 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/netinet tcp.h tcp_input.c tcp_output.c tcp_syncache.c tcp_var.h X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Mar 2007 15:59:29 -0000 andre 2007-03-15 15:59:28 UTC FreeBSD src repository Modified files: sys/netinet tcp.h tcp_input.c tcp_output.c tcp_syncache.c tcp_var.h Log: Consolidate insertion of TCP options into a segment from within tcp_output() and syncache_respond() into its own generic function tcp_addoptions(). tcp_addoptions() is alignment agnostic and does optimal packing in all cases. In struct tcpopt rename to_requested_s_scale to just to_wscale. Add a comment with quote from RFC1323: "The Window field in a SYN (i.e., a or ) segment itself is never scaled." Reviewed by: silby, mohans, julian Sponsored by: TCP/IP Optimization Fundraise 2005 Revision Changes Path 1.35 +5 -2 src/sys/netinet/tcp.h 1.317 +2 -2 src/sys/netinet/tcp_input.c 1.126 +199 -146 src/sys/netinet/tcp_output.c 1.105 +43 -75 src/sys/netinet/tcp_syncache.c 1.140 +14 -8 src/sys/netinet/tcp_var.h