From 50e24903ba3e90d3502428eaa1bdb961de305c72 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Fri, 18 Nov 2016 10:11:46 -0500 Subject: [PATCH] *: Fix up licensing to be right These files were submitted by Cumulus but did not properly setup the licensing of them. This fixes that issue. Signed-off-by: Donald Sharp --- lib/bitfield.h | 20 ++++++++++++++++++++ lib/csv.c | 20 ++++++++++++++++++++ lib/csv.h | 21 ++++++++++++++++++++- lib/ptm_lib.c | 21 +++++++++++++++++---- lib/ptm_lib.h | 24 +++++++++++++++++++++--- tools/cmd_check.py | 20 ++++++++++++++++++++ tools/quagga-reload.py | 21 ++++++++++++++++++++- zebra/zebra_rnh_null.c | 20 ++++++++++++++++++++ 8 files changed, 158 insertions(+), 9 deletions(-) diff --git a/lib/bitfield.h b/lib/bitfield.h index b3f40a948..6c97ac0f1 100644 --- a/lib/bitfield.h +++ b/lib/bitfield.h @@ -1,3 +1,23 @@ +/* Bitfields + * Copyright (C) 2016 Cumulus Networks, Inc. + * + * This file is part of Quagga. + * + * Quagga 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 2, or (at your option) any + * later version. + * + * Quagga 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 Quagga; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ /** * A simple bit array implementation to allocate and free IDs. An example * of its usage is in allocating link state IDs for OSPFv3 as OSPFv3 has diff --git a/lib/csv.c b/lib/csv.c index b90a8a9b9..7df929264 100644 --- a/lib/csv.c +++ b/lib/csv.c @@ -1,3 +1,23 @@ +/* CSV + * Copyright (C) 2013 Cumulus Networks, Inc. + * + * This file is part of Quagga. + * + * Quagga 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 2, or (at your option) any + * later version. + * + * Quagga 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 Quagga; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ #include #include #include diff --git a/lib/csv.h b/lib/csv.h index 078f39087..3fb445376 100644 --- a/lib/csv.h +++ b/lib/csv.h @@ -1,4 +1,23 @@ -/* Copyright 2013 Cumulus Networks, LLC. All rights reserved. */ +/* CSV + * Copyright (C) 2013 Cumulus Networks, Inc. + * + * This file is part of Quagga. + * + * Quagga 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 2, or (at your option) any + * later version. + * + * Quagga 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 Quagga; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ #ifndef __CSV_H__ #define __CSV_H__ diff --git a/lib/ptm_lib.c b/lib/ptm_lib.c index bcf0be623..0666797fa 100644 --- a/lib/ptm_lib.c +++ b/lib/ptm_lib.c @@ -1,10 +1,23 @@ -/********************************************************************* - * Copyright 2015 Cumulus Networks, LLC. All rights reserved. +/* PTM Library + * Copyright (C) 2015 Cumulus Networks, Inc. * - * library file used by clients for sending commands and parsing response + * This file is part of Quagga. * + * Quagga 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 2, or (at your option) any + * later version. + * + * Quagga 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 Quagga; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. */ - #include #include #include diff --git a/lib/ptm_lib.h b/lib/ptm_lib.h index e79529a81..be4170bb3 100644 --- a/lib/ptm_lib.h +++ b/lib/ptm_lib.h @@ -1,9 +1,25 @@ -/********************************************************************* - * Copyright 2015 Cumulus Networks, LLC. All rights reserved. +/* PTM Library + * Copyright (C) 2015 Cumulus Networks, Inc. * - * library file used by clients for sending commands and parsing response + * This file is part of Quagga. * + * Quagga 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 2, or (at your option) any + * later version. + * + * Quagga 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 Quagga; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. */ +#ifndef __PTM_LIB_H__ +#define __PTM_LIB_H__ #define PTMLIB_MSG_SZ 1024 #define PTMLIB_MSG_HDR_LEN 37 @@ -47,3 +63,5 @@ int ptm_lib_find_key_in_msg(void *, const char *, char *); int ptm_lib_init_msg(ptm_lib_handle_t *, int, int, void *, void **); int ptm_lib_append_msg(ptm_lib_handle_t *, void *, const char *, const char *); int ptm_lib_complete_msg(ptm_lib_handle_t *, void *, char *, int *); + +#endif diff --git a/tools/cmd_check.py b/tools/cmd_check.py index 5bd8032b7..bfe90c439 100755 --- a/tools/cmd_check.py +++ b/tools/cmd_check.py @@ -1,4 +1,24 @@ #!/usr/bin/python3 +# Command Checker +# Copyright (C) 2016 Cumulus Networks, Inc. +# +# This file is part of Quagga. +# +# Quagga 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 2, or (at your option) any +# later version. +# +# Quagga 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 Quagga; see the file COPYING. If not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. +# # Parses a source file, ensuring that CLI definitions (DEFUNs, ALIASs, etc) # have install_command called on them at some point. diff --git a/tools/quagga-reload.py b/tools/quagga-reload.py index ed36b940a..4d6e9259f 100755 --- a/tools/quagga-reload.py +++ b/tools/quagga-reload.py @@ -1,5 +1,24 @@ #!/usr/bin/python - +# Quagga Reloader +# Copyright (C) 2014 Cumulus Networks, Inc. +# +# This file is part of Quagga. +# +# Quagga 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 2, or (at your option) any +# later version. +# +# Quagga 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 Quagga; see the file COPYING. If not, write to the Free +# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. +# """ This program - reads a quagga configuration text file diff --git a/zebra/zebra_rnh_null.c b/zebra/zebra_rnh_null.c index 3ec8be027..eecb8519d 100644 --- a/zebra/zebra_rnh_null.c +++ b/zebra/zebra_rnh_null.c @@ -1,3 +1,23 @@ +/* Zebra next hop tracking code + * Copyright (C) 2013 Cumulus Networks, Inc. + * + * This file is part of Quagga. + * + * Quagga 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 2, or (at your option) any + * later version. + * + * Quagga 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 Quagga; see the file COPYING. If not, write to the Free + * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + * 02111-1307, USA. + */ #include #include "zebra/rib.h" #include "zebra/zserv.h" -- 2.39.5