New config option in ArpHandler to control if existing entries should be updated...

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

diff --git a/gosa-si/modules/ArpHandler.pm b/gosa-si/modules/ArpHandler.pm
index 0e551f43fbd2aae9433ec59e47b6aef2ceea6445..144d72b55ac6824ce21db12a3311ddb562f8f5d0 100644 (file)
--- 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,7 +59,7 @@ 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) && ( (-s $main::cfg_file) > 0 )) {
                if( -r $main::cfg_file ) {
@@ -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,7 +93,6 @@ sub get_module_info {
                                &main::daemon_log("Loading OUI cache file suceeded!", 6);
                        }
                }
-               my $ldap_handle = &main::get_ldap_handle();
 
                # When interface is not configured (or 'all'), start arpwatch on all possible interfaces
                if ((!defined($arp_interface)) || $arp_interface eq 'all') {
@@ -174,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})) {
@@ -213,7 +211,7 @@ 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}.
                                ": ".$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}.
@@ -271,37 +269,6 @@ sub get_host_from_ldap {
        return $result;
 }
 
-# moved to GosaSupportDaemon: 03-06-2008: rettenbe
-#===  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 
@@ -377,7 +344,7 @@ sub add_ldap_entry {
                # 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)}
@@ -477,4 +444,5 @@ sub search_ldap_entry {
        return $msg;
 }
 
+# vim:ts=4:shiftwidth:expandtab
 1;