Code

in case of --no-bus, server do not try to forward msg with unknown target address...
[gosa.git] / gosa-si / gosa-si-server
index 4397b5c1d1560b612a03e94f9b3f190d2b025e21..e4df616d29fcc7aa0976f2f00487b59bdaf7e1c6 100755 (executable)
@@ -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;
@@ -47,22 +46,19 @@ my $modules_path = "/usr/lib/gosa-si/modules";
 use lib "/usr/lib/gosa-si/modules";
 
 my (%cfg_defaults, $foreground, $verbose, $ping_timeout);
-my ($bus, $msg_to_bus, $bus_cipher);
-my ($server, $server_mac_address, $server_events);
+my ($bus_activ, $bus, $msg_to_bus, $bus_cipher);
+my ($server, $server_mac_address);
 my ($gosa_server, $job_queue_timeout, $job_queue_table_name, $job_queue_file_name,$job_queue_loop_delay);
 my ($known_modules, $known_clients_file_name, $known_server_file_name);
-my ($max_clients);
 my ($pid_file, $procid, $pid, $log_file);
-my (%free_child, %busy_child, $child_max, $child_min, %child_alive_time, $child_timeout);
-my ($arp_activ, $arp_fifo, $arp_fifo_path);
+my ($arp_activ, $arp_fifo);
 my ($xml);
 
 # variables declared in config file are always set to 'our'
 our (%cfg_defaults, $log_file, $pid_file, 
-    $bus_activ, $bus_passwd, $bus_ip, $bus_port,
-    $server_activ, $server_ip, $server_port, $SIPackages_key, $max_clients,
-    $arp_activ, $arp_fifo_path,
-    $gosa_activ, $GosaPackages_key, $gosa_ip, $gosa_port, $gosa_timeout,
+    $server_ip, $server_port, $SIPackages_key, 
+    $arp_activ, 
+    $GosaPackages_key, $gosa_ip, $gosa_port, $gosa_timeout,
 );
 
 # additional variable which should be globaly accessable
@@ -85,6 +81,7 @@ $foreground = 0 ;
 $ping_timeout = 5;
 
 $no_bus = 0;
+$bus_activ = "true";
 
 $no_arp = 0;
 
@@ -98,43 +95,31 @@ our $known_server_db;
 # holds all registrated clients
 our $known_clients_db;
 
