[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga/ricci/modules/cluster/clumon/src cim-pro ...



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe sourceware org	2007-09-18 20:16:28

Modified files:
	ricci/modules/cluster/clumon/src/cim-provider: 
	                                               ClusterProvider.cpp 
	                                               ClusterProvider.h 
	                                               ClusterProviderMain.cpp 
	                                               SmartHandler.h 
	                                               clusterCIM_test.cpp 
	                                               clusterCIM_test.h 
	ricci/modules/cluster/clumon/src/common: Cluster.cpp 
	                                         ClusterMonitor.cpp 
	                                         Node.cpp Service.cpp 
	ricci/modules/cluster/clumon/src/daemon: Communicator.cpp 
	                                         Communicator.h 
	                                         Monitor.cpp Monitor.h 
	                                         Peer.cpp Peer.h 
	                                         main.cpp 
	ricci/modules/cluster/clumon/src/include: Cluster.h 
	                                          ClusterMonitor.h 
	                                          clumond_globals.h 
	ricci/modules/cluster/clumon/src/snmp-agent: clusterMIB.cpp 
	                                             clusterMIB.h 
	                                             clusterMonitorSnmp.cpp 
	                                             clusterMonitorSnmp.h 
	                                             nodesMIB.cpp 
	                                             nodesMIB.h 
	                                             nodesMIB_access.cpp 
	                                             nodesMIB_access.h 
	                                             nodesMIB_checkfns.h 
	                                             nodesMIB_checkfns_local.cpp 
	                                             nodesMIB_checkfns_local.h 
	                                             nodesMIB_columns.h 
	                                             nodesMIB_enums.h 
	                                             servicesMIB.cpp 
	                                             servicesMIB.h 
	                                             servicesMIB_access.cpp 
	                                             servicesMIB_access.h 
	                                             servicesMIB_checkfns.h 
	                                             servicesMIB_checkfns_local.cpp 
	                                             servicesMIB_checkfns_local.h 
	                                             servicesMIB_columns.h 
	                                             servicesMIB_enums.h 

Log message:
	- Update license text
	- Cleanup includes
	- Cleanup code to make it readable
	- Fix a compile error (I don't know how it ever compiled) caused by
	arithmetic on a void * in C++ code.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/cim-provider/ClusterProvider.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/cim-provider/ClusterProvider.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/cim-provider/ClusterProviderMain.cpp.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/cim-provider/SmartHandler.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/cim-provider/clusterCIM_test.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/cim-provider/clusterCIM_test.h.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/common/Cluster.cpp.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/common/ClusterMonitor.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/common/Node.cpp.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/common/Service.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Communicator.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Communicator.h.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp.diff?cvsroot=cluster&r1=1.17&r2=1.18
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Monitor.h.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Peer.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Peer.h.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/main.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/include/Cluster.h.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/include/ClusterMonitor.h.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/include/clumond_globals.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMonitorSnmp.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMonitorSnmp.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_access.cpp.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_access.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_checkfns.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_checkfns_local.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_checkfns_local.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_columns.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_enums.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_access.cpp.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_access.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_checkfns.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_checkfns_local.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_checkfns_local.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_columns.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_enums.h.diff?cvsroot=cluster&r1=1.2&r2=1.3

--- conga/ricci/modules/cluster/clumon/src/cim-provider/ClusterProvider.cpp	2007/09/11 02:45:27	1.4
+++ conga/ricci/modules/cluster/clumon/src/cim-provider/ClusterProvider.cpp	2007/09/18 20:16:25	1.5
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "ClusterProvider.h"
 #include "SmartHandler.h"
 #include "Cluster.h"
@@ -38,14 +37,10 @@
 #include <functional>
 #include <vector>
 
-
-
 using namespace std;
 using namespace Pegasus;
 using namespace ClusterMonitoring;
 
-
-
 static CIMInstance
 buildClusterInstance(counting_auto_ptr<Cluster>& cluster, Boolean qual, Boolean orig);
 static CIMInstance
@@ -53,7 +48,6 @@
 static CIMInstance
 buildServiceInstance(counting_auto_ptr<Service>& service, Boolean qual, Boolean orig);
 
-
 static CIMObjectPath
 buildClusterInstancePath(counting_auto_ptr<Cluster>& cluster, const CIMNamespaceName& nameSpace);
 static CIMObjectPath
@@ -61,9 +55,7 @@
 static CIMObjectPath
 buildServiceInstancePath(counting_auto_ptr<Service>& service, const CIMNamespaceName& nameSpace);
 
-
-static Pegasus::String
-hostname(void);
+static Pegasus::String hostname(void);
 
 
 ClusterProvider::ClusterProvider(void) throw()
@@ -77,7 +69,6 @@
   set_logger(counting_auto_ptr<Logger>(new Logger()));
 }
 
-
 // CIMProvider interface
 void
 ClusterProvider::initialize (CIMOMHandle& cimom)
@@ -92,7 +83,6 @@
   delete this;
 }
 
-
 // CIMInstanceProvider interface
 void
 ClusterProvider::getInstance(const OperationContext &context,
--- conga/ricci/modules/cluster/clumon/src/cim-provider/ClusterProvider.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/cim-provider/ClusterProvider.h	2007/09/18 20:16:25	1.3
@@ -1,28 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef ClusterProvider_h
-#define ClusterProvider_h
+#ifndef __CONGA_MODCLUSTER_CIM_CLUSTERPROVIDER_H
+#define __CONGA_MODCLUSTER_CIM_CLUSTERPROVIDER_H
 
 #include <Pegasus/Common/Config.h>
 #include <Pegasus/Provider/CIMInstanceProvider.h>
@@ -31,114 +30,117 @@
 #include "Cluster.h"
 #include "ClusterMonitor.h"
 
-
 namespace ClusterMonitoring
 {
 
-
 #define CLUSTER_PROVIDER_CLASSNAME Pegasus::String("RedHatClusterProvider")
 #define CLUSTER_SERVICE_CLASSNAME "RedHat_ClusterFailoverService"
 #define CLUSTER_NODE_CLASSNAME "RedHat_ClusterNode"
 #define CLUSTER_CLASSNAME "RedHat_Cluster"
-//#define CLUSTER_PARTICIPATING_NODE_CLASSNAME "RedHat_ClusterParticipatingNode"
-//#define CLUSTER_HOSTING_FAILOVER_SERVICE_CLASSNAME "RedHat_ClusterHostingFailoverService"
-//#define CLUSTER_NODE_HOSTING_FAILOVER_SERVICE_CLASSNAME "RedHat_ClusterNodeHostingFailoverService"
-
 
+/*
+#define CLUSTER_PARTICIPATING_NODE_CLASSNAME "RedHat_ClusterParticipatingNode"
+#define CLUSTER_HOSTING_FAILOVER_SERVICE_CLASSNAME "RedHat_ClusterHostingFailoverService"
+#define CLUSTER_NODE_HOSTING_FAILOVER_SERVICE_CLASSNAME "RedHat_ClusterNodeHostingFailoverService"
+*/
 
 class ClusterProvider :
-  public Pegasus::CIMInstanceProvider  //, public Pegasus::CIMAssociationProvider
+	public Pegasus::CIMInstanceProvider //, public Pegasus::CIMAssociationProvider
 {
- public:
-  ClusterProvider (void) throw ();
-  virtual ~ClusterProvider (void) throw ();
-
-  // CIMProvider interface
-  virtual void initialize (Pegasus::CIMOMHandle& cimom);
-  virtual void terminate (void);
-
-  // CIMInstanceProvider interface
-  virtual void getInstance(
-			   const Pegasus::OperationContext & context,
-			   const Pegasus::CIMObjectPath & ref,
-			   const Pegasus::Boolean includeQualifiers,
-			   const Pegasus::Boolean includeClassOrigin,
-			   const Pegasus::CIMPropertyList & propertyList,
-			   Pegasus::InstanceResponseHandler & handler);
-  virtual void enumerateInstances(
-				  const Pegasus::OperationContext & context,
-				  const Pegasus::CIMObjectPath & ref,
-				  const Pegasus::Boolean includeQualifiers,
-				  const Pegasus::Boolean includeClassOrigin,
-				  const Pegasus::CIMPropertyList & propertyList,
-				  Pegasus::InstanceResponseHandler & handler);
-  virtual void enumerateInstanceNames(
-				      const Pegasus::OperationContext & context,
-				      const Pegasus::CIMObjectPath & ref,
-				      Pegasus::ObjectPathResponseHandler & handler);
-  virtual void modifyInstance(
-			      const Pegasus::OperationContext & context,
-			      const Pegasus::CIMObjectPath & ref,
-			      const Pegasus::CIMInstance & obj,
-			      const Pegasus::Boolean includeQualifiers,
-			      const Pegasus::CIMPropertyList & propertyList,
-			      Pegasus::ResponseHandler & handler);
-  virtual void createInstance(
-			      const Pegasus::OperationContext & context,
-			      const Pegasus::CIMObjectPath & ref,
-			      const Pegasus::CIMInstance & obj,
-			      Pegasus::ObjectPathResponseHandler & handler);
-  virtual void deleteInstance(
-			      const Pegasus::OperationContext & context,
-			      const Pegasus::CIMObjectPath & ref,
-			      Pegasus::ResponseHandler & handler);
-
-  /*
-  // CIMAssociationProvider
-  virtual void associatorNames(
-			       const Pegasus::OperationContext& context,
-			       const Pegasus::CIMObjectPath& objectName,
-			       const Pegasus::CIMName& associationClass,
-			       const Pegasus::CIMName& resultClass,
-			       const Pegasus::String& role,
-			       const Pegasus::String& resultRole,
-			       Pegasus::ObjectPathResponseHandler& handler) ;
-
-  virtual void associators(const Pegasus::OperationContext& context,
-			   const Pegasus::CIMObjectPath& objectName,
-			   const Pegasus::CIMName& associationClass,
-			   const Pegasus::CIMName& resultClass,
-			   const Pegasus::String& role,
-			   const Pegasus::String& resultRole,
-			   const Pegasus::Boolean includeQualifiers,
-			   const Pegasus::Boolean includeClassOrigin,
-			   const Pegasus::CIMPropertyList& propertyList,
-			   Pegasus::ObjectResponseHandler& handler);
-
-  virtual void referenceNames(const Pegasus::OperationContext& context,
-			      const Pegasus::CIMObjectPath& objectName,
-			      const Pegasus::CIMName& resultClass,
-			      const Pegasus::String& role,
-			      Pegasus::ObjectPathResponseHandler& handler);
-
-  virtual void references(const Pegasus::OperationContext& context,
-			  const Pegasus::CIMObjectPath& objectName,
-			  const Pegasus::CIMName& resultClass,
-			  const Pegasus::String& role,
-			  const Pegasus::Boolean includeQualifiers,
-			  const Pegasus::Boolean includeClassOrigin,
-			  const Pegasus::CIMPropertyList& propertyList,
-			  Pegasus::ObjectResponseHandler& handler);
-  */
-
- private:
-  void log(const Pegasus::String& str);
-  ClusterMonitor _monitor;
-
-};  // class ClusterProvider
-
+	public:
+		ClusterProvider(void) throw ();
+		virtual ~ClusterProvider(void) throw ();
+
+		// CIMProvider interface
+		virtual void initialize(Pegasus::CIMOMHandle& cimom);
+		virtual void terminate(void);
+
+		// CIMInstanceProvider interface
+		virtual void getInstance(
+								const Pegasus::OperationContext & context,
+								const Pegasus::CIMObjectPath & ref,
+								const Pegasus::Boolean includeQualifiers,
+								const Pegasus::Boolean includeClassOrigin,
+								const Pegasus::CIMPropertyList & propertyList,
+								Pegasus::InstanceResponseHandler & handler);
+
+		virtual void enumerateInstances(
+								const Pegasus::OperationContext & context,
+								const Pegasus::CIMObjectPath & ref,
+								const Pegasus::Boolean includeQualifiers,
+								const Pegasus::Boolean includeClassOrigin,
+								const Pegasus::CIMPropertyList & propertyList,
+								Pegasus::InstanceResponseHandler & handler);
+
+		virtual void enumerateInstanceNames(
+								const Pegasus::OperationContext & context,
+								const Pegasus::CIMObjectPath & ref,
+								Pegasus::ObjectPathResponseHandler & handler);
+
+		virtual void modifyInstance(
+								const Pegasus::OperationContext & context,
+								const Pegasus::CIMObjectPath & ref,
+								const Pegasus::CIMInstance & obj,
+								const Pegasus::Boolean includeQualifiers,
+								const Pegasus::CIMPropertyList & propertyList,
+								Pegasus::ResponseHandler & handler);
+
+		virtual void createInstance(
+								const Pegasus::OperationContext & context,
+								const Pegasus::CIMObjectPath & ref,
+								const Pegasus::CIMInstance & obj,
+								Pegasus::ObjectPathResponseHandler & handler);
+
+		virtual void deleteInstance(
+								const Pegasus::OperationContext & context,
+								const Pegasus::CIMObjectPath & ref,
+								Pegasus::ResponseHandler & handler);
+
+	/*
+	// CIMAssociationProvider
+	virtual void associatorNames(
+					const Pegasus::OperationContext& context,
+					const Pegasus::CIMObjectPath& objectName,
+					const Pegasus::CIMName& associationClass,
+					const Pegasus::CIMName& resultClass,
+					const Pegasus::String& role,
+					const Pegasus::String& resultRole,
+					Pegasus::ObjectPathResponseHandler& handler);
+
+	virtual void associators(	const Pegasus::OperationContext& context,
+								const Pegasus::CIMObjectPath& objectName,
+								const Pegasus::CIMName& associationClass,
+								const Pegasus::CIMName& resultClass,
+								const Pegasus::String& role,
+								const Pegasus::String& resultRole,
+								const Pegasus::Boolean includeQualifiers,
+								const Pegasus::Boolean includeClassOrigin,
+								const Pegasus::CIMPropertyList& propertyList,
+								Pegasus::ObjectResponseHandler& handler);
+
+	virtual void referenceNames(
+					const Pegasus::OperationContext& context,
+					const Pegasus::CIMObjectPath& objectName,
+					const Pegasus::CIMName& resultClass,
+					const Pegasus::String& role,
+					Pegasus::ObjectPathResponseHandler& handler);
+
+	virtual void references(const Pegasus::OperationContext& context,
+							const Pegasus::CIMObjectPath& objectName,
+							const Pegasus::CIMName& resultClass,
+							const Pegasus::String& role,
+							const Pegasus::Boolean includeQualifiers,
+							const Pegasus::Boolean includeClassOrigin,
+							const Pegasus::CIMPropertyList& propertyList,
+							Pegasus::ObjectResponseHandler& handler);
+	*/
+
+	private:
+		void log(const Pegasus::String& str);
+		ClusterMonitor _monitor;
+};
 
-}; // namespace ClusterMonitoring
 
