From owner-p4-projects@FreeBSD.ORG Thu Feb 1 16:59:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C88DE16A40B; Thu, 1 Feb 2007 16:59:37 +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 98AB416A402 for ; Thu, 1 Feb 2007 16:59:37 +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 8CF0513C4B2 for ; Thu, 1 Feb 2007 16:59:37 +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 l11Gxbw6073142 for ; Thu, 1 Feb 2007 16:59:37 GMT (envelope-from piso@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id l11Gxbe0073139 for perforce@freebsd.org; Thu, 1 Feb 2007 16:59:37 GMT (envelope-from piso@freebsd.org) Date: Thu, 1 Feb 2007 16:59:37 GMT Message-Id: <200702011659.l11Gxbe0073139@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 113845 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: Thu, 01 Feb 2007 16:59:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=113845 Change 113845 by piso@piso_newluxor on 2007/02/01 16:59:07 Teach mbuf to LibAliasUnaliasOut(). Affected files ... .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#51 edit .. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#12 edit Differences ... ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.c#51 (text+ko) ==== @@ -167,7 +167,7 @@ #define PULLUP_ICMPHDR(pip, ptr) do { \ struct mbuf *m; \ - pip = ptr; \ + pip = (struct ip *)ptr; \ m = m_pullup((ptr), (pip->ip_hl << 2) + sizeof(struct icmp)); \ (pip) = mtod(m, struct ip *); \ } while (0) @@ -183,10 +183,10 @@ } while (0) #else -#define PULLUP_IPHDR(pip, ptr) pip = ptr +#define PULLUP_IPHDR(pip, ptr) pip = (struct ip *)ptr #define PULLUP_UDPHDR(pip, ptr) pip = ptr #define PULLUP_TCPHDR(pip, ptr) pip = ptr -#define PULLUP_ICMPHDR(pip, ptr) pip = ptr +#define PULLUP_ICMPHDR(pip, ptr) pip = (struct ip *)ptr #define PULLUP_ICMPIP64(pip, ptr, ic) pip = ptr #endif @@ -1533,9 +1533,15 @@ } int +#ifdef _KERNEL +LibAliasUnaliasOut(struct libalias *la, struct mbuf *ptr, /* valid IP packet */ + int maxpacketsize /* for error checking */ +) +#else LibAliasUnaliasOut(struct libalias *la, char *ptr, /* valid IP packet */ int maxpacketsize /* for error checking */ ) +#endif { struct ip *pip; struct icmp *ic; @@ -1545,13 +1551,19 @@ int iresult = PKT_ALIAS_IGNORED; LIBALIAS_LOCK(la); - pip = (struct ip *)ptr; + PULLUP_IPHDR(pip, ptr); + if (pip == NULL) + goto getout; /* Defense against mangled packets */ if (ntohs(pip->ip_len) > maxpacketsize || (pip->ip_hl << 2) > maxpacketsize) goto getout; + /* Let's make enough space for any of the protocols header below */ + PULLUP_ICMPHDR(pip, ptr); + if (pip == NULL) + goto getout; ud = (struct udphdr *)ip_next(pip); tc = (struct tcphdr *)ip_next(pip); ic = (struct icmp *)ip_next(pip); ==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#12 (text+ko) ==== @@ -149,12 +149,13 @@ int LibAliasIn (struct libalias *, struct mbuf *_ptr, int _maxpacketsize); int LibAliasOut(struct libalias *, struct mbuf *_ptr, int _maxpacketsize); int LibAliasOutTry(struct libalias *, struct mbuf *_ptr, int _maxpacketsize, int _create); +int LibAliasUnaliasOut(struct libalias *, struct mbuf *_ptr, int _maxpacketsize); #else int LibAliasIn (struct libalias *, char *_ptr, int _maxpacketsize); int LibAliasOut(struct libalias *, char *_ptr, int _maxpacketsize); int LibAliasOutTry(struct libalias *, char *_ptr, int _maxpacketsize, int _create); +int LibAliasUnaliasOut(struct libalias *, char *_ptr, int _maxpacketsize); #endif -int LibAliasUnaliasOut(struct libalias *, char *_ptr, int _maxpacketsize); /* Port and address redirection functions. */