From 7b07636281bec9dfc0dd8e965e456510a36b0631 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Wed, 6 Jun 2018 09:57:31 +0200 Subject: [PATCH] Refreshed copyright and added contributors list --- README.md | 2 +- benchmark.c | 18 ++++++++++++++++++ contributors.txt | 8 ++++++++ edge.c | 9 +-------- n2n.c | 18 ++++++------------ n2n.h | 11 +++-------- n2n_keyfile.c | 19 ++++++++++++++++--- n2n_keyfile.h | 18 +++++++++++++++++- n2n_transforms.h | 18 +++++++++++++++++- n2n_wire.h | 19 +++++++++++++++---- sn.c | 22 ++++++++++++++++------ test.c | 18 ++++++++++++++++++ transform_aes.c | 19 ++++++++++++++++--- transform_null.c | 18 +++++++++++++++++- transform_tf.c | 18 +++++++++++++++++- tuntap_freebsd.c | 5 +++-- tuntap_linux.c | 9 +++++---- tuntap_netbsd.c | 6 +++--- tuntap_osx.c | 5 +++-- wire.c | 18 +++++++++++++++++- 20 files changed, 217 insertions(+), 61 deletions(-) create mode 100644 contributors.txt diff --git a/README.md b/README.md index a057b52..4e4a58c 100644 --- a/README.md +++ b/README.md @@ -116,4 +116,4 @@ NULL (-O3) 10659 (C) 2007-2010 - Luca Deri and Richard Andrews -(C) 2016 - ntop +(C) 2018 - ntop diff --git a/benchmark.c b/benchmark.c index f6802ce..a631c61 100644 --- 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 + * + */ + #include "n2n_wire.h" #include "n2n_transforms.h" #include "n2n.h" diff --git a/contributors.txt b/contributors.txt new file mode 100644 index 0000000..0b19fb6 --- /dev/null +++ b/contributors.txt @@ -0,0 +1,8 @@ +Code contributions courtesy of: + * Richard Andrews + * Don Bindner + * Sylwester Sosnowski + * Wilfried "Wonka" Klaebe + * Lukasz Taczuk + * Alaric Snell-Pym + * Babak Farrokhi [FreeBSD port] diff --git a/edge.c b/edge.c index 7a4d563..c8f2813 100644 --- a/edge.c +++ b/edge.c @@ -1,6 +1,5 @@ /** - * (C) 2007-09 - Luca Deri - * Richard Andrews + * (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 @@ -15,12 +14,6 @@ * You should have received a copy of the GNU General Public License * along with this program; if not see see * - * Code contributions courtesy of: - * Don Bindner - * Sylwester Sosnowski - * Wilfried "Wonka" Klaebe - * Lukasz Taczuk - * */ #include "n2n.h" diff --git a/n2n.c b/n2n.c index b6bae37..ece937d 100644 --- a/n2n.c +++ b/n2n.c @@ -1,11 +1,10 @@ -/* - *(C) 2007-09 - Luca Deri - * Richard Andrews +/** + * (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. + * (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 @@ -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 - * - * Code contributions courtesy of: - * Massimo Torquati - * Matt Gilg + * along with this program; if not see see * */ @@ -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 index a004e7f..8f80720 100644 --- a/n2n.h +++ b/n2n.h @@ -1,6 +1,5 @@ -/* - * (C) 2007-09 - Luca Deri - * Richard Andrews +/** + * (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,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 - * - * Code contributions courtesy of: - * Babak Farrokhi [FreeBSD port] - * Lukasz Taczuk + * along with this program; if not see see * */ diff --git a/n2n_keyfile.c b/n2n_keyfile.c index 56de3a1..eda6c83 100644 --- a/n2n_keyfile.c +++ b/n2n_keyfile.c @@ -1,6 +1,19 @@ -/* (c) 2009 Richard Andrews */ -/* Contributions from: - * - Jozef Kralik +/** + * (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 + * */ #include "n2n.h" diff --git a/n2n_keyfile.h b/n2n_keyfile.h index 6068df1..05cdf60 100644 --- a/n2n_keyfile.h +++ b/n2n_keyfile.h @@ -1,4 +1,20 @@ -/* (c) 2009 Richard Andrews */ +/** + * (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 + * + */ /** Key files * diff --git a/n2n_transforms.h b/n2n_transforms.h index effbc50..6702dae 100644 --- a/n2n_transforms.h +++ b/n2n_transforms.h @@ -1,4 +1,20 @@ -/* (c) 2009 Richard Andrews */ +/** + * (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 + * + */ #if !defined(N2N_TRANSFORMS_H_) #define N2N_TRANSFORMS_H_ diff --git a/n2n_wire.h b/n2n_wire.h index 8a3dfdf..88fa0ea 100644 --- a/n2n_wire.h +++ b/n2n_wire.h @@ -1,8 +1,19 @@ -/* (c) 2009 Richard Andrews +/** + * (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 * - * Contributions by: - * Luca Deri - * Lukasz Taczuk */ #if !defined( N2N_WIRE_H_ ) diff --git a/sn.c b/sn.c index 7df4729..9138a37 100644 --- a/sn.c +++ b/sn.c @@ -1,12 +1,22 @@ -/* Supernode for n2n-2.x */ - -/* (c) 2009 Richard Andrews +/** + * (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 * - * Contributions by: - * Lukasz Taczuk - * Struan Bartlett */ +/* Supernode for n2n-2.x */ #include "n2n.h" diff --git a/test.c b/test.c index 97ec91b..ab89e45 100644 --- 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 + * + */ + #include "n2n.h" #include "n2n_keyfile.h" #include diff --git a/transform_aes.c b/transform_aes.c index a8c4969..718cb4e 100644 --- a/transform_aes.c +++ b/transform_aes.c @@ -1,6 +1,19 @@ -/* (c) 2009 Richard Andrews */ -/* Contributions from: - * - Jozef Kralik +/** + * (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 + * */ #include "n2n.h" diff --git a/transform_null.c b/transform_null.c index b486989..78a7185 100644 --- a/transform_null.c +++ b/transform_null.c @@ -1,4 +1,20 @@ -/* (c) 2009 Richard Andrews */ +/** + * (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 + * + */ #include "n2n.h" #include "n2n_transforms.h" diff --git a/transform_tf.c b/transform_tf.c index 1ae5bc5..944a55a 100644 --- a/transform_tf.c +++ b/transform_tf.c @@ -1,4 +1,20 @@ -/* (c) 2009 Richard Andrews */ +/** + * (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 + * + */ #include "n2n.h" #include "n2n_transforms.h" diff --git a/tuntap_freebsd.c b/tuntap_freebsd.c index 7d9096a..fc06f74 100644 --- a/tuntap_freebsd.c +++ b/tuntap_freebsd.c @@ -1,5 +1,5 @@ -/* - * (C) 2007-09 - Luca Deri +/** + * (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 + * */ #include "n2n.h" diff --git a/tuntap_linux.c b/tuntap_linux.c index ae535e1..27ce05c 100644 --- a/tuntap_linux.c +++ b/tuntap_linux.c @@ -1,5 +1,5 @@ -/* - * (C) 2007-09 - Luca Deri +/** + * (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 -*/ + * along with this program; if not see see + * + */ #include "n2n.h" diff --git a/tuntap_netbsd.c b/tuntap_netbsd.c index bca6e3e..2d948d9 100644 --- a/tuntap_netbsd.c +++ b/tuntap_netbsd.c @@ -1,6 +1,5 @@ -/* - * (C) 2007-09 - Luca Deri - * (C) 2009 - Alaric Snell-Pym +/** + * (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 @@ -14,6 +13,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not see see + * */ #include "n2n.h" diff --git a/tuntap_osx.c b/tuntap_osx.c index c6df8e4..ee06ef8 100644 --- a/tuntap_osx.c +++ b/tuntap_osx.c @@ -1,5 +1,5 @@ -/* - * (C) 2007-09 - Luca Deri +/** + * (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 + * */ #include "n2n.h" diff --git a/wire.c b/wire.c index 6490c9d..228b426 100644 --- a/wire.c +++ b/wire.c @@ -1,4 +1,20 @@ -/* (c) 2009 Richard Andrews */ +/** + * (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 + * + */ /** Routines for encoding and decoding n2n packets on the wire. *