+};
 
 #endif
--- conga/ricci/modules/cluster/clumon/src/cim-provider/ClusterProviderMain.cpp	2007/09/11 02:45:27	1.3
+++ conga/ricci/modules/cluster/clumon/src/cim-provider/ClusterProviderMain.cpp	2007/09/18 20:16:25	1.4
@@ -1,40 +1,37 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include <Pegasus/Common/Config.h>
 #include <Pegasus/Common/String.h>
 
 #include "ClusterProvider.h"
 
-
 using namespace Pegasus;
 
 extern "C" PEGASUS_EXPORT Pegasus::CIMProvider* PegasusCreateProvider(const Pegasus::String &providerName)
 {
-  if (Pegasus::String::equalNoCase(providerName, "RedHatClusterProvider"))
-    {
-      return new ClusterMonitoring::ClusterProvider();
-    }
+	if (Pegasus::String::equalNoCase(providerName, "RedHatClusterProvider")) {
+		return new ClusterMonitoring::ClusterProvider();
+	}
 
-  return (0);
+	return (0);
 }
--- conga/ricci/modules/cluster/clumon/src/cim-provider/SmartHandler.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/cim-provider/SmartHandler.h	2007/09/18 20:16:25	1.3
@@ -1,48 +1,42 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef SmartHandler_h
-#define SmartHandler_h
-
+#ifndef __CONGA_MODCLUSTER_CIM_SMARTHANDLER_H
+#define __CONGA_MODCLUSTER_CIM_SMARTHANDLER_H
 
 namespace ClusterMonitoring
 {
 
-
 template<class cl>
 class SmartHandler
 {
- public:
-  SmartHandler(cl &handler) : _handler(handler) { _handler.processing(); }
-  virtual ~SmartHandler(void) { _handler.complete(); }
-
- private:
-  cl& _handler;
-
-};  // class SmartHandler
-
-
-};  // namespace ClusterMonitoring
+	public:
+		SmartHandler(cl &handler) : _handler(handler) { _handler.processing(); }
+		virtual ~SmartHandler(void) { _handler.complete(); }
+
+	private:
+		cl& _handler;
+};
 
+};
 
 #endif
--- conga/ricci/modules/cluster/clumon/src/cim-provider/clusterCIM_test.cpp	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/cim-provider/clusterCIM_test.cpp	2007/09/18 20:16:25	1.3
@@ -1,161 +1,166 @@
+/*
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
+*/
+
 #include "clusterCIM_test.h"
 
 #include <Pegasus/Common/SSLContext.h>
 
-
 PEGASUS_USING_PEGASUS;
 PEGASUS_USING_STD;
 
-
 int
-main(int argc, char** argv)
+main(int argc, char **argv)
 {
-  try
-    {
-      CIMClient               client;
-      string hostname;
-
-      if (argc == 1) {
-	cout << "Enter hostname: ";
-	cin >> hostname;
-      }
-      else if (argc == 2)
-	hostname = argv[1];
-      else {
-	cout << "Usage:" << endl;
-	cout << "      " << argv[0] << " <hostname>" << endl;
-	return 1;
-      }
-
-      // connect
-
-      if (hostname == "localhost")
-	client.connectLocal();
-      else {
-	string username, password;
-	cout << "Enter username: ";
-	cin >> username;
-	cout << "Enter password for user \"" + username + "\" on \"" + hostname + "\": ";
-	cin >> password;
-
-	client.connect(hostname.c_str(),
-		       PEGASUS_PORT,
-		       SSLContext("", NULL),
-		       username.c_str(),
-		       password.c_str());
-      }
-
-      // print
-
-      printClusters(client);
-      printNodes(client);
-      printServices(client);
-    }
-  catch(Exception& e)
-    {
-      cerr << "Error: " << e.getMessage() << endl;
-      exit(1);
-    }
+	try {
+		CIMClient client;
+		string hostname;
+
+		if (argc == 1) {
+			cout << "Enter hostname: ";
+			cin >> hostname;
+		} else if (argc == 2)
+			hostname = argv[1];
+		else {
+			cout << "Usage:" << endl;
+			cout << "\t" << argv[0] << " <hostname>" << endl;
+			return 1;
+		}
+
+		// connect
+		if (hostname == "localhost")
+			client.connectLocal();
+		else {
+			string username, password;
+			cout << "Enter username: ";
+			cin >> username;
+			cout << "Enter password for user \"" + username + "\" on \"" + hostname + "\": ";
+			cin >> password;
+
+			client.connect(hostname.c_str(),
+				PEGASUS_PORT,
+				SSLContext("", NULL),
+				username.c_str(),
+				password.c_str());
+		}
+
+		// print
+		printClusters(client);
+		printNodes(client);
+		printServices(client);
+	} catch(Exception& e) {
+		cerr << "Error: " << e.getMessage() << endl;
+		exit(1);
+	}
 
-  return 0;
+	return 0;
 }
 
-
 void
 printClusters(CIMClient& client)
 {
-  const CIMNamespaceName NAMESPACE = CIMNamespaceName("root/cimv2");
-  const CIMName CLASSNAME = CIMName("RedHat_Cluster");
+	const CIMNamespaceName NAMESPACE = CIMNamespaceName("root/cimv2");
+	const CIMName CLASSNAME = CIMName("RedHat_Cluster");
 
-  Boolean                 deepInheritance = true;
-  Boolean                 localOnly = true;
-  Boolean                 includeQualifiers = false;
-  Boolean                 includeClassOrigin = false;
-  Array<CIMInstance>      cimInstances;
-
-  //
-  // Enumerate Instances.
-  //
-  cimInstances = client.enumerateInstances(NAMESPACE,
-					   CLASSNAME,
-					   deepInheritance,
-					   localOnly,
-					   includeQualifiers,
-					   includeClassOrigin );
-  int size = cimInstances.size();
-  if (size == 0)
-    cout << "Cluster info is not accessible" << endl;
-  for (int i=0; i<size; i++) {
-    cout << "Cluster: " << endl;
-    printInstance("\t", cimInstances[i]);
-  }
+	Boolean deepInheritance = true;
+	Boolean localOnly = true;
+	Boolean includeQualifiers = false;
+	Boolean includeClassOrigin = false;
+	Array<CIMInstance> cimInstances;
+
+	// Enumerate Instances.
+	cimInstances = client.enumerateInstances(NAMESPACE,
+						CLASSNAME,
+						deepInheritance,
+						localOnly,
+						includeQualifiers,
+						includeClassOrigin);
+
+	int size = cimInstances.size();
+	if (size == 0)
+		cout << "Cluster info is not accessible" << endl;
+
+	for (int i = 0 ; i < size ; i++) {
+		cout << "Cluster: " << endl;
+		printInstance("\t", cimInstances[i]);
+	}
 }
 
 void
 printNodes(CIMClient& client)
 {
-  const CIMNamespaceName NAMESPACE = CIMNamespaceName("root/cimv2");
-  const CIMName CLASSNAME = CIMName("RedHat_ClusterNode");
+	const CIMNamespaceName NAMESPACE = CIMNamespaceName("root/cimv2");
+	const CIMName CLASSNAME = CIMName("RedHat_ClusterNode");
 
-  Boolean                 deepInheritance = true;
-  Boolean                 localOnly = true;
-  Boolean                 includeQualifiers = false;
-  Boolean                 includeClassOrigin = false;
-  Array<CIMInstance>      cimInstances;
-
-  //
-  // Enumerate Instances.
-  //
-  cimInstances = client.enumerateInstances(NAMESPACE,
-					   CLASSNAME,
-					   deepInheritance,
-					   localOnly,
-					   includeQualifiers,
-					   includeClassOrigin );
-  int size = cimInstances.size();
-  for (int i=0; i<size; i++) {
-    cout << "\tNode: " << endl;
-    printInstance("\t\t", cimInstances[i]);
-  }
+	Boolean deepInheritance = true;
+	Boolean localOnly = true;
+	Boolean includeQualifiers = false;
+	Boolean includeClassOrigin = false;
+	Array<CIMInstance> cimInstances;
+
+	// Enumerate Instances.
+	cimInstances = client.enumerateInstances(NAMESPACE,
+						CLASSNAME,
+						deepInheritance,
+						localOnly,
+						includeQualifiers,
+						includeClassOrigin);
+
+	int size = cimInstances.size();
+	for (int i = 0 ; i < size ; i++) {
+		cout << "\tNode: " << endl;
+		printInstance("\t\t", cimInstances[i]);
+	}
 }
 
 void
 printServices(CIMClient& client)
 {
-  const CIMNamespaceName NAMESPACE = CIMNamespaceName("root/cimv2");
-  const CIMName CLASSNAME = CIMName("RedHat_ClusterFailoverService");
+	const CIMNamespaceName NAMESPACE = CIMNamespaceName("root/cimv2");
+	const CIMName CLASSNAME = CIMName("RedHat_ClusterFailoverService");
 
-  Boolean                 deepInheritance = true;
-  Boolean                 localOnly = true;
-  Boolean                 includeQualifiers = false;
-  Boolean                 includeClassOrigin = false;
-  Array<CIMInstance>      cimInstances;
-
-  //
-  // Enumerate Instances.
-  //
-  cimInstances = client.enumerateInstances(NAMESPACE,
-					   CLASSNAME,
-					   deepInheritance,
-					   localOnly,
-					   includeQualifiers,
-					   includeClassOrigin );
-  int size = cimInstances.size();
-  for (int i=0; i<size; i++) {
-    cout << "\tService: " << endl;
-    printInstance("\t\t", cimInstances[i]);
-  }
+	Boolean deepInheritance = true;
+	Boolean localOnly = true;
+	Boolean includeQualifiers = false;
+	Boolean includeClassOrigin = false;
+	Array<CIMInstance> cimInstances;
+
+	// Enumerate Instances.
+	cimInstances = client.enumerateInstances(NAMESPACE,
+						CLASSNAME,
+						deepInheritance,
+						localOnly,
+						includeQualifiers,
+						includeClassOrigin);
+
+	int size = cimInstances.size();
+	for (int i = 0 ; i < size ; i++) {
+		cout << "\tService: " << endl;
+		printInstance("\t\t", cimInstances[i]);
+	}
 }
 
 void
 printInstance(string tab, CIMInstance& inst)
 {
-  int size = inst.getPropertyCount();
-  for (int i=0; i<size; i++) {
-    CIMProperty prop = inst.getProperty(i);
-
-    cout << tab << prop.getName().getString() << ": ";
-    cout << prop.getValue().toString() << endl;
-
-  }
+	int size = inst.getPropertyCount();
+	for (int i = 0 ; i < size ; i++) {
+		CIMProperty prop = inst.getProperty(i);
+		cout << tab << prop.getName().getString() << ": ";
+		cout << prop.getValue().toString() << endl;
+	}
 }
