From owner-p4-projects@FreeBSD.ORG Wed Apr 9 21:27:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 228891065674; Wed, 9 Apr 2008 21:27:17 +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 D847C106566B for ; Wed, 9 Apr 2008 21:27:16 +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 C69F48FC19 for ; Wed, 9 Apr 2008 21:27:16 +0000 (UTC) (envelope-from piso@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 m39LRG0K021820 for ; Wed, 9 Apr 2008 21:27:16 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m39LRG9g021818 for perforce@freebsd.org; Wed, 9 Apr 2008 21:27:16 GMT (envelope-from piso@freebsd.org) Date: Wed, 9 Apr 2008 21:27:16 GMT Message-Id: <200804092127.m39LRG9g021818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to piso@freebsd.org using -f From: Paolo Pisati To: Perforce Change Reviews Cc: Subject: PERFORCE change 139684 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: Wed, 09 Apr 2008 21:27:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=139684 Change 139684 by piso@piso_newluxor on 2008/04/09 21:26:47 -move around debug code. -remove a bogus check. Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#8 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#76 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/ip_fw_nat.c#8 (text+ko) ==== @@ -259,7 +259,8 @@ NULL) goto badnat; ip = mtod(m, struct ip *); - printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, ip->ip_off); + printf("%s()::%d - ip_off: %d ip_len: %d mlen: %d\n", __FUNCTION__, __LINE__, + ip->ip_off, ip->ip_len, m->m_len); if (ip->ip_off & (IP_MF | IP_OFFMASK)) { struct mbuf *reass; @@ -347,7 +348,6 @@ CSUM_DELAY_DATA) ldt = 1; - printf("bef ip_len: %d ip_hl: %d\n", ntohs(ip->ip_len), ip->ip_hl); if (args->oif == NULL) retval = LibAliasIn(t->lib, &m, MCLBYTES); @@ -355,10 +355,6 @@ retval = LibAliasOut(t->lib, &m, MCLBYTES); if (retval != PKT_ALIAS_OK) { - if (retval & - (PKT_ALIAS_FOUND_HEADER_FRAGMENT | - PKT_ALIAS_UNRESOLVED_FRAGMENT)) - printf("fragment in libalias?!?!\n"); // XXX panic?!?! printf("retval: %d", retval); /* XXX - should i add some logging? */ m_free(m); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#76 (text+ko) ==== @@ -282,7 +282,6 @@ IcmpAliasIn1(struct libalias *la, struct ip *pip, struct icmp *ic) { - printf("%s\n", __FUNCTION__); LIBALIAS_LOCK_ASSERT(la); /* De-alias incoming echo and timestamp replies. @@ -325,7 +324,6 @@ IcmpAliasIn2(struct libalias *la, pkt_t ptr) { - printf("%s\n", __FUNCTION__); LIBALIAS_LOCK_ASSERT(la); /* Alias incoming ICMP error messages containing @@ -432,7 +430,6 @@ struct ip *pip; struct icmp *ic; - printf("%s\n", __FUNCTION__); LIBALIAS_LOCK_ASSERT(la); /* Return if proxy-only mode is enabled */ if (la->packetAliasMode & PKT_ALIAS_PROXY_ONLY) @@ -1258,7 +1255,7 @@ struct ip *pip; int iresult; - printf("%s\n", __FUNCTION__); + printf("%s()::%d\n", __FUNCTION__, __LINE__); if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; iresult = LibAliasOutLocked(la, ptr, maxpacketsize, 1); @@ -1273,27 +1270,20 @@ /* Defense against mangled packets */ if (ntohs(pip->ip_len) > maxpacketsize || (pip->ip_hl << 2) > maxpacketsize) { - printf("%d\n", __LINE__); - printf("maxpktsize: %d ip_len: %d ip_hl: %d\n", maxpacketsize, - ntohs(pip->ip_len), pip->ip_hl); iresult = PKT_ALIAS_IGNORED; goto getout; } iresult = PKT_ALIAS_IGNORED; if ((ntohs(pip->ip_off) & IP_OFFMASK) == 0) { - printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, pip->ip_off); switch (pip->ip_p) { case IPPROTO_ICMP: - printf("%d\n", __LINE__); iresult = IcmpAliasIn(la, ptr); break; case IPPROTO_UDP: - printf("%d\n", __LINE__); iresult = UdpAliasIn(la, ptr); break; case IPPROTO_TCP: - printf("%d\n", __LINE__); iresult = TcpAliasIn(la, ptr); break; case IPPROTO_GRE: { @@ -1318,7 +1308,6 @@ } break; default: - printf("%d\n", __LINE__); iresult = ProtoAliasIn(la, pip->ip_src, &pip->ip_dst, pip->ip_p, &pip->ip_sum); break; @@ -1328,7 +1317,6 @@ if (ntohs(pip->ip_off) & IP_MF) { struct alias_link *lnk; - printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, pip->ip_off); lnk = FindFragmentIn1(la, pip->ip_src, alias_addr, pip->ip_id); if (lnk != NULL) { iresult = PKT_ALIAS_FOUND_HEADER_FRAGMENT; @@ -1338,7 +1326,6 @@ } } } else { - printf("%s()::%d - ip->ip_off: %d\n", __FUNCTION__, __LINE__, pip->ip_off); iresult = FragmentIn(la, pip->ip_src, &pip->ip_dst, pip->ip_id, &pip->ip_sum); } @@ -1396,6 +1383,7 @@ struct in_addr addr_save; struct ip *pip; + printf("%s()::%d\n", __FUNCTION__, __LINE__); if (la->packetAliasMode & PKT_ALIAS_REVERSE) { la->packetAliasMode &= ~PKT_ALIAS_REVERSE; iresult = LibAliasInLocked(la, ptr, maxpacketsize);