Code

Increased waiting time.
[gosa.git] / gosa-si / modules / SIPackages.pm
index 1d3213a91a31dfa482bebe2dcfc23b9bb8601d74..00def48475f2a6e23380df446f3d58e25854fcef 100644 (file)
@@ -361,7 +361,7 @@ sub register_at_bus {
 #  DESCRIPTION:  handels the proceeded distribution to the appropriated functions
 #===============================================================================
 sub process_incoming_msg {
-    my ($msg, $msg_hash) = @_ ;
+    my ($msg, $msg_hash, $remote_ip) = @_ ;
     my $error = 0;
     my $host_name;
     my $host_key;
@@ -369,7 +369,6 @@ sub process_incoming_msg {
 
     # process incoming msg
     my $header = @{$msg_hash->{header}}[0]; 
-    my $source = @{$msg_hash->{source}}[0];
     my @target_l = @{$msg_hash->{target}};
 
     &main::daemon_log("SIPackages: msg to process: $header", 3);
@@ -383,25 +382,25 @@ sub process_incoming_msg {
     if( 1 == length @target_l) {
         my $target = $target_l[0];
         if( $target eq $server_address ) {  
-            if ($header eq 'new_passwd') {
-               @out_msg_l = &new_passwd($msg_hash)
-           } elsif ($header eq 'here_i_am') {
-               @out_msg_l = &here_i_am($msg_hash)
-           } elsif ($header eq 'who_has') {
-               @out_msg_l = &who_has($msg_hash)
-           } elsif ($header eq 'who_has_i_do') {
-               @out_msg_l = &who_has_i_do($msg_hash)
-           } elsif ($header eq 'got_ping') {
-               @out_msg_l = &got_ping($msg_hash)
-           } elsif ($header eq 'get_load') {
-               @out_msg_l = &execute_actions($msg_hash)
+            if ($header eq 'new_key') {
+                @out_msg_l = &new_key($msg_hash)
+            } elsif ($header eq 'here_i_am') {
+                @out_msg_l = &here_i_am($msg_hash)
+            } elsif ($header eq 'who_has') {
+                @out_msg_l = &who_has($msg_hash)
+            } elsif ($header eq 'who_has_i_do') {
+                @out_msg_l = &who_has_i_do($msg_hash)
+            } elsif ($header eq 'got_ping') {
+                @out_msg_l = &got_ping($msg_hash)
+            } elsif ($header eq 'get_load') {
+                @out_msg_l = &execute_actions($msg_hash)
             } elsif ($header eq 'detected_hardware') {
-               @out_msg_l = &process_detected_hardware($msg_hash)
-           } elsif ($header eq 'trigger_wake') {
-               foreach (@{$msg_hash->{macAddress}}){
-                   &main::daemon_log("SIPackages: trigger wake for $_", 1);
-                   do_wake($_);
-               }
+                @out_msg_l = &process_detected_hardware($msg_hash)
+            } elsif ($header eq 'trigger_wake') {
+                foreach (@{$msg_hash->{macAddress}}){
+                    &main::daemon_log("SIPackages: trigger wake for $_", 1);
+                    do_wake($_);
+                }
 
             } else {
                 &main::daemon_log("ERROR: $header is an unknown core function", 1);
@@ -453,13 +452,13 @@ sub got_ping {
 #      RETURNS:  nothing
 #  DESCRIPTION:  process this incoming message
 #===============================================================================
-sub new_passwd {
+sub new_key {
     my ($msg_hash) = @_;
     my @out_msg_l;
     
     my $header = @{$msg_hash->{header}}[0];
     my $source_name = @{$msg_hash->{source}}[0];
-    my $source_key = @{$msg_hash->{new_passwd}}[0];
+    my $source_key = @{$msg_hash->{new_key}}[0];
     my $query_res;
 
     # check known_clients_db
@@ -471,7 +470,6 @@ sub new_passwd {
             "SET hostkey='$source_key', timestamp='$act_time' ".
             "WHERE hostname='$source_name'";
         my $res = $main::known_clients_db->update_dbentry( $sql_statement );
-
         my $hash = &create_xml_hash("confirm_new_passwd", $server_address, $source_name);
         my $out_msg = &create_xml_string($hash);
         push(@out_msg_l, $out_msg);
@@ -927,47 +925,47 @@ sub hardware_config {
                        &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);
+               #       }
+
+               #}
 
        }