Code

msgPool
[gosa.git] / gosa-si / gosa-si-server
index dfa840aa8ef762125c8045d856e549516d7f3ffd..2d13fb1c5376fb9f0c763db2d8fe2d0cf712297d 100755 (executable)
@@ -25,7 +25,6 @@ use warnings;
 use Getopt::Long;
 use Config::IniFiles;
 use POSIX;
-use utf8;
 
 use Fcntl;
 use IO::Socket::INET;
@@ -77,7 +76,7 @@ our $no_arp;
 our $verbose;
 our $forground;
 our $cfg_file;
-our ($ldap_handle, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password );
+our ($ldap_handle, $ldap_uri, $ldap_base, $ldap_admin_dn, $ldap_admin_password, $ldap_server_dn);
 
 
 # specifies the verbosity of the daemon_log
@@ -125,7 +124,7 @@ my @login_users_col_names = ('client', 'user', 'timestamp');
 our $fai_server_db;
 our $fai_server_tn = "fai_server"; 
 my $fai_server_file_name;
-our @fai_server_col_names = ('timestamp', 'server', 'release', 'tag'); 
+our @fai_server_col_names = ('timestamp', 'server', 'release', 'sections', 'tag'); 
 our $fai_release_tn = "fai_release"; 
 our @fai_release_col_names = ('timestamp', 'release', 'class', 'type', 'state'); 
 
@@ -146,8 +145,10 @@ my $messaging_file_name;
 # path to directory to store client install log files
 our $client_fai_log_dir = "/var/log/fai"; 
 
-# queue which stores taskes while max_clients are reached
+# queue which stores taskes until one of the $max_children children are ready to process the task
 my @tasks = qw();
