From owner-p4-projects@FreeBSD.ORG Sun Sep 17 14:22:37 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 7F76216A412; Sun, 17 Sep 2006 14:22:37 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
by hub.freebsd.org (Postfix) with ESMTP id 4136C16A407
for <perforce@freebsd.org>; Sun, 17 Sep 2006 14:22:37 +0000 (UTC)
(envelope-from piso@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
by mx1.FreeBSD.org (Postfix) with ESMTP id A945843D46
for <perforce@freebsd.org>; Sun, 17 Sep 2006 14:22:36 +0000 (GMT)
(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 k8HEMaJw033348
for <perforce@freebsd.org>; Sun, 17 Sep 2006 14:22:36 GMT
(envelope-from piso@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k8HEMa3u033345
for perforce@freebsd.org; Sun, 17 Sep 2006 14:22:36 GMT
(envelope-from piso@freebsd.org)
Date: Sun, 17 Sep 2006 14:22:36 GMT
Message-Id: <200609171422.k8HEMa3u033345@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 106243 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: Sun, 17 Sep 2006 14:22:37 -0000
http://perforce.freebsd.org/chv.cgi?CH=106243
Change 106243 by piso@piso_newluxor on 2006/09/17 14:21:45
Cosmetic and whitespace reduction.
Affected files ...
.. //depot/projects/soc2005/libalias/sbin/natd/natd.c#5 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#4 edit
.. //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#11 edit
Differences ...
==== //depot/projects/soc2005/libalias/sbin/natd/natd.c#5 (text+ko) ====
@@ -349,7 +349,6 @@
siginterrupt(SIGHUP, 1);
signal (SIGTERM, InitiateShutdown);
signal (SIGHUP, RefreshAddr);
-
/*
* Set alias address if it has been given.
*/
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias.h#4 (text+ko) ====
@@ -193,6 +193,7 @@
* Mode flags and other constants.
*/
+
/* Mode flags, set using PacketAliasSetMode() */
/*
==== //depot/projects/soc2005/libalias/sys/netinet/libalias/alias_db.c#11 (text+ko) ====
@@ -160,7 +160,7 @@
#include <sys/socket.h>
#include <netinet/tcp.h>
-#ifdef _KERNEL
+#ifdef _KERNEL
#include <netinet/libalias/alias.h>
#include <netinet/libalias/alias_local.h>
#include <netinet/libalias/alias_mod.h>
@@ -173,6 +173,7 @@
static LIST_HEAD(, libalias) instancehead = LIST_HEAD_INITIALIZER(instancehead);
+
/*
Constants (note: constants are also defined
near relevant functions or structs)
@@ -338,6 +339,7 @@
/* Kernel module definition. */
#ifdef _KERNEL
MALLOC_DEFINE(M_ALIAS, "libalias", "packet aliasing");
+
MODULE_VERSION(libalias, 1);
static int
@@ -359,6 +361,7 @@
default:
error = EINVAL;
}
+
return (error);
}
@@ -479,7 +482,6 @@
static void
ShowAliasStats(struct libalias *la)
{
-
/* Used for debugging */
if (la->logDesc) {
int tot = la->icmpLinkCount + la->udpLinkCount +
@@ -2220,10 +2222,11 @@
fprintf(la->logDesc, "PacketAlias/InitPacketAliasLog: Packet alias logging enabled.\n");
#endif
else
- return(ENOMEM); /* log initialization failed */
+ return (ENOMEM); /* log initialization failed */
la->packetAliasMode |= PKT_ALIAS_LOG;
}
- return(1);
+
+ return (1);
}
/* Close the log-file and disable logging. */
@@ -2535,7 +2538,7 @@
if (flags & mask & PKT_ALIAS_LOG) {
/* Do the enable */
if (InitPacketAliasLog(la) == ENOMEM)
- return(-1);
+ return (-1);
} else
/* _Disable_ logging? */
if (~flags & mask & PKT_ALIAS_LOG) {
@@ -2574,7 +2577,6 @@
/* Firewall include files */
#include <net/if.h>
-
#include <netinet/ip_fw.h>
#include <string.h>
#include <err.h>