![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 00def48475f2a6e23380df446f3d58e25854fcef..fa4d03fd5b948e8200649f76c8ca88446aff6da4 100644 (file)
use Net::LDAP;
use Socket;
use Net::hostent;
+use Net::DNS;
BEGIN{}
END {}
my ($known_clients_file_name);
my ($server_activ, $server_ip, $server_mac_address, $server_port, $SIPackages_key, $max_clients, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password);
-my ($bus_activ, $bus_passwd, $bus_ip, $bus_port);
+my ($bus_activ, $bus_key, $bus_ip, $bus_port);
my $server;
my $network_interface;
my $no_bus;
},
"bus" =>
{"bus_activ" => [\$bus_activ, "on"],
- "bus_passwd" => [\$bus_passwd, ""],
+ "bus_passwd" => [\$bus_key, ""],
"bus_ip" => [\$bus_ip, ""],
"bus_port" => [\$bus_port, "20080"],
},
primkey=>'hostname',
hostname=>$bus_address,
status=>'bus',
- hostkey=>$bus_passwd,
+ hostkey=>$bus_key,
timestamp=>&get_time,
} );
my $msg_hash = &create_xml_hash("here_i_am", $server_address, $bus_address);
my $msg = &create_xml_string($msg_hash);
+
+ &main::send_msg_to_target($msg, $bus_address, $bus_key, "here_i_am");
return $msg;
# my $answer = "";
# $answer = &send_msg_hash2address($msg_hash, $bus_address, $bus_passwd);
}
}
- if( $error == 0) {
- if( 0 == @out_msg_l ) {
- push(@out_msg_l, $msg);
- }
- }
+# if( $error == 0) {
+# if( 0 == @out_msg_l ) {
+# push(@out_msg_l, $msg);
+# }
+# }
return \@out_msg_l;
}
# add entry to known_clients_db
+ my $act_timestamp = &get_time;
my $res = $main::known_clients_db->add_dbentry( {table=>'known_clients',
primkey=>'hostname',
hostname=>$source,
macaddress=>$mac_address,
status=>'registered',
hostkey=>$new_passwd,
- timestamp=>&get_time,
+ timestamp=>$act_timestamp,
} );
if ($res != 0) {
# send update msg to bus
$out_hash = &create_xml_hash("new_client", $server_address, $bus_address, $source);
+ &add_content2xml_hash($out_hash, "macaddress", $mac_address);
+ &add_content2xml_hash($out_hash, "timestamp", $act_timestamp);
my $new_client_out = &create_xml_string($out_hash);
push(@out_msg_l, $new_client_out);
&main::daemon_log("send bus msg that client '$source' has registerd at server '$server_address'", 3);
sub process_detected_hardware {
my $msg_hash = shift;
my $address = $msg_hash->{source}[0];
+ my $gotoHardwareChecksum= $msg_hash->{detected_hardware}[0]->{gotoHardwareChecksum};
my $sql_statement= "SELECT * FROM known_clients WHERE hostname='$address'";
my $res = $main::known_clients_db->select_dbentry( $sql_statement );
my $hit_counter = keys %{$res};
if( not $hit_counter == 1 ) {
&main::daemon_log("ERROR: more or no hit found in known_clients_db by query by '$address'", 1);
+ return;
}
my $macaddress = $res->{1}->{macaddress};
filter => "(&(objectClass=GOhard)(|(macAddress=$macaddress)(dhcpHWaddress=ethernet $macaddress)))"
);
+ # We need to create a base entry first (if not done from ArpHandler)
+ if($mesg->count == 0) {
+ &main::daemon_log("Need to create a new LDAP Entry for client $address", 1);
+ my $resolver=Net::DNS::Resolver->new;
+ my $ipaddress= $1 if $address =~ /^([0-9\.]*?):.*$/;
+ my $dnsresult= $resolver->search($ipaddress);
+ my $dnsname= (defined($dnsresult))?$dnsresult->{answer}[0]->{ptrdname}:$ipaddress;
+ my $cn = (($dnsname =~ /^(\d){1,3}\.(\d){1,3}\.(\d){1,3}\.(\d){1,3}/) ? $dnsname : sprintf "%s", $dnsname =~ /([^\.]+)\.?/);
+ my $dn = "cn=$cn,ou=incoming,$ldap_base";
+ &main::daemon_log("Creating entry for $dn",6);
+ my $entry= Net::LDAP::Entry->new( $dn );
+ $entry->dn($dn);
+ $entry->add("objectClass" => "goHard");
+ $entry->add("cn" => $cn);
+ $entry->add("macAddress" => $macaddress);
+ $entry->add("gotoSysStatus" => "new-system");
+ $entry->add("ipHostNumber" => $ipaddress);
+ if(my $res=$entry->update($ldap)) {
+ # Fill $mesg again
+ $mesg = $ldap->search(
+ base => $ldap_base,
+ scope => 'sub',
+ filter => "(&(objectClass=GOhard)(|(macAddress=$macaddress)(dhcpHWaddress=ethernet $macaddress)))"
+ );
+ } else {
+ &main::daemon_log("There was a problem adding the entry", 1);
+ }
+
+ }
+
if($mesg->count == 1) {
my $entry= $mesg->entry(0);
$entry->changetype("modify");
foreach my $attribute (
"gotoSndModule", "ghNetNic", "gotoXResolution", "ghSoundAdapter", "ghCpuType", "gotoXkbModel",
"ghGfxAdapter", "gotoXMousePort", "ghMemSize", "gotoXMouseType", "ghUsbSupport", "gotoXHsync",
- "gotoXDriver", "gotoXVsync", "gotoXMonitor") {
+ "gotoXDriver", "gotoXVsync", "gotoXMonitor", "gotoHardwareChecksum") {
if(defined($msg_hash->{detected_hardware}[0]->{$attribute})) {
if(defined($entry->get_value($attribute))) {
$entry->delete($attribute);
}
}
+
if($entry->update($ldap)) {
&main::daemon_log("Added Hardware configuration to LDAP", 4);
}
if($mesg->count() == 0) {
&main::daemon_log("Host was not found in LDAP!", 1);
- return;
- }
-
- my $entry= $mesg->entry(0);
- my $dn= $entry->dn;
- if(defined($entry->get_value("gotoHardwareChecksum"))) {
- if(! $entry->get_value("gotoHardwareChecksum") eq $gotoHardwareChecksum) {
- $entry->replace(gotoHardwareChecksum => $gotoHardwareChecksum);
- if($entry->update($ldap)) {
- &main::daemon_log("Hardware changed! Detection triggered.", 4);
- }
- } else {
- # Nothing to do
- return;
- }
} else {
- # need to fill it to LDAP
- $entry->add(gotoHardwareChecksum => $gotoHardwareChecksum);
- if($entry->update($ldap)) {
- &main::daemon_log("gotoHardwareChecksum $gotoHardwareChecksum was added to LDAP", 4);
+ my $entry= $mesg->entry(0);
+ my $dn= $entry->dn;
+ if(defined($entry->get_value("gotoHardwareChecksum"))) {
+ if(! $entry->get_value("gotoHardwareChecksum") eq $gotoHardwareChecksum) {
+ $entry->replace(gotoHardwareChecksum => $gotoHardwareChecksum);
+ if($entry->update($ldap)) {
+ &main::daemon_log("Hardware changed! Detection triggered.", 4);
+ }
+ } else {
+ # Nothing to do
+ return;
+ }
}
+ }
+ # need to fill it to LDAP
+ #$entry->add(gotoHardwareChecksum => $gotoHardwareChecksum);
+ #if($entry->update($ldap)) {
+ # &main::daemon_log("gotoHardwareChecksum $gotoHardwareChecksum was added to LDAP", 4);
+ #}
+
+ ## Look if there another host with this checksum to use the hardware config
+ #$mesg = $ldap->search(
+ # base => $ldap_base,
+ # scope => 'sub',
+ # filter => "(&(objectClass=GOhard)(gotoHardwareChecksum=$gotoHardwareChecksum))"
+ #);
+
+ #if($mesg->count>1) {
+ # my $clone_entry= $mesg->entry(0);
+ # $entry->changetype("modify");
+ # foreach my $attribute (
+ # "gotoSndModule", "ghNetNic", "gotoXResolution", "ghSoundAdapter", "ghCpuType", "gotoXkbModel",
+ # "ghGfxAdapter", "gotoXMousePort", "ghMemSize", "gotoXMouseType", "ghUsbSupport", "gotoXHsync",
+ # "gotoXDriver", "gotoXVsync", "gotoXMonitor") {
+ # my $value= $clone_entry->get_value($attribute);
+ # if(defined($value)) {
+ # if(defined($entry->get_value($attribute))) {
+ # $entry->delete($attribute);
+ # }
+ # &main::daemon_log("Adding attribute $attribute with value $value",1);
+ # $entry->add($attribute => $value);
+ # }
+ # }
+ # foreach my $attribute (
+ # "gotoModules", "ghScsiDev", "ghIdeDev") {
+ # my $array= $clone_entry->get_value($attribute, 'as_ref' => 1);
+ # if(defined($array)) {
+ # if(defined($entry->get_value($attribute))) {
+ # $entry->delete($attribute);
+ # }
+ # foreach my $array_entry (@{$array}) {
+ # $entry->add($attribute => $array_entry);
+ # }
+ # }
+
+ # }
+ # if($entry->update($ldap)) {
+ # &main::daemon_log("Added Hardware configuration to LDAP", 4);
+ # }
+
+ #}
- ## Look if there another host with this checksum to use the hardware config
- #$mesg = $ldap->search(
- # base => $ldap_base,
- # scope => 'sub',
- # filter => "(&(objectClass=GOhard)(gotoHardwareChecksum=$gotoHardwareChecksum))"
- #);
-
- #if($mesg->count>1) {
- # my $clone_entry= $mesg->entry(0);
- # $entry->changetype("modify");
- # foreach my $attribute (
- # "gotoSndModule", "ghNetNic", "gotoXResolution", "ghSoundAdapter", "ghCpuType", "gotoXkbModel",
- # "ghGfxAdapter", "gotoXMousePort", "ghMemSize", "gotoXMouseType", "ghUsbSupport", "gotoXHsync",
- # "gotoXDriver", "gotoXVsync", "gotoXMonitor") {
- # my $value= $clone_entry->get_value($attribute);
- # if(defined($value)) {
- # if(defined($entry->get_value($attribute))) {
- # $entry->delete($attribute);
- # }
- # &main::daemon_log("Adding attribute $attribute with value $value",1);
- # $entry->add($attribute => $value);
- # }
- # }
- # foreach my $attribute (
- # "gotoModules", "ghScsiDev", "ghIdeDev") {
- # my $array= $clone_entry->get_value($attribute, 'as_ref' => 1);
- # if(defined($array)) {
- # if(defined($entry->get_value($attribute))) {
- # $entry->delete($attribute);
- # }
- # foreach my $array_entry (@{$array}) {
- # $entry->add($attribute => $array_entry);
- # }
- # }
-
- # }
- # if($entry->update($ldap)) {
- # &main::daemon_log("Added Hardware configuration to LDAP", 4);
- # }
-
- #}
-
- }
# Assemble data package
my %data = ();
$mesg = $ldap->unbind;
&main::daemon_log("Send detect_hardware message to $address", 4);
-
+
# Send information
return send_msg("detect_hardware", $server_address, $address, \%data);
}