From owner-svn-src-all@FreeBSD.ORG  Fri May 31 22:53:44 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id D3BCC781;
 Fri, 31 May 2013 22:53:44 +0000 (UTC)
 (envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id C5C276F;
 Fri, 31 May 2013 22:53:44 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4VMrikG002802;
 Fri, 31 May 2013 22:53:44 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4VMriSR002801;
 Fri, 31 May 2013 22:53:44 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201305312253.r4VMriSR002801@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Fri, 31 May 2013 22:53:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r251207 - vendor/tcpdump/dist
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 May 2013 22:53:44 -0000

Author: delphij
Date: Fri May 31 22:53:44 2013
New Revision: 251207
URL: http://svnweb.freebsd.org/changeset/base/251207

Log:
  Apply vendor commit 654f1b3fc5, this is slight different from
  our version as discussed with upstream.

Modified:
  vendor/tcpdump/dist/print-rip.c

Modified: vendor/tcpdump/dist/print-rip.c
==============================================================================
--- vendor/tcpdump/dist/print-rip.c	Fri May 31 22:33:28 2013	(r251206)
+++ vendor/tcpdump/dist/print-rip.c	Fri May 31 22:53:44 2013	(r251207)
@@ -141,7 +141,7 @@ rip_entry_print_v2(register const struct
 				putchar (isprint(*p) ? *p : '.');
 		} else if (auth_type == 3) {
 			printf("\n\t  Auth header:");
-			printf(" Packet Len %u,", EXTRACT_16BITS(&ni->rip_dest));
+			printf(" Packet Len %u,", EXTRACT_16BITS((u_int8_t *)ni + 4));
 			printf(" Key-ID %u,", *((u_int8_t *)ni + 6));
 			printf(" Auth Data Len %u,", *((u_int8_t *)ni + 7));
 			printf(" SeqNo %u,", EXTRACT_32BITS(&ni->rip_dest_mask));