-%cfg_defaults =
-("general" =>
-    {"log_file" => [\$log_file, "/var/run/".$0.".log"],
-    "pid_file" => [\$pid_file, "/var/run/".$0.".pid"],
-    "child_max" => [\$child_max, 10],
-    "child_min" => [\$child_min, 3],
-    "child_timeout" => [\$child_timeout, 180],
-    "job_queue_timeout" => [\$job_queue_timeout, undef],
-    "job_queue_file_name" => [\$job_queue_file_name, '/var/lib/gosa-si/gosa-si-server_jobs.db'],
-    "job_queue_loop_delay" => [\$job_queue_loop_delay, 3],
-    "known_clients_file_name" => [\$known_clients_file_name, '/var/lib/gosa-si/gosa-si-server_known_clients.db' ],
-    "known_server_file_name" => [\$known_server_file_name, '/var/lib/gosa-si/gosa-si-server_known_server.db'],
-   },
-"bus" =>
-    {"bus_activ" => [\$bus_activ, "on"],
-    "bus_passwd" => [\$bus_passwd, ""],
-    "bus_ip" => [\$bus_ip, "0.0.0.0"],
-    "bus_port" => [\$bus_port, "20080"],
+%cfg_defaults = (
+"general" => {
+    "log-file" => [\$log_file, "/var/run/".$0.".log"],
+    "pid-file" => [\$pid_file, "/var/run/".$0.".pid"],
     },
-"server" =>
-    {"server_activ" => [\$server_activ, "on"],
-    "server_ip" => [\$server_ip, "0.0.0.0"],
-    "server_port" => [\$server_port, "20081"],
-    "SIPackages_key" => [\$SIPackages_key, "none"],
-    "max_clients" => [\$max_clients, 100],
+"bus" => {
+    "activ" => [\$bus_activ, "true"],
     },
-"arp" =>
-    {"arp_activ" => [\$arp_activ, "on"],
-    "arp_fifo_path" => [\$arp_fifo_path, "/var/run/gosa-si/arp-notify"],
+"server" => {
+#    "ip" => [\$server_ip, "0.0.0.0"],
+    "port" => [\$server_port, "20081"],
+    "known-clients" => [\$known_clients_file_name, '/var/lib/gosa-si/clients.db' ],
+    "known-servers" => [\$known_server_file_name, '/var/lib/gosa-si/servers.db'],
     },
-"gosa" =>
-    {"gosa_activ" => [\$gosa_activ, "on"],
-    "gosa_ip" => [\$gosa_ip, "0.0.0.0"],
-    "gosa_port" => [\$gosa_port, "20082"],
-    "GosaPackages_key" => [\$GosaPackages_key, "none"],
+"GOsaPackages" => {
+    "ip" => [\$gosa_ip, "0.0.0.0"],
+    "port" => [\$gosa_port, "20082"],
+    "job-queue" => [\$job_queue_file_name, '/var/lib/gosa-si/jobs.db'],
+    "job-queue-loop-delay" => [\$job_queue_loop_delay, 3],
+    "key" => [\$GosaPackages_key, "none"],
     },
-    );
+"SIPackages" => {
+    "key" => [\$SIPackages_key, "none"],
+    },
+);
 
 
 #===  FUNCTION  ================================================================
@@ -210,7 +195,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;
@@ -396,43 +381,44 @@ sub check_key_and_xml_validity {
     my $msg_hash;
     eval{
         $msg = &decrypt_msg($crypted_msg, $module_key);
-        &main::daemon_log("decrypted_msg: \n$msg", 8);
-
-        $msg_hash = $xml->XMLin($msg, ForceArray=>1);
 
-        # check header
-        my $header_l = $msg_hash->{'header'};
-        if( 1 != @{$header_l} ) {
-            die'header error';
-        }
-        my $header = @{$header_l}[0];
-        if( 0 == length $header) {
-            die 'header error';
-        }
+       if ($msg =~ /<xml>/i){
+               &main::daemon_log("decrypted_msg: \n$msg", 8);
+               $msg_hash = $xml->XMLin($msg, ForceArray=>1);
 
-        # check source
-        my $source_l = $msg_hash->{'source'};
-        if( 1 != @{$source_l} ) {
-            die'source error';
-        }
-        my $source = @{$source_l}[0];
-        if( 0 == length $source) {
-            die 'source error';
-        }
+               # check header
+               my $header_l = $msg_hash->{'header'};
+               if( 1 != @{$header_l} ) {
+                   die 'header error';
+               }
+               my $header = @{$header_l}[0];
+               if( 0 == length $header) {
+                   die 'header error';
+               }
 
-        # check target
-        my $target_l = $msg_hash->{'target'};
-        if( 1 != @{$target_l} ) {
-            die'target error';
-        }
-        my $target = @{$target_l}[0];
-        if( 0 == length $target) {
-            die 'target error';
-        }
+               # check source
+               my $source_l = $msg_hash->{'source'};
+               if( not defined @{$source_l} or 1 != @{$source_l} ) {
+                   die 'source error';
+               }
+               my $source = @{$source_l}[0];
+               if( 0 == length $source) {
+                   die 'source error';
+               }
 
+               # check target
+               my $target_l = $msg_hash->{'target'};
+               if( 1 != @{$target_l} ) {
+                   die'target error';
+               }
+               my $target = @{$target_l}[0];
+               if( 0 == length $target) {
+                   die 'target error';
+               }
+       }
     };
     if($@) {
-        &main::daemon_log("WARNING: do not understand the message:", 5);
+        &main::daemon_log("WARNING: do not understand the message", 5);
         &main::daemon_log("$@", 8);
     }
 
@@ -444,26 +430,28 @@ 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 } ) {    
         my $host_name = $hit->{hostname};
         if( not $host_name =~ "^$remote_ip") {
             next;
         }
         my $host_key = $hit->{hostkey};
-        daemon_log("SIPackages: host_name: $host_name", 7);
-        daemon_log("SIPackages: host_key: $host_key", 7);
+        daemon_log("SIPackages: known_server host_name: $host_name", 7);
+        daemon_log("SIPackages: known_server host_key: $host_key", 7);
 
         # check if module can open msg envelope with module key
-        my ($msg, $msg_hash) = &check_key_and_xml_validity($input, $host_key);
-        if( (!$msg) || (!$msg_hash) ) {
+        my ($tmp_msg, $tmp_msg_hash) = &check_key_and_xml_validity($input, $host_key);
+        if( (!$tmp_msg) || (!$tmp_msg_hash) ) {
             daemon_log("SIPackages: deciphering raise error", 7);
             daemon_log("$@", 8);
             next;
         }
         else {
+            $msg = $tmp_msg;
+            $msg_hash = $tmp_msg_hash;
             $module = "SIPackages";
             last;
         }
@@ -489,8 +477,8 @@ sub input_from_known_client {
             next;
                }
         my $host_key = $hit->{hostkey};
-        &daemon_log("SIPackages: host_name: $host_name", 7);
-        &daemon_log("SIPackages: host_key: $host_key", 7);
+        &daemon_log("SIPackages: known_client host_name: $host_name", 7);
+        &daemon_log("SIPackages: 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);
@@ -522,6 +510,7 @@ sub input_from_unknown_host {
        my %act_modules = %$known_modules;
 
        while( my ($mod, $info) = each(%act_modules)) {
+
         # check a key exists for this module
         my $module_key = ${$mod."_key"};
         if( ! $module_key ) {
@@ -533,7 +522,7 @@ sub input_from_unknown_host {
         # check if module can open msg envelope with module key
         ($msg, $msg_hash) = &check_key_and_xml_validity($input, $module_key);
         if( (!$msg) || (!$msg_hash) ) {
-            daemon_log("$mod: deciphering failed", 5);
+            #daemon_log("$mod: deciphering failed", 5);
             next;
         }
         else {
@@ -543,7 +532,7 @@ sub input_from_unknown_host {
     }
 
     if( (!$msg) || (!$msg_hash) || (!$module)) {
-        daemon_log("Incoming message is not from a unknown host", 3);
+        daemon_log("Incoming message is not from a unknown host", 5);
     }
 
     return ($msg, $msg_hash, $module);
@@ -551,6 +540,9 @@ sub input_from_unknown_host {
 
 sub create_ciphering {
     my ($passwd) = @_;
+       if((!defined($passwd)) || length($passwd)==0) {
+               $passwd = "";
+       }
     $passwd = substr(md5_hex("$passwd") x 32, 0, 32);
     my $iv = substr(md5_hex('GONICUS GmbH'),0, 16);
     my $my_cipher = Crypt::Rijndael->new($passwd , Crypt::Rijndael::MODE_CBC());
@@ -590,23 +582,22 @@ sub get_encrypt_key {
     my $error = 0;
 
     # target can be in known_server
-    if( !$encrypt_key ) {
-        my $sql_statement= "SELECT * FROM known_server";
+    if( not defined $encrypt_key ) {
+        my $sql_statement= "SELECT * FROM known_server WHERE hostname='$target'";
         my $query_res = $known_server_db->select_dbentry( $sql_statement ); 
         while( my ($hit_num, $hit) = each %{ $query_res } ) {    
             my $host_name = $hit->{hostname};
             if( $host_name ne $target ) {
                 next;
             }
-            my $host_key = $hit->{hostkey};
+            $encrypt_key = $hit->{hostkey};
             last;
         }
     }
-   
 
     # target can be in known_client
-    if( !$encrypt_key ) {
-        my $sql_statement= "SELECT * FROM known_clients";
+    if( not defined $encrypt_key ) {
+        my $sql_statement= "SELECT * FROM known_clients WHERE hostname='$target'";
         my $query_res = $known_clients_db->select_dbentry( $sql_statement ); 
         while( my ($hit_num, $hit) = each %{ $query_res } ) {    
             my $host_name = $hit->{hostname};
@@ -648,35 +639,113 @@ sub open_socket {
 }
 
 
+#===  FUNCTION  ================================================================
+#         NAME:  get_ip 
+#   PARAMETERS:  interface name (i.e. eth0)
+#      RETURNS:  (ip address) 
+#  DESCRIPTION:  Uses ioctl to get ip address directly from system.
+#===============================================================================
+sub get_ip {
+       my $ifreq= shift;
+       my $result= "";
+       my $SIOCGIFADDR= 0x8915;       # man 2 ioctl_list
+       my $proto= getprotobyname('ip');
+
+       socket SOCKET, PF_INET, SOCK_DGRAM, $proto
+               or die "socket: $!";
+
+       if(ioctl SOCKET, $SIOCGIFADDR, $ifreq) {
+               my ($if, $sin)    = unpack 'a16 a16', $ifreq;
+               my ($port, $addr) = sockaddr_in $sin;
+               my $ip            = inet_ntoa $addr;
+
+               if ($ip && length($ip) > 0) {
+                       $result = $ip;
+               }
+       }
+
+       return $result;
+}
+
+sub get_local_ip_for_remote_ip {
+       my $remote_ip= shift;
+       my $result="0.0.0.0";
+
+       if($remote_ip =~ /^(\d\d?\d?\.){3}\d\d?\d?$/) {
+               if($remote_ip eq "127.0.0.1") {
+                       $result = "127.0.0.1";
+               } else {
+                       my $PROC_NET_ROUTE= ('/proc/net/route');
+
+                       open(PROC_NET_ROUTE, "<$PROC_NET_ROUTE")
+                               or die "Could not open $PROC_NET_ROUTE";
+
+                       my @ifs = <PROC_NET_ROUTE>;
+
+                       close(PROC_NET_ROUTE);
+
+                       # Eat header line
+                       shift @ifs;
+                       chomp @ifs;
+                       foreach my $line(@ifs) {
+                               my ($Iface,$Destination,$Gateway,$Flags,$RefCnt,$Use,$Metric,$Mask,$MTU,$Window,$IRTT)=split(/\s/, $line);
+                               my $destination;
+                               my $mask;
+                               my ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Destination);
+                               $destination= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
+                               ($d,$c,$b,$a)=unpack('a2 a2 a2 a2', $Mask);
+                               $mask= sprintf("%d.%d.%d.%d", hex($a), hex($b), hex($c), hex($d));
+                               if(new NetAddr::IP($remote_ip)->within(new NetAddr::IP($destination, $mask))) {
+                                       # destination matches route, save mac and exit
+                                       $result= &get_ip($Iface);
+                                       last;
+                               }
+                       }
+               }
+       } else {
+               daemon_log("get_local_ip_for_remote_ip was called with a non-ip parameter: $remote_ip", 1);
+       }
+       return $result;
+}
+
 sub send_msg_to_target {
     my ($msg, $address, $encrypt_key, $msg_header) = @_ ;
     my $error = 0;
-
+    my $header;
+    my $new_status;
+    my $act_status;
+    my ($sql_statement, $res);
+  
     if( $msg_header ) {
-        $msg_header = "'$msg_header'-";
+        $header = "'$msg_header'-";
     }
     else {
-        $msg_header = "";
+        $header = "";
     }
 
+       # Patch the source ip
+       if($msg =~ /<source>0\.0\.0\.0:\d*?<\/source>/) {
+               my $remote_ip = &get_local_ip_for_remote_ip(sprintf("%s", $address =~ /^([0-9\.]*?):.*$/));
+               $msg =~ s/<source>(0\.0\.0\.0):(\d*?)<\/source>/<source>$remote_ip:$2<\/source>/s;
+       }
+
     # encrypt xml msg
     my $crypted_msg = &encrypt_msg($msg, $encrypt_key);
 
     # opensocket
     my $socket = &open_socket($address);
     if( !$socket ) {
-        daemon_log("cannot send ".$msg_header."msg to $address , host not reachable", 1);
+        daemon_log("cannot send ".$header."msg to $address , host not reachable", 1);
         $error++;
     }
     
     if( $error == 0 ) {
-
         # send xml msg
         print $socket $crypted_msg."\n";
 
-        daemon_log("send ".$msg_header."msg to $address", 1);
+        daemon_log("send ".$header."msg to $address", 1);
         daemon_log("message:\n$msg", 8);
-
+        
     }
 
     # close socket in any case
@@ -684,7 +753,61 @@ sub send_msg_to_target {
         close $socket;
     }
 
-    return;
+    if( $error > 0 ) { $new_status = "down"; }
+    else { $new_status = $msg_header; }
+
+
+    # known_clients
+    $sql_statement = "SELECT * FROM known_clients WHERE hostname='$address'";
+    $res = $known_clients_db->select_dbentry($sql_statement);
+    if( keys(%$res) > 0) {
+        $act_status = $res->{1}->{'status'};
+        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);
+        } 
+        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);
+            }
+            else {
+                daemon_log("INFO: set '$address' from status '$act_status' to '$new_status'", 5);
+            }
+        }
+    }
+
+    # known_server
+    $sql_statement = "SELECT * FROM known_server WHERE hostname='$address'";
+    $res = $known_server_db->select_dbentry($sql_statement);
+    if( keys(%$res) > 0 ) {
+        $act_status = $res->{1}->{'status'};
+        if( $act_status eq "down" ) {
+            $sql_statement = "DELETE FROM known_server WHERE hostname='$address'";
+            $res = $known_clients_db->del_dbentry($sql_statement);
+            daemon_log("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);
+            }
+            else {
+                daemon_log("INFO: set '$address' from status '$act_status' to '$new_status'", 5);
+            }
+        }
+    }
+
+    return; 
+}
+
+
+sub _start {
+    my ($kernel) = $_[KERNEL];
+    &trigger_db_loop($kernel);
 }
 
 
@@ -697,7 +820,8 @@ sub client_input {
     my ($answer_header, @answer_target_l, $answer_source);
     my $client_answer;
 
-    daemon_log("Incoming msg:\n$input\n", 8);
+    daemon_log("Incoming msg from '".$heap->{'remote_ip'}."'", 7);
+    daemon_log("\n$input", 8);
 
     # msg is from a new client or gosa
     ($msg, $msg_hash, $module) = &input_from_unknown_host($input);
@@ -720,8 +844,8 @@ sub client_input {
     ######################
     # process incoming msg
     if( $error == 0) {
-        daemon_log("Processing module ".$module, 3);
-        $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash);
+        daemon_log("Processing module ".$module, 5);
+        $answer_l = &{ $module."::process_incoming_msg" }($msg, $msg_hash, $heap->{'remote_ip'});
 
         if ( 0 > @{$answer_l} ) {
             my $answer_str = join("\n", @{$answer_l});
@@ -730,99 +854,134 @@ sub client_input {
     }
     if( !$answer_l ) { $error++ };
 
+    ########
+    # answer
     if( $error == 0 ) {
 
         # for each answer in answer list
         foreach my $answer ( @{$answer_l} ) {
 
+            my $error = 0;
             # check answer if gosa-si envelope conform
-            if( $error == 0 ) {
+            if(defined($answer)) {
                 my $answer_hash = $xml->XMLin($answer, ForceArray=>1);
                 $answer_header = @{$answer_hash->{'header'}}[0];
                 @answer_target_l = @{$answer_hash->{'target'}};
                 $answer_source = @{$answer_hash->{'source'}}[0];
                 if( !$answer_header ) {
                     daemon_log('ERROR: module answer is not gosa-si envelope conform: no header', 1);
+                    daemon_log("\n$answer", 8);
                     $error++;
                 }
                 if( 0 == length @answer_target_l ) {
                     daemon_log('ERROR: module answer is not gosa-si envelope conform: no targets', 1);
+                    daemon_log("\n$answer", 8);
                     $error++;
                 }
                 if( !$answer_source ) {
                     daemon_log('ERROR: module answer is not gosa-si envelope conform: no source', 1);
+                    daemon_log("\n$answer", 8);
                     $error++;
                 }
 
                 if( $error != 0 ) {
                     next;
                 }
+            }
 
-                # deliver msg to all targets 
-                foreach my $answer_target ( @answer_target_l ) {
-                    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};
-                            &send_msg_to_target($answer, $host_name, $host_key);
-                        }
+            # deliver msg to all targets 
+            foreach my $answer_target ( @answer_target_l ) {
+                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};
+                        &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
                     }
-                    elsif( $answer_target eq "GOSA" ) {
-                        # answer is for GOSA and has to returned to connected client
-                        my $gosa_answer = &encrypt_msg($answer, $GosaPackages_key);
-                        $client_answer = $gosa_answer;
+                }
+                elsif( $answer_target eq "GOSA" ) {
+                    # answer is for GOSA and has to returned to connected client
+                    my $gosa_answer = &encrypt_msg($answer, $GosaPackages_key);
+                    $client_answer = $gosa_answer;
+                }
+                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;
+                        &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
                     }
-                    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;
-                            &send_msg_to_target($answer, $host_name, $host_key);
+                }
+                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("target is mac address '$answer_target', looking for host in known_clients", 3);
+                    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("found host '$host_name', assoziated to '$answer_target'", 3);
+                        &send_msg_to_target($answer, $host_name, $host_key, $answer_header);
+                        $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};
+                                &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
+                                last;
+                            }
                         }
-                       
-                       print STDERR $answer_target."\n";
 
                     }
-                    else {
-                        # answer is for one specific host
-                        # get encrypt_key
-                        my $encrypt_key = &get_encrypt_key($answer_target);
-                        if( !$encrypt_key ) {
-                            daemon_log("ERROR: no encrypt key found for answer target '$answer_target'", 1);
-                            next;
+                } else {
+                    # ... answer is for one specific host
+
+                    # 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 $bus_key = $query_res->{1}->{hostkey};
+                            &send_msg_to_target($answer, $bus_address, $bus_key, $answer_header);
                         }
-                        # send_msg
-                        &send_msg_to_target($answer, $answer_target, $encrypt_key, $answer_header);
+                        next;
                     }
+                    # send_msg
+                    &send_msg_to_target($answer, $answer_target, $encrypt_key, $answer_header);
                 }
             }
         }
     }
 
     if( $client_answer ) {
-        $heap->{client}->put($client_answer);
+           $heap->{client}->put($client_answer);
     }
 
     return;
 }
 
-sub _start {
-    my ($kernel) = $_[KERNEL];
-    &trigger_db_loop($kernel);
-    #&register_at_gosa_si_bus();
-}
 
 
 sub trigger_db_loop {
 #      my ($kernel) = $_[KERNEL];
        my ($kernel) = @_ ;
-       $kernel->delay_set('watch_for_new_jobs',3);
+       $kernel->delay_set('watch_for_new_jobs', $job_queue_loop_delay);
 }
 
 
@@ -942,11 +1101,17 @@ if( 0 != $pid ) {
 daemon_log(" ", 1);
 daemon_log("$0 started!", 1);
 
+if ($no_bus > 0) {
+    $bus_activ = "false"
+}
+
+
+
 # delete old DBsqlite lock files
-system('rm -f /tmp/gosa_si_lock*gosa-si-server*');
+#unlink('/tmp/gosa_si_lock*');
 
 # connect to gosa-si job queue
-my @job_col_names = ("id", "timestamp", "status", "result", "headertag", "targettag", "xmlmessage", "macaddress");
+my @job_col_names = ("id INTEGER", "timestamp", "status", "result", "headertag", "targettag", "xmlmessage", "macaddress");
 $job_db = GOSA::DBsqlite->new($job_queue_file_name);
 $job_db->create_table('jobs', \@job_col_names);
 
@@ -960,15 +1125,9 @@ my @server_col_names = ('hostname', 'status', 'hostkey', 'timestamp');
 $known_server_db = GOSA::DBsqlite->new($known_server_file_name);
 $known_server_db->create_table('known_server', \@server_col_names);
 
-# import all modules
-&import_modules;
-
-# check wether all modules are gosa-si valid passwd check
-
 # create xml object used for en/decrypting
 $xml = new XML::Simple();
 
-
 # create socket for incoming xml messages
 POE::Component::Server::TCP->new(
        Port => $server_port,
@@ -984,6 +1143,12 @@ POE::Session->create(
        }
 );
 
+
+# import all modules
+&import_modules;
+
+# check wether all modules are gosa-si valid passwd check
+
 POE::Kernel->run();
 exit;