svn commit: r215153 - in head/sys/netinet: . libalias

[Lawrence Stewart]

Author: lstewart
Date: Fri Nov 12 00:44:18 2010
New Revision: 215153
URL: http://svn.freebsd.org/changeset/base/215153

Log:
  Standardise all Swinburne related copyright/licence statements throughout the
  tree in preparation for another large code import. Swinburne University is the
  legal entity that owns copyright and the 2-clause BSD licence is acceptable.

Modified:
  head/sys/netinet/libalias/alias_sctp.c
  head/sys/netinet/libalias/alias_sctp.h
  head/sys/netinet/siftr.c

Modified: head/sys/netinet/libalias/alias_sctp.c
==============================================================================
--- head/sys/netinet/libalias/alias_sctp.c	Fri Nov 12 00:19:42 2010	(r215152)
+++ head/sys/netinet/libalias/alias_sctp.c	Fri Nov 12 00:44:18 2010	(r215153)
@@ -1,8 +1,7 @@
-/**
- * @file alias_sctp.c
- * Copyright (c) 2008, Centre for Advanced Internet Architectures
- * Swinburne University of Technology, Melbourne, Australia.
- * 
+/*-
+ * Copyright (c) 2008
+ * 	Swinburne University of Technology, Melbourne, Australia.
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
@@ -11,11 +10,7 @@
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- *  3. The names of the authors, the "Centre for Advanced Internet Architectures"
- *     and "Swinburne University of Technology" may not be used to endorse
- *     or promote products derived from this software without specific
- *     prior written permission.
- * 
+ *
  *  THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS "AS IS" AND
  *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -27,7 +22,9 @@
  *  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.
- *
+ */
+
+/*
  * Alias_sctp forms part of the libalias kernel module to handle 
  * Network Address Translation (NAT) for the SCTP protocol.
  *

Modified: head/sys/netinet/libalias/alias_sctp.h
==============================================================================
--- head/sys/netinet/libalias/alias_sctp.h	Fri Nov 12 00:19:42 2010	(r215152)
+++ head/sys/netinet/libalias/alias_sctp.h	Fri Nov 12 00:44:18 2010	(r215153)
@@ -1,8 +1,7 @@
-/**
- * @file alias_sctp.h
- * Copyright (c) 2008, Centre for Advanced Internet Architectures
- * Swinburne University of Technology, Melbourne, Australia.
- * 
+/*-
+ * Copyright (c) 2008
+ * 	Swinburne University of Technology, Melbourne, Australia.
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
@@ -11,11 +10,7 @@
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- *  3. The names of the authors, the "Centre for Advanced Internet Architectures"
- *     and "Swinburne University of Technology" may not be used to endorse
- *     or promote products derived from this software without specific
- *     prior written permission.
- * 
+ *
  *  THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS "AS IS" AND
  *  ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  *  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -27,7 +22,9 @@
  *  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.
- *
+ */
+
+/*
  * Alias_sctp forms part of the libalias kernel module to handle 
  * Network Address Translation (NAT) for the SCTP protocol.
  *

Modified: head/sys/netinet/siftr.c
==============================================================================
--- head/sys/netinet/siftr.c	Fri Nov 12 00:19:42 2010	(r215152)
+++ head/sys/netinet/siftr.c	Fri Nov 12 00:44:18 2010	(r215153)
@@ -1,6 +1,6 @@
 /*-
- * Copyright (c) 2007-2009, Centre for Advanced Internet Architectures
- * Swinburne University of Technology, Melbourne, Australia.
+ * Copyright (c) 2007-2009
+ * 	Swinburne University of Technology, Melbourne, Australia.
  * Copyright (c) 2009-2010, The FreeBSD Foundation
  * All rights reserved.
  *