index d81ef57d5a6db68d02f95300da152236053c6ec7..144d72b55ac6824ce21db12a3311ddb562f8f5d0 100644 (file)
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;
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 $resolver=Net::DNS::Resolver->new;
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 ================================================================
# 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 {
}
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) {
&main::daemon_log("Loading OUI cache file suceeded!", 6);
}
}
- if(defined($ldap_uri) && length($ldap_uri)>0) {
- &main::refresh_ldap_handle();
- if (!$main::ldap_handle) {
- &main::daemon_log("Could not connect to LDAP Server at $ldap_uri!\n$@", 1);
- }
- } else {
- $main::ldap_handle= undef;
- }
# When interface is not configured (or 'all'), start arpwatch on all possible interfaces
if ((!defined($arp_interface)) || $arp_interface eq 'all') {
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})) {
+ 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})) {
": ".$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',
}
$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}.
"->".$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',
my $mac=shift;
my $result={};
- if(defined($main::ldap_handle)) {
+ my $ldap_handle = &main::get_ldap_handle();
+ if(defined($ldap_handle)) {
my $ldap_result= &search_ldap_entry(
- $main::ldap_handle,
+ $ldap_handle,
$ldap_base,
"(|(macAddress=$mac)(dhcpHWAddress=ethernet $mac))"
);
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
# 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)}
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
return $msg;
}
+# vim:ts=4:shiftwidth:expandtab
1;