X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-si%2Fmodules%2FArpHandler.pm;h=210e95654f4e0231a4f6888c3a3f46d351925232;hb=bc18340d72a93568de1eb69137ff8565bcf4262f;hp=3bc46cfd05861f2cd89c61a5bc51aba0bb9cf017;hpb=8d32c2811e256aeea583ef2f04654d6b5e56220f;p=gosa.git

diff --git a/gosa-si/modules/ArpHandler.pm b/gosa-si/modules/ArpHandler.pm
index 3bc46cfd0..210e95654 100644
--- a/gosa-si/modules/ArpHandler.pm
+++ b/gosa-si/modules/ArpHandler.pm
@@ -34,22 +34,23 @@ BEGIN{
 END{}
 
 my ($timeout, $mailto, $mailfrom, $user, $group);
-my ($arp_enabled, $arp_interface, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password);
+my ($arp_enabled, $arp_interface, $arp_update, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password);
 my $hosts_database={};
 my $ldap;
 
 my %cfg_defaults =
 (
-	"ArpHandler" => {
-		"enabled"           => [\$arp_enabled,         "true"],
-		"interface"       => [\$arp_interface,    "all"],
-	},
-	"server" => {
-		"ldap-uri"            => [\$ldap_uri,            ""],
-		"ldap-base"           => [\$ldap_base,           ""],
-		"ldap-admin-dn"       => [\$ldap_admin_dn,       ""],
-		"ldap-admin-password" => [\$ldap_admin_password, ""],
-	},
+    "ArpHandler" => {
+        "enabled"             => [\$arp_enabled,         "true"],
+        "interface"           => [\$arp_interface,       "all"],
+        "update-entries"      => [\$arp_update,          "false"],
+    },
+    "server" => {
+        "ldap-uri"            => [\$ldap_uri,            ""],
+        "ldap-base"           => [\$ldap_base,           ""],
+        "ldap-admin-dn"       => [\$ldap_admin_dn,       ""],
+        "ldap-admin-password" => [\$ldap_admin_password, ""],
+    },
 );
 
 #===  FUNCTION  ================================================================
@@ -58,9 +59,9 @@ my %cfg_defaults =
 #      RETURNS:  nothing
 #  DESCRIPTION:  read cfg_file and set variables
 #===============================================================================
-sub read_configfile {
+sub local_read_configfile {
 	my $cfg;
-	if( defined( $main::cfg_file) && ( length($main::cfg_file) > 0 )) {
+	if( defined( $main::cfg_file) && ( (-s $main::cfg_file) > 0 )) {
 		if( -r $main::cfg_file ) {
 			$cfg = Config::IniFiles->new( -file => $main::cfg_file );
 		} else {
@@ -78,11 +79,9 @@ sub read_configfile {
 }
 
 sub get_module_info {
-	my @info = (undef,
-		undef,
-	);
+	my @info = (undef, undef);
 
-	&read_configfile();
+	&local_read_configfile();
 	# Don't start if some of the modules are missing
 	if(($arp_enabled eq 'true') && $start_service) {
 		if($lookup_vendor) {
@@ -94,14 +93,6 @@ sub get_module_info {
 				&main::daemon_log("Loading OUI cache file suceeded!", 6);
 			}
 		}
-        my $ldap_handle = &main::get_ldap_handle();
-		if(defined($ldap_uri) && length($ldap_uri)>0) {
-			if (!$ldap_handle) {
-				&main::daemon_log("Could not connect to LDAP Server at $ldap_uri!\n$@", 1);
-			}
-		} else {
-			$ldap_handle= undef;
-		}
 
 		# When interface is not configured (or 'all'), start arpwatch on all possible interfaces
 		if ((!defined($arp_interface)) || $arp_interface eq 'all') {
@@ -181,7 +172,7 @@ sub got_packet {
     if(!exists($hosts_database->{$packet->{source_haddr}})) {
 		my $dnsname= gethostbyaddr(inet_aton($packet->{source_ipaddr}), AF_INET) || $packet->{source_ipaddr};
 		my $ldap_result=&get_host_from_ldap($packet->{source_haddr});
-		if(exists($ldap_result->{dn})) {
+		if(exists($ldap_result->{dn}) and $arp_update eq "true") {
 			$hosts_database->{$packet->{source_haddr}}=$ldap_result;
 			$hosts_database->{$packet->{source_haddr}}->{dnsname}= $dnsname;
 			if(!exists($ldap_result->{ipHostNumber})) {
@@ -204,11 +195,11 @@ sub got_packet {
 				cn => (($dnsname =~ /^(\d){1,3}\.(\d){1,3}\.(\d){1,3}\.(\d){1,3}/) ? $dnsname : sprintf "%s", $dnsname =~ /([^\.]+)\./),
 				macVendor => (($lookup_vendor) ? &get_vendor_for_mac($packet->{source_haddr}) : "Unknown Vendor"),
 			};
-			&main::daemon_log("Host was not found in LDAP (".($hosts_database->{$packet->{source_haddr}}->{dnsname}).")",6);
+			&main::daemon_log("A DEBUG: Host was not found in LDAP (".($hosts_database->{$packet->{source_haddr}}->{dnsname}).")",522);
 			&main::daemon_log(
-				"New Host ".($hosts_database->{$packet->{source_haddr}}->{dnsname}).
+				"A INFO: New Host ".($hosts_database->{$packet->{source_haddr}}->{dnsname}).
 				": ".$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}.
-				"/".$hosts_database->{$packet->{source_haddr}}->{macAddress},4);
+				"/".$hosts_database->{$packet->{source_haddr}}->{macAddress},5);
 			&add_ldap_entry(
 				$ldap_handle, 
 				$ldap_base, 
@@ -220,11 +211,11 @@ sub got_packet {
 		}
 		$hosts_database->{$packet->{source_haddr}}->{device}= $capture_device;
 	} else {
-		if(!($hosts_database->{$packet->{source_haddr}}->{ipHostNumber} eq $packet->{source_ipaddr})) {
+		if(($arp_update eq "true") and !($hosts_database->{$packet->{source_haddr}}->{ipHostNumber} eq $packet->{source_ipaddr})) {
 			&main::daemon_log(
-				"IP Address change of MAC ".$packet->{source_haddr}.
+				"A INFO: IP Address change of MAC ".$packet->{source_haddr}.
 				": ".$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}.
-				"->".$packet->{source_ipaddr}, 4);
+				"->".$packet->{source_ipaddr}, 5);
 			$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}= $packet->{source_ipaddr};
 			&change_ldap_entry(
 				$ldap_handle, 
@@ -243,7 +234,7 @@ sub get_host_from_ldap {
 	my $mac=shift;
 	my $result={};
 		
-    my $ldap_handle = &get_ldap_handle();     
+    my $ldap_handle = &main::get_ldap_handle();     
 	if(defined($ldap_handle)) {
 		my $ldap_result= &search_ldap_entry(
 			$ldap_handle,
@@ -278,36 +269,6 @@ sub get_host_from_ldap {
 	return $result;
 }
 
-#===  FUNCTION  ================================================================
-#         NAME:  get_interfaces 
-#   PARAMETERS:  none
-#      RETURNS:  (list of interfaces) 
-#  DESCRIPTION:  Uses proc fs (/proc/net/dev) to get list of interfaces.
-#===============================================================================
-sub get_interfaces {
-	my @result;
-	my $PROC_NET_DEV= ('/proc/net/dev');
-
-	open(PROC_NET_DEV, "<$PROC_NET_DEV")
-		or die "Could not open $PROC_NET_DEV";
-
-	my @ifs = <PROC_NET_DEV>;
-
-	close(PROC_NET_DEV);
-
-	# Eat first two line
-	shift @ifs;
-	shift @ifs;
-
-	chomp @ifs;
-	foreach my $line(@ifs) {
-		my $if= (split /:/, $line)[0];
-		$if =~ s/^\s+//;
-		push @result, $if;
-	}
-
-	return @result;
-}
 
 #===  FUNCTION  ================================================================
 #         NAME:  get_mac 
@@ -350,7 +311,7 @@ sub get_vendor_for_mac {
 		if(length($vendor) > 0) {
 			$result= @{$vendor}[0];
 		}
-		&main::daemon_log("Looking up Vendor for MAC ".$mac.": $result", 4);
+		&main::daemon_log("A INFO: Looking up Vendor for MAC ".$mac.": $result", 5);
 	}
 
 	return $result;
@@ -373,17 +334,17 @@ sub add_ldap_entry {
 		my $s_res = &search_ldap_entry($ldap_tree, $ldap_base, "(|(macAddress=$mac)(dhcpHWAddress=ethernet $mac))");
 		my $c_res = (defined($s_res))?$s_res->count:0;
 		if($c_res == 1) {
-			&main::daemon_log("WARNING: macAddress $mac already in LDAP", 1);
+			&main::daemon_log("A WARNING: macAddress $mac already in LDAP", 3);
 			return;
 		} elsif($c_res > 0) {
-			&main::daemon_log("ERROR: macAddress $mac exists $c_res times in LDAP", 1);
+			&main::daemon_log("A ERROR: macAddress $mac exists $c_res times in LDAP", 1);
 			return;
 		}
 
 		# create LDAP entry 
 		my $entry = Net::LDAP::Entry->new( $dn );
 		$entry->dn($dn);
-		$entry->add("objectClass" => "goHard");
+		$entry->add("objectClass" => "GOhard");
 		$entry->add("cn" => $hosts_database->{$mac}->{cn});
 		$entry->add("macAddress" => $mac);
 		if(defined $gotoSysStatus) {$entry->add("gotoSysStatus" => $gotoSysStatus)}
@@ -396,14 +357,14 @@ sub add_ldap_entry {
 
 		# for $result->code constants please look at Net::LDAP::Constant
 		if($result->code == 68) {   # entry already exists 
-			&main::daemon_log("WARNING: $dn ".$result->error, 3);
+			&main::daemon_log("A WARNING: $dn ".$result->error, 3);
 		} elsif($result->code == 0) {   # everything went fine
-			&main::daemon_log("add entry $dn to ldap", 1);
+			&main::daemon_log("A INFO: Add entry $dn to ldap", 5);
 		} else {  # if any other error occur
-			&main::daemon_log("ERROR: $dn, ".$result->code.", ".$result->error, 1);
+			&main::daemon_log("A ERROR: $dn, ".$result->code.", ".$result->error, 1);
 		}
 	} else {
-		&main::daemon_log("Not adding new Entry: LDAP disabled", 6);
+		&main::daemon_log("A INFO: Not adding new Entry: LDAP disabled", 5);
 	}
 	return;
 }
@@ -483,4 +444,5 @@ sub search_ldap_entry {
 	return $msg;
 }
 
+# vim:ts=4:shiftwidth:expandtab
 1;