Sophie

Sophie

distrib > Mageia > 1 > i586 > media > core-release-src > by-pkgid > 665ebc33f7723e7c06ab61d3e02f9a0c > files > 1

glpi-tracker_agent-1.5.3-1.mga1.src.rpm

diff -Naur -x '*~' agent_tracker/inc/functions.pm agent_tracker-fhs/inc/functions.pm
--- agent_tracker/inc/functions.pm	2009-10-08 09:13:17.000000000 +0200
+++ agent_tracker-fhs/inc/functions.pm	2010-03-23 16:54:34.000000000 +0100
@@ -48,10 +48,10 @@
    my $text = shift;
    my $dump = shift;
    my $PID = shift;
-   my $Bin = shift;
+   my $logdir = shift;
 
    if ($log eq "2"){
-      open (DEBUG, '>>'.$Bin.'/log/'.$PID.'.log') || die ("Erreur d'ouverture du fichier de LOG") ;;
+      open (DEBUG, '>>'.$logdir.'/'.$PID.'.log') || die ("Erreur d'ouverture du fichier de LOG") ;;
       if ($dump eq "dump") {
          print DEBUG Dumper($text);
       } else {
@@ -89,4 +89,4 @@
    }
 
 }
-1;
\ Pas de fin de ligne à la fin du fichier.
+1;
diff -Naur -x '*~' agent_tracker/inc/tracker_discovery.pm agent_tracker-fhs/inc/tracker_discovery.pm
--- agent_tracker/inc/tracker_discovery.pm	2009-10-15 21:39:29.000000000 +0200
+++ agent_tracker-fhs/inc/tracker_discovery.pm	2010-03-23 16:57:52.000000000 +0100
@@ -128,7 +128,7 @@
 	my $nb_threads_discovery = shift;
 	my $nb_core_discovery = shift;
 	my $log = shift;
-	my $Bin = shift;
+	my $logdir = shift;
 	my $config = shift;
 	my $PID = shift;
 	my $fragment = shift;
@@ -144,7 +144,7 @@
 	my $num_files = 1;
 	my $counter=0;
 
-	debug($log,"==== Discovery ====","",$PID,$Bin);
+	debug($log,"==== Discovery ====","",$PID,$logdir);
 
 	#===================================
 	# Threads et variables partagées
@@ -363,12 +363,12 @@
       } else {
          $description = snmpget('.1.3.6.1.2.1.1.1.0',1);
          if ($description =~ m/No response from remote host/) {
-            debug($log,"[".$ip."][NO][".$$authSNMP_discovery{$key}{'version'}."][".$$authSNMP_discovery{$key}{'community'}."] ".$session->error, "",$PID,$Bin);
+            debug($log,"[".$ip."][NO][".$$authSNMP_discovery{$key}{'version'}."][".$$authSNMP_discovery{$key}{'community'}."] ".$session->error, "",$PID,$logdir);
          } elsif ($description =~ m/No buffer space available/) {
-            debug($log,"[".$ip."][NO][".$$authSNMP_discovery{$key}{'version'}."][".$$authSNMP_discovery{$key}{'community'}."] ".$session->error, "",$PID,$Bin);
+            debug($log,"[".$ip."][NO][".$$authSNMP_discovery{$key}{'version'}."][".$$authSNMP_discovery{$key}{'community'}."] ".$session->error, "",$PID,$logdir);
          } elsif ($description ne "null") {
             #print "TROUVE\n";
-            debug($log,"[".$ip."][YES][".$$authSNMP_discovery{$key}{'version'}."][".$$authSNMP_discovery{$key}{'community'}."]", "",$PID,$Bin);
+            debug($log,"[".$ip."][YES][".$$authSNMP_discovery{$key}{'version'}."][".$$authSNMP_discovery{$key}{'community'}."]", "",$PID,$logdir);
             
             # ***** manufacturer specifications
             # If HP printer detected, get best sysDescr
@@ -403,7 +403,7 @@
             #print $tmp_xml."\n";
             return $tmp_xml;
          } else {
-            debug($log,"[".$ip."][NO][".$$authSNMP_discovery{$key}{'version'}."][".$$authSNMP_discovery{$key}{'community'}."] ".$session->error, "",$PID,$Bin);
+            debug($log,"[".$ip."][NO][".$$authSNMP_discovery{$key}{'version'}."][".$$authSNMP_discovery{$key}{'community'}."] ".$session->error, "",$PID,$logdir);
          }
          $session->close;
       }
