From owner-svn-src-projects@FreeBSD.ORG Thu Feb 17 22:48:23 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 17AEC106564A; Thu, 17 Feb 2011 22:48:23 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 06DF48FC13; Thu, 17 Feb 2011 22:48:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1HMmMG8034182; Thu, 17 Feb 2011 22:48:22 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1HMmMqL034180; Thu, 17 Feb 2011 22:48:22 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201102172248.p1HMmMqL034180@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Thu, 17 Feb 2011 22:48:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218784 - projects/pf/pf45/sys/contrib/pf/net X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Feb 2011 22:48:23 -0000 Author: bz Date: Thu Feb 17 22:48:22 2011 New Revision: 218784 URL: http://svn.freebsd.org/changeset/base/218784 Log: Cleanup whitspace. Modified: projects/pf/pf45/sys/contrib/pf/net/if_pflog.c Modified: projects/pf/pf45/sys/contrib/pf/net/if_pflog.c ============================================================================== --- projects/pf/pf45/sys/contrib/pf/net/if_pflog.c Thu Feb 17 22:05:00 2011 (r218783) +++ projects/pf/pf45/sys/contrib/pf/net/if_pflog.c Thu Feb 17 22:48:22 2011 (r218784) @@ -57,27 +57,27 @@ __FBSDID("$FreeBSD$"); #else /* ! __FreeBSD__ */ #include "bpfilter.h" #include "pflog.h" -#endif +#endif /* __FreeBSD__ */ #include #include #include #include #include - #ifdef __FreeBSD__ - #include - #include - #include - #include - #include - #else +#ifdef __FreeBSD__ +#include +#include +#include +#include +#include +#else #include #endif #include - #ifdef __FreeBSD__ - #include - #endif +#ifdef __FreeBSD__ +#include +#endif #include #include #include @@ -99,11 +99,11 @@ __FBSDID("$FreeBSD$"); #include #include - #ifdef INET - #ifdef __FreeBSD__ - #include - #endif - #endif +#ifdef __FreeBSD__ +#ifdef INET +#include +#endif /* INET */ +#endif /* __FreeBSD__ */ #define PFLOGMTU (32768 + MHLEN + MLEN) @@ -122,18 +122,18 @@ int pflogoutput(struct ifnet *, struct m #endif int pflogioctl(struct ifnet *, u_long, caddr_t); void pflogstart(struct ifnet *); - #ifdef __FreeBSD__ - static int pflog_clone_create(struct if_clone *, int, caddr_t); - static void pflog_clone_destroy(struct ifnet *); - #else +#ifdef __FreeBSD__ +static int pflog_clone_create(struct if_clone *, int, caddr_t); +static void pflog_clone_destroy(struct ifnet *); +#else int pflog_clone_create(struct if_clone *, int); int pflog_clone_destroy(struct ifnet *); #endif LIST_HEAD(, pflog_softc) pflogif_list; - #ifdef __FreeBSD__ - IFC_SIMPLE_DECLARE(pflog, 1); - #else +#ifdef __FreeBSD__ +IFC_SIMPLE_DECLARE(pflog, 1); +#else struct if_clone pflog_cloner = IF_CLONE_INITIALIZER("pflog", pflog_clone_create, pflog_clone_destroy); #endif @@ -150,10 +150,10 @@ pflogattach(int npflog) if_clone_attach(&pflog_cloner); } - #ifdef __FreeBSD__ - static int - pflog_clone_create(struct if_clone *ifc, int unit, caddr_t param) - #else +#ifdef __FreeBSD__ +static int +pflog_clone_create(struct if_clone *ifc, int unit, caddr_t param) +#else int pflog_clone_create(struct if_clone *ifc, int unit) #endif @@ -170,14 +170,14 @@ pflog_clone_create(struct if_clone *ifc, return (ENOMEM); pflogif->sc_unit = unit; - #ifdef __FreeBSD__ - ifp = pflogif->sc_ifp = if_alloc(IFT_PFLOG); - if (ifp == NULL) { - free(pflogif, M_DEVBUF); - return (ENOSPC); - } - if_initname(ifp, ifc->ifc_name, unit); - #else +#ifdef __FreeBSD__ + ifp = pflogif->sc_ifp = if_alloc(IFT_PFLOG); + if (ifp == NULL) { + free(pflogif, M_DEVBUF); + return (ENOSPC); + } + if_initname(ifp, ifc->ifc_name, unit); +#else ifp = &pflogif->sc_if; snprintf(ifp->if_xname, sizeof ifp->if_xname, "pflog%d", unit); #endif @@ -205,24 +205,24 @@ pflog_clone_create(struct if_clone *ifc, #endif s = splnet(); - #ifdef __FreeBSD__ +#ifdef __FreeBSD__ /* XXX: Why pf(4) lock?! Better add a pflog lock?! */ - PF_LOCK(); - #endif + PF_LOCK(); +#endif LIST_INSERT_HEAD(&pflogif_list, pflogif, sc_list); pflogifs[unit] = ifp; - #ifdef __FreeBSD__ - PF_UNLOCK(); - #endif +#ifdef __FreeBSD__ + PF_UNLOCK(); +#endif splx(s); return (0); } - #ifdef __FreeBSD__ - static void - pflog_clone_destroy(struct ifnet *ifp) - #else +#ifdef __FreeBSD__ +static void +pflog_clone_destroy(struct ifnet *ifp) +#else int pflog_clone_destroy(struct ifnet *ifp) #endif @@ -231,23 +231,23 @@ pflog_clone_destroy(struct ifnet *ifp) int s; s = splnet(); - #ifdef __FreeBSD__ - PF_LOCK(); - #endif +#ifdef __FreeBSD__ + PF_LOCK(); +#endif pflogifs[pflogif->sc_unit] = NULL; LIST_REMOVE(pflogif, sc_list); - #ifdef __FreeBSD__ - PF_UNLOCK(); - #endif +#ifdef __FreeBSD__ + PF_UNLOCK(); +#endif splx(s); #if NBPFILTER > 0 bpfdetach(ifp); #endif if_detach(ifp); - #ifdef __FreeBSD__ - if_free(ifp); - #endif +#ifdef __FreeBSD__ + if_free(ifp); +#endif free(pflogif, M_DEVBUF); #ifndef __FreeBSD__ return (0); @@ -261,17 +261,17 @@ void pflogstart(struct ifnet *ifp) { struct mbuf *m; - #ifndef __FreeBSD__ +#ifndef __FreeBSD__ int s; #endif for (;;) { - #ifdef __FreeBSD__ - IF_LOCK(&ifp->if_snd); - _IF_DROP(&ifp->if_snd); - _IF_DEQUEUE(&ifp->if_snd, m); - IF_UNLOCK(&ifp->if_snd); - #else +#ifdef __FreeBSD__ + IF_LOCK(&ifp->if_snd); + _IF_DROP(&ifp->if_snd); + _IF_DEQUEUE(&ifp->if_snd, m); + IF_UNLOCK(&ifp->if_snd); +#else s = splnet(); IF_DROP(&ifp->if_snd); IF_DEQUEUE(&ifp->if_snd, m); @@ -303,12 +303,12 @@ pflogioctl(struct ifnet *ifp, u_long cmd { switch (cmd) { case SIOCSIFFLAGS: - #ifdef __FreeBSD__ - if (ifp->if_flags & IFF_UP) - ifp->if_drv_flags |= IFF_DRV_RUNNING; - else - ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - #else +#ifdef __FreeBSD__ + if (ifp->if_flags & IFF_UP) + ifp->if_drv_flags |= IFF_DRV_RUNNING; + else + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; +#else if (ifp->if_flags & IFF_UP) ifp->if_flags |= IFF_RUNNING; else @@ -355,13 +355,13 @@ pflog_packet(struct pfi_kif *kif, struct sizeof(hdr.ruleset)); } if (rm->log & PF_LOG_SOCKET_LOOKUP && !pd->lookup.done) - #ifdef __FreeBSD__ - /* - * XXX: This should not happen as we force an early lookup - * via debug.pfugidhack - */ - ; /* empty */ - #else +#ifdef __FreeBSD__ + /* + * XXX: This should not happen as we force an early lookup + * via debug.pfugidhack + */ + ; /* empty */ +#else pd->lookup.done = pf_socket_lookup(dir, pd); #endif if (pd->lookup.done > 0) { @@ -387,9 +387,9 @@ pflog_packet(struct pfi_kif *kif, struct ifn->if_opackets++; ifn->if_obytes += m->m_pkthdr.len; - #ifdef __FreeBSD__ - BPF_MTAP2(ifn, &hdr, PFLOG_HDRLEN, m); - #else +#ifdef __FreeBSD__ + BPF_MTAP2(ifn, &hdr, PFLOG_HDRLEN, m); +#else bpf_mtap_hdr(ifn->if_bpf, (char *)&hdr, PFLOG_HDRLEN, m, BPF_DIRECTION_OUT); #endif @@ -398,38 +398,38 @@ pflog_packet(struct pfi_kif *kif, struct return (0); } - #ifdef __FreeBSD__ - static int - pflog_modevent(module_t mod, int type, void *data) - { - int error = 0; - - switch (type) { - case MOD_LOAD: - pflogattach(1); - PF_LOCK(); - pflog_packet_ptr = pflog_packet; - PF_UNLOCK(); - break; - case MOD_UNLOAD: - PF_LOCK(); - pflog_packet_ptr = NULL; - PF_UNLOCK(); - if_clone_detach(&pflog_cloner); - break; - default: - error = EINVAL; - break; - } - - return error; - } - - static moduledata_t pflog_mod = { "pflog", pflog_modevent, 0 }; - - #define PFLOG_MODVER 1 - - DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); - MODULE_VERSION(pflog, PFLOG_MODVER); - MODULE_DEPEND(pflog, pf, PF_MODVER, PF_MODVER, PF_MODVER); - #endif /* __FreeBSD__ */ +#ifdef __FreeBSD__ +static int +pflog_modevent(module_t mod, int type, void *data) +{ + int error = 0; + + switch (type) { + case MOD_LOAD: + pflogattach(1); + PF_LOCK(); + pflog_packet_ptr = pflog_packet; + PF_UNLOCK(); + break; + case MOD_UNLOAD: + PF_LOCK(); + pflog_packet_ptr = NULL; + PF_UNLOCK(); + if_clone_detach(&pflog_cloner); + break; + default: + error = EINVAL; + break; + } + + return error; +} + +static moduledata_t pflog_mod = { "pflog", pflog_modevent, 0 }; + +#define PFLOG_MODVER 1 + +DECLARE_MODULE(pflog, pflog_mod, SI_SUB_PROTO_IFATTACHDOMAIN, SI_ORDER_ANY); +MODULE_VERSION(pflog, PFLOG_MODVER); +MODULE_DEPEND(pflog, pf, PF_MODVER, PF_MODVER, PF_MODVER); +#endif /* __FreeBSD__ */