From owner-p4-projects@FreeBSD.ORG  Thu Feb  8 11:59:04 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A261316A407; Thu,  8 Feb 2007 11:58:54 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 0517A16A400
	for <perforce@freebsd.org>; Thu,  8 Feb 2007 11:58:51 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id EAB2B13C471
	for <perforce@freebsd.org>; Thu,  8 Feb 2007 11:58:50 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id l18BwoDI081158
	for <perforce@freebsd.org>; Thu, 8 Feb 2007 11:58:50 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l18BwoDn081152
	for perforce@freebsd.org; Thu, 8 Feb 2007 11:58:50 GMT
	(envelope-from piso@freebsd.org)
Date: Thu, 8 Feb 2007 11:58:50 GMT
Message-Id: <200702081158.l18BwoDn081152@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	piso@freebsd.org using -f
From: Paolo Pisati <piso@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 114235 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 08 Feb 2007 11:59:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=114235

Change 114235 by piso@piso_newluxor on 2007/02/08 11:58:25

	When pulling up the tcp hdr, pull up the options too.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#25 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_local.h#25 (text+ko) ====

@@ -198,8 +198,15 @@
 } while (0)
 
 #define PULLUP_TCPHDR(pip, ptr) do {            \
+        struct tcphdr *th;                      \
 	pip = mtod(*ptr, struct ip *);          \
         PULLUP_SIZE(pip, ptr, (pip->ip_hl << 2) + sizeof(struct tcphdr)); \
+        if (pip != NULL) { \
+                th = (struct tcphdr *)&(((char *)pip)[pip->ip_hl << 2]);  \
+                if ((th->th_off << 2) > sizeof(struct tcphdr)) \
+                        PULLUP_SIZE(pip, ptr, ((pip->ip_hl + th->th_off) << \
+			    2)); \
+        } \
 } while (0)
 
 #define PULLUP_ICMPHDR(pip, ptr) do {           \