From owner-p4-projects@FreeBSD.ORG Mon Jun 16 17:34:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78EEB1065672; Mon, 16 Jun 2008 17:34:31 +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 3A85A106564A for ; Mon, 16 Jun 2008 17:34:31 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 26A2D8FC18 for ; Mon, 16 Jun 2008 17:34:31 +0000 (UTC) (envelope-from zec@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 m5GHYVRS074361 for ; Mon, 16 Jun 2008 17:34:31 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m5GHYUcT074359 for perforce@freebsd.org; Mon, 16 Jun 2008 17:34:30 GMT (envelope-from zec@FreeBSD.org) Date: Mon, 16 Jun 2008 17:34:30 GMT Message-Id: <200806161734.m5GHYUcT074359@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 143601 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: Mon, 16 Jun 2008 17:34:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=143601 Change 143601 by zec@zec_tca51 on 2008/06/16 17:33:59 Include year 2008 in copyright note, and do more whitespace noise cleanup. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_vimage.c#61 edit .. //depot/projects/vimage/src/sys/net/vnet.h#11 edit .. //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#6 edit .. //depot/projects/vimage/src/sys/netgraph/ng_pipe.h#2 edit .. //depot/projects/vimage/src/sys/netgraph/ng_wormhole.c#4 edit .. //depot/projects/vimage/src/sys/netgraph/vnetgraph.h#8 edit .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#34 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#42 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#9 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#21 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#28 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#26 edit .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#14 edit .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#10 edit .. //depot/projects/vimage/src/sys/sys/sysctl.h#17 edit .. //depot/projects/vimage/src/sys/sys/vimage.h#55 edit .. //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#9 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_vimage.c#61 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2004, 2005, 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2004-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * XXX RCS tag goes here */ #include "opt_ddb.h" ==== //depot/projects/vimage/src/sys/net/vnet.h#11 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * XXX RCS tag goes here */ #ifndef _NET_VNET_H_ ==== //depot/projects/vimage/src/sys/netgraph/ng_pipe.c#6 (text+ko) ==== @@ -1,6 +1,6 @@ /* - * Copyright (c) 2004, 2005, 2007 University of Zagreb - * Copyright (c) 2007 FreeBSD Foundation + * Copyright (c) 2004-2008 University of Zagreb + * Copyright (c) 2007-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -539,7 +539,8 @@ * NIH sindrome, so probably it would be wise to look around what other * folks have found out to be a good and efficient IP hash function... */ -static int ip_hash(struct mbuf *m, int offset) +static int +ip_hash(struct mbuf *m, int offset) { u_int64_t i; struct ip *ip = (struct ip *)(mtod(m, u_char *) + offset); ==== //depot/projects/vimage/src/sys/netgraph/ng_pipe.h#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* - * Copyright (c) 2004, 2007 University of Zagreb - * Copyright (c) 2007 FreeBSD Foundation + * Copyright (c) 2004-2008 University of Zagreb + * Copyright (c) 2007-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the ==== //depot/projects/vimage/src/sys/netgraph/ng_wormhole.c#4 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2007 University of Zagreb - * Copyright (c) 2007 FreeBSD Foundation + * Copyright (c) 2007-2008 University of Zagreb + * Copyright (c) 2007-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * XXX RCS tag goes here */ /* ==== //depot/projects/vimage/src/sys/netgraph/vnetgraph.h#8 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * XXX RCS tag goes here */ #ifndef _NETGRAPH_VNETGRPAH_H_ ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#34 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#42 (text+ko) ==== @@ -196,9 +196,11 @@ &tcp_inflight_debug, 0, "Debug TCP inflight calculations"); static int sysctl_tcp_inflight_rttthresh(SYSCTL_HANDLER_ARGS); -int sysctl_tcp_inflight_rttthresh(SYSCTL_HANDLER_ARGS) + +static int +sysctl_tcp_inflight_rttthresh(SYSCTL_HANDLER_ARGS) { - return (0); /* XXX MARKO REVISIT */ + return (0); /* XXX MARKO REVISIT */ } SYSCTL_PROC(_net_inet_tcp_inflight, OID_AUTO, rttthresh, CTLTYPE_INT|CTLFLAG_RW, 0, 0, sysctl_tcp_inflight_rttthresh, "I", ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.h#9 (text+ko) ==== @@ -83,8 +83,8 @@ #define SCF_SIGNATURE 0x20 /* send MD5 digests */ #define SCF_SACK 0x80 /* send SACK option */ #ifndef TCP_OFFLOAD_DISABLE - struct toe_usrreqs *sc_tu; /* TOE operations */ - void *sc_toepcb; /* TOE protocol block */ + struct toe_usrreqs *sc_tu; /* TOE operations */ + void *sc_toepcb; /* TOE protocol block */ #endif #ifdef MAC struct label *sc_label; /* MAC label reference */ ==== //depot/projects/vimage/src/sys/netinet/vinet.h#21 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * XXX RCS tag goes here */ #ifndef _NETINET_VINET_H_ ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#28 (text+ko) ==== @@ -153,9 +153,10 @@ VNET_MOD_DECLARE(INET6, inet6, NULL, NULL, INET, NULL) -static void vnet_inet6_register() +static void +vnet_inet6_register(void) { - vnet_mod_register(&vnet_inet6_modinfo); + vnet_mod_register(&vnet_inet6_modinfo); } SYSINIT(inet6, SI_SUB_PROTO_BEGIN, SI_ORDER_FIRST, vnet_inet6_register, 0); ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#26 (text+ko) ==== @@ -472,7 +472,7 @@ ln = (struct llinfo_nd6 *)arg; - if (ln->ln_ntick > 0) { + if (ln->ln_ntick > 0) { if (ln->ln_ntick > INT_MAX) { ln->ln_ntick -= INT_MAX; nd6_llinfo_settimer(ln, INT_MAX); ==== //depot/projects/vimage/src/sys/netinet6/vinet6.h#14 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * XXX RCS tag goes here */ #ifndef _NETINET6_VINET6_H_ ==== //depot/projects/vimage/src/sys/netipsec/vipsec.h#10 (text+ko) ==== @@ -1,6 +1,6 @@ /* - * Copyright (c) 2007 University of Zagreb - * Copyright (c) 2007 FreeBSD Foundation + * Copyright (c) 2007-2008 University of Zagreb + * Copyright (c) 2007-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * XXX RCS tag goes here */ #ifndef _NETIPSEC_VIPSEC_H_ ==== //depot/projects/vimage/src/sys/sys/sysctl.h#17 (text+ko) ==== @@ -247,10 +247,10 @@ #ifdef VIMAGE #define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \ handler, fmt, descr) \ - static struct sysctl_v_oid sysctl__##parent##_##name = { \ - &sysctl_##parent##_children, { 0 }, nbr, kind, \ - (void *) offsetof(struct mod, _##a1), a2, #name, \ - handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \ + static struct sysctl_v_oid sysctl__##parent##_##name = { \ + &sysctl_##parent##_children, { 0 }, nbr, kind, \ + (void *) offsetof(struct mod, _##a1), a2, #name, \ + handler, fmt, 0, __DESCR(descr), subs, V_MOD_##mod }; \ DATA_SET(sysctl_set, sysctl__##parent##_##name) #else #define SYSCTL_V_OID(subs, mod, parent, nbr, name, kind, a1, a2, \ ==== //depot/projects/vimage/src/sys/sys/vimage.h#55 (text+ko) ==== @@ -1,6 +1,6 @@ /*- - * Copyright (c) 2006 University of Zagreb - * Copyright (c) 2006 FreeBSD Foundation + * Copyright (c) 2006-2008 University of Zagreb + * Copyright (c) 2006-2008 FreeBSD Foundation * * This software was developed by the University of Zagreb and the * FreeBSD Foundation under sponsorship by the Stichting NLnet and the @@ -26,8 +26,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * XXX RCS tag goes here */ #ifndef _NET_VIMAGE_H_ @@ -234,7 +232,7 @@ #define VNET_ITERLOOP_END() \ CURVNET_RESTORE(); \ } \ - VNET_LIST_UNREF(); + VNET_LIST_UNREF(); #else /* !VNET_DEBUG */ @@ -264,7 +262,7 @@ #define VNET_ITERLOOP_END() \ CURVNET_RESTORE(); \ } \ - VNET_LIST_UNREF(); + VNET_LIST_UNREF(); #endif /* !VNET_DEBUG */ ==== //depot/projects/vimage/src/usr.sbin/vimage/vimage.c#9 (text+ko) ==== @@ -160,7 +160,7 @@ switch (cmd) { case VI_GET: - if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) + if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; if (argc == 1) printf("%s\n", vi_req.vi_name); @@ -171,11 +171,11 @@ case VI_GETNEXT: case VI_GETNEXT_RECURSE: vi_req.req_action = VI_GET; - if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) + if (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) < 0) goto abort; vi_print(&vi_req); vi_req.req_action = VI_GETNEXT_RECURSE; - while (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) == 0) { + while (ioctl(s, SIOCGPVIMAGE, (caddr_t)&vi_req) == 0) { vi_print(&vi_req); vi_req.req_action = cmd; } @@ -189,7 +189,7 @@ sizeof(vi_req.vi_if_xname)); else vi_req.vi_if_xname[0] = 0; - if (ioctl(s, SIOCSIFVIMAGE, (caddr_t)&vi_req) < 0) + if (ioctl(s, SIOCSIFVIMAGE, (caddr_t)&vi_req) < 0) goto abort; printf("%s@%s\n", vi_req.vi_chroot, vi_req.vi_name); exit(0);