and add unified header to source files. Also remove LIBVIRT-MIB.txt from %doc dir. --- README | 4 +++- libvirt-snmp.spec.in | 10 +++++++--- src/libvirtGuestTable.c | 24 +++++++++++++++++------- src/libvirtGuestTable.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_access.c | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_access.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_get.c | 22 +++++++++++++++++++--- src/libvirtGuestTable_data_get.h | 22 +++++++++++++++------- src/libvirtGuestTable_data_set.c | 21 ++++++++++++++++++--- src/libvirtGuestTable_data_set.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_enums.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_interface.c | 22 +++++++++++++++++++--- src/libvirtGuestTable_interface.h | 22 +++++++++++++++++++--- src/libvirtGuestTable_oids.h | 22 +++++++++++++++++++--- src/libvirtMib_subagent.c | 22 ++++++++++++++++++++-- src/libvirtSnmp.c | 29 +++++++++++++++++++++-------- src/libvirtSnmp.h | 22 ++++++++++++++++++++++ 17 files changed, 294 insertions(+), 58 deletions(-) diff --git a/README b/README index acb916b..6f9f349 100644 --- a/README +++ b/README @@ -6,4 +6,6 @@ it is now possible to gather and set domain status over SNMP from one place. This allows to create views of entire platforms end to end. -This code is distributed under GPLv3. \ No newline at end of file +This code is distributed under GPLv2, or (at your option) any later +version. + diff --git a/libvirt-snmp.spec.in b/libvirt-snmp.spec.in index 5bf0032..a59b991 100644 --- a/libvirt-snmp.spec.in +++ b/libvirt-snmp.spec.in @@ -1,10 +1,10 @@ Name: libvirt-snmp Version: @VERSION@ -Release: 1%{?dist}%{?extra_release} +Release: 2%{?dist}%{?extra_release} Summary: SNMP functionality for libvirt Group: Development/Libraries -License: GPLv3 +License: GPLv2+ URL: http://libvirt.org Source0: http://www.libvirt.org/sources/snmp/libvirt-snmp-%{version}.tar.gz BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -31,11 +31,15 @@ make install DESTDIR=$RPM_BUILD_ROOT %defattr(-,root,root,-) %{_bindir}/libvirtMib_subagent %{_datadir}/snmp/mibs/LIBVIRT-MIB.txt -%doc README NEWS ChangeLog AUTHORS src/LIBVIRT-MIB.txt +%doc README NEWS ChangeLog AUTHORS %{_mandir}/man1/libvirtMib_subagent.1* %changelog +* Wed Mar 9 2011 Michal Privoznik <mprivozn(a)redhat.com&gt; 0.0.1-2 +- resolve licensing conflicts +- add unified header to sources + * Thu Feb 2 2011 Michal Privoznik <mprivozn(a)redhat.com&gt; 0.0.1-1 - initial revision diff --git a/src/libvirtGuestTable.c b/src/libvirtGuestTable.c index ed50f69..d595568 100644 --- a/src/libvirtGuestTable.c +++ b/src/libvirtGuestTable.c @@ -1,15 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 17337 $ of $ + * libvirtGuestTable.c: SNMP table of running domains * - * $Id:$ - */ -/** \page MFD helper for libvirtGuestTable + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 of the License, or + * (at your option) any later version. * - * \section intro Introduction - * Introductory text. + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable.h b/src/libvirtGuestTable.h index 85eb866..eb64048 100644 --- a/src/libvirtGuestTable.h +++ b/src/libvirtGuestTable.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 17337 $ of $ + * libvirtGuestTable.h: SNMP table of running domains * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + #ifndef LIBVIRTGUESTTABLE_H #define LIBVIRTGUESTTABLE_H diff --git a/src/libvirtGuestTable_data_access.c b/src/libvirtGuestTable_data_access.c index 6864b25..f602021 100644 --- a/src/libvirtGuestTable_data_access.c +++ b/src/libvirtGuestTable_data_access.c @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 14170 $ of $ + * libvirtGuestTable_data_access.c: SNMP table data access routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable_data_access.h b/src/libvirtGuestTable_data_access.h index 6c54890..3491aa4 100644 --- a/src/libvirtGuestTable_data_access.h +++ b/src/libvirtGuestTable_data_access.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 14170 $ of $ + * libvirtGuestTable_data_access.h: SNMP table data access routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + #ifndef LIBVIRTGUESTTABLE_DATA_ACCESS_H #define LIBVIRTGUESTTABLE_DATA_ACCESS_H diff --git a/src/libvirtGuestTable_data_get.c b/src/libvirtGuestTable_data_get.c index 72f07bd..2430f9c 100644 --- a/src/libvirtGuestTable_data_get.c +++ b/src/libvirtGuestTable_data_get.c @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12088 $ of $ + * libvirtGuestTable_data_get.c: SNMP table data get routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable_data_get.h b/src/libvirtGuestTable_data_get.h index 76baf81..450d112 100644 --- a/src/libvirtGuestTable_data_get.h +++ b/src/libvirtGuestTable_data_get.h @@ -1,17 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12088 $ of $ + * libvirtGuestTable_data_get.h: SNMP table data get routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. * - * @file libvirtGuestTable_data_get.h + * 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 2 of the License, or + * (at your option) any later version. * - * @addtogroup get + * 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. * - * Prototypes for get functions + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * @{ + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + #ifndef LIBVIRTGUESTTABLE_DATA_GET_H #define LIBVIRTGUESTTABLE_DATA_GET_H diff --git a/src/libvirtGuestTable_data_set.c b/src/libvirtGuestTable_data_set.c index f3f4ea5..c1f6625 100644 --- a/src/libvirtGuestTable_data_set.c +++ b/src/libvirtGuestTable_data_set.c @@ -1,10 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12077 $ of $ + * libvirtGuestTable_data_set.c: SNMP table data set routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtGuestTable_data_set.h b/src/libvirtGuestTable_data_set.h index 8afb3ce..cce0fe7 100644 --- a/src/libvirtGuestTable_data_set.h +++ b/src/libvirtGuestTable_data_set.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 12077 $ of $ + * libvirtGuestTable_data_set.h: SNMP table data set routines * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + #ifndef LIBVIRTGUESTTABLE_DATA_SET_H #define LIBVIRTGUESTTABLE_DATA_SET_H diff --git a/src/libvirtGuestTable_enums.h b/src/libvirtGuestTable_enums.h index 12617db..ea7e6df 100644 --- a/src/libvirtGuestTable_enums.h +++ b/src/libvirtGuestTable_enums.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * : generic-table-enums.m2c 12526 2005-07-15 22:41:16Z rstory $ + * libvirtGuestTable_enums.h: SNMP table enums * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + #ifndef LIBVIRTGUESTTABLE_ENUMS_H #define LIBVIRTGUESTTABLE_ENUMS_H diff --git a/src/libvirtGuestTable_interface.c b/src/libvirtGuestTable_interface.c index 9dc428d..2d78d5b 100644 --- a/src/libvirtGuestTable_interface.c +++ b/src/libvirtGuestTable_interface.c @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 16927 $ of $ + * libvirtGuestTable_interface.c: SNMP table interface * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + /* * ********************************************************************* * ********************************************************************* diff --git a/src/libvirtGuestTable_interface.h b/src/libvirtGuestTable_interface.h index 2fd4959..97a7ccc 100644 --- a/src/libvirtGuestTable_interface.h +++ b/src/libvirtGuestTable_interface.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 16927 $ of $ + * libvirtGuestTable_interface.h: SNMP table interface * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + /** @ingroup interface: Routines to interface to Net-SNMP * * \warning This code should not be modified, called directly, diff --git a/src/libvirtGuestTable_oids.h b/src/libvirtGuestTable_oids.h index ab6055b..a8f97fd 100644 --- a/src/libvirtGuestTable_oids.h +++ b/src/libvirtGuestTable_oids.h @@ -1,9 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * : generic-table-oids.m2c 17548 2009-04-23 16:35:18Z hardaker $ + * libvirtGuestTable_oids.h: SNMP table OIDs * - * $Id:$ + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + #ifndef LIBVIRTGUESTTABLE_OIDS_H #define LIBVIRTGUESTTABLE_OIDS_H diff --git a/src/libvirtMib_subagent.c b/src/libvirtMib_subagent.c index 5eda993..4adfbb8 100644 --- a/src/libvirtMib_subagent.c +++ b/src/libvirtMib_subagent.c @@ -1,7 +1,25 @@ /* - * Note: this file originally auto-generated by mib2c using - * version : 15795 $ of $ + * libvirtMib_subagent.c: SNMP subagent + * + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; */ + /* standard Net-SNMP includes */ #include <net-snmp/net-snmp-config.h> #include <net-snmp/net-snmp-includes.h> diff --git a/src/libvirtSnmp.c b/src/libvirtSnmp.c index c15431a..0401d53 100644 --- a/src/libvirtSnmp.c +++ b/src/libvirtSnmp.c @@ -1,11 +1,24 @@ -/* This file contains trivial example code to connect to the running - * hypervisor and gather a few bits of information. */ - -/* compile with: - -gcc -lvirt activeguests.c - -*/ +/* + * libvirtSnmp.c: interface between libvirt and the agent + * + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; + */ #include <stdio.h> #include <stdlib.h> diff --git a/src/libvirtSnmp.h b/src/libvirtSnmp.h index 4ac6130..52355c7 100644 --- a/src/libvirtSnmp.h +++ b/src/libvirtSnmp.h @@ -1,3 +1,25 @@ +/* + * libvirtSnmp.h: interface between libvirt and agent + * + * Copyright (C) 2011 Red Hat, Inc. + * + * 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 2 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, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Michal Privoznik <mprivozn(a)redhat.com&gt; + */ + #ifndef __VIR_SNMP_H__ #define __VIR_SNMP_H__ -- 1.7.4