index d81ef57d5a6db68d02f95300da152236053c6ec7..3bc46cfd05861f2cd89c61a5bc51aba0bb9cf017 100644 (file)
use Net::DNS;
use Switch;
use Data::Dumper;
use Net::DNS;
use Switch;
use Data::Dumper;
-use utf8;
+use Socket;
# Don't start if some of the modules are missing
my $start_service=1;
# Don't start if some of the modules are missing
my $start_service=1;
my ($timeout, $mailto, $mailfrom, $user, $group);
my ($arp_enabled, $arp_interface, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password);
my $hosts_database={};
my ($timeout, $mailto, $mailfrom, $user, $group);
my ($arp_enabled, $arp_interface, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password);
my $hosts_database={};
-my $resolver=Net::DNS::Resolver->new;
my $ldap;
my %cfg_defaults =
my $ldap;
my %cfg_defaults =
&main::daemon_log("Loading OUI cache file suceeded!", 6);
}
}
&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(defined($ldap_uri) && length($ldap_uri)>0) {
- &main::refresh_ldap_handle();
- if (!$main::ldap_handle) {
+ if (!$ldap_handle) {
&main::daemon_log("Could not connect to LDAP Server at $ldap_uri!\n$@", 1);
}
} else {
&main::daemon_log("Could not connect to LDAP Server at $ldap_uri!\n$@", 1);
}
} else {
- $main::ldap_handle= undef;
+ $ldap_handle= undef;
}
# When interface is not configured (or 'all'), start arpwatch on all possible interfaces
}
# When interface is not configured (or 'all'), start arpwatch on all possible interfaces
my $capture_device = sprintf "%s", $kernel->alias_list($sender) =~ /^arp_watch_(.*)$/;
my $capture_device = sprintf "%s", $kernel->alias_list($sender) =~ /^arp_watch_(.*)$/;
- if(!exists($hosts_database->{$packet->{source_haddr}})) {
- my $dnsresult= $resolver->search($packet->{source_ipaddr});
- my $dnsname= (defined($dnsresult))?$dnsresult->{answer}[0]->{ptrdname}:$packet->{source_ipaddr};
+ my $ldap_handle = &main::get_ldap_handle();
+ 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})) {
$hosts_database->{$packet->{source_haddr}}=$ldap_result;
my $ldap_result=&get_host_from_ldap($packet->{source_haddr});
if(exists($ldap_result->{dn})) {
$hosts_database->{$packet->{source_haddr}}=$ldap_result;
": ".$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}.
"/".$hosts_database->{$packet->{source_haddr}}->{macAddress},4);
&add_ldap_entry(
": ".$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}.
"/".$hosts_database->{$packet->{source_haddr}}->{macAddress},4);
&add_ldap_entry(
- $main::ldap_handle,
+ $ldap_handle,
$ldap_base,
$hosts_database->{$packet->{source_haddr}}->{macAddress},
'new-system',
$ldap_base,
$hosts_database->{$packet->{source_haddr}}->{macAddress},
'new-system',
"->".$packet->{source_ipaddr}, 4);
$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}= $packet->{source_ipaddr};
&change_ldap_entry(
"->".$packet->{source_ipaddr}, 4);
$hosts_database->{$packet->{source_haddr}}->{ipHostNumber}= $packet->{source_ipaddr};
&change_ldap_entry(
- $main::ldap_handle,
+ $ldap_handle,
$ldap_base,
$hosts_database->{$packet->{source_haddr}}->{macAddress},
'ip-changed',
$ldap_base,
$hosts_database->{$packet->{source_haddr}}->{macAddress},
'ip-changed',
my $mac=shift;
my $result={};
my $mac=shift;
my $result={};
- if(defined($main::ldap_handle)) {
+ my $ldap_handle = &get_ldap_handle();
+ if(defined($ldap_handle)) {
my $ldap_result= &search_ldap_entry(
my $ldap_result= &search_ldap_entry(
- $main::ldap_handle,
+ $ldap_handle,
$ldap_base,
"(|(macAddress=$mac)(dhcpHWAddress=ethernet $mac))"
);
$ldap_base,
"(|(macAddress=$mac)(dhcpHWAddress=ethernet $mac))"
);
if (defined($ip)) {
$replace->{'ipHostNumber'} = $ip;
}
if (defined($ip)) {
$replace->{'ipHostNumber'} = $ip;
}
- my $result = $main::ldap_handle->modify( $dn, replace => $replace );
+ my $result = $ldap_tree->modify( $dn, replace => $replace );
# for $result->code constants please look at Net::LDAP::Constant
if($result->code == 32) { # entry doesnt exists
# for $result->code constants please look at Net::LDAP::Constant
if($result->code == 32) { # entry doesnt exists