--- conga/ricci/modules/cluster/clumon/src/cim-provider/clusterCIM_test.h	2006/06/14 21:44:37	1.1
+++ conga/ricci/modules/cluster/clumon/src/cim-provider/clusterCIM_test.h	2007/09/18 20:16:25	1.2
@@ -1,23 +1,37 @@
-#ifndef ClusterClient_h
-#define ClusterClient_h
+/*
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
+*/
+
+#ifndef __CONGA_MODCLUSTER_CIM_TEST_H
+#define __CONGA_MODCLUSTER_CIM_TEST_H
 
 #include <Pegasus/Common/Config.h>
 #include <Pegasus/Common/CIMInstance.h>
 #include <Pegasus/Client/CIMClient.h>
 
-
 PEGASUS_USING_PEGASUS;
 PEGASUS_USING_STD;
 
-
 #define PEGASUS_PORT 5989
 
-
 void printClusters(CIMClient& client);
 void printNodes(CIMClient& client);
 void printServices(CIMClient& client);
 
 void printInstance(string tab, CIMInstance& inst);
 
-
 #endif
--- conga/ricci/modules/cluster/clumon/src/common/Cluster.cpp	2007/09/04 18:28:40	1.7
+++ conga/ricci/modules/cluster/clumon/src/common/Cluster.cpp	2007/09/18 20:16:26	1.8
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "Cluster.h"
 
 #include <stdio.h>
--- conga/ricci/modules/cluster/clumon/src/common/ClusterMonitor.cpp	2007/09/11 00:26:52	1.4
+++ conga/ricci/modules/cluster/clumon/src/common/ClusterMonitor.cpp	2007/09/18 20:16:26	1.5
@@ -1,37 +1,34 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "ClusterMonitor.h"
 #include "Socket.h"
 #include "Time.h"
 
-#include <sys/poll.h>
 #include <errno.h>
-
+#include <sys/poll.h>
 
 using namespace ClusterMonitoring;
 
-
 ClusterMonitor::ClusterMonitor(const String& socket_path) :
 	_sock_path(socket_path)
 {}
--- conga/ricci/modules/cluster/clumon/src/common/Node.cpp	2007/09/04 18:28:40	1.5
+++ conga/ricci/modules/cluster/clumon/src/common/Node.cpp	2007/09/18 20:16:26	1.6
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "Cluster.h"
 
 using namespace std;
--- conga/ricci/modules/cluster/clumon/src/common/Service.cpp	2007/09/04 18:28:40	1.4
+++ conga/ricci/modules/cluster/clumon/src/common/Service.cpp	2007/09/18 20:16:26	1.5
@@ -1,33 +1,30 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "Cluster.h"
 
-
 using namespace ClusterMonitoring;
 using namespace std;
 
-
 Service::Service(const String& name,
 		 const String& clustername,
 		 const Node& node,
--- conga/ricci/modules/cluster/clumon/src/daemon/Communicator.cpp	2007/09/05 22:27:29	1.6
+++ conga/ricci/modules/cluster/clumon/src/daemon/Communicator.cpp	2007/09/18 20:16:27	1.7
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "Communicator.h"
 #include "array_auto_ptr.h"
 #include "Logger.h"
@@ -38,14 +37,12 @@
 using namespace ClusterMonitoring;
 using namespace std;
 
-
 CommDP::CommDP()
 {}
 
 CommDP::~CommDP()
 {}
 
-
 Communicator::Communicator(unsigned short port, CommDP& delivery_point) :
 	_port(port),
 	_serv_sock(_port),
--- conga/ricci/modules/cluster/clumon/src/daemon/Communicator.h	2007/09/04 18:28:40	1.4
+++ conga/ricci/modules/cluster/clumon/src/daemon/Communicator.h	2007/09/18 20:16:27	1.5
@@ -1,28 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef __CONGA_CLUSTER_COMMUNICATOR_H
-#define __CONGA_CLUSTER_COMMUNICATOR_H
+#ifndef __CONGA_MODCLUSTERD_COMMUNICATOR_H
+#define __CONGA_MODCLUSTERD_COMMUNICATOR_H
 
 #include "Thread.h"
 #include "Mutex.h"
@@ -33,7 +32,6 @@
 #include <vector>
 #include <map>
 
-
 namespace ClusterMonitoring
 {
 
@@ -81,7 +79,6 @@
 		Communicator& operator= (const Communicator&);
 };
 
-
 };
 
 #endif
--- conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp	2007/09/05 22:27:29	1.17
+++ conga/ricci/modules/cluster/clumon/src/daemon/Monitor.cpp	2007/09/18 20:16:27	1.18
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "Monitor.h"
 #include "executils.h"
 #include "Logger.h"
@@ -33,7 +32,6 @@
 
 #include <algorithm>
 
-
 using namespace ClusterMonitoring;
 using namespace std;
 
--- conga/ricci/modules/cluster/clumon/src/daemon/Monitor.h	2007/09/04 18:28:40	1.7
+++ conga/ricci/modules/cluster/clumon/src/daemon/Monitor.h	2007/09/18 20:16:27	1.8
@@ -1,28 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef __CONGA_CLUSTER_MONITOR_H
-#define __CONGA_CLUSTER_MONITOR_H
+#ifndef __CONGA_MODCLUSTERD_MONITOR_H
+#define __CONGA_MODCLUSTERD_MONITOR_H
 
 #include "String.h"
 #include <map>
--- conga/ricci/modules/cluster/clumon/src/daemon/Peer.cpp	2007/09/04 18:28:40	1.4
+++ conga/ricci/modules/cluster/clumon/src/daemon/Peer.cpp	2007/09/18 20:16:27	1.5
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "Peer.h"
 #include "Logger.h"
 
--- conga/ricci/modules/cluster/clumon/src/daemon/Peer.h	2007/09/04 18:28:40	1.3
+++ conga/ricci/modules/cluster/clumon/src/daemon/Peer.h	2007/09/18 20:16:27	1.4
@@ -1,27 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-#ifndef __CONGA_CLUSTER_PEER_H
-#define __CONGA_CLUSTER_PEER_H
+#ifndef __CONGA_MODCLUSTERD_PEER_H
+#define __CONGA_MODCLUSTERD_PEER_H
 
 #include "counting_auto_ptr.h"
 #include "Socket.h"
@@ -29,7 +29,6 @@
 #include <vector>
 #include "String.h"
 
