Updated package selection

[gosa.git] / gosa-si / modules / ArpHandler.pm

diff --git a/gosa-si/modules/ArpHandler.pm b/gosa-si/modules/ArpHandler.pm
index 03a55ec9a5408f2c25eb4d1a93a2eb2073cececd..210e95654f4e0231a4f6888c3a3f46d351925232 100644 (file)
--- a/gosa-si/modules/ArpHandler.pm
+++ b/gosa-si/modules/ArpHandler.pm
@@ -34,7 +34,7 @@ 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;
 
@@ -43,6 +43,7 @@ my %cfg_defaults =
     "ArpHandler" => {
         "enabled"             => [\$arp_enabled,         "true"],
         "interface"           => [\$arp_interface,       "all"],
+        "update-entries"      => [\$arp_update,          "false"],
     },
     "server" => {
         "ldap-uri"            => [\$ldap_uri,            ""],
@@ -78,7 +79,6 @@ sub local_read_configfile {
 }
 
 sub get_module_info {
-    my ($ldap_handle) = @_;
        my @info = (undef, undef);
 
        &local_read_configfile();
@@ -172,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})) {
@@ -195,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, 
@@ -211,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, 
@@ -311,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;
@@ -334,10 +334,10 @@ 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;
                }
 
@@ -357,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;
 }