Increased waiting time.

[gosa.git] / gosa-si / gosa-si-server

diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server
index 4397b5c1d1560b612a03e94f9b3f190d2b025e21..29a52650990ca810c40c63f223ce0aaf5ebd238e 100755 (executable)
--- a/gosa-si/gosa-si-server
+++ b/gosa-si/gosa-si-server
@@ -25,7 +25,6 @@ use warnings;
 use Getopt::Long;
 use Config::IniFiles;
 use POSIX;
-use Time::HiRes qw( gettimeofday );
 
 use Fcntl;
 use IO::Socket::INET;
@@ -210,7 +209,7 @@ sub daemon_log {
                 $hours = $hours < 10 ? $hours = "0".$hours : $hours;
                 $minutes = $minutes < 10 ? $minutes = "0".$minutes : $minutes;
                 $seconds = $seconds < 10 ? $seconds = "0".$seconds : $seconds;
-                my @monthnames = ("Jan", "Feb", "Mar", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
+                my @monthnames = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec");
                 $month = $monthnames[$month];
                 $monthday = $monthday < 10 ? $monthday = "0".$monthday : $monthday;
                 $year+=1900;
@@ -444,7 +443,6 @@ sub input_from_known_server {
     my ($input, $remote_ip) = @_ ;  
     my ($msg, $msg_hash, $module);
 
-    
     my $sql_statement= "SELECT * FROM known_server";
     my $query_res = $known_server_db->select_dbentry( $sql_statement ); 
     while( my ($hit_num, $hit) = each %{ $query_res } ) {    
@@ -670,7 +668,6 @@ sub send_msg_to_target {
     }
     
     if( $error == 0 ) {
-
         # send xml msg
         print $socket $crypted_msg."\n";
 
@@ -688,6 +685,12 @@ sub send_msg_to_target {
 }
 
 
+sub _start {
+    my ($kernel) = $_[KERNEL];
+    &trigger_db_loop($kernel);
+}
+
+
 sub client_input {
     no strict "refs";
     my ($heap,$input,$wheel) = @_[HEAP, ARG0, ARG1];
@@ -721,7 +724,7 @@ sub client_input {
     # process incoming msg
     if( $error == 0) {
         daemon_log("Processing module ".$module, 3);
-        $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash);
+        $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash, $heap->{'remote_ip'});
 
         if ( 0 > @{$answer_l} ) {
             my $answer_str = join("\n", @{$answer_l});
@@ -730,6 +733,8 @@ sub client_input {
     }
     if( !$answer_l ) { $error++ };
 
+    ########
+    # answer
     if( $error == 0 ) {
 
         # for each answer in answer list
@@ -767,7 +772,7 @@ sub client_input {
                         while( my ($hit_num, $hit) = each %{ $query_res } ) {    
                             my $host_name = $hit->{hostname};
                             my $host_key = $hit->{hostkey};
-                            &send_msg_to_target($answer, $host_name, $host_key);
+                            &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
                         }
                     }
                     elsif( $answer_target eq "GOSA" ) {
@@ -781,13 +786,10 @@ sub client_input {
                         my $query_res = $known_server_db->select_dbentry( $sql_statement ); 
                         while( my ($hit_num, $hit) = each %{ $query_res } ) {    
                             my $host_name = $hit->{hostname};
-                           my $host_key = $hit->{hostkey};
-                           $answer =~ s/KNOWN_SERVER/$host_name/g;
-                            &send_msg_to_target($answer, $host_name, $host_key);
+                            my $host_key = $hit->{hostkey};
+                            $answer =~ s/KNOWN_SERVER/$host_name/g;
+                            &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
                         }
-                       
-                       print STDERR $answer_target."\n";
-
                     }
                     else {
                         # answer is for one specific host
@@ -812,11 +814,6 @@ sub client_input {
     return;
 }
 
-sub _start {
-    my ($kernel) = $_[KERNEL];
-    &trigger_db_loop($kernel);
-    #&register_at_gosa_si_bus();
-}
 
 
 sub trigger_db_loop {