Refreshed copyright and added contributors list

ntop · Jun 6, 2018 · 7b07636 · 7b07636
1 parent 415f6b0
commit 7b07636
Show file tree

Hide file tree

Showing 20 changed files with 217 additions and 61 deletions.
diff --git a/README.md b/README.md
@@ -116,4 +116,4 @@ NULL (-O3) 10659
 
 (C) 2007-2010 - Luca Deri <deri@ntop.org> and Richard Andrews <andrews@ntop.org>
 
-(C) 2016 - ntop
+(C) 2018 - ntop
diff --git a/benchmark.c b/benchmark.c
@@ -1,3 +1,21 @@
+/*
+ * (C) 2007-18 - ntop.org and contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
 #include "n2n_wire.h"
 #include "n2n_transforms.h"
 #include "n2n.h"

diff --git a/contributors.txt b/contributors.txt
@@ -0,0 +1,8 @@
+Code contributions courtesy of:
+ * Richard Andrews <andrews@ntop.org>
+ * Don Bindner <don.bindner@gmail.com>
+ * Sylwester Sosnowski <syso-n2n@no-route.org>
+ * Wilfried "Wonka" Klaebe
+ * Lukasz Taczuk
+ * Alaric Snell-Pym <alaric@kitten-technologies.co.uk>
+ * Babak Farrokhi <babak@farrokhi.net> [FreeBSD port]
diff --git a/edge.c b/edge.c
@@ -1,6 +1,5 @@
 /**
- * (C) 2007-09 - Luca Deri <deri@ntop.org>
+ * (C) 2007-18 - ntop.org and contributors
- *               Richard Andrews <andrews@ntop.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -15,12 +14,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not see see <http://www.gnu.org/licenses/>
  *
- * Code contributions courtesy of:
- * Don Bindner <don.bindner@gmail.com>
- * Sylwester Sosnowski <syso-n2n@no-route.org>
- * Wilfried "Wonka" Klaebe
- * Lukasz Taczuk
- *
  */
 
 #include "n2n.h"

diff --git a/n2n.c b/n2n.c
@@ -1,23 +1,18 @@
-/*
+/**
- *(C) 2007-09 - Luca Deri <deri@ntop.org>
+ * (C) 2007-18 - ntop.org and contributors
- *               Richard Andrews <andrews@ntop.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
- *(at your option) any later version.
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
- *
- * Code contributions courtesy of:
- * Massimo Torquati <torquati@ntop.org>
- * Matt Gilg
  *
  */
 
@@ -235,12 +230,11 @@ void hexdump(const uint8_t * buf, size_t len)
 void print_n2n_version() {
   printf("Welcome to n2n v.%s for %s\n"
          "Built on %s\n"
-	 "Copyright 2007-09 - http://www.ntop.org\n\n",
+	 "Copyright 2007-18 - ntop.org and contributors\n\n",
          n2n_sw_version, n2n_sw_osName, n2n_sw_buildDate);
 }
 
-
+/* *********************************************** */ 
-
 
 /** Find the peer entry in list with mac_addr equal to mac.
  *

diff --git a/n2n.h b/n2n.h
@@ -1,6 +1,5 @@
-/*
+/**
- * (C) 2007-09 - Luca Deri <deri@ntop.org>
+ * (C) 2007-18 - ntop.org and contributors
- *               Richard Andrews <andrews@ntop.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,11 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
- *
- * Code contributions courtesy of:
- *    Babak Farrokhi <babak@farrokhi.net> [FreeBSD port]
- *    Lukasz Taczuk
  *
  */
 

diff --git a/n2n_keyfile.c b/n2n_keyfile.c
@@ -1,6 +1,19 @@
-/* (c) 2009 Richard Andrews <andrews@ntop.org> */
+/**
-/* Contributions from:
+ * (C) 2007-18 - ntop.org and contributors
- *     - Jozef Kralik
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
+ *
  */
 
 #include "n2n.h"

