PERFORCE change 154437 for review

[Paolo Pisati]

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

Change 154437 by piso at 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) {