From owner-svn-src-all@FreeBSD.ORG Mon Jul 26 09:26:55 2010 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E93841065674; Mon, 26 Jul 2010 09:26:55 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E3B948FC23; Mon, 26 Jul 2010 09:26:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6Q9Qt3Z024295; Mon, 26 Jul 2010 09:26:55 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6Q9Qtsv024293; Mon, 26 Jul 2010 09:26:55 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201007260926.o6Q9Qtsv024293@svn.freebsd.org> From: Michael Tuexen Date: Mon, 26 Jul 2010 09:26:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210495 - head/sys/netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jul 2010 09:26:56 -0000 Author: tuexen Date: Mon Jul 26 09:26:55 2010 New Revision: 210495 URL: http://svn.freebsd.org/changeset/base/210495 Log: Fix a bug where the length of a FORWARD-TSN chunk was set incorrectly in the chunk. This resulted in malformed frames. Remove a duplicate assignment. MFC after: 2 weeks Modified: head/sys/netinet/sctp_output.c Modified: head/sys/netinet/sctp_output.c ============================================================================== --- head/sys/netinet/sctp_output.c Mon Jul 26 09:22:52 2010 (r210494) +++ head/sys/netinet/sctp_output.c Mon Jul 26 09:26:55 2010 (r210495) @@ -2271,7 +2271,6 @@ sctp_is_ifa_addr_acceptable(struct sctp_ { uint8_t dest_is_global = 0; - /* * Here we determine if its a acceptable address. A acceptable * address means it is the same scope or higher scope but we can @@ -9800,7 +9799,8 @@ sctp_fill_in_rest: * peer ack point */ advance_peer_ack_point = last->rec.data.TSN_seq; - space_needed -= (cnt_of_skipped * sizeof(struct sctp_strseq)); + space_needed = sizeof(struct sctp_forward_tsn_chunk) + + cnt_of_skipped * sizeof(struct sctp_strseq); } chk->send_size = space_needed; /* Setup the chunk */ @@ -9809,8 +9809,6 @@ sctp_fill_in_rest: fwdtsn->ch.chunk_flags = 0; fwdtsn->ch.chunk_type = SCTP_FORWARD_CUM_TSN; fwdtsn->new_cumulative_tsn = htonl(advance_peer_ack_point); - chk->send_size = (sizeof(struct sctp_forward_tsn_chunk) + - (cnt_of_skipped * sizeof(struct sctp_strseq))); SCTP_BUF_LEN(chk->data) = chk->send_size; fwdtsn++; /*-