diff --git a/n2n_keyfile.h b/n2n_keyfile.h
@@ -1,4 +1,20 @@
-/* (c) 2009 Richard Andrews <andrews@ntop.org> */
+/**
+ * (C) 2007-18 - ntop.org and contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
+ *
+ */
 
 /** Key files
  *

diff --git a/n2n_transforms.h b/n2n_transforms.h
@@ -1,4 +1,20 @@
-/* (c) 2009 Richard Andrews <andrews@ntop.org> */
+/**
+ * (C) 2007-18 - ntop.org and contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
+ *
+ */
 
 #if !defined(N2N_TRANSFORMS_H_)
 #define N2N_TRANSFORMS_H_

diff --git a/n2n_wire.h b/n2n_wire.h
@@ -1,8 +1,19 @@
-/* (c) 2009 Richard Andrews <andrews@ntop.org> 
+/**
+ * (C) 2007-18 - ntop.org and contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
  *
- * Contributions by:
- *    Luca Deri
- *    Lukasz Taczuk
  */
 
 #if !defined( N2N_WIRE_H_ )

diff --git a/sn.c b/sn.c
@@ -1,12 +1,22 @@
-/* Supernode for n2n-2.x */
+/**
-
+ * (C) 2007-18 - ntop.org and contributors
-/* (c) 2009 Richard Andrews <andrews@ntop.org> 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
  *
- * Contributions by:
- *    Lukasz Taczuk
- *    Struan Bartlett
  */
 
+/* Supernode for n2n-2.x */
 
 #include "n2n.h"
 

diff --git a/test.c b/test.c
@@ -1,3 +1,21 @@
+/**
+ * (C) 2007-18 - ntop.org and contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
+ *
+ */
+
 #include "n2n.h"
 #include "n2n_keyfile.h"
 #include <assert.h>

diff --git a/transform_aes.c b/transform_aes.c
@@ -1,6 +1,19 @@
-/* (c) 2009 Richard Andrews <andrews@ntop.org> */
+/**
-/* Contributions from:
+ * (C) 2007-18 - ntop.org and contributors
- *     - Jozef Kralik
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
+ *
  */
 
 #include "n2n.h"

diff --git a/transform_null.c b/transform_null.c
@@ -1,4 +1,20 @@
-/* (c) 2009 Richard Andrews <andrews@ntop.org> */
+/**
+ * (C) 2007-18 - ntop.org and contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
+ *
+ */
 
 #include "n2n.h"
 #include "n2n_transforms.h"

diff --git a/transform_tf.c b/transform_tf.c
@@ -1,4 +1,20 @@
-/* (c) 2009 Richard Andrews <andrews@ntop.org> */
+/**
+ * (C) 2007-18 - ntop.org and contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
+ *
+ */
 
 #include "n2n.h"
 #include "n2n_transforms.h"

diff --git a/tuntap_freebsd.c b/tuntap_freebsd.c
@@ -1,5 +1,5 @@
-/*
+/**
- * (C) 2007-09 - Luca Deri <deri@ntop.org>
+ * (C) 2007-18 - ntop.org and contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -13,6 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not see see <http://www.gnu.org/licenses/>
+ *
  */
 
 #include "n2n.h"

diff --git a/tuntap_linux.c b/tuntap_linux.c
@@ -1,5 +1,5 @@
-/*
+/**
- * (C) 2007-09 - Luca Deri <deri@ntop.org>
+ * (C) 2007-18 - ntop.org and contributors
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -12,8 +12,9 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>
+ * along with this program; if not see see <http://www.gnu.org/licenses/>
-*/
+ *
+ */
 
 #include "n2n.h"
 

diff --git a/tuntap_netbsd.c b/tuntap_netbsd.c
@@ -1,6 +1,5 @@
-/*
+/**
- * (C) 2007-09 - Luca Deri <deri@ntop.org>
+ * (C) 2007-18 - ntop.org and contributors
- * (C) 2009 - Alaric Snell-Pym <alaric@kitten-technologies.co.uk>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -14,6 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not see see <http://www.gnu.org/licenses/>
+ *
  */
 
 #include "n2n.h"