From owner-p4-projects@FreeBSD.ORG Tue May 20 05:24:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F78E1065675; Tue, 20 May 2008 05:24:05 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 21CDF106564A for ; Tue, 20 May 2008 05:24:05 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F61A8FC16 for ; Tue, 20 May 2008 05:24:05 +0000 (UTC) (envelope-from rfrench@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4K5O4mi081193 for ; Tue, 20 May 2008 05:24:04 GMT (envelope-from rfrench@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4K5O49j081191 for perforce@freebsd.org; Tue, 20 May 2008 05:24:04 GMT (envelope-from rfrench@FreeBSD.org) Date: Tue, 20 May 2008 05:24:04 GMT Message-Id: <200805200524.m4K5O49j081191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rfrench@FreeBSD.org using -f From: Ryan French To: Perforce Change Reviews Cc: Subject: PERFORCE change 141885 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 May 2008 05:24:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=141885 Change 141885 by rfrench@rfrench_mpls on 2008/05/20 05:23:48 Fixed a bug where the ICMP header checksum value was not being computed correctly. Submitted by: Ryan French Affected files ... .. //depot/projects/soc2008/rfrench_mpls/mpls-needle/mpls-needle.c#4 edit .. //depot/projects/soc2008/rfrench_mpls/mpls-needle/mpls-needle.conf#3 edit Differences ... ==== //depot/projects/soc2008/rfrench_mpls/mpls-needle/mpls-needle.c#4 (text+ko) ==== @@ -392,7 +392,7 @@ icmph->icmp_type = icmp_type; icmph->icmp_code = icmp_code; icmph->icmp_cksum = 0; - icmph->icmp_cksum = htons(in_cksum((unsigned short *)icmph, sizeof(icmph))); + icmph->icmp_cksum = in_cksum((unsigned short *)icmph, 4); //set values in mpls header mplsh = htonl(mpls_label << 12 | mpls_qos << 9 | mpls_bos_flag << 8 | mpls_ttl); ==== //depot/projects/soc2008/rfrench_mpls/mpls-needle/mpls-needle.conf#3 (text+ko) ==== @@ -1,3 +1,3 @@ -dst_mac 00:16:d3:fc:c0:b8 ip4 10.1.18.149/10.1.18.162/2/0 icmp 0/0 mpls 55/1/1/3 -dst_mac 00:16:d3:fc:c0:b8 ip4 10.1.18.149/10.1.18.162/2/0 icmp 0/0 mpls 44/1/1/3 -dst_mac 00:16:d3:fc:c0:b8 ip4 10.1.18.149/10.1.18.162/2/0 icmp 0/0 mpls 66/1/1/3 +dst_mac 00:16:d3:fc:c0:b8 ip4 10.1.60.134/10.1.60.123/2/0 icmp 8/0 mpls 55/1/1/3 +dst_mac 00:16:d3:fc:c0:b8 ip4 10.1.60.134/10.1.60.123/2/0 icmp 8/0 mpls 44/1/1/3 +dst_mac 00:16:d3:fc:c0:b8 ip4 10.1.60.134/10.1.60.123/2/0 icmp 8/0 mpls 66/1/1/3