+my $max_children = 2;
+
 
 %cfg_defaults = (
 "general" => {
@@ -316,7 +317,8 @@ sub check_pid {
             chomp( $pid );
             if( -f "/proc/$pid/stat" ) {
                 my($stat) = `cat /proc/$pid/stat` =~ m/$pid \((.+)\).*/;
-                if( $0 eq $stat ) {
+                if( $stat ) {
+                                       daemon_log("ERROR: Already running",1);
                     close( LOCK_FILE );
                     exit -1;
                 }
@@ -409,14 +411,14 @@ sub sig_int_handler {
        }
 
     daemon_log("shutting down gosa-si-server", 1);
-    exit(0);
+    system("killall gosa-si-server");
 }
 $SIG{INT} = \&sig_int_handler;
 
 
 
 sub check_key_and_xml_validity {
-    my ($crypted_msg, $module_key) = @_;
+    my ($crypted_msg, $module_key, $session_id) = @_;
     my $msg;
     my $msg_hash;
     my $error_string;
@@ -424,7 +426,8 @@ sub check_key_and_xml_validity {
         $msg = &decrypt_msg($crypted_msg, $module_key);
 
         if ($msg =~ /<xml>/i){
-            daemon_log("decrypted_msg: \n$msg", 8);
+            $msg =~ s/\s+/ /g;  # just for better daemon_log
+            daemon_log("$session_id DEBUG: decrypted_msg: \n$msg", 8);
             $msg_hash = $xml->XMLin($msg, ForceArray=>1);
 
             ##############
@@ -453,7 +456,7 @@ sub check_key_and_xml_validity {
         }
     };
     if($@) {
-        daemon_log("WARNING: do not understand the message: $@", 5);
+        daemon_log("$session_id DEBUG: do not understand the message: $@", 7);
         $msg = undef;
         $msg_hash = undef;
     }
@@ -526,7 +529,7 @@ sub check_outgoing_xml_validity {
 
 
 sub input_from_known_server {
-    my ($input, $remote_ip) = @_ ;  
+    my ($input, $remote_ip, $session_id) = @_ ;  
     my ($msg, $msg_hash, $module);
 
     my $sql_statement= "SELECT * FROM known_server";
@@ -538,13 +541,13 @@ sub input_from_known_server {
             next;
         }
         my $host_key = $hit->{hostkey};
-        daemon_log("DEBUG: input_from_known_server: host_name: $host_name", 7);
+        daemon_log("$session_id DEBUG: input_from_known_server: host_name: $host_name", 7);
         daemon_log("DEBUG: input_from_known_server: host_key: $host_key", 7);
 
         # check if module can open msg envelope with module key
-        my ($tmp_msg, $tmp_msg_hash) = &check_key_and_xml_validity($input, $host_key);
+        my ($tmp_msg, $tmp_msg_hash) = &check_key_and_xml_validity($input, $host_key, $session_id);
         if( (!$tmp_msg) || (!$tmp_msg_hash) ) {
-            daemon_log("DEBUG: input_from_known_server: deciphering raise error", 7);
+            daemon_log("$session_id DEBUG: input_from_known_server: deciphering raise error", 7);
             daemon_log("$@", 8);
             next;
         }
@@ -557,7 +560,7 @@ sub input_from_known_server {
     }
 
     if( (!$msg) || (!$msg_hash) || (!$module) ) {
-        daemon_log("DEBUG: Incoming message is not from a known server", 7);
+        daemon_log("$session_id DEBUG: Incoming message is not from a known server", 7);
     }
   
     return ($msg, $msg_hash, $module);
@@ -565,7 +568,7 @@ sub input_from_known_server {
 
 
 sub input_from_known_client {
-    my ($input, $remote_ip) = @_ ;  
+    my ($input, $remote_ip, $session_id) = @_ ;  
     my ($msg, $msg_hash, $module);
 
     my $sql_statement= "SELECT * FROM known_clients";
@@ -576,14 +579,14 @@ sub input_from_known_client {
                 next;
                }
         my $host_key = $hit->{hostkey};
-        &daemon_log("DEBUG: input_from_known_client: host_name: $host_name", 7);
-        &daemon_log("DEBUG: input_from_known_client: host_key: $host_key", 7);
+        &daemon_log("$session_id DEBUG: input_from_known_client: host_name: $host_name", 7);
+        &daemon_log("$session_id DEBUG: input_from_known_client: host_key: $host_key", 7);
 
         # check if module can open msg envelope with module key
-        ($msg, $msg_hash) = &check_key_and_xml_validity($input, $host_key);
+        ($msg, $msg_hash) = &check_key_and_xml_validity($input, $host_key, $session_id);
 
         if( (!$msg) || (!$msg_hash) ) {
-            &daemon_log("DEGUG: input_from_known_client: deciphering raise error", 7);
+            &daemon_log("$session_id DEGUG: input_from_known_client: deciphering raise error", 7);
             &daemon_log("$@", 8);
             next;
         }
@@ -594,7 +597,7 @@ sub input_from_known_client {
     }
 
     if( (!$msg) || (!$msg_hash) || (!$module) ) {
-        &daemon_log("DEBUG: Incoming message is not from a known client", 7);
+        &daemon_log("$session_id DEBUG: Incoming message is not from a known client", 7);
     }
 
     return ($msg, $msg_hash, $module);
@@ -603,7 +606,7 @@ sub input_from_known_client {
 
 sub input_from_unknown_host {
     no strict "refs";
-    my ($input) = @_ ;
+    my ($input, $session_id) = @_ ;
     my ($msg, $msg_hash, $module);
     my $error_string;
     
@@ -617,13 +620,13 @@ sub input_from_unknown_host {
             if( $mod eq 'ArpHandler' ) {
                 next;
             }
-            daemon_log("ERROR: no key specified in config file for $mod", 1);
+            daemon_log("$session_id ERROR: no key specified in config file for $mod", 1);
             next;
         }
-        daemon_log("DEBUG: $mod: $module_key", 7);
+        daemon_log("$session_id DEBUG: $mod: $module_key", 7);
 
         # check if module can open msg envelope with module key
-        ($msg, $msg_hash) = &check_key_and_xml_validity($input, $module_key);
+        ($msg, $msg_hash) = &check_key_and_xml_validity($input, $module_key, $session_id);
         if( (not defined $msg) || (not defined $msg_hash) ) {
             next;
         }
@@ -634,7 +637,7 @@ sub input_from_unknown_host {
     }
 
     if( (!$msg) || (!$msg_hash) || (!$module)) {
-        daemon_log("DEBUG: Incoming message is not from an unknown host", 7);
+        daemon_log("$session_id DEBUG: Incoming message is not from an unknown host", 7);
     }
 
     return ($msg, $msg_hash, $module);
@@ -817,7 +820,7 @@ sub get_local_ip_for_remote_ip {
 
 
 sub send_msg_to_target {
-    my ($msg, $address, $encrypt_key, $msg_header) = @_ ;
+    my ($msg, $address, $encrypt_key, $msg_header, $session_id) = @_ ;
     my $error = 0;
     my $header;
     my $new_status;
@@ -842,7 +845,7 @@ sub send_msg_to_target {
     # opensocket
     my $socket = &open_socket($address);
     if( !$socket ) {
-        daemon_log("ERROR: cannot send ".$header."msg to $address , host not reachable", 1);
+        daemon_log("$session_id ERROR: cannot send ".$header."msg to $address , host not reachable", 1);
         $error++;
     }
     
@@ -850,8 +853,8 @@ sub send_msg_to_target {
         # send xml msg
         print $socket $crypted_msg."\n";
 
-        daemon_log("INFO: send ".$header."msg to $address", 5);
-        daemon_log("message:\n$msg", 8);
+        daemon_log("$session_id INFO: send ".$header."msg to $address", 5);
+        #daemon_log("DEBUG: message:\n$msg", 9);
         
     }
 
@@ -872,14 +875,14 @@ sub send_msg_to_target {
         if( $act_status eq "down" ) {
             $sql_statement = "DELETE FROM known_clients WHERE hostname='$address'";
             $res = $known_clients_db->del_dbentry($sql_statement);
-            daemon_log("WARNING: failed 2x to send msg to host '$address', delete host from known_clients", 3);
+            daemon_log("$session_id WARNING: failed 2x to send msg to host '$address', delete host from known_clients", 3);
         } else { 
             $sql_statement = "UPDATE known_clients SET status='$new_status' WHERE hostname='$address'";
             $res = $known_clients_db->update_dbentry($sql_statement);
             if($new_status eq "down"){
-                daemon_log("WARNING: set '$address' from status '$act_status' to '$new_status'", 3);
+                daemon_log("$session_id WARNING: set '$address' from status '$act_status' to '$new_status'", 3);
             } else {
-                daemon_log("INFO: set '$address' from status '$act_status' to '$new_status'", 5);
+                daemon_log("$session_id INFO: set '$address' from status '$act_status' to '$new_status'", 5);
             }
         }
     }
@@ -892,16 +895,16 @@ sub send_msg_to_target {
         if( $act_status eq "down" ) {
             $sql_statement = "DELETE FROM known_server WHERE hostname='$address'";
             $res = $known_server_db->del_dbentry($sql_statement);
-            daemon_log("WARNING: failed 2x to a send msg to host '$address', delete host from known_server", 3);
+            daemon_log("$session_id WARNING: failed 2x to a send msg to host '$address', delete host from known_server", 3);
         } 
         else { 
             $sql_statement = "UPDATE known_server SET status='$new_status' WHERE hostname='$address'";
             $res = $known_server_db->update_dbentry($sql_statement);
             if($new_status eq "down"){
-                daemon_log("WARNING: set '$address' from status '$act_status' to '$new_status'", 3);
+                daemon_log("$session_id WARNING: set '$address' from status '$act_status' to '$new_status'", 3);
             }
             else {
-                daemon_log("INFO: set '$address' from status '$act_status' to '$new_status'", 5);
+                daemon_log("$session_id INFO: set '$address' from status '$act_status' to '$new_status'", 5);
             }
         }
     }
@@ -913,16 +916,18 @@ sub update_jobdb_status_for_send_msgs {
     my ($answer, $error) = @_;
     if( $answer =~ /<jobdb_id>(\d+)<\/jobdb_id>/ ) {
         my $jobdb_id = $1;
+            
+        # sending msg faild
         if( $error ) {
             if (not $answer =~ /<header>trigger_action_reinstall<\/header>/) {
-                # sending msg faild
                 my $sql_statement = "UPDATE $job_queue_tn ".
                     "SET status='error', result='can not deliver msg, please consult log file' ".
                     "WHERE id='$jobdb_id'";
                 my $res = $job_db->update_dbentry($sql_statement);
             }
+
+        # sending msg was successful
         } else {
-            # sending msg was successful
             my $sql_statement = "UPDATE $job_queue_tn ".
                 "SET status='done' ".
                 "WHERE id='$jobdb_id' AND status='processed'";
@@ -931,36 +936,35 @@ sub update_jobdb_status_for_send_msgs {
     }
 }
 
-
 sub _start {
     my ($kernel) = $_[KERNEL];
     &trigger_db_loop($kernel);
-    $kernel->yield('create_fai_server_db', $fai_server_tn );
-       $kernel->yield('create_fai_release_db', $fai_release_tn );
-    $kernel->yield('create_packages_list_db', $sources_list );
+       #$kernel->yield('create_fai_server_db', $fai_server_tn );
+       #$kernel->yield('create_fai_release_db', $fai_release_tn );
 }
 
-
-sub next_tasks {
+sub next_task {
     my ($session, $heap) = @_[SESSION, HEAP];
 
-    while ( keys( %{ $heap->{task} } ) < $max_clients ) {
+    while ( keys( %{ $heap->{task} } ) < $max_children ) {
         my $next_task = shift @tasks;
         last unless defined $next_task;
 
         my $task = POE::Wheel::Run->new(
                 Program => sub { process_task($session, $heap, $next_task) },
-                StdoutFilter => POE::Filter::Reference->new(),
+                StdioFilter => POE::Filter::Reference->new(),
                 StdoutEvent  => "task_result",
                 StderrEvent  => "task_debug",
                 CloseEvent   => "task_done",
-                );
+               );
 
         $heap->{task}->{ $task->ID } = $task;
     }
 }
+
 sub handle_task_result {
-    my ($kernel, $heap, $client_answer) = @_[KERNEL, HEAP, ARG0];    
+    my ($kernel, $heap, $result) = @_[KERNEL, HEAP, ARG0];
+    my $client_answer = $result->{'answer'};
     if( $client_answer =~ s/session_id=(\d+)$// ) {
         my $session_id = $1;
         if( defined $session_id ) {
@@ -968,11 +972,15 @@ sub handle_task_result {
             if( defined $session_reference ) {
                 $heap = $session_reference->get_heap();
             }
-        }     
+        }
+
+        if(exists $heap->{'client'}) {
+            $heap->{'client'}->put($client_answer);
+        }
     }
-    $heap->{client}->put($client_answer);
     $kernel->sig(CHLD => "child_reap");
 }
+
 sub handle_task_debug {
     my $result = $_[ARG0];
     print STDERR "$result\n";
@@ -983,6 +991,7 @@ sub handle_task_done {
     delete $heap->{task}->{$task_id};
     $kernel->yield("next_task");
 }
+
 sub process_task {
     no strict "refs";
     my ($session, $heap, $input) = @_;
@@ -994,220 +1003,47 @@ sub process_task {
     my $client_answer = "";
 
     daemon_log("", 5); 
-    daemon_log("INFO: Incoming msg from '".$heap->{'remote_ip'}."'", 5);
-    daemon_log("DEBUG: Incoming msg:\n$input", 9);
+    daemon_log("$session_id INFO: Incoming msg with session ID $session_id from '".$heap->{'remote_ip'}."'", 5);
+    daemon_log("$session_id DEBUG: Incoming msg:\n$input", 9);
 
     ####################
     # check incoming msg
     # msg is from a new client or gosa
-    ($msg, $msg_hash, $module) = &input_from_unknown_host($input);
+    ($msg, $msg_hash, $module) = &input_from_unknown_host($input, $session_id);
     # msg is from a gosa-si-server or gosa-si-bus
     if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
-        ($msg, $msg_hash, $module) = &input_from_known_server($input, $heap->{'remote_ip'});
+        ($msg, $msg_hash, $module) = &input_from_known_server($input, $heap->{'remote_ip'}, $session_id);
     }
     # msg is from a gosa-si-client
     if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
-        ($msg, $msg_hash, $module) = &input_from_known_client($input, $heap->{'remote_ip'});
+        ($msg, $msg_hash, $module) = &input_from_known_client($input, $heap->{'remote_ip'}, $session_id);
     }
     # an error occurred
     if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
-        $error++;
-    }
-
-    ######################
-    # process incoming msg
-    if( $error == 0) {
-        daemon_log("INFO: Incoming msg with header '".@{$msg_hash->{'header'}}[0]."'", 5); 
-        daemon_log("DEBUG: Processing module ".$module, 7);
-        $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash, $session_id);
-
-        if ( 0 > @{$answer_l} ) {
-            my $answer_str = join("\n", @{$answer_l});
-            daemon_log("DEGUB: $module: Got answer from module: \n".$answer_str,8);
-        }
-    }
-    if( !$answer_l ) { $error++ };
-
-    ########
-    # answer
-    if( $error == 0 ) {
-
-        foreach my $answer ( @{$answer_l} ) {
-            # for each answer in answer list
-            
-            # check outgoing msg to xml validity
-            my $answer_hash = &check_outgoing_xml_validity($answer);
-            if( not defined $answer_hash ) {
-                next;
-            }
-            
-            $answer_header = @{$answer_hash->{'header'}}[0];
-            @answer_target_l = @{$answer_hash->{'target'}};
-            $answer_source = @{$answer_hash->{'source'}}[0];
-
-            # deliver msg to all targets 
-            foreach my $answer_target ( @answer_target_l ) {
-
-                # targets of msg are all gosa-si-clients in known_clients_db
-                if( $answer_target eq "*" ) {
-                    # answer is for all clients
-                    my $sql_statement= "SELECT * FROM known_clients";
-                    my $query_res = $known_clients_db->select_dbentry( $sql_statement ); 
-                    while( my ($hit_num, $hit) = each %{ $query_res } ) {    
-                        my $host_name = $hit->{hostname};
-                        my $host_key = $hit->{hostkey};
-                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
-                        &update_jobdb_status_for_send_msgs($answer, $error);
-                    }
-                }
-
-                # targets of msg are all gosa-si-server in known_server_db
-                elsif( $answer_target eq "KNOWN_SERVER" ) {
-                    # answer is for all server in known_server
-                    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 } ) {    
-                        my $host_name = $hit->{hostname};
-                        my $host_key = $hit->{hostkey};
-                        $answer =~ s/KNOWN_SERVER/$host_name/g;
-                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
-                        &update_jobdb_status_for_send_msgs($answer, $error);
-                    }
-                }
-
-                # target of msg is GOsa
-                elsif( $answer_target eq "GOSA" ) {
-                    $answer =~ /<session_id>(\d+)<\/session_id>/;
-                    my $session_id = $1;
-                    my $add_on = "";
-                    if( defined $session_id ) {
-                        $add_on = ".session_id=$session_id";
-                    }
-                    # answer is for GOSA and has to returned to connected client
-                    my $gosa_answer = &encrypt_msg($answer, $GosaPackages_key);
-                    $client_answer = $gosa_answer.$add_on;
-                }
-
-                # target of msg is job queue at this host
-                elsif( $answer_target eq "JOBDB") {
-                    $answer =~ /<header>(\S+)<\/header>/;   
-                    my $header;
-                    if( defined $1 ) { $header = $1; }
-                    my $error = &send_msg_to_target($answer, $server_address, $GosaPackages_key, $header);
-                    &update_jobdb_status_for_send_msgs($answer, $error);
-                }
-
-                # target of msg is a mac address
-                elsif( $answer_target =~ /^([0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2})$/i ) {
-                    daemon_log("INFO: target is mac address '$answer_target', looking for host in known_clients", 5);
-                    my $sql_statement = "SELECT * FROM known_clients WHERE macaddress='$answer_target'";
-                    my $query_res = $known_clients_db->select_dbentry( $sql_statement );
-                    my $found_ip_flag = 0;
-                    while( my ($hit_num, $hit) = each %{ $query_res } ) {    
-                        my $host_name = $hit->{hostname};
-                        my $host_key = $hit->{hostkey};
-                        $answer =~ s/$answer_target/$host_name/g;
-                        daemon_log("INFO: found host '$host_name', associated to '$answer_target'", 5);
-                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
-                        &update_jobdb_status_for_send_msgs($answer, $error);
-                        $found_ip_flag++ ;
-                    }   
-                    if( $found_ip_flag == 0) {
-                        daemon_log("WARNING: no host found in known_clients with mac address '$answer_target'", 3);
-                        if( $bus_activ eq "true" ) { 
-                            daemon_log("INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5);
-                            my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'";
-                            my $query_res = $known_server_db->select_dbentry( $sql_statement );
-                            while( my ($hit_num, $hit) = each %{ $query_res } ) {    
-                                my $bus_address = $hit->{hostname};
-                                my $bus_key = $hit->{hostkey};
-                                my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
-                                &update_jobdb_status_for_send_msgs($answer, $error);
-                                last;
-                            }
-                        }
-
-                    }
-
-                #  answer is for one specific host   
-                } else {
-                    # get encrypt_key
-                    my $encrypt_key = &get_encrypt_key($answer_target);
-                    if( not defined $encrypt_key ) {
-                        # unknown target, forward msg to bus
-                        daemon_log("WARNING: unknown target '$answer_target'", 3);
-                        if( $bus_activ eq "true" ) { 
-                            daemon_log("INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5);
-                            my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'";
-                            my $query_res = $known_server_db->select_dbentry( $sql_statement );
-                            my $res_length = keys( %{$query_res} );
-                            if( $res_length == 0 ){
-                                daemon_log("WARNING: send '$answer_header' to '$bus_address' failed, ".
-                                        "no bus found in known_server", 3);
-                            }
-                            else {
-                                while( my ($hit_num, $hit) = each %{ $query_res } ) {    
-                                    my $bus_key = $hit->{hostkey};
-                                    my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
-                                    &update_jobdb_status_for_send_msgs($answer, $error);
-                                }
-                            }
-                        }
-                        next;
-                    }
-                    my $error = &send_msg_to_target($answer, $answer_target, $encrypt_key, $answer_header);
-                    &update_jobdb_status_for_send_msgs($answer, $error);
-                }
-            }
+        # if an incoming msg could not be decrypted (maybe a wrong key), send client a ping. If the client
+        # could not understand a msg from its server the client cause a re-registering process
+        my $sql_statement = "SELECT * FROM $main::known_clients_tn WHERE (hostname LIKE '".$heap->{'remote_ip'}."%')";
+        my $query_res = $known_clients_db->select_dbentry( $sql_statement ); 
+        while( my ($hit_num, $hit) = each %{ $query_res } ) {    
+            my $host_name = $hit->{'hostname'};
+            my $host_key = $hit->{'hostkey'};
+            my $ping_msg = "<xml> <header>gosa_ping</header> <source>$server_address</source> <target>$host_name</target></xml>";
+            my $error = &send_msg_to_target($ping_msg, $host_name, $host_key, "gosa_ping", $session_id);
+            &update_jobdb_status_for_send_msgs($ping_msg, $error);
         }
-    }
-
-    print $client_answer;
-    return;
-}
-
-
-sub client_input {
-    no strict "refs";
-    my ($kernel, $session, $heap, $input, $wheel) = @_[KERNEL, SESSION, HEAP, ARG0, ARG1];
-    my $session_id = $session->ID;
-    my ($msg, $msg_hash, $module);
-    my $error = 0;
-    my $answer_l;
-    my ($answer_header, @answer_target_l, $answer_source);
-    my $client_answer;
-
-    daemon_log("", 5); 
-    daemon_log("INFO: Incoming msg from '".$heap->{'remote_ip'}."'", 5);
-    daemon_log("DEBUG: Incoming msg:\n$input", 9);
-
-    ####################
-    # check incoming msg
-    # msg is from a new client or gosa
-    ($msg, $msg_hash, $module) = &input_from_unknown_host($input);
-    # msg is from a gosa-si-server or gosa-si-bus
-    if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
-        ($msg, $msg_hash, $module) = &input_from_known_server($input, $heap->{'remote_ip'});
-    }
-    # msg is from a gosa-si-client
-    if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
-        ($msg, $msg_hash, $module) = &input_from_known_client($input, $heap->{'remote_ip'});
-    }
-    # an error occurred
-    if(( !$msg ) || ( !$msg_hash ) || ( !$module )){
         $error++;
     }
 
     ######################
     # process incoming msg
     if( $error == 0) {
-        daemon_log("INFO: Incoming msg with header '".@{$msg_hash->{'header'}}[0]."'", 5); 
-        daemon_log("DEBUG: Processing module ".$module, 7);
+        daemon_log("$session_id INFO: Incoming msg with header '".@{$msg_hash->{'header'}}[0]."'", 5); 
+        daemon_log("$session_id DEBUG: Processing module ".$module, 7);
         $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash, $session_id);
 
-        if ( 0 > @{$answer_l} ) {
+        if ( 0 < @{$answer_l} ) {
             my $answer_str = join("\n", @{$answer_l});
-            daemon_log("DEGUB: $module: Got answer from module: \n".$answer_str,8);
+            daemon_log("$session_id DEBUG: $module: Got answer from module: \n".$answer_str,8);
         }
     }
     if( !$answer_l ) { $error++ };
@@ -1240,7 +1076,7 @@ sub client_input {
                     while( my ($hit_num, $hit) = each %{ $query_res } ) {    
                         my $host_name = $hit->{hostname};
                         my $host_key = $hit->{hostkey};
-                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header, $session_id);
                         &update_jobdb_status_for_send_msgs($answer, $error);
                     }
                 }
@@ -1254,16 +1090,15 @@ sub client_input {
                         my $host_name = $hit->{hostname};
                         my $host_key = $hit->{hostkey};
                         $answer =~ s/KNOWN_SERVER/$host_name/g;
-                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header, $session_id);
                         &update_jobdb_status_for_send_msgs($answer, $error);
                     }
                 }
 
                 # target of msg is GOsa
-                elsif( $answer_target eq "GOSA" ) {
-                    $answer =~ /<session_id>(\d+)<\/session_id>/;
-                    my $session_id = $1;
-                    my $add_on = "";
+                               elsif( $answer_target eq "GOSA" ) {
+                                       my $session_id = ($1) if $answer =~ /<session_id>(\d+?)<\/session_id>/;
+                                       my $add_on = "";
                     if( defined $session_id ) {
                         $add_on = ".session_id=$session_id";
                     }
@@ -1277,13 +1112,13 @@ sub client_input {
                     $answer =~ /<header>(\S+)<\/header>/;   
                     my $header;
                     if( defined $1 ) { $header = $1; }
-                    my $error = &send_msg_to_target($answer, $server_address, $GosaPackages_key, $header);
+                    my $error = &send_msg_to_target($answer, $server_address, $GosaPackages_key, $header, $session_id);
                     &update_jobdb_status_for_send_msgs($answer, $error);
                 }
 
                 # target of msg is a mac address
                 elsif( $answer_target =~ /^([0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2}:[0-9a-f]{2})$/i ) {
-                    daemon_log("INFO: target is mac address '$answer_target', looking for host in known_clients", 5);
+                    daemon_log("$session_id INFO: target is mac address '$answer_target', looking for host in known_clients", 5);
                     my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$answer_target'";
                     my $query_res = $known_clients_db->select_dbentry( $sql_statement );
                     my $found_ip_flag = 0;
@@ -1291,21 +1126,21 @@ sub client_input {
                         my $host_name = $hit->{hostname};
                         my $host_key = $hit->{hostkey};
                         $answer =~ s/$answer_target/$host_name/g;
-                        daemon_log("INFO: found host '$host_name', associated to '$answer_target'", 5);
-                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+                        daemon_log("$session_id INFO: found host '$host_name', associated to '$answer_target'", 5);
+                        my $error = &send_msg_to_target($answer, $host_name, $host_key, $answer_header, $session_id);
                         &update_jobdb_status_for_send_msgs($answer, $error);
                         $found_ip_flag++ ;
                     }   
                     if( $found_ip_flag == 0) {
-                        daemon_log("WARNING: no host found in known_clients with mac address '$answer_target'", 3);
+                        daemon_log("$session_id WARNING: no host found in known_clients with mac address '$answer_target'", 3);
                         if( $bus_activ eq "true" ) { 
-                            daemon_log("INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5);
+                            daemon_log("$session_id INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5);
                             my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'";
                             my $query_res = $known_server_db->select_dbentry( $sql_statement );
                             while( my ($hit_num, $hit) = each %{ $query_res } ) {    
                                 my $bus_address = $hit->{hostname};
                                 my $bus_key = $hit->{hostkey};
-                                my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
+                                my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header, $session_id);
                                 &update_jobdb_status_for_send_msgs($answer, $error);
                                 last;
                             }
@@ -1319,50 +1154,45 @@ sub client_input {
                     my $encrypt_key = &get_encrypt_key($answer_target);
                     if( not defined $encrypt_key ) {
                         # unknown target, forward msg to bus
-                        daemon_log("WARNING: unknown target '$answer_target'", 3);
+                        daemon_log("$session_id WARNING: unknown target '$answer_target'", 3);
                         if( $bus_activ eq "true" ) { 
-                            daemon_log("INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5);
+                            daemon_log("$session_id INFO: try to forward msg '$answer_header' to bus '$bus_address'", 5);
                             my $sql_statement = "SELECT * FROM known_server WHERE hostname='$bus_address'";
                             my $query_res = $known_server_db->select_dbentry( $sql_statement );
                             my $res_length = keys( %{$query_res} );
                             if( $res_length == 0 ){
-                                daemon_log("WARNING: send '$answer_header' to '$bus_address' failed, ".
+                                daemon_log("$session_id WARNING: send '$answer_header' to '$bus_address' failed, ".
                                         "no bus found in known_server", 3);
                             }
                             else {
                                 while( my ($hit_num, $hit) = each %{ $query_res } ) {    
                                     my $bus_key = $hit->{hostkey};
-                                    my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
+                                    my $error = &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header,$session_id );
                                     &update_jobdb_status_for_send_msgs($answer, $error);
                                 }
                             }
                         }
                         next;
                     }
-                    my $error = &send_msg_to_target($answer, $answer_target, $encrypt_key, $answer_header);
+                    my $error = &send_msg_to_target($answer, $answer_target, $encrypt_key, $answer_header,$session_id);
                     &update_jobdb_status_for_send_msgs($answer, $error);
                 }
             }
         }
     }
 
-    if( $client_answer ) {
-        if( $client_answer =~ s/session_id=(\d+)$// ) {
-            my $session_id = $1;
-            if( defined $session_id ) {
-                my $session_reference = $kernel->ID_id_to_session($session_id);
-                if( defined $session_reference ) {
-                    $heap = $session_reference->get_heap();
-                }
-            }     
-        }
-        $heap->{client}->put($client_answer);
-    }
+    my $filter = POE::Filter::Reference->new();
+    my %result = ( 
+            status => "seems ok to me",
+            answer => $client_answer,
+            );
 
-    return;
-}
+    my $output = $filter->put( [ \%result ] );
+    print @$output;
 
 
+}
+
 
 sub trigger_db_loop {
        my ($kernel) = @_ ;
@@ -1399,30 +1229,31 @@ sub watch_for_new_jobs {
                my $jobdb_id = $hit->{id};
                my $macaddress = $hit->{'macaddress'};
         my $job_msg = $hit->{'xmlmessage'};
-        daemon_log("DEBUG: its time to execute $job_msg", 7); 
-        my $header = $hit->{'headertag'};
+        daemon_log("J DEBUG: its time to execute $job_msg", 7); 
         my $sql_statement = "SELECT * FROM known_clients WHERE macaddress LIKE '$macaddress'";
                my $res_hash = $known_clients_db->select_dbentry( $sql_statement );
                # expect macaddress is unique!!!!!!
                my $target = $res_hash->{1}->{hostname};
 
-               if (not defined $target) {
-                       &daemon_log("ERROR: no host found for mac address: $macaddress", 1);
-                       &daemon_log("$hit->{xmlmessage}", 8);
-            my $sql_statement = "UPDATE $job_queue_tn ".
-                "SET status='error', result='no host found for mac address' ".
-                "WHERE id='$jobdb_id'";
-                       my $res = $job_db->update_dbentry($sql_statement);
-                       next;
-               }
-
+#        if (not defined $target) {
+#                      &daemon_log("ERROR: no host found for mac address: $macaddress", 1);
+#                      &daemon_log("$hit->{xmlmessage}", 8);
+#            my $sql_statement = "UPDATE $job_queue_tn ".
+#                "SET status='error', result='no host found for mac address' ".
+#                "WHERE id='$jobdb_id'";
+#                      my $res = $job_db->update_dbentry($sql_statement);
+#                      next;
+#              }
+#
                # change header
         $job_msg =~ s/<header>job_/<header>gosa_/;
 
                # add sqlite_id 
         $job_msg =~ s/<\/xml>$/<jobdb_id>$jobdb_id<\/jobdb_id><\/xml>/;
 
-               my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header);
+        $job_msg =~ /<header>(\S+)<\/header>/;
+        my $header = $1 ;
+               my $func_error = &send_msg_to_target($job_msg, $server_address, $GosaPackages_key, $header, "J");
 
         # update status in job queue to 'processing'
         $sql_statement = "UPDATE $job_queue_tn SET status='processing' WHERE id='$jobdb_id'";
@@ -1468,8 +1299,8 @@ sub refresh_ldap_handle {
 
 
 sub change_fai_state {
-    my ($st, $targets) = @_;
-
+    my ($st, $targets, $session_id) = @_;
+    $session_id = 0 if not defined $session_id;
     # Set FAI state to localboot
     my %mapActions= (
         reboot    => '',
@@ -1484,6 +1315,7 @@ sub change_fai_state {
 
     # Return if this is unknown
     if (!exists $mapActions{ $st }){
+        daemon_log("$session_id ERROR: unknown action '$st', can not translate ot FAIstate", 1); 
       return;
     }
 
@@ -1493,16 +1325,17 @@ sub change_fai_state {
     if( defined($ldap_handle) ) {
 
       # Build search filter for hosts
-      my $search= "(&(objectClass=GOhard)";
-      foreach (@{$targets}){
-        $search.= "(macAddress=$_)";
-      }
-      $search.= ")";
+        my $search= "(&(objectClass=GOhard)";
+        foreach (@{$targets}){
+            $search.= "(macAddress=$_)";
+        }
+        $search.= ")";
 
       # If there's any host inside of the search string, procress them
-      if (!($search =~ /macAddress/)){
-        return;
-      }
+        if (!($search =~ /macAddress/)){
+            daemon_log("$session_id ERROR: no macAddress found in filter statement for LDAP search: '$search'", 1);    
+            return;
+        }
 
       # Perform search for Unit Tag
       my $mesg = $ldap_handle->search(
@@ -1515,11 +1348,9 @@ sub change_fai_state {
       if ($mesg->count) {
         my @entries = $mesg->entries;
         foreach my $entry (@entries) {
-
           # Only modify entry if it is not set to '$state'
           if ($entry->get_value("FAIstate") ne "$state"){
-
-            daemon_log("INFO: Setting FAIstate to '$state' for ".$entry->dn, 5);
+            daemon_log("$session_id INFO: Setting FAIstate to '$state' for ".$entry->dn, 5);
             my $result;
             my %tmp = map { $_ => 1 } $entry->get_value("objectClass");
             if (exists $tmp{'FAIobject'}){
@@ -1538,18 +1369,24 @@ sub change_fai_state {
 
             # Errors?
             if ($result->code){
-              daemon_log("Error: Setting FAIstate to '$state' for ".$entry->dn. "failed: ".$result->error, 1);
+              daemon_log("$session_id Error: Setting FAIstate to '$state' for ".$entry->dn. "failed: ".$result->error, 1);
             }
 
-          }
+          } else {
+            daemon_log("$session_id DEBUG FAIstate at host found with filter statement '$search' already at state '$st'", 7); 
+          }  
         }
       }
+    # if no ldap handle defined
+    } else {
+        daemon_log("$session_id ERROR: no LDAP handle defined for update FAIstate", 1); 
     }
 }
 
 
 sub change_goto_state {
-    my ($st, $targets) = @_;
+    my ($st, $targets, $session_id) = @_;
+    $session_id = 0  if not defined $session_id;
 
     # Switch on or off?
     my $state= $st eq 'active' ? 'active': 'locked';
@@ -1584,14 +1421,14 @@ sub change_goto_state {
           # Only modify entry if it is not set to '$state'
           if ($entry->get_value("gotoMode") ne $state){
 
-            daemon_log("INFO: Setting gotoMode to '$state' for ".$entry->dn, 5);
+            daemon_log("$session_id INFO: Setting gotoMode to '$state' for ".$entry->dn, 5);
             my $result;
             $result= $ldap_handle->modify($entry->dn, changes => [
                                                 replace => [ gotoMode => $state ] ]);
 
             # Errors?
             if ($result->code){
-              &daemon_log("Error: Setting gotoMode to '$state' for ".$entry->dn. "failed: ".$result->error, 1);
+              &daemon_log("$session_id Error: Setting gotoMode to '$state' for ".$entry->dn. "failed: ".$result->error, 1);
             }
 
           }
@@ -1603,7 +1440,7 @@ sub change_goto_state {
 
 
 sub create_fai_server_db {
-    my ($table_name) = @_;
+    my ($table_name, $kernel) = @_;
        my $result;
 
        if(defined($ldap_handle)) {
@@ -1627,6 +1464,7 @@ sub create_fai_server_db {
                                                                   primkey => ['server', 'release', 'tag'],
                                                                   server => $tmp_url,
                                                                   release => $tmp_release,
+                                                                  sections => $tmp_sections,
                                                                   tag => (length($tmp_tag)>0)?$tmp_tag:"",
                                                           } );
                                           }
@@ -1634,13 +1472,18 @@ sub create_fai_server_db {
                           }
                   }
                daemon_log("INFO: create_fai_server_db: finished", 5);
+
+               # TODO: Find a way to post the 'create_packages_list_db' event
+               &create_packages_list_db();
        }       
+
        return $result;
 }
+
 sub run_create_fai_server_db {
-    my ($session, $heap, $table_name) = @_[SESSION, HEAP, ARG0];
+    my ($kernel, $session, $heap, $table_name) = @_[KERNEL, SESSION, HEAP, ARG0];
     my $task = POE::Wheel::Run->new(
-            Program => sub { &create_fai_server_db($table_name) },
+            Program => sub { &create_fai_server_db($table_name,$kernel) },
             StdoutEvent  => "session_run_result",
             StderrEvent  => "session_run_debug",
             CloseEvent   => "session_run_done",
@@ -1689,12 +1532,12 @@ sub create_fai_release_db {
                                        }
                                }
                        }
-                       daemon_log("Inserting entries to DB",6);
+                       daemon_log("DEBUG: Inserting ".scalar @sql_list." entries to DB",6);
                        if(@sql_list) {
                                unshift @sql_list, "DELETE FROM $table_name";
                                $fai_server_db->exec_statementlist(\@sql_list);
                        }
-                       daemon_log("Done with inserting",6);
+                       daemon_log("DEBUG: Done with inserting",6);
                }
                daemon_log("INFO: create_fai_release_db: finished",5);
        }
@@ -1754,14 +1597,14 @@ sub resolve_fai_classes {
        my $fai_filter= "(|(&(objectClass=FAIclass)(|(objectClass=".join(")(objectClass=", @possible_fai_classes).")))(objectClass=FAIbranch))";
        my $fai_classes;
 
-       daemon_log("Searching for FAI entries in base $fai_base",6);
+       daemon_log("DEBUG: Searching for FAI entries in base $fai_base",6);
        my $mesg= $ldap_handle->search(
                base   => $fai_base,
                scope  => 'sub',
                attrs  => ['cn','objectClass','FAIstate'],
                filter => $fai_filter,
        );
-       daemon_log("Found ".$mesg->count()." FAI entries",6);
+       daemon_log("DEBUG: Found ".$mesg->count()." FAI entries",6);
 
        if($mesg->{'resultCode'} == 0 &&
                $mesg->count != 0) {
@@ -1890,6 +1733,40 @@ sub apply_fai_inheritance {
        return $fai_classes;
 }
 
+sub get_fai_release_entries {
+       my $tmp_classes = shift || return;
+       my $parent = shift || "";
+       my @result = shift || ();
+
+       foreach my $entry (keys %{$tmp_classes}) {
+               if(defined($entry)) {
+                       if($entry =~ /^ou=.*$/) {
+                               my $release_name = $entry;
+                               $release_name =~ s/ou=//g;
+                               if(length($parent)>0) {
+                                       $release_name = $parent."/".$release_name;
+                               }
+                               my @bufentries = get_fai_release_entries($tmp_classes->{$entry}, $release_name, @result);
+                               foreach my $bufentry(@bufentries) {
+                                       push @result, $bufentry;
+                               }
+                       } else {
+                               my @types = get_fai_types($tmp_classes->{$entry});
+                               foreach my $type (@types) {
+                                       push @result, 
+                                       {
+                                               'class' => $entry,
+                                               'type' => $type->{'type'},
+                                               'release' => $parent,
+                                               'state' => $type->{'state'},
+                                       };
+                               }
+                       }
+               }
+       }
+
+       return @result;
+}
 
 sub deep_copy {
        my $this = shift;
@@ -1918,9 +1795,40 @@ sub session_run_done {
     delete $heap->{task}->{$task_id};
 }
 
+sub create_sources_list {
+       my $result="/tmp/gosa_si_tmp_sources_list";
+
+       # Remove old file
+       if(stat($result)) {
+               unlink($result);
+       }
+
+       my $fh;
+       open($fh, ">$result") or return undef;
+       if(defined($ldap_server_dn) && length($ldap_server_dn)>0) {
+               my $mesg=$ldap_handle->search(
+                       base    => $ldap_server_dn,
+                       scope   => 'base',
+                       attrs   => 'FAIrepository',
+               );
+
+               if($mesg->count) {
+                       foreach my $entry(@{$mesg->{'entries'}}) {
+                               my ($server, $tag, $release, $sections)= split /\|/, $entry->get_value('FAIrepository');
+                               my $line = "deb $server $release";
+                               $sections =~ s/,/ /g;
+                               $line.= " $sections";
+                               print $fh $line."\n";
+                       }
+               }
+       }
+       close($fh);
+
+       return $result;
+}
 
 sub create_packages_list_db {
-    my ($sources_file) = @_ ;
+    my ($sources_file) = @_ || &create_sources_list;
     my $line;
     daemon_log("INFO: create_packages_list_db: start", 5); 
 
@@ -1960,14 +1868,13 @@ sub create_packages_list_db {
     return;
 }
 sub run_create_packages_list_db {
-    my ($session, $heap, $sources_list) = @_[SESSION, HEAP, ARG0];
+    my ($session, $heap) = @_[SESSION, HEAP];
     my $task = POE::Wheel::Run->new(
-            Program => sub { &create_packages_list_db($sources_list) },
+            Program => sub {&create_packages_list_db},
             StdoutEvent  => "session_run_result",
             StderrEvent  => "session_run_debug",
             CloseEvent   => "session_run_done",
             );
-
     $heap->{task}->{ $task->ID } = $task;
 }
 sub parse_package_info {
@@ -2178,7 +2085,7 @@ POE::Component::Server::TCP->new(
         $kernel->yield("next_task");
         },
     InlineStates => {
-        next_task => \&next_tasks,
+        next_task => \&next_task,
         task_result => \&handle_task_result,
         task_done   => \&handle_task_done,
         task_debug  => \&handle_task_debug,