lick incense

kohler · Oct 4, 2000 · bb2036a · bb2036a
1 parent 1255b47
commit bb2036a
Show file tree

Hide file tree

Showing 280 changed files with 3,330 additions and 1,737 deletions.
diff --git a/COPYRIGHT b/COPYRIGHT
diff --git a/DISTFILES b/DISTFILES
@@ -1,5 +1,4 @@
 AUTHORS
-COPYRIGHT
 DISTFILES
 FAQ
 INSTALL

diff --git a/LICENSE b/LICENSE
diff --git a/README b/README
@@ -110,8 +110,8 @@ more up-to-date configurations.
 COPYRIGHT AND LICENSE
 =====================
 
-    We are distributing Click under the GNU Public License. See the files
-`COPYRIGHT', `LICENSE' and `AUTHORS' for details.
+    We are distributing Click under a version of the "MIT License", which
+is a BSD-like license. See the files `LICENSE' and `AUTHORS' for details.
 
 BUGS, QUESTIONS, ETC.
 =====================

diff --git a/apps/ClickController/ClickController.java b/apps/ClickController/ClickController.java
@@ -2,12 +2,19 @@
  * ClickController.java -- main ClickController program
  * Eddie Kohler, Douglas S. J. De Couto
  *
- * Copyright (c) 2000 Massachusetts Institute of Technology.
+ * Copyright (c) 2000 Massachusetts Institute of Technology
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 import java.awt.*;

diff --git a/apps/ClickController/ControlSocket.java b/apps/ClickController/ControlSocket.java
@@ -4,10 +4,17 @@
  *
  * Copyright (c) 2000 Massachusetts Institute of Technology.
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 import java.net.*;

diff --git a/apps/ClickController/NewConnectionDialog.java b/apps/ClickController/NewConnectionDialog.java
@@ -4,10 +4,17 @@
  *
  * Copyright (c) 2000 Massachusetts Institute of Technology.
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 import java.awt.*;

diff --git a/apps/ClickController/RouterTreeModel.java b/apps/ClickController/RouterTreeModel.java
@@ -4,10 +4,17 @@
  *
  * Copyright (c) 2000 Massachusetts Institute of Technology.
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 import javax.swing.*;

diff --git a/apps/ClickController/Util.java b/apps/ClickController/Util.java
@@ -4,10 +4,17 @@
  *
  * Copyright (c) 2000 Massachusetts Institute of Technology.
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 import java.util.*;

diff --git a/click-compile.in b/click-compile.in
@@ -1,5 +1,22 @@
 #!/bin/sh
 
+# click-compile.in -- script compiles Click elements
+# Eddie Kohler
+#
+# Copyright (c) 1999 Massachusetts Institute of Technology
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# Further elaboration of this license, including a DISCLAIMER OF ANY
+# WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+# also accessible at http://www.pdos.lcs.mit.edu/click/license.html
+
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 includedir=@includedir@/click

diff --git a/conf/make-ip-conf.pl b/conf/make-ip-conf.pl
@@ -5,10 +5,17 @@
 #
 # Copyright (c) 1999-2000 Massachusetts Institute of Technology.
 #
-# This software is being provided by the copyright holders under the GNU
-# General Public License, either version 2 or, at your discretion, any later
-# version. For more information, see the `COPYRIGHT' file in the source
-# distribution.
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# Further elaboration of this license, including a DISCLAIMER OF ANY
+# WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+# also accessible at http://www.pdos.lcs.mit.edu/click/license.html
 
 # Make a Click IP router configuration.
 # The output is only useful with the Linux kernel module.

diff --git a/doc/element2man.pl b/doc/element2man.pl
@@ -7,10 +7,17 @@
 #
 # Copyright (c) 1999 Massachusetts Institute of Technology.
 #