@@ -444,4 +444,4 @@
 }
 
 
-1;
\ Pas de fin de ligne à la fin du fichier.
+1;
diff -Naur -x '*~' agent_tracker/inc/tracker_query.pm agent_tracker-fhs/inc/tracker_query.pm
--- agent_tracker/inc/tracker_query.pm	2009-10-15 21:39:29.000000000 +0200
+++ agent_tracker-fhs/inc/tracker_query.pm	2010-03-23 16:57:38.000000000 +0100
@@ -5,7 +5,7 @@
 	my $PID = shift;
 	my $nb_core_query = shift;
 	my $log = shift;
-	my $Bin = shift;
+	my $logdir = shift;
 	my $config = shift;
 	my $config_key = shift;
 	my $agent_version = shift;
@@ -15,7 +15,7 @@
    my $num_files = 1;
    my $device;
 
-	debug($log,'==== Query ====','',$PID,$Bin);
+	debug($log,'==== Query ====','',$PID,$logdir);
 
 	#===================================
 	# Threads et variables partagées
@@ -291,7 +291,7 @@
 	$ID = $device->{infos}->{id};
 	$type = $device->{infos}->{type};
 
-	debug($log,"[".$device->{infos}->{ip}."] : start Thread", "",$PID,$Bin);
+	debug($log,"[".$device->{infos}->{ip}."] : start Thread", "",$PID,$logdir);
 
 	$snmp_version = $device->{auth}->{version};
 	$snmp_community = $device->{auth}->{community};
@@ -303,7 +303,7 @@
 	$snmp_privpassword = $device->{auth}->{priv_passphrase};
 	$snmp_privprotocol = $device->{auth}->{priv_protocol};
 
-	#debug($log,"IP : $IP", "",$PID,$Bin);
+	#debug($log,"IP : $IP", "",$PID,$logdir);
 
 	foreach my $lists (@{$device->{get}}) {
 		$SNMPget{$lists->{object}} = $lists->{oid};
@@ -322,7 +322,7 @@
 	############### SNMP Queries ###############
 	($session, $error) = start_session($IP,$snmp_version,$snmp_community,$snmp_username,$snmp_authkey,$snmp_authpassword,$snmp_authprotocol,$snmp_privkey,$snmp_privpassword,$snmp_privprotocol,'1');
 	if (!defined($session)) {
-		debug($log,"[$IP] Error on connection","",$PID,$Bin);
+		debug($log,"[$IP] Error on connection","",$PID,$logdir);
 		print("SNMP ERROR: %s.\n", $error);
 		return "";
 	}
@@ -336,7 +336,7 @@
 		$error = "No response from remote host";
 		%ArraySNMPget = ();
 		%ArraySNMPwalk = ();
-		debug($log,"[$IP] $error","",$PID,$Bin);
+		debug($log,"[$IP] $error","",$PID,$logdir);
 		return "";
 	} else {
 		# Query SNMP get #
@@ -380,7 +380,7 @@
 
 				$Array_trunk_ifIndex = cisco_trunk_port(%ArraySNMPwalk);
 
-				debug($log,"[".$device->{infos}->{ip}."] : Vlan : Start", "",$PID,$Bin);
+				debug($log,"[".$device->{infos}->{ip}."] : Vlan : Start", "",$PID,$logdir);
 				%ArrayVlans = ();
 				%ArraySNMP = ();
 				%ArrayVlans = snmpwalk('.1.3.6.1.4.1.9.9.46.1.3.1.1.4.1');
@@ -404,17 +404,17 @@
    		}
 		}
 	}
