From owner-p4-projects@FreeBSD.ORG  Wed Dec 10 11:40:27 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 611EF1065675; Wed, 10 Dec 2008 11:40:27 +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 24F611065670
	for <perforce@freebsd.org>; Wed, 10 Dec 2008 11:40:27 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1641E8FC18
	for <perforce@freebsd.org>; Wed, 10 Dec 2008 11:40:27 +0000 (UTC)
	(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mBABeONt037327
	for <perforce@freebsd.org>; Wed, 10 Dec 2008 11:40:24 GMT
	(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mBABeNwQ037325
	for perforce@freebsd.org; Wed, 10 Dec 2008 11:40:23 GMT
	(envelope-from piso@freebsd.org)
Date: Wed, 10 Dec 2008 11:40:23 GMT
Message-Id: <200812101140.mBABeNwQ037325@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 154437 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: Wed, 10 Dec 2008 11:40:27 -0000

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

Change 154437 by piso@piso_ferret on 2008/12/10 11:40:07

	Slightly simplify the logic in IcmpAlias[In|Out]2: always initialize lnk to NULL.

Affected files ...

.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#85 edit

Differences ...

==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#85 (text+ko) ====

@@ -342,6 +342,7 @@
 	ud = (struct udphdr *)ip_next(ip);
 	tc = (struct tcphdr *)ip_next(ip);
 	ic2 = (struct icmp *)ip_next(ip);
+	lnk = NULL;
 
 	if (ip->ip_p == IPPROTO_UDP)
 		lnk = FindUdpTcpIn(la, ip->ip_dst, ip->ip_src,
@@ -354,10 +355,7 @@
 	else if (ip->ip_p == IPPROTO_ICMP) {
 		if (ic2->icmp_type == ICMP_ECHO || ic2->icmp_type == ICMP_TSTAMP)
 			lnk = FindIcmpIn(la, ip->ip_dst, ip->ip_src, ic2->icmp_id, 0);
-		else
-			lnk = NULL;
-	} else
-		lnk = NULL;
+	}
 
 	if (lnk != NULL) {
 		if (ip->ip_p == IPPROTO_UDP || ip->ip_p == IPPROTO_TCP) {
@@ -525,6 +523,7 @@
 	ud = (struct udphdr *)ip_next(ip);
 	tc = (struct tcphdr *)ip_next(ip);
 	ic2 = (struct icmp *)ip_next(ip);
+	lnk = NULL;
 
 	if (ip->ip_p == IPPROTO_UDP)
 		lnk = FindUdpTcpOut(la, ip->ip_dst, ip->ip_src,
@@ -537,10 +536,7 @@
 	else if (ip->ip_p == IPPROTO_ICMP) {
 		if (ic2->icmp_type == ICMP_ECHO || ic2->icmp_type == ICMP_TSTAMP)
 			lnk = FindIcmpOut(la, ip->ip_dst, ip->ip_src, ic2->icmp_id, 0);
-		else
-			lnk = NULL;
-	} else
-		lnk = NULL;
+	}
 
 	if (lnk != NULL) {
 		if (ip->ip_p == IPPROTO_UDP || ip->ip_p == IPPROTO_TCP) {