-# This software is being provided by the copyright holders under the GNU
-# General Public License, either version 2 or, at your discretion, any later
-# version. For more information, see the `COPYRIGHT' file in the source
-# distribution.
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, subject to the following
+# conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# Further elaboration of this license, including a DISCLAIMER OF ANY
+# WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+# also accessible at http://www.pdos.lcs.mit.edu/click/license.html
 
 my(%section_break) =
     ( 'head1' => 1, 'c' => 1, 's' => 1, 'io' => 1, 'processing' => 1,

diff --git a/elements/app/ftpportmapper.cc b/elements/app/ftpportmapper.cc
@@ -2,12 +2,19 @@
  * ftpportmapper.{cc,hh} -- IPMapper for FTP PORT commands
  * Eddie Kohler
  *
- * Copyright (c) 2000 Massachusetts Institute of Technology.
+ * Copyright (c) 2000 Massachusetts Institute of Technology
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 #ifdef HAVE_CONFIG_H

diff --git a/elements/aqm/red.cc b/elements/aqm/red.cc
@@ -2,12 +2,19 @@
  * red.{cc,hh} -- element implements Random Early Detection dropping policy
  * Eddie Kohler
  *
- * Copyright (c) 1999-2000 Massachusetts Institute of Technology.
+ * Copyright (c) 1999-2000 Massachusetts Institute of Technology
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 #ifdef HAVE_CONFIG_H

diff --git a/elements/ethernet/arpfaker.cc b/elements/ethernet/arpfaker.cc
@@ -2,12 +2,19 @@
  * arpfaker.{cc,hh} -- ARP response faker element
  * Robert Morris
  *
- * Copyright (c) 1999-2000 Massachusetts Institute of Technology.
+ * Copyright (c) 1999-2000 Massachusetts Institute of Technology
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 #ifdef HAVE_CONFIG_H

diff --git a/elements/ethernet/arpquerier.cc b/elements/ethernet/arpquerier.cc
@@ -2,12 +2,19 @@
  * arpquerier.{cc,hh} -- ARP resolver element
  * Robert Morris, Eddie Kohler
  *
- * Copyright (c) 1999-2000 Massachusetts Institute of Technology.
+ * Copyright (c) 1999-2000 Massachusetts Institute of Technology
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 #ifdef HAVE_CONFIG_H

diff --git a/elements/ethernet/arpresponder.cc b/elements/ethernet/arpresponder.cc
@@ -2,12 +2,19 @@
  * arpresponder.{cc,hh} -- element that responds to ARP queries
  * Robert Morris
  *
- * Copyright (c) 1999-2000 Massachusetts Institute of Technology.
+ * Copyright (c) 1999-2000 Massachusetts Institute of Technology
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 #ifdef HAVE_CONFIG_H

diff --git a/elements/ethernet/ethermirror.cc b/elements/ethernet/ethermirror.cc
@@ -2,12 +2,19 @@
  * ethermirror.{cc,hh} -- rewrites Ethernet packet a->b to b->a
  * Eddie Kohler
  *
- * Copyright (c) 2000 Massachusetts Institute of Technology.
+ * Copyright (c) 2000 Massachusetts Institute of Technology
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 #ifdef HAVE_CONFIG_H

diff --git a/elements/ethernet/hostetherfilter.cc b/elements/ethernet/hostetherfilter.cc
@@ -2,12 +2,19 @@
  * hostetherfilter.{cc,hh} -- Discard packets not for this host.
  * Robert Morris
  *
- * Copyright (c) 1999-2000 Massachusetts Institute of Technology.
+ * Copyright (c) 1999-2000 Massachusetts Institute of Technology
  *
- * This software is being provided by the copyright holders under the GNU
- * General Public License, either version 2 or, at your discretion, any later
- * version. For more information, see the `COPYRIGHT' file in the source
- * distribution.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * Further elaboration of this license, including a DISCLAIMER OF ANY
+ * WARRANTY, EXPRESS OR IMPLIED, is provided in the LICENSE file, which is
+ * also accessible at http://www.pdos.lcs.mit.edu/click/license.html
  */
 
 #ifdef HAVE_CONFIG_H