From owner-svn-src-all@FreeBSD.ORG Sat Apr 11 15:19:09 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86DAA106566C; Sat, 11 Apr 2009 15:19:09 +0000 (UTC) (envelope-from piso@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7549C8FC17; Sat, 11 Apr 2009 15:19:09 +0000 (UTC) (envelope-from piso@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3BFJ909090569; Sat, 11 Apr 2009 15:19:09 GMT (envelope-from piso@svn.freebsd.org) Received: (from piso@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3BFJ9jx090567; Sat, 11 Apr 2009 15:19:09 GMT (envelope-from piso@svn.freebsd.org) Message-Id: <200904111519.n3BFJ9jx090567@svn.freebsd.org> From: Paolo Pisati Date: Sat, 11 Apr 2009 15:19:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r190938 - in head/sys: . netinet/libalias X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Apr 2009 15:19:10 -0000 Author: piso Date: Sat Apr 11 15:19:09 2009 New Revision: 190938 URL: http://svn.freebsd.org/changeset/base/190938 Log: Plug two bugs introduced with modules conversion: -UdpAliasIn(): correctly check return code after modules ran. -alias_nbt: in case of malformed packets (or some other unrecoverable error), toss the packet. Modified: head/sys/ (props changed) head/sys/netinet/libalias/alias.c head/sys/netinet/libalias/alias_nbt.c Modified: head/sys/netinet/libalias/alias.c ============================================================================== --- head/sys/netinet/libalias/alias.c Sat Apr 11 15:16:11 2009 (r190937) +++ head/sys/netinet/libalias/alias.c Sat Apr 11 15:19:09 2009 (r190938) @@ -742,7 +742,7 @@ UdpAliasIn(struct libalias *la, struct i u_short alias_port; u_short proxy_port; int accumulate; - int r = 0, error; + int error; struct alias_data ad = { .lnk = lnk, .oaddr = &original_address, @@ -804,7 +804,7 @@ UdpAliasIn(struct libalias *la, struct i /* * If we cannot figure out the packet, ignore it. */ - if (r < 0) + if (error < 0) return (PKT_ALIAS_IGNORED); else return (PKT_ALIAS_OK); Modified: head/sys/netinet/libalias/alias_nbt.c ============================================================================== --- head/sys/netinet/libalias/alias_nbt.c Sat Apr 11 15:16:11 2009 (r190937) +++ head/sys/netinet/libalias/alias_nbt.c Sat Apr 11 15:19:09 2009 (r190938) @@ -93,8 +93,7 @@ static int protohandler1(struct libalias *la, struct ip *pip, struct alias_data *ah) { - AliasHandleUdpNbt(la, pip, ah->lnk, ah->aaddr, *ah->aport); - return (0); + return (AliasHandleUdpNbt(la, pip, ah->lnk, ah->aaddr, *ah->aport)); } static int @@ -123,9 +122,8 @@ static int protohandler2out(struct libalias *la, struct ip *pip, struct alias_data *ah) { - AliasHandleUdpNbtNS(la, pip, ah->lnk, &pip->ip_src, ah->sport, - ah->aaddr, ah->aport); - return (0); + return (AliasHandleUdpNbtNS(la, pip, ah->lnk, &pip->ip_src, ah->sport, + ah->aaddr, ah->aport)); } /* Kernel module definition. */