-
 namespace ClusterMonitoring
 {
 
--- conga/ricci/modules/cluster/clumon/src/daemon/main.cpp	2007/09/04 18:28:40	1.6
+++ conga/ricci/modules/cluster/clumon/src/daemon/main.cpp	2007/09/18 20:16:27	1.7
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include <unistd.h>
 #include <sys/types.h>
 #include <signal.h>
--- conga/ricci/modules/cluster/clumon/src/include/Cluster.h	2007/09/04 18:28:40	1.7
+++ conga/ricci/modules/cluster/clumon/src/include/Cluster.h	2007/09/18 20:16:27	1.8
@@ -1,28 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef __CONGA_MODCLUSTER_CLUSTER_H
-#define __CONGA_MODCLUSTER_CLUSTER_H
+#ifndef __CONGA_MODCLUSTERD_CLUSTER_H
+#define __CONGA_MODCLUSTERD_CLUSTER_H
 
 #include <counting_auto_ptr.h>
 #include "String.h"
@@ -31,7 +30,6 @@
 
 #include "XML.h"
 
-
 namespace ClusterMonitoring
 {
 
@@ -39,7 +37,6 @@
 class Service;
 class Cluster;
 
-
 String cluster2xml(Cluster& cluster);
 counting_auto_ptr<Cluster> xml2cluster(const String& xml);
 
--- conga/ricci/modules/cluster/clumon/src/include/ClusterMonitor.h	2007/09/04 18:28:40	1.3
+++ conga/ricci/modules/cluster/clumon/src/include/ClusterMonitor.h	2007/09/18 20:16:27	1.4
@@ -1,28 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef __CONGA_CLUSTERMONITOR_H
-#define __CONGA_CLUSTERMONITOR_H
+#ifndef __CONGA_MODCLUSTERD_CLUSTERMONITOR_H
+#define __CONGA_MODCLUSTERD_CLUSTERMONITOR_H
 
 #include "Cluster.h"
 #include "counting_auto_ptr.h"
@@ -30,7 +29,6 @@
 
 #include "String.h"
 
-
 namespace ClusterMonitoring
 {
 
--- conga/ricci/modules/cluster/clumon/src/include/clumond_globals.h	2007/09/04 18:28:40	1.2
+++ conga/ricci/modules/cluster/clumon/src/include/clumond_globals.h	2007/09/18 20:16:27	1.3
@@ -1,29 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef clumond_globals_h
-#define clumond_globals_h
-
+#ifndef __CONGA_MODCLUSTERD_GLOBALS_H
+#define __CONGA_MODCLUSTERD_GLOBALS_H
 
 #define COMMUNICATION_PORT			16851
 #define MONITORING_CLIENT_SOCKET	"/var/run/clumond.sock"
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp	2007/09/11 02:45:27	1.4
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp	2007/09/18 20:16:27	1.5
@@ -1,27 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.scalar.conf,v 1.7 2003/04/08 14:57:04 dts12 Exp $
+ * : mib2c.scalar.conf,v 1.7 2003/04/08 14:57:04 dts12 Exp $
  */
 
 
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.h	2007/09/18 20:16:27	1.3
@@ -1,66 +1,62 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.scalar.conf,v 1.7 2003/04/08 14:57:04 dts12 Exp $
+ * : mib2c.scalar.conf,v 1.7 2003/04/08 14:57:04 dts12 Exp $
  */
 
 
-#ifndef clusterMIB_h
-#define clusterMIB_h
+#ifndef __CONGA_MODCLUSTER_SNMP_CLUSTERMIB_H
+#define __CONGA_MODCLUSTER_SNMP_CLUSTERMIB_H
 
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
-
 void initialize_clusterMIB(void);
 
 extern "C"
 {
-
-Netsnmp_Node_Handler handle_rhcMIBVersion;
-Netsnmp_Node_Handler handle_rhcClusterName;
-Netsnmp_Node_Handler handle_rhcClusterStatusCode;
-Netsnmp_Node_Handler handle_rhcClusterStatusDesc;
-Netsnmp_Node_Handler handle_rhcClusterVotes;
-Netsnmp_Node_Handler handle_rhcClusterQuorate;
-Netsnmp_Node_Handler handle_rhcClusterFailedServicesNum;
-Netsnmp_Node_Handler handle_rhcClusterFailedServicesNames;
-Netsnmp_Node_Handler handle_rhcClusterStoppedServicesNum;
-Netsnmp_Node_Handler handle_rhcClusterStoppedServicesNames;
-Netsnmp_Node_Handler handle_rhcClusterAvailNodesNum;
-Netsnmp_Node_Handler handle_rhcClusterAvailNodesNames;
-Netsnmp_Node_Handler handle_rhcClusterServicesNum;
-Netsnmp_Node_Handler handle_rhcClusterServicesNames;
-Netsnmp_Node_Handler handle_rhcClusterUnavailNodesNum;
-Netsnmp_Node_Handler handle_rhcClusterUnavailNodesNames;
-Netsnmp_Node_Handler handle_rhcClusterNodesNum;
-Netsnmp_Node_Handler handle_rhcClusterNodesNames;
-Netsnmp_Node_Handler handle_rhcClusterRunningServicesNum;
-Netsnmp_Node_Handler handle_rhcClusterRunningServicesNames;
-Netsnmp_Node_Handler handle_rhcClusterVotesNeededForQuorum;
-
+	Netsnmp_Node_Handler handle_rhcMIBVersion;
+	Netsnmp_Node_Handler handle_rhcClusterName;
+	Netsnmp_Node_Handler handle_rhcClusterStatusCode;
+	Netsnmp_Node_Handler handle_rhcClusterStatusDesc;
+	Netsnmp_Node_Handler handle_rhcClusterVotes;
+	Netsnmp_Node_Handler handle_rhcClusterQuorate;
+	Netsnmp_Node_Handler handle_rhcClusterFailedServicesNum;
+	Netsnmp_Node_Handler handle_rhcClusterFailedServicesNames;
+	Netsnmp_Node_Handler handle_rhcClusterStoppedServicesNum;
+	Netsnmp_Node_Handler handle_rhcClusterStoppedServicesNames;
+	Netsnmp_Node_Handler handle_rhcClusterAvailNodesNum;
+	Netsnmp_Node_Handler handle_rhcClusterAvailNodesNames;
+	Netsnmp_Node_Handler handle_rhcClusterServicesNum;
+	Netsnmp_Node_Handler handle_rhcClusterServicesNames;
+	Netsnmp_Node_Handler handle_rhcClusterUnavailNodesNum;
+	Netsnmp_Node_Handler handle_rhcClusterUnavailNodesNames;
+	Netsnmp_Node_Handler handle_rhcClusterNodesNum;
+	Netsnmp_Node_Handler handle_rhcClusterNodesNames;
+	Netsnmp_Node_Handler handle_rhcClusterRunningServicesNum;
+	Netsnmp_Node_Handler handle_rhcClusterRunningServicesNames;
+	Netsnmp_Node_Handler handle_rhcClusterVotesNeededForQuorum;
 };
 
-
-#endif  /* clusterMIB_h */
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMonitorSnmp.cpp	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMonitorSnmp.cpp	2007/09/18 20:16:27	1.3
@@ -1,44 +1,41 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "clusterMonitorSnmp.h"
 #include "clusterMIB.h"
 #include "nodesMIB.h"
 #include "servicesMIB.h"
 #include "clumond_globals.h"
 
-
 ClusterMonitoring::ClusterMonitor monitor;
 
 void
 init_RedHatCluster(void)
 {
-  try {
-    initialize_clusterMIB();
-    initialize_nodesMIB();
-    initialize_servicesMIB();
+	try {
+		initialize_clusterMIB();
+		initialize_nodesMIB();
+		initialize_servicesMIB();
 
-    // TODO: initialize others
-  } catch ( ... )
-    {}
+		// TODO: initialize others
+	} catch ( ... ) {}
 }
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMonitorSnmp.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMonitorSnmp.h	2007/09/18 20:16:27	1.3
@@ -1,39 +1,37 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.scalar.conf,v 1.7 2003/04/08 14:57:04 dts12 Exp $
+ * : mib2c.scalar.conf,v 1.7 2003/04/08 14:57:04 dts12 Exp $
  */
 
-
-#ifndef clusterMonitorSnmp_h
-#define clusterMonitorSnmp_h
+#ifndef __CONGA_MODCLUSTER_SNMP_CLUSTERMONITORSNMP_H
+#define __CONGA_MODCLUSTER_SNMP_CLUSTERMONITORSNMP_H
 
 #include "ClusterMonitor.h"
 
 extern ClusterMonitoring::ClusterMonitor monitor;
 
-
 // called by snmpd
 extern "C" void init_RedHatCluster(void);
 
-#endif  /* clusterMonitorSnmp_h */
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB.cpp	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB.cpp	2007/09/18 20:16:27	1.3
@@ -1,341 +1,327 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.iterate_access.conf,v 1.6 2003/09/29 22:30:36 hardaker Exp $
+ * : mib2c.iterate_access.conf,v 1.6 2003/09/29 22:30:36 hardaker Exp $
  */
 
-
 #include "nodesMIB.h"
 #include "nodesMIB_checkfns.h"
 #include "nodesMIB_access.h"
 
-
 void
 initialize_nodesMIB(void)
 {
-  init_rhcNodesTable();
+	init_rhcNodesTable();
 }
 
-
-
 static netsnmp_oid_stash_node *undoStorage = NULL;
 static netsnmp_oid_stash_node *commitStorage = NULL;
 
 struct undoInfo {
-    void           *ptr;
-    size_t          len;
+	void *ptr;
+	size_t len;
 };
 
 struct commitInfo {
-    void           *data_context;
-    int             have_committed;
-    int             new_row;
+	void *data_context;
+	int have_committed;
+	int new_row;
 };
 
-
 void
 rhcNodesTable_free_undoInfo(void *vptr)
 {
-  struct undoInfo *ui = (struct undoInfo*) vptr;
-  if (!ui)
-    return;
-  SNMP_FREE(ui->ptr);
-  SNMP_FREE(ui);
+	struct undoInfo *ui = (struct undoInfo *) vptr;
+	if (!ui)
+		return;
+	SNMP_FREE(ui->ptr);
+	SNMP_FREE(ui);
 }
 
 /** Initialize the rhcNodesTable table by defining its contents and how it's structured */
 void
 initialize_table_rhcNodesTable(void)
 {
-    static oid      rhcNodesTable_oid[] =
-        { 1, 3, 6, 1, 4, 1, 2312, 8, 3, 1 };
-    netsnmp_table_registration_info *table_info;
-    netsnmp_handler_registration *my_handler;
-    netsnmp_iterator_info *iinfo;
-
-    /** create the table registration information structures */
-    table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
-    iinfo = SNMP_MALLOC_TYPEDEF(netsnmp_iterator_info);
-
-    /** if your table is read only, it's easiest to change the
-        HANDLER_CAN_RWRITE definition below to HANDLER_CAN_RONLY */
-    my_handler = netsnmp_create_handler_registration("rhcNodesTable",
-                                                     rhcNodesTable_handler,
-                                                     rhcNodesTable_oid,
-                                                     OID_LENGTH
-                                                     (rhcNodesTable_oid),
-                                                     HANDLER_CAN_RONLY);
-
-    if (!my_handler || !table_info || !iinfo) {
-        snmp_log(LOG_ERR,
-                 "malloc failed in initialize_table_rhcNodesTable");
-        return; /** Serious error. */
-    }
-
-    /***************************************************
-     * Setting up the table's definition
-     */
-    netsnmp_table_helper_add_indexes(table_info, ASN_OCTET_STR,
-				     /** index: rhcNodeName */
-                                     0);
-
-    /** Define the minimum and maximum accessible columns.  This
-        optimizes retrival. */
-    table_info->min_column = 1;
-    table_info->max_column = 5;
-
-    /** iterator access routines */
-    iinfo->get_first_data_point = rhcNodesTable_get_first_data_point;
-    iinfo->get_next_data_point = rhcNodesTable_get_next_data_point;
-
-    /** you may wish to set these as well */
-    //#ifdef MAYBE_USE_THESE
-    iinfo->make_data_context = rhcNodesTable_context_convert_function;
-    iinfo->free_data_context = rhcNodesTable_data_free;
-
-    /** pick *only* one of these if you use them */
-    //iinfo->free_loop_context = rhcNodesTable_loop_free;
-    iinfo->free_loop_context_at_end = rhcNodesTable_loop_free;
-    //#endif
-
-    /** tie the two structures together */
-    iinfo->table_reginfo = table_info;
-
-    /***************************************************
-     * registering the table with the master agent
-     */
-    DEBUGMSGTL(("initialize_table_rhcNodesTable",
-                "Registering table rhcNodesTable as a table iterator\n"));
-    netsnmp_register_table_iterator(my_handler, iinfo);
+	static oid rhcNodesTable_oid[] = { 1, 3, 6, 1, 4, 1, 2312, 8, 3, 1 };
+	netsnmp_table_registration_info *table_info;
+	netsnmp_handler_registration *my_handler;
+	netsnmp_iterator_info *iinfo;
+
+	/** create the table registration information structures */
+	table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
+	iinfo = SNMP_MALLOC_TYPEDEF(netsnmp_iterator_info);
+
+	/** if your table is read only, it's easiest to change the
+		HANDLER_CAN_RWRITE definition below to HANDLER_CAN_RONLY */
+	my_handler = netsnmp_create_handler_registration("rhcNodesTable",
+					rhcNodesTable_handler,
+					rhcNodesTable_oid,
+					OID_LENGTH
+					(rhcNodesTable_oid),
+					HANDLER_CAN_RONLY);
+
+	if (!my_handler || !table_info || !iinfo) {
+		snmp_log(LOG_ERR, "malloc failed in initialize_table_rhcNodesTable");
+		return; /** Serious error. */
+	}
+
+	/***************************************************
+	 * Setting up the table's definition
+	 */
+	netsnmp_table_helper_add_indexes(table_info, ASN_OCTET_STR,
+								/** index: rhcNodeName */ 0);
+
+	/** Define the minimum and maximum accessible columns. This
+		optimizes retrival. */
+	table_info->min_column = 1;
+	table_info->max_column = 5;
+
+	/** iterator access routines */
+	iinfo->get_first_data_point = rhcNodesTable_get_first_data_point;
+	iinfo->get_next_data_point = rhcNodesTable_get_next_data_point;
+
+	/** you may wish to set these as well */
+	//#ifdef MAYBE_USE_THESE
+	iinfo->make_data_context = rhcNodesTable_context_convert_function;
+	iinfo->free_data_context = rhcNodesTable_data_free;
+
+	/** pick *only* one of these if you use them */
+	//iinfo->free_loop_context = rhcNodesTable_loop_free;
+	iinfo->free_loop_context_at_end = rhcNodesTable_loop_free;
+	//#endif
+
+	/** tie the two structures together */
+	iinfo->table_reginfo = table_info;
+
+	/***************************************************
+	 * registering the table with the master agent
+	 */
+	DEBUGMSGTL(("initialize_table_rhcNodesTable",
+		"Registering table rhcNodesTable as a table iterator\n"));
+	netsnmp_register_table_iterator(my_handler, iinfo);
 }
 
 /** Initializes the rhcNodesTable module */
 void
 init_rhcNodesTable(void)
 {
-
-  /** here we initialize all the tables we're planning on supporting */
-    initialize_table_rhcNodesTable();
+	/** here we initialize all the tables we're planning on supporting */
+	initialize_table_rhcNodesTable();
 }
 
 /** handles requests for the rhcNodesTable table, if anything else needs to be done */
 int
-rhcNodesTable_handler(netsnmp_mib_handler *handler,
-                      netsnmp_handler_registration *reginfo,
-                      netsnmp_agent_request_info *reqinfo,
-                      netsnmp_request_info *requests)
+rhcNodesTable_handler(	netsnmp_mib_handler *handler,
+						netsnmp_handler_registration *reginfo,
+						netsnmp_agent_request_info *reqinfo,
+						netsnmp_request_info *requests)
 {
 
-    netsnmp_request_info *request;
-    netsnmp_table_request_info *table_info;
-    netsnmp_variable_list *var;
-    struct commitInfo *ci = NULL;
-
-    void           *data_context = NULL;
-
-    oid            *suffix;
-    size_t          suffix_len;
-
-    /** column and row index encoded portion */
-    suffix = requests->requestvb->name + reginfo->rootoid_len + 1;
-    suffix_len = requests->requestvb->name_length -
-        (reginfo->rootoid_len + 1);
-
-    for (request = requests; request; request = request->next) {
-        var = request->requestvb;
-        if (request->processed != 0)
-            continue;
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-        case MODE_SET_RESERVE1:
-            data_context = netsnmp_extract_iterator_context(request);
-            if (data_context == NULL) {
-                if (reqinfo->mode == MODE_GET) {
-                    netsnmp_set_request_error(reqinfo, request,
-                                              SNMP_NOSUCHINSTANCE);
-                    continue;
-                }
-            }
-            break;
-
-        default:               /* == the other SET modes */
-            ci = (struct commitInfo*) netsnmp_oid_stash_get_data(commitStorage,
-								 suffix + 1, suffix_len - 1);
-            break;
-
-        }
-
-        /** extracts the information about the table from the request */
-        table_info = netsnmp_extract_table_info(request);
-        /** table_info->colnum contains the column number requested */
-        /** table_info->indexes contains a linked list of snmp variable
-           bindings for the indexes of the table.  Values in the list
-           have been set corresponding to the indexes of the
-           request */
-        if (table_info == NULL) {
-            continue;
-        }
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-            switch (table_info->colnum) {
-            case COLUMN_RHCNODENAME:
-                {
-                    char           *retval;
-                    size_t          retval_len = 0;
-                    retval = get_rhcNodeName(data_context, &retval_len);
-                    snmp_set_var_typed_value(var, ASN_OCTET_STR,
-                                             (const u_char *) retval,
-                                             retval_len);
-                }
-                break;
-
-            case COLUMN_RHCNODESTATUSCODE:
-                {
-                    long           *retval;
-                    size_t          retval_len = 0;
-                    retval =
-                        get_rhcNodeStatusCode(data_context, &retval_len);
-                    snmp_set_var_typed_value(var, ASN_INTEGER,
-                                             (const u_char *) retval,
-                                             retval_len);
-                }
-                break;
-
-            case COLUMN_RHCNODESTATUSDESC:
-                {
-                    char           *retval;
-                    size_t          retval_len = 0;
-                    retval =
-                        get_rhcNodeStatusDesc(data_context, &retval_len);
-                    snmp_set_var_typed_value(var, ASN_OCTET_STR,
-                                             (const u_char *) retval,
-                                             retval_len);
-                }
-                break;
-
-            case COLUMN_RHCNODERUNNINGSERVICESNUM:
-                {
-                    long           *retval;
-                    size_t          retval_len = 0;
-                    retval =
-                        get_rhcNodeRunningServicesNum(data_context,
-                                                      &retval_len);
-                    snmp_set_var_typed_value(var, ASN_INTEGER,
-                                             (const u_char *) retval,
-                                             retval_len);
-                }
-                break;
-
-            case COLUMN_RHCNODERUNNINGSERVICESNAMES:
-                {
-                    char           *retval;
-                    size_t          retval_len = 0;
-                    retval =
-                        get_rhcNodeRunningServicesNames(data_context,
-							&retval_len);
-                    snmp_set_var_typed_value(var, ASN_OCTET_STR,
-                                             (const u_char *) retval,
-                                             retval_len);
-                }
-                break;
-
-            default:
-                /** We shouldn't get here */
-                snmp_log(LOG_ERR,
-                         "problem encountered in rhcNodesTable_handler: unknown column\n");
-            }
-            break;
-
-        case MODE_SET_RESERVE1:
-            ci = (struct commitInfo*) netsnmp_oid_stash_get_data(commitStorage,
-								 suffix + 1, suffix_len - 1);
-
-            if (!ci) {
-                    /** create the commit storage info */
-                ci = SNMP_MALLOC_STRUCT(commitInfo);
-                if (!data_context) {
-                    ci->data_context =
-                        rhcNodesTable_create_data_context(table_info->
-                                                          indexes);
-                    ci->new_row = 1;
-                } else {
-                    ci->data_context = data_context;
-                }
-                netsnmp_oid_stash_add_data(&commitStorage,
-                                           suffix + 1, suffix_len - 1, ci);
-            }
-            break;
-
-        case MODE_SET_RESERVE2:
-            switch (table_info->colnum) {
-            default:
-                netsnmp_set_request_error(reqinfo, request,
-                                          SNMP_ERR_NOTWRITABLE);
-                break;
-            }
-            break;
-
-        case MODE_SET_ACTION:
-            /** save a variable copy */
-            switch (table_info->colnum) {
-            }
-            break;
-
-        case MODE_SET_COMMIT:
-            if (!ci->have_committed) {
-                    /** do this once per row only */
-                rhcNodesTable_commit_row(&ci->data_context, ci->new_row);
-                ci->have_committed = 1;
-            }
-            break;
-
-        case MODE_SET_UNDO:
-             /** save a variable copy */
-            switch (table_info->colnum) {
-            }
-            break;
-
-        case MODE_SET_FREE:
-            break;
-
-        default:
-            snmp_log(LOG_ERR,
-                     "problem encountered in rhcNodesTable_handler: unsupported mode\n");
-        }
-    }
-
-    /** clean up after all requset processing has ended */
-    switch (reqinfo->mode) {
-    case MODE_SET_UNDO:
-    case MODE_SET_FREE:
-    case MODE_SET_COMMIT:
-        /** clear out the undo cache */
-        netsnmp_oid_stash_free(&undoStorage, rhcNodesTable_free_undoInfo);
-        netsnmp_oid_stash_free(&commitStorage, netsnmp_oid_stash_no_free);
-    }
-
+	netsnmp_request_info *request;
+	netsnmp_table_request_info *table_info;
+	netsnmp_variable_list *var;
+	struct commitInfo *ci = NULL;
+	void *data_context = NULL;
+	void *suffix;
+	size_t suffix_len;
+
+	/** column and row index encoded portion */
+	suffix = requests->requestvb->name + reginfo->rootoid_len + 1;
+	suffix_len = requests->requestvb->name_length - (reginfo->rootoid_len + 1);
+
+	for (request = requests ; request ; request = request->next) {
+		var = request->requestvb;
+		if (request->processed != 0)
+			continue;
+
+		switch (reqinfo->mode) {
+			case MODE_GET:
+			case MODE_SET_RESERVE1:
+				data_context = netsnmp_extract_iterator_context(request);
+				if (data_context == NULL) {
+					if (reqinfo->mode == MODE_GET) {
+						netsnmp_set_request_error(reqinfo, request,
+							SNMP_NOSUCHINSTANCE);
+						continue;
+					}
+				}
+				break;
+
+			default:
+				/* == the other SET modes */
+				ci = (struct commitInfo*)
+						netsnmp_oid_stash_get_data(commitStorage,
+							 (oid *) ((char *) suffix + 1), suffix_len - 1);
+				break;
+		}
+
+		/** extracts the information about the table from the request */
+		table_info = netsnmp_extract_table_info(request);
+
+		/** table_info->colnum contains the column number requested */
+		/** table_info->indexes contains a linked list of snmp variable
+			bindings for the indexes of the table. Values in the list
+			have been set corresponding to the indexes of the
+			request */
+
+		if (table_info == NULL) {
+			continue;
+		}
+
+		switch (reqinfo->mode) {
+			case MODE_GET:
+				switch (table_info->colnum) {
+					case COLUMN_RHCNODENAME:
+					{
+						char *retval;
+						size_t retval_len = 0;
+						retval = get_rhcNodeName(data_context, &retval_len);
+						snmp_set_var_typed_value(var, ASN_OCTET_STR,
+							(const u_char *) retval, retval_len);
+					}
+					break;
+
+					case COLUMN_RHCNODESTATUSCODE:
+					{
+						long *retval;
+						size_t retval_len = 0;
+						retval = get_rhcNodeStatusCode(data_context,
+									&retval_len);
+						snmp_set_var_typed_value(var, ASN_INTEGER,
+								(const u_char *) retval, retval_len);
+					}
+					break;
+
+					case COLUMN_RHCNODESTATUSDESC:
+					{
+						char *retval;
+						size_t retval_len = 0;
+						retval = get_rhcNodeStatusDesc(data_context,
+									&retval_len);
+						snmp_set_var_typed_value(var, ASN_OCTET_STR,
+							(const u_char *) retval, retval_len);
+					}
+					break;
+
+					case COLUMN_RHCNODERUNNINGSERVICESNUM:
+					{
+						long *retval;
+						size_t retval_len = 0;
+						retval = get_rhcNodeRunningServicesNum(data_context,
+									&retval_len);
+						snmp_set_var_typed_value(var, ASN_INTEGER,
+							(const u_char *) retval, retval_len);
+					}
+					break;
+
+					case COLUMN_RHCNODERUNNINGSERVICESNAMES:
+					{
+						char *retval;
+						size_t retval_len = 0;
+						retval = get_rhcNodeRunningServicesNames(data_context,
+									&retval_len);
+						snmp_set_var_typed_value(var, ASN_OCTET_STR,
+							(const u_char *) retval, retval_len);
+					}
+					break;
+
+					default:
+						/** We shouldn't get here */
+						snmp_log(LOG_ERR,
+							"problem encountered in rhcNodesTable_handler: unknown column\n");
+				}
+				break;
+
+			case MODE_SET_RESERVE1:
+				ci = (struct commitInfo *)
+						netsnmp_oid_stash_get_data(commitStorage,
+							(oid *) ((char *) suffix + 1), suffix_len - 1);
+
+				if (!ci) {
+					/** create the commit storage info */
+					ci = SNMP_MALLOC_STRUCT(commitInfo);
+					if (!data_context) {
+						ci->data_context = rhcNodesTable_create_data_context(table_info->indexes);
+						ci->new_row = 1;
+					} else {
+						ci->data_context = data_context;
+					}
+					netsnmp_oid_stash_add_data(&commitStorage,
+						(oid *) ((char *) suffix + 1), suffix_len - 1, ci);
+				}
+				break;
+
+			case MODE_SET_RESERVE2:
+				switch (table_info->colnum) {
+					default:
+						netsnmp_set_request_error(reqinfo, request,
+							SNMP_ERR_NOTWRITABLE);
+						break;
+				}
+				break;
+
+			case MODE_SET_ACTION:
+				/** save a variable copy */
+				switch (table_info->colnum) {
+					default:
+						break;
+				}
+				break;
+
+			case MODE_SET_COMMIT:
+				if (!ci->have_committed) {
+					/** do this once per row only */
+					rhcNodesTable_commit_row(&ci->data_context, ci->new_row);
+					ci->have_committed = 1;
+				}
+				break;
+
+			case MODE_SET_UNDO:
+				/** save a variable copy */
+				switch (table_info->colnum) {
+					default:
+						break;
+				}
+				break;
+
+			case MODE_SET_FREE:
+				break;
+
+			default:
+				snmp_log(LOG_ERR,
+					"problem encountered in rhcNodesTable_handler: unsupported mode\n");
+		}
+	}
+
+	/** clean up after all requset processing has ended */
+	switch (reqinfo->mode) {
+		case MODE_SET_UNDO:
+		case MODE_SET_FREE:
+		case MODE_SET_COMMIT:
+			/** clear out the undo cache */
+			netsnmp_oid_stash_free(&undoStorage, rhcNodesTable_free_undoInfo);
+			netsnmp_oid_stash_free(&commitStorage, netsnmp_oid_stash_no_free);
+	}
 
-    return SNMP_ERR_NOERROR;
+	return SNMP_ERR_NOERROR;
 }
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB.h	2007/09/18 20:16:27	1.3
@@ -1,56 +1,53 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.iterate_access.conf,v 1.6 2003/09/29 22:30:36 hardaker Exp $
+ * : mib2c.iterate_access.conf,v 1.6 2003/09/29 22:30:36 hardaker Exp $
  */
 
-
-#ifndef nodesMIB_h
-#define nodesMIB_h
+#ifndef __CONGA_MODCLUSTER_SNMP_NODESMIB_H
+#define __CONGA_MODCLUSTER_SNMP_NODESMIB_H
 
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
-
 void initialize_nodesMIB(void);
 
 extern "C" {
-config_require(rhcNodesTable_access)
-       /** other required module components */
-       config_require(rhcNodesTable_checkfns)
-
-       /*
-	* function declarations
-	*/
-       void            init_rhcNodesTable(void);
-       void            initialize_table_rhcNodesTable(void);
-       Netsnmp_Node_Handler rhcNodesTable_handler;
+	config_require(rhcNodesTable_access)
+
+	/** other required module components */
+	config_require(rhcNodesTable_checkfns)
+
+	/*
+	 * function declarations
+	 */
+	void init_rhcNodesTable(void);
+	void initialize_table_rhcNodesTable(void);
+	Netsnmp_Node_Handler rhcNodesTable_handler;
 };
 
 #include "nodesMIB_columns.h"
-
 #include "nodesMIB_enums.h"
 
-
-#endif // nodesMIB_h
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_access.cpp	2007/09/11 02:45:27	1.3
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_access.cpp	2007/09/18 20:16:27	1.4
@@ -1,21 +1,21 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_access.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_access.h	2007/09/18 20:16:27	1.3
@@ -1,32 +1,32 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.access_functions.conf,v 1.6.2.2 2004/06/21 10:12:28 dts12 Exp $
+ * : mib2c.access_functions.conf,v 1.6.2.2 2004/06/21 10:12:28 dts12 Exp $
  */
 
-#ifndef nodesMIB_access_h
-#define nodesMIB_access_h
+#ifndef __CONGA_MODCLUSTER_SNMP_NODESMIB_ACCESS_H
+#define __CONGA_MODCLUSTER_SNMP_NODESMIB_ACCESS_H
 
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
@@ -34,23 +34,24 @@
 
 
 extern "C" {
-  /** User-defined data access functions for data in table rhcNodesTable */
-  /** row level accessors */
-  Netsnmp_First_Data_Point rhcNodesTable_get_first_data_point;
-  Netsnmp_Next_Data_Point rhcNodesTable_get_next_data_point;
-  Netsnmp_Free_Loop_Context rhcNodesTable_loop_free;
-  Netsnmp_Make_Data_Context rhcNodesTable_context_convert_function;
-  Netsnmp_Free_Data_Context rhcNodesTable_data_free;
-
-  int rhcNodesTable_commit_row(void** my_data_context, int new_or_del);
-  void* rhcNodesTable_create_data_context(netsnmp_variable_list* index_data);
-
-  /** column accessors */
-  char* get_rhcNodeName(void* data_context, size_t* ret_len);
-  long* get_rhcNodeStatusCode(void* data_context, size_t* ret_len);
-  char* get_rhcNodeStatusDesc(void* data_context, size_t* ret_len);
-  long* get_rhcNodeRunningServicesNum(void* data_context, size_t* ret_len);
-  char* get_rhcNodeRunningServicesNames(void* data_context, size_t* ret_len);
+	/** User-defined data access functions for data in table rhcNodesTable */
+
+	/** row level accessors */
+	Netsnmp_First_Data_Point rhcNodesTable_get_first_data_point;
+	Netsnmp_Next_Data_Point rhcNodesTable_get_next_data_point;
+	Netsnmp_Free_Loop_Context rhcNodesTable_loop_free;
+	Netsnmp_Make_Data_Context rhcNodesTable_context_convert_function;
+	Netsnmp_Free_Data_Context rhcNodesTable_data_free;
+
+	int rhcNodesTable_commit_row(void **my_data_context, int new_or_del);
+	void *rhcNodesTable_create_data_context(netsnmp_variable_list *index_data);
+
+	/** column accessors */
+	char *get_rhcNodeName(void *data_context, size_t *ret_len);
+	long *get_rhcNodeStatusCode(void *data_context, size_t *ret_len);
+	char *get_rhcNodeStatusDesc(void *data_context, size_t *ret_len);
+	long *get_rhcNodeRunningServicesNum(void *data_context, size_t *ret_len);
+	char *get_rhcNodeRunningServicesNames(void *data_context, size_t *ret_len);
 };
 
-#endif  // nodesMIB_access_h
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_checkfns.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_checkfns.h	2007/09/18 20:16:27	1.3
@@ -9,19 +9,18 @@
  *   (so that you can regenerate this one as mib2c improvements are made)
  ***********************************************************************/
 
-#ifndef nodesMIB_checkfns_h
-#define nodesMIB_checkfns_h
+#ifndef __CONGA_MODCLUSTER_SNMP_NODESMIB_CHECKFNS_H
+#define __CONGA_MODCLUSTER_SNMP_NODESMIB_CHECKFNS_H
 
 extern "C" {
 /** make sure we load the functions that you can modify */
 config_require(rhcNodesTable_checkfns_local)
 
-    /*
-     * these functions are designed to check incoming values for
-     * columns in the rhcNodesTable table for legality with respect to
-     * datatype and value.
-     */
+	/*
+	 * these functions are designed to check incoming values for
+	 * columns in the rhcNodesTable table for legality with respect to
+	 * datatype and value.
+	 */
 };
 
-
-#endif  // nodesMIB_checkfns_h
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_checkfns_local.cpp	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_checkfns_local.cpp	2007/09/18 20:16:27	1.3
@@ -1,30 +1,29 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.check_values_local.conf,v 5.1.2.1 2004/05/04 23:35:32 hardaker Exp $
+ * : mib2c.check_values_local.conf,v 5.1.2.1 2004/05/04 23:35:32 hardaker Exp $
  */
 
-
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_checkfns_local.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_checkfns_local.h	2007/09/18 20:16:27	1.3
@@ -1,41 +1,39 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : : mib2c.check_values_local.conf,v 5.1.2.1 2004/05/04 23:35:32 hardaker Exp $
- *
+ * : mib2c.check_values_local.conf,v 5.1.2.1 2004/05/04 23:35:32 hardaker Exp $
  */
 
-
-#ifndef nodesMIB_chekfns_local_h
-#define nodesMIB_chekfns_local_h
+#ifndef __CONGA_MODCLUSTER_SNMP_NODESMIB_CHECKFNS_LOCAL_H
+#define __CONGA_MODCLUSTER_SNMP_nodesMIB_CHECKFNS_LOCAL_H
 
 extern "C" {
 
 /*
  * these functions are designed to check incoming values for
  * columns in the rhcNodesTable table for legality with respect to
- * datatype and value according to local conventions.  You should modify
- * them as appropriate.  They will be called from parent check_value
+ * datatype and value according to local conventions. You should modify
+ * them as appropriate. They will be called from parent check_value
  * functions that are auto-generated using mib2c and the parent functions
  * should NOT be modified.
  */
@@ -43,4 +41,4 @@
 };
 
 
-#endif  // nodesMIB_chekfns_local_h
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_columns.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_columns.h	2007/09/18 20:16:27	1.3
@@ -1,42 +1,39 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *  : mib2c.column_defines.conf,v 5.1 2002/05/08 05:42:47 hardaker Exp $
+ * : mib2c.column_defines.conf,v 5.1 2002/05/08 05:42:47 hardaker Exp $
  */
 
-
-#ifndef nodesMIB_columns_h
-#define nodesMIB_columns_h
-
+#ifndef __CONGA_MODCLUSTER_SNMP_NODESMIB_COLUMNS_H
+#define __CONGA_MODCLUSTER_SNMP_NODESMIB_COLUMNS_H
 
 /*
  * column number definitions for table rhcNodesTable
  */
-#define COLUMN_RHCNODENAME		1
-#define COLUMN_RHCNODESTATUSCODE		2
-#define COLUMN_RHCNODESTATUSDESC		3
+#define COLUMN_RHCNODENAME						1
+#define COLUMN_RHCNODESTATUSCODE				2
+#define COLUMN_RHCNODESTATUSDESC				3
 #define COLUMN_RHCNODERUNNINGSERVICESNUM		4
 #define COLUMN_RHCNODERUNNINGSERVICESNAMES		5
 
-
-#endif  // nodesMIB_columns_h
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_enums.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/nodesMIB_enums.h	2007/09/18 20:16:27	1.3
@@ -1,33 +1,30 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *  : mib2c.column_enums.conf,v 5.2 2003/02/22 04:09:25 hardaker Exp $
+ * : mib2c.column_enums.conf,v 5.2 2003/02/22 04:09:25 hardaker Exp $
  */
 
+#ifndef __CONGA_MODCLUSTER_SNMP_NODESMIB_ENUMS_H
+#define __CONGA_MODCLUSTER_SNMP_NODESMIB_ENUMS_H
 
-#ifndef nodesMIB_enums_h
-#define nodesMIB_enums_h
-
-
-
-#endif  // nodesMIB_enums_h
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB.cpp	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB.cpp	2007/09/18 20:16:27	1.3
@@ -1,27 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.iterate_access.conf,v 1.6 2003/09/29 22:30:36 hardaker Exp $
+ * : mib2c.iterate_access.conf,v 1.6 2003/09/29 22:30:36 hardaker Exp $
  */
 
 
@@ -29,103 +29,100 @@
 #include "servicesMIB_checkfns.h"
 #include "servicesMIB_access.h"
 
-
 void
 initialize_servicesMIB(void)
 {
-  init_rhcServicesTable();
+	init_rhcServicesTable();
 }
 
-
-
 static netsnmp_oid_stash_node *undoStorage = NULL;
 static netsnmp_oid_stash_node *commitStorage = NULL;
 
 struct undoInfo {
-    void           *ptr;
-    size_t          len;
+	void *ptr;
+	size_t len;
 };
 
 struct commitInfo {
-    void           *data_context;
-    int             have_committed;
-    int             new_row;
+	void *data_context;
+	int have_committed;
+	int new_row;
 };
 
 void
 rhcServicesTable_free_undoInfo(void *vptr)
 {
-    struct undoInfo* ui = (struct undoInfo*) vptr;
-    if (!ui)
-        return;
-    SNMP_FREE(ui->ptr);
-    SNMP_FREE(ui);
+	struct undoInfo* ui = (struct undoInfo*) vptr;
+	if (!ui)
+		return;
+	SNMP_FREE(ui->ptr);
+	SNMP_FREE(ui);
 }
 
 /** Initialize the rhcServicesTable table by defining its contents and how it's structured */
 void
 initialize_table_rhcServicesTable(void)
 {
-    static oid      rhcServicesTable_oid[] =
-        { 1, 3, 6, 1, 4, 1, 2312, 8, 3, 2 };
-    netsnmp_table_registration_info *table_info;
-    netsnmp_handler_registration *my_handler;
-    netsnmp_iterator_info *iinfo;
-
-    /** create the table registration information structures */
-    table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
-    iinfo = SNMP_MALLOC_TYPEDEF(netsnmp_iterator_info);
-
-    /** if your table is read only, it's easiest to change the
-        HANDLER_CAN_RWRITE definition below to HANDLER_CAN_RONLY */
-    my_handler = netsnmp_create_handler_registration("rhcServicesTable",
-                                                     rhcServicesTable_handler,
-                                                     rhcServicesTable_oid,
-                                                     OID_LENGTH
-                                                     (rhcServicesTable_oid),
-                                                     HANDLER_CAN_RONLY);
-
-    if (!my_handler || !table_info || !iinfo) {
-        snmp_log(LOG_ERR,
-                 "malloc failed in initialize_table_rhcServicesTable");
-        return; /** Serious error. */
-    }
-
-    /***************************************************
-     * Setting up the table's definition
-     */
-    netsnmp_table_helper_add_indexes(table_info, ASN_OCTET_STR,
-				     /** index: rhcServiceName */
-                                     0);
-
-    /** Define the minimum and maximum accessible columns.  This
-        optimizes retrival. */
-    table_info->min_column = 1;
-    table_info->max_column = 5;
-
-    /** iterator access routines */
-    iinfo->get_first_data_point = rhcServicesTable_get_first_data_point;
-    iinfo->get_next_data_point = rhcServicesTable_get_next_data_point;
-
-    /** you may wish to set these as well */
-    //#ifdef MAYBE_USE_THESE
-    iinfo->make_data_context = rhcServicesTable_context_convert_function;
-    iinfo->free_data_context = rhcServicesTable_data_free;
-
-    /** pick *only* one of these if you use them */
-    //iinfo->free_loop_context = rhcServicesTable_loop_free;
-    iinfo->free_loop_context_at_end = rhcServicesTable_loop_free;
-    //#endif
-
-    /** tie the two structures together */
-    iinfo->table_reginfo = table_info;
-
-    /***************************************************
-     * registering the table with the master agent
-     */
-    DEBUGMSGTL(("initialize_table_rhcServicesTable",
-                "Registering table rhcServicesTable as a table iterator\n"));
-    netsnmp_register_table_iterator(my_handler, iinfo);
+	static oid rhcServicesTable_oid[] =
+		{ 1, 3, 6, 1, 4, 1, 2312, 8, 3, 2 };
+	netsnmp_table_registration_info *table_info;
+	netsnmp_handler_registration *my_handler;
+	netsnmp_iterator_info *iinfo;
+
+	/** create the table registration information structures */
+	table_info = SNMP_MALLOC_TYPEDEF(netsnmp_table_registration_info);
+	iinfo = SNMP_MALLOC_TYPEDEF(netsnmp_iterator_info);
+
+	/** if your table is read only, it's easiest to change the
+		HANDLER_CAN_RWRITE definition below to HANDLER_CAN_RONLY */
+	my_handler = netsnmp_create_handler_registration("rhcServicesTable",
+													 rhcServicesTable_handler,
+													 rhcServicesTable_oid,
+													 OID_LENGTH
+													 (rhcServicesTable_oid),
+													 HANDLER_CAN_RONLY);
+
+	if (!my_handler || !table_info || !iinfo) {
+		snmp_log(LOG_ERR,
+				 "malloc failed in initialize_table_rhcServicesTable");
+		return; /** Serious error. */
+	}
+
+	/***************************************************
+	 * Setting up the table's definition
+	 */
+	netsnmp_table_helper_add_indexes(table_info, ASN_OCTET_STR,
+					 /** index: rhcServiceName */
+									 0);
+
+	/** Define the minimum and maximum accessible columns. This
+		optimizes retrival. */
+	table_info->min_column = 1;
+	table_info->max_column = 5;
+
+	/** iterator access routines */
+	iinfo->get_first_data_point = rhcServicesTable_get_first_data_point;
+	iinfo->get_next_data_point = rhcServicesTable_get_next_data_point;
+
+	/** you may wish to set these as well */
+	//#ifdef MAYBE_USE_THESE
+	iinfo->make_data_context = rhcServicesTable_context_convert_function;
+	iinfo->free_data_context = rhcServicesTable_data_free;
+
+	/** pick *only* one of these if you use them */
+	//iinfo->free_loop_context = rhcServicesTable_loop_free;
+	iinfo->free_loop_context_at_end = rhcServicesTable_loop_free;
+	//#endif
+
+	/** tie the two structures together */
+	iinfo->table_reginfo = table_info;
+
+	/***************************************************
+	 * registering the table with the master agent
+	 */
+	DEBUGMSGTL(("initialize_table_rhcServicesTable",
+				"Registering table rhcServicesTable as a table iterator\n"));
+	netsnmp_register_table_iterator(my_handler, iinfo);
 }
 
 /** Initializes the rhcServicesTable module */
@@ -133,213 +130,211 @@
 init_rhcServicesTable(void)
 {
 
-  /** here we initialize all the tables we're planning on supporting */
-    initialize_table_rhcServicesTable();
+	/** here we initialize all the tables we're planning on supporting */
+	initialize_table_rhcServicesTable();
 }
 
 /** handles requests for the rhcServicesTable table, if anything else needs to be done */
 int
 rhcServicesTable_handler(netsnmp_mib_handler *handler,
-                         netsnmp_handler_registration *reginfo,
-                         netsnmp_agent_request_info *reqinfo,
-                         netsnmp_request_info *requests)
+						 netsnmp_handler_registration *reginfo,
+						 netsnmp_agent_request_info *reqinfo,
+						 netsnmp_request_info *requests)
 {
 
-    netsnmp_request_info *request;
-    netsnmp_table_request_info *table_info;
-    netsnmp_variable_list *var;
-    struct commitInfo *ci = NULL;
-
-    void           *data_context = NULL;
-
-    oid            *suffix;
-    size_t          suffix_len;
-
-    /** column and row index encoded portion */
-    suffix = requests->requestvb->name + reginfo->rootoid_len + 1;
-    suffix_len = requests->requestvb->name_length -
-        (reginfo->rootoid_len + 1);
-
-    for (request = requests; request; request = request->next) {
-        var = request->requestvb;
-        if (request->processed != 0)
-            continue;
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-        case MODE_SET_RESERVE1:
-            data_context = netsnmp_extract_iterator_context(request);
-            if (data_context == NULL) {
-                if (reqinfo->mode == MODE_GET) {
-                    netsnmp_set_request_error(reqinfo, request,
-                                              SNMP_NOSUCHINSTANCE);
-                    continue;
-                }
-            }
-            break;
-
-        default:               /* == the other SET modes */
-	    ci = (struct commitInfo*) netsnmp_oid_stash_get_data(commitStorage,
+	netsnmp_request_info *request;
+	netsnmp_table_request_info *table_info;
+	netsnmp_variable_list *var;
+	struct commitInfo *ci = NULL;
+
+	void *data_context = NULL;
+	oid *suffix;
+	size_t suffix_len;
+
+	/** column and row index encoded portion */
+	suffix = requests->requestvb->name + reginfo->rootoid_len + 1;
+	suffix_len = requests->requestvb->name_length -
+		(reginfo->rootoid_len + 1);
+
+	for (request = requests; request; request = request->next) {
+		var = request->requestvb;
+		if (request->processed != 0)
+			continue;
+
+		switch (reqinfo->mode) {
+		case MODE_GET:
+		case MODE_SET_RESERVE1:
+			data_context = netsnmp_extract_iterator_context(request);
+			if (data_context == NULL) {
+				if (reqinfo->mode == MODE_GET) {
+					netsnmp_set_request_error(reqinfo, request,
+						SNMP_NOSUCHINSTANCE);
+					continue;
+				}
+			}
+			break;
+
+		default:
+			/* == the other SET modes */
+			ci = (struct commitInfo*) netsnmp_oid_stash_get_data(commitStorage,
 								 suffix + 1,
 								 suffix_len - 1);
-            break;
+			break;
 
-        }
+		}
 
-        /** extracts the information about the table from the request */
-        table_info = netsnmp_extract_table_info(request);
-        /** table_info->colnum contains the column number requested */
-        /** table_info->indexes contains a linked list of snmp variable
-           bindings for the indexes of the table.  Values in the list
-           have been set corresponding to the indexes of the
-           request */
-        if (table_info == NULL) {
-            continue;
-        }
-
-        switch (reqinfo->mode) {
-        case MODE_GET:
-            switch (table_info->colnum) {
-            case COLUMN_RHCSERVICENAME:
-                {
-                    char           *retval;
-                    size_t          retval_len = 0;
-                    retval = get_rhcServiceName(data_context, &retval_len);
-                    snmp_set_var_typed_value(var, ASN_OCTET_STR,
-                                             (const u_char *) retval,
-                                             retval_len);
-                }
-                break;
-
-            case COLUMN_RHCSERVICESTATUSCODE:
-                {
-                    long           *retval;
-                    size_t          retval_len = 0;
-                    retval =
-                        get_rhcServiceStatusCode(data_context,
-                                                 &retval_len);
-                    snmp_set_var_typed_value(var, ASN_INTEGER,
-                                             (const u_char *) retval,
-                                             retval_len);
-                }
-                break;
-
-            case COLUMN_RHCSERVICESTATUSDESC:
-                {
-                    char           *retval;
-                    size_t          retval_len = 0;
-                    retval =
-                        get_rhcServiceStatusDesc(data_context,
+		/** extracts the information about the table from the request */
+		table_info = netsnmp_extract_table_info(request);
+		/** table_info->colnum contains the column number requested */
+		/** table_info->indexes contains a linked list of snmp variable
+		 	bindings for the indexes of the table. Values in the list
+			have been set corresponding to the indexes of the
+			request */
+		if (table_info == NULL) {
+			continue;
+		}
+
+		switch (reqinfo->mode) {
+		case MODE_GET:
+			switch (table_info->colnum) {
+			case COLUMN_RHCSERVICENAME:
+				{
+					char *retval;
+					size_t retval_len = 0;
+					retval = get_rhcServiceName(data_context, &retval_len);
+					snmp_set_var_typed_value(var, ASN_OCTET_STR,
+											 (const u_char *) retval,
+											 retval_len);
+				}
+				break;
+
+			case COLUMN_RHCSERVICESTATUSCODE:
+				{
+					long *retval;
+					size_t retval_len = 0;
+					retval =
+						get_rhcServiceStatusCode(data_context,
+												 &retval_len);
+					snmp_set_var_typed_value(var, ASN_INTEGER,
+											 (const u_char *) retval,
+											 retval_len);
+				}
+				break;
+
+			case COLUMN_RHCSERVICESTATUSDESC:
+				{
+					char *retval;
+					size_t retval_len = 0;
+					retval =
+						get_rhcServiceStatusDesc(data_context,
 						 &retval_len);
-                    snmp_set_var_typed_value(var, ASN_OCTET_STR,
-                                             (const u_char *) retval,
-                                             retval_len);
-                }
-                break;
-
-            case COLUMN_RHCSERVICESTARTMODE:
-                {
-                    char           *retval;
-                    size_t          retval_len = 0;
-                    retval =
-                        get_rhcServiceStartMode(data_context, &retval_len);
-                    snmp_set_var_typed_value(var, ASN_OCTET_STR,
-                                             (const u_char *) retval,
-                                             retval_len);
-                }
-                break;
-
-            case COLUMN_RHCSERVICERUNNINGONNODE:
-                {
-                    char           *retval;
-                    size_t          retval_len = 0;
-                    retval =
-                        get_rhcServiceRunningOnNode(data_context,
-                                                    &retval_len);
-                    snmp_set_var_typed_value(var, ASN_OCTET_STR,
-                                             (const u_char *) retval,
-                                             retval_len);
-                }
-                break;
-
-            default:
-                /** We shouldn't get here */
-                snmp_log(LOG_ERR,
-                         "problem encountered in rhcServicesTable_handler: unknown column\n");
-            }
-            break;
+					snmp_set_var_typed_value(var, ASN_OCTET_STR,
+											 (const u_char *) retval,
+											 retval_len);
+				}
+				break;
+
+			case COLUMN_RHCSERVICESTARTMODE:
+				{
+					char *retval;
+					size_t retval_len = 0;
+					retval =
+						get_rhcServiceStartMode(data_context, &retval_len);
+					snmp_set_var_typed_value(var, ASN_OCTET_STR,
+											 (const u_char *) retval,
+											 retval_len);
+				}
+				break;
+
+			case COLUMN_RHCSERVICERUNNINGONNODE:
+				{
+					char *retval;
+					size_t retval_len = 0;
+					retval =
+						get_rhcServiceRunningOnNode(data_context,
+													&retval_len);
+					snmp_set_var_typed_value(var, ASN_OCTET_STR,
+											 (const u_char *) retval,
+											 retval_len);
+				}
+				break;
+
+			default:
+				/** We shouldn't get here */
+				snmp_log(LOG_ERR,
+						 "problem encountered in rhcServicesTable_handler: unknown column\n");
+			}
+			break;
 
-        case MODE_SET_RESERVE1:
-	    ci = (struct commitInfo*) netsnmp_oid_stash_get_data(commitStorage,
+		case MODE_SET_RESERVE1:
+		ci = (struct commitInfo*) netsnmp_oid_stash_get_data(commitStorage,
 								 suffix + 1,
 								 suffix_len - 1);
 
-            if (!ci) {
-                    /** create the commit storage info */
-                ci = SNMP_MALLOC_STRUCT(commitInfo);
-                if (!data_context) {
-                    ci->data_context =
-                        rhcServicesTable_create_data_context(table_info->
-                                                             indexes);
-                    ci->new_row = 1;
-                } else {
-                    ci->data_context = data_context;
-                }
-                netsnmp_oid_stash_add_data(&commitStorage,
-                                           suffix + 1, suffix_len - 1, ci);
-            }
-            break;
-
-        case MODE_SET_RESERVE2:
-            switch (table_info->colnum) {
-            default:
-                netsnmp_set_request_error(reqinfo, request,
-                                          SNMP_ERR_NOTWRITABLE);
-                break;
-            }
-            break;
-
-        case MODE_SET_ACTION:
-            /** save a variable copy */
-            switch (table_info->colnum) {
-            }
-            break;
-
-        case MODE_SET_COMMIT:
-            if (!ci->have_committed) {
-                    /** do this once per row only */
-                rhcServicesTable_commit_row(&ci->data_context,
-                                            ci->new_row);
-                ci->have_committed = 1;
-            }
-            break;
-
-        case MODE_SET_UNDO:
-             /** save a variable copy */
-            switch (table_info->colnum) {
-            }
-            break;
-
-        case MODE_SET_FREE:
-            break;
-
-        default:
-            snmp_log(LOG_ERR,
-                     "problem encountered in rhcServicesTable_handler: unsupported mode\n");
-        }
-    }
-
-    /** clean up after all requset processing has ended */
-    switch (reqinfo->mode) {
-    case MODE_SET_UNDO:
-    case MODE_SET_FREE:
-    case MODE_SET_COMMIT:
-        /** clear out the undo cache */
-        netsnmp_oid_stash_free(&undoStorage,
-                               rhcServicesTable_free_undoInfo);
-        netsnmp_oid_stash_free(&commitStorage, netsnmp_oid_stash_no_free);
-    }
-
+			if (!ci) {
+					/** create the commit storage info */
+				ci = SNMP_MALLOC_STRUCT(commitInfo);
+				if (!data_context) {
+					ci->data_context =
+						rhcServicesTable_create_data_context(table_info->
+															 indexes);
+					ci->new_row = 1;
+				} else {
+					ci->data_context = data_context;
+				}
+				netsnmp_oid_stash_add_data(&commitStorage,
+					suffix + 1, suffix_len - 1, ci);
+			}
+			break;
+
+		case MODE_SET_RESERVE2:
+			switch (table_info->colnum) {
+			default:
+				netsnmp_set_request_error(reqinfo, request,
+					SNMP_ERR_NOTWRITABLE);
+				break;
+			}
+			break;
+
+		case MODE_SET_ACTION:
+			/** save a variable copy */
+			switch (table_info->colnum) {
+			}
+			break;
+
+		case MODE_SET_COMMIT:
+			if (!ci->have_committed) {
+					/** do this once per row only */
+				rhcServicesTable_commit_row(&ci->data_context,
+											ci->new_row);
+				ci->have_committed = 1;
+			}
+			break;
+
+		case MODE_SET_UNDO:
+			 /** save a variable copy */
+			switch (table_info->colnum) {
+			}
+			break;
+
+		case MODE_SET_FREE:
+			break;
+
+		default:
+			snmp_log(LOG_ERR,
+				 "problem encountered in rhcServicesTable_handler: unsupported mode\n");
+		}
+	}
+
+	/** clean up after all requset processing has ended */
+	switch (reqinfo->mode) {
+	case MODE_SET_UNDO:
+	case MODE_SET_FREE:
+	case MODE_SET_COMMIT:
+		/** clear out the undo cache */
+		netsnmp_oid_stash_free(&undoStorage, rhcServicesTable_free_undoInfo);
+		netsnmp_oid_stash_free(&commitStorage, netsnmp_oid_stash_no_free);
+	}
 
-    return SNMP_ERR_NOERROR;
+	return SNMP_ERR_NOERROR;
 }
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB.h	2007/09/18 20:16:27	1.3
@@ -1,54 +1,51 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.iterate_access.conf,v 1.6 2003/09/29 22:30:36 hardaker Exp $
+ * : mib2c.iterate_access.conf,v 1.6 2003/09/29 22:30:36 hardaker Exp $
  */
 
-
-#ifndef servicesMIB_h
-#define servicesMIB_h
+#ifndef __CONGA_MODCLUSTER_SNMP_SERVICESMIB_H
+#define __CONGA_MODCLUSTER_SNMP_SERVICESMIB_H
 
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
-
 void initialize_servicesMIB(void);
 
 extern "C" {
-config_require(rhcServicesTable_access)
-    config_require(rhcServicesTable_checkfns)
+	config_require(rhcServicesTable_access)
+	config_require(rhcServicesTable_checkfns)
 
-    /*
-     * function declarations
-     */
-     void            init_rhcServicesTable(void);
-     void            initialize_table_rhcServicesTable(void);
-     Netsnmp_Node_Handler rhcServicesTable_handler;
+	/*
+	 * function declarations
+	 */
+	void init_rhcServicesTable(void);
+	void initialize_table_rhcServicesTable(void);
+	Netsnmp_Node_Handler rhcServicesTable_handler;
 };
 
-
 #include "servicesMIB_columns.h"
 #include "servicesMIB_enums.h"
 
-#endif // servicesMIB_h
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_access.cpp	2007/09/11 02:45:27	1.3
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_access.cpp	2007/09/18 20:16:27	1.4
@@ -1,30 +1,29 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.access_functions.conf,v 1.6.2.2 2004/06/21 10:12:28 dts12 Exp $
+ * : mib2c.access_functions.conf,v 1.6.2.2 2004/06/21 10:12:28 dts12 Exp $
  */
 
-
 #include "servicesMIB_access.h"
 #include "servicesMIB_enums.h"
 
@@ -37,12 +36,9 @@
 using namespace ClusterMonitoring;
 using namespace std;
 
-
 static unsigned int getStatusCode(counting_auto_ptr<Service>);
 static String getStatusDescription(unsigned int code);
 
-
-
 class LoopContext
 {
 public:
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_access.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_access.h	2007/09/18 20:16:27	1.3
@@ -1,56 +1,55 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.access_functions.conf,v 1.6.2.2 2004/06/21 10:12:28 dts12 Exp $
+ * : mib2c.access_functions.conf,v 1.6.2.2 2004/06/21 10:12:28 dts12 Exp $
  */
 
-
-#ifndef servicesMIB_access_h
-#define servicesMIB_access_h
+#ifndef __CONGA_MODCLUSTER_SNMP_SERVICESMIB_ACCESS_H
+#define __CONGA_MODCLUSTER_SNMP_SERVICESMIB_ACCESS_H
 
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 #include <net-snmp/agent/net-snmp-agent-includes.h>
 
-
 extern "C" {
-  /** User-defined data access functions for data in table rhcServicesTable */
-  /** row level accessors */
-  Netsnmp_First_Data_Point rhcServicesTable_get_first_data_point;
-  Netsnmp_Next_Data_Point rhcServicesTable_get_next_data_point;
-  Netsnmp_Free_Loop_Context rhcServicesTable_loop_free;
-  Netsnmp_Make_Data_Context rhcServicesTable_context_convert_function;
-  Netsnmp_Free_Data_Context rhcServicesTable_data_free;
-
-  int             rhcServicesTable_commit_row(void** my_data_context, int new_or_del);
-  void           *rhcServicesTable_create_data_context(netsnmp_variable_list* index_data);
-
-  /** column accessors */
-  char           *get_rhcServiceName(void *data_context, size_t * ret_len);
-  long           *get_rhcServiceStatusCode(void *data_context, size_t * ret_len);
-  char           *get_rhcServiceStatusDesc(void *data_context, size_t * ret_len);
-  char           *get_rhcServiceStartMode(void *data_context, size_t * ret_len);
-  char           *get_rhcServiceRunningOnNode(void *data_context, size_t * ret_len);
+	/** User-defined data access functions for data in table rhcServicesTable */
+
+	/** row level accessors */
+	Netsnmp_First_Data_Point rhcServicesTable_get_first_data_point;
+	Netsnmp_Next_Data_Point rhcServicesTable_get_next_data_point;
+	Netsnmp_Free_Loop_Context rhcServicesTable_loop_free;
+	Netsnmp_Make_Data_Context rhcServicesTable_context_convert_function;
+	Netsnmp_Free_Data_Context rhcServicesTable_data_free;
+
+	int rhcServicesTable_commit_row(void **my_data_context, int new_or_del);
+	void *rhcServicesTable_create_data_context(netsnmp_variable_list *index_data);
+
+	/** column accessors */
+	char *get_rhcServiceName(void *data_context, size_t *ret_len);
+	long *get_rhcServiceStatusCode(void *data_context, size_t *ret_len);
+	char *get_rhcServiceStatusDesc(void *data_context, size_t *ret_len);
+	char *get_rhcServiceStartMode(void *data_context, size_t *ret_len);
+	char *get_rhcServiceRunningOnNode(void *data_context, size_t *ret_len);
 };
 
-#endif  // servicesMIB_access_h
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_checkfns.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_checkfns.h	2007/09/18 20:16:27	1.3
@@ -9,8 +9,8 @@
  *   (so that you can regenerate this one as mib2c improvements are made)
  ***********************************************************************/
 
-#ifndef servicesMIB_checkfns_h
-#define servicesMIB_checkfns_h
+#ifndef __CONGA_MODCLUSTER_SNMP_SERVICESMIB_CHECKFNS_H
+#define __CONGA_MODCLUSTER_SNMP_SERVICESMIB_CHECKFNS_H
 
 /** make sure we load the functions that you can modify */
 config_require(rhcServicesTable_checkfns_local)
@@ -21,4 +21,4 @@
      * datatype and value.
      */
 
-#endif  // servicesMIB_checkfns_h
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_checkfns_local.cpp	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_checkfns_local.cpp	2007/09/18 20:16:27	1.3
@@ -1,30 +1,29 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : mib2c.check_values_local.conf,v 5.1.2.1 2004/05/04 23:35:32 hardaker Exp $
+ * : mib2c.check_values_local.conf,v 5.1.2.1 2004/05/04 23:35:32 hardaker Exp $
  */
 
-
 #include <net-snmp/net-snmp-config.h>
 #include <net-snmp/net-snmp-includes.h>
 
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_checkfns_local.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_checkfns_local.h	2007/09/18 20:16:27	1.3
@@ -1,41 +1,40 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *        : : mib2c.check_values_local.conf,v 5.1.2.1 2004/05/04 23:35:32 hardaker Exp $
+ * : mib2c.check_values_local.conf,v 5.1.2.1 2004/05/04 23:35:32 hardaker Exp $
  */
 
-
-#ifndef servicesMIB_checkfns_local_h
-#define servicesMIB_checkfns_local_h
+#ifndef __CONGA_MODCLUSTER_SNMP_SERVICESMIB_CHECKFNS_LOCAL_H
+#define __CONGA_MODCLUSTER_SNMP_SERVICESMIB_CHECKFNS_LOCAL_H
 
 /*
  * these functions are designed to check incoming values for
  * columns in the rhcServicesTable table for legality with respect to
- * datatype and value according to local conventions.  You should modify
- * them as appropriate.  They will be called from parent check_value
+ * datatype and value according to local conventions. You should modify
+ * them as appropriate. They will be called from parent check_value
  * functions that are auto-generated using mib2c and the parent functions
  * should NOT be modified.
  */
 
 
-#endif  // servicesMIB_checkfns_local_h
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_columns.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_columns.h	2007/09/18 20:16:27	1.3
@@ -1,40 +1,39 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *  : mib2c.column_defines.conf,v 5.1 2002/05/08 05:42:47 hardaker Exp $
+ * : mib2c.column_defines.conf,v 5.1 2002/05/08 05:42:47 hardaker Exp $
  */
 
-
-#ifndef servicesMIB_columns_h
-#define servicesMIB_columns_h
+#ifndef __CONGA_MODCLUSTER_SNMP_SERVICESMIB_COLUMNS_H
+#define __CONGA_MODCLUSTER_SNMP_SERVICESMIB_COLUMNS_H
 
 /*
  * column number definitions for table rhcServicesTable
  */
-#define COLUMN_RHCSERVICENAME		1
-#define COLUMN_RHCSERVICESTATUSCODE		2
-#define COLUMN_RHCSERVICESTATUSDESC		3
-#define COLUMN_RHCSERVICESTARTMODE		4
+#define COLUMN_RHCSERVICENAME				1
+#define COLUMN_RHCSERVICESTATUSCODE			2
+#define COLUMN_RHCSERVICESTATUSDESC			3
+#define COLUMN_RHCSERVICESTARTMODE			4
 #define COLUMN_RHCSERVICERUNNINGONNODE		5
 
-#endif  // servicesMIB_columns_h
+#endif
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_enums.h	2007/09/11 02:45:27	1.2
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/servicesMIB_enums.h	2007/09/18 20:16:27	1.3
@@ -1,31 +1,30 @@
 /*
-  Copyright Red Hat, Inc. 2005
-
-  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, 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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 /*
  * Note: this file originally auto-generated by mib2c using
- *  : mib2c.column_enums.conf,v 5.2 2003/02/22 04:09:25 hardaker Exp $
+ * : mib2c.column_enums.conf,v 5.2 2003/02/22 04:09:25 hardaker Exp $
  */
 
+#ifndef __CONGA_MODCLUSTER_SNMP_SERVICESMIB_ENUMS_H
+#define __CONGA_MODCLUSTER_SNMP_SERVICESMIB_ENUMS_H
 
-#ifndef servicesMIB_enums_h
-#define servicesMIB_enums_h
-
-#endif  // servicesMIB_enums_h
+#endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]