-	debug($log,"[".$device->{infos}->{ip}."] : end Thread", "",$PID,$Bin);
-	my $tmp_xml = constructxmlDevice(\%ArraySNMPget,\%ArraySNMPwalk,$IP,$ID,$entity,$error,$agent_version,$config_key,$type,$insertXML,$log,$PID,$Bin);
+	debug($log,"[".$device->{infos}->{ip}."] : end Thread", "",$PID,$logdir);
+	my $tmp_xml = constructxmlDevice(\%ArraySNMPget,\%ArraySNMPwalk,$IP,$ID,$entity,$error,$agent_version,$config_key,$type,$insertXML,$log,$PID,$logdir);
 	return $tmp_xml;
 }
 
 sub query_device_threaded_vlans {
-#	debug($log,"[".$IP."][Vlan ".$vlanID."] Thread create", "",$PID,$Bin);
+#	debug($log,"[".$IP."][Vlan ".$vlanID."] Thread create", "",$PID,$logdir);
 #	if ($experimental == 1) {
 #		threads->yield;
 #	}
-#	debug($log,"[".$IP."][Vlan ".$vlanID."] Thread (1)", "",$PID,$Bin);
+#	debug($log,"[".$IP."][Vlan ".$vlanID."] Thread (1)", "",$PID,$logdir);
 	($session, $error) = start_session($IP,$snmp_version,$snmp_community."@".$vlanID,$snmp_username,$snmp_authkey,$snmp_authpassword,$snmp_authprotocol,$snmp_privkey,$snmp_privpassword,$snmp_privprotocol,'1');
    ($session2, $error2) = start_session($IP,$snmp_version,$snmp_community."@".$vlanID,$snmp_username,$snmp_authkey,$snmp_authpassword,$snmp_authprotocol,$snmp_privkey,$snmp_privpassword,$snmp_privprotocol,'0');
 	%ArraySNMPget_vlan = ();
@@ -430,4 +430,4 @@
 	return $insertXML_tmp;
 }
 
-1;
\ Pas de fin de ligne à la fin du fichier.
+1;
diff -Naur -x '*~' agent_tracker/tools/verif_descr.pl agent_tracker-fhs/tools/verif_descr.pl
--- agent_tracker/tools/verif_descr.pl	2009-10-14 17:25:05.000000000 +0200
+++ agent_tracker-fhs/tools/verif_descr.pl	2010-03-23 17:03:37.000000000 +0100
@@ -1,9 +1,10 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 
 use LWP::Simple;
 use POSIX qw(strftime);
+use lib '/usr/share/tracker_agent/inc';
 
-require '../inc/device_serials.pm';
+require 'device_serials.pm';
 
 
 $urlfr = "https://forge.indepnet.net/wiki/tracker/Deviceslist";
diff -Naur -x '*~' agent_tracker/tracker_agent.pl agent_tracker-fhs/tracker_agent.pl
--- agent_tracker/tracker_agent.pl	2009-10-15 23:16:33.000000000 +0200
+++ agent_tracker-fhs/tracker_agent.pl	2010-03-23 17:04:13.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
 
 #BEGIN {
 #    if ($^O ne "MSWin32")
@@ -18,6 +18,7 @@
 my $argnodisplay = 0;
 my $argnoprogressbar = 0;
 my $conffile = "";
+my $logdir = "/var/log/tracker_agent";
 my ($input_file, $nodisplay, $noprogressbar, $help);
 $nodisplay=0;
 $noprogressbar=0;
@@ -69,9 +70,9 @@
 use HTTP::Request::Common;
 use XML::Simple;
 use Data::Dumper;
-use FindBin qw($Bin);
 use File::stat;
 use Parallel::ForkManager;
+use lib '/usr/share/tracker_agent/inc';
 if (! $Config{'useithreads'}) {
 	print("1..0 # Skip: Perl not compiled with 'useithreads'\n");
 	exit(0);
@@ -116,23 +117,23 @@
 ##### Include serials for discovery
 ###########################################
 
-require $Bin.'/inc/errors.pm';
-require $Bin.'/inc/device_serials.pm';
-require $Bin.'/inc/functions.pm';
-require $Bin.'/inc/communications_serveur.pm';
-require $Bin.'/inc/tracker_snmp.pm';
-require $Bin.'/inc/tracker_xml.pm';
+require 'errors.pm';
+require 'device_serials.pm';
+require 'functions.pm';
+require 'communications_serveur.pm';
+require 'tracker_snmp.pm';
+require 'tracker_xml.pm';
 
 # Manufacturer specifications
-require $Bin.'/inc/devices/cisco.pm';
-require $Bin.'/inc/devices/hp.pm';
-require $Bin.'/inc/devices/samsung.pm';
-require $Bin.'/inc/devices/wyse.pm';
+require 'devices/cisco.pm';
+require 'devices/hp.pm';
+require 'devices/samsung.pm';
+require 'devices/wyse.pm';
 
-require $Bin.'/inc/tracker_discovery.pm';
-require $Bin.'/inc/tracker_query.pm';
+require 'tracker_discovery.pm';
+require 'tracker_query.pm';
 
-require $Bin.'/inc/tracker_pid.pm';
+require 'tracker_pid.pm';
 
 pid_check_lock();
 
@@ -140,7 +141,7 @@
 ############# Read config file #############
 ############################################
 
-if (! -e $Bin.'/'.$conffile) {
+if (! -e "/etc/$conffile") {
 	ErrorCode('1051');
    delete_pid();
 	exit;
@@ -149,7 +150,7 @@
 $config->define("server", {ARGCOUNT => ARGCOUNT_ONE});
 $config->define("id", {ARGCOUNT => ARGCOUNT_ONE});
 $config->define("key", {ARGCOUNT => ARGCOUNT_ONE});
-$config->file($Bin.'/'.$conffile);
+$config->file("/etc/$conffile");
 
 #############################################
 ####### Get values by http request ##########
@@ -185,25 +186,24 @@
 	my $fragment = ($data->{agent}->{fragment}) * 1000;
 	my $log = $data->{agent}->{logs};
 
-	debug($log,"=========================================","",$PID,$Bin);
-	debug($log,"============== Start Agent ==============","",$PID,$Bin);
-	debug($log,"=========================================","",$PID,$Bin);
-	debug($log,"Operating system : ".$Config{osname},"",$PID,$Bin);
-	debug($log,"Operating system version : ".$Config{osvers},"",$PID,$Bin);
-	debug($log,"Operating system arch : ".$Config{archname},"",$PID,$Bin);
-	debug($log,"Perl version : ".$Config{PERL_REVISION}.".".$Config{PERL_VERSION}.".".$Config{PERL_SUBVERSION},"",$PID,$Bin);
-	debug($log,"Thread version : ".$threads::VERSION,"",$PID,$Bin);
-	debug($log,"ForkManager version : ".$Parallel::ForkManager::VERSION,"",$PID,$Bin);
-	debug($log,"SNMP version : ".$Net::SNMP::VERSION,"",$PID,$Bin);
-	debug($log,"Zlib version : ".$Compress::Zlib::VERSION,"",$PID,$Bin);
-	debug($log,"AppConfig version : ".$AppConfig::VERSION,"",$PID,$Bin);
-	debug($log,"UserAgent version : ".$LWP::UserAgent::VERSION,"",$PID,$Bin);
-	debug($log,"HTTP Request Common version : ".$HTTP::Request::Common::VERSION,"",$PID,$Bin);
-	debug($log,"XML Simple version : ".$XML::Simple::VERSION,"",$PID,$Bin);
-	debug($log,"Data Dumper version : ".$Data::Dumper::VERSION,"",$PID,$Bin);
-	debug($log,"FindBin version : ".$FindBin::VERSION,"",$PID,$Bin);
-	debug($log,"","",$PID,$Bin);
-	debug($log,$data,"dump",$PID,$Bin);
+	debug($log,"=========================================","",$PID,$logdir);
+	debug($log,"============== Start Agent ==============","",$PID,$logdir);
+	debug($log,"=========================================","",$PID,$logdir);
+	debug($log,"Operating system : ".$Config{osname},"",$PID,$logdir);
+	debug($log,"Operating system version : ".$Config{osvers},"",$PID,$logdir);
+	debug($log,"Operating system arch : ".$Config{archname},"",$PID,$logdir);
+	debug($log,"Perl version : ".$Config{PERL_REVISION}.".".$Config{PERL_VERSION}.".".$Config{PERL_SUBVERSION},"",$PID,$logdir);
+	debug($log,"Thread version : ".$threads::VERSION,"",$PID,$logdir);
+	debug($log,"ForkManager version : ".$Parallel::ForkManager::VERSION,"",$PID,$logdir);
+	debug($log,"SNMP version : ".$Net::SNMP::VERSION,"",$PID,$logdir);
+	debug($log,"Zlib version : ".$Compress::Zlib::VERSION,"",$PID,$logdir);
+	debug($log,"AppConfig version : ".$AppConfig::VERSION,"",$PID,$logdir);
+	debug($log,"UserAgent version : ".$LWP::UserAgent::VERSION,"",$PID,$logdir);
+	debug($log,"HTTP Request Common version : ".$HTTP::Request::Common::VERSION,"",$PID,$logdir);
+	debug($log,"XML Simple version : ".$XML::Simple::VERSION,"",$PID,$logdir);
+	debug($log,"Data Dumper version : ".$Data::Dumper::VERSION,"",$PID,$logdir);
+	debug($log,"","",$PID,$logdir);
+	debug($log,$data,"dump",$PID,$logdir);
 
 	#########################################
 	########### Discover devices ############
@@ -219,14 +219,14 @@
 
 	my ($nbip,$iplist) = rangeip($data,$nb_core_discovery);
 
-	debug($log,"==== List of IP to discover ====","",$PID,$Bin);
-	debug($log,$iplist,"dump",$PID,$Bin);
+	debug($log,"==== List of IP to discover ====","",$PID,$logdir);
+	debug($log,$iplist,"dump",$PID,$logdir);
 
 	$authSNMP_discovery = discovery_auth($data);
 
 	$date_start_discovery = date_now();
 	if ($nbip != 0) {
-		$xml_post .= discovery_threaded($nb_threads_discovery,$nb_core_discovery,$log,$Bin,$config->server,$PID,$fragment,$iplist,$authSNMP_discovery,$nbip,$argnodisplay,$argnoprogressbar);
+		$xml_post .= discovery_threaded($nb_threads_discovery,$nb_core_discovery,$log,$logdir,$config->server,$PID,$fragment,$iplist,$authSNMP_discovery,$nbip,$argnodisplay,$argnoprogressbar);
 	}
 
    $date_end_discovery = date_now();
@@ -252,7 +252,7 @@
    }
 
 	$date_start_query = date_now();
-	$num_files = query_threaded($nb_threads_query, $data,$fragment,$PID,$nb_core_query,$log,$Bin,$config->server,$config->key,$agent_version,$argnodisplay,$argnoprogressbar);
+	$num_files = query_threaded($nb_threads_query, $data,$fragment,$PID,$nb_core_query,$log,$logdir,$config->server,$config->key,$agent_version,$argnodisplay,$argnoprogressbar);
 	$date_end_query = date_now();
 
 	#########################################
@@ -269,9 +269,9 @@
    $data_compressed = Compress::Zlib::memGzip($xml_post);
    send_snmp_http($data_compressed,$PID,$config->server);
 
-   debug($log,"=========================================","",$PID,$Bin);
-   debug($log,"================== END ==================","",$PID,$Bin);
-   debug($log,"=========================================","",$PID,$Bin);
+   debug($log,"=========================================","",$PID,$logdir);
+   debug($log,"================== END ==================","",$PID,$logdir);
+   debug($log,"=========================================","",$PID,$logdir);
 
    delete_pid();

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional