cleanup daemon_log messages

[gosa.git] / gosa-si / modules / ServerPackages.pm

diff --git a/gosa-si/modules/ServerPackages.pm b/gosa-si/modules/ServerPackages.pm
index 80b34bb165178420f6cee4cbbf40c8c4b94b0573..cb7c976f95d75ca3a8d34a9fe36ce37c891d6f4d 100644 (file)
--- a/gosa-si/modules/ServerPackages.pm
+++ b/gosa-si/modules/ServerPackages.pm
@@ -58,9 +58,6 @@ my %cfg_defaults =
 $network_interface= &get_interface_for_ip($server_ip);
 $server_mac_address= &get_mac($network_interface); 
 
-&main::daemon_log("server ip address detected: $server_ip", 1);
-&main::daemon_log("server mac address detected: $server_mac_address", 1);
-
 # complete addresses
 my $server_address = "$server_ip:$server_port";
 my $bus_address = "$bus_ip:$bus_port";
@@ -68,29 +65,11 @@ my $bus_address = "$bus_ip:$bus_port";
 # create general settings for this module
 my $xml = new XML::Simple();
 
-# open server socket
-if($server_activ eq "on"){
-    &main::daemon_log(" ", 1);
-    $server = IO::Socket::INET->new(LocalPort => $server_port,
-            Type => SOCK_STREAM,
-            Reuse => 1,
-            Listen => 20,
-            ); 
-    if(not defined $server){
-        &main::daemon_log("cannot be a tcp server at $server_port : $@");
-        die;
-    } else {
-        &main::daemon_log("start server: $server_address", 1);
-    }
-}
-
-
 # register at bus
 if ($main::no_bus > 0) {
     $bus_activ = "off"
 }
 if($bus_activ eq "on") {
-    &main::daemon_log(" ", 1);
     &register_at_bus();
 }
 
@@ -348,7 +327,10 @@ sub process_incoming_msg {
 
     $crypted_msg =~ /^([\s\S]*?)\.(\d{1,3}?)\.(\d{1,3}?)\.(\d{1,3}?)\.(\d{1,3}?)$/;
     $crypted_msg = $1;
-    my $host = sprintf("%s.%s.%s.%s", $2, $3, $4, $5);
+       my $host="0.0.0.0";
+       if($1 && $2 && $3 && $4) {
+               $host = sprintf("%s.%s.%s.%s", $2, $3, $4, $5);
+       }
 
     my $msg;
     my $msg_hash;
@@ -362,7 +344,7 @@ sub process_incoming_msg {
     &main::daemon_log("ServerPackage: host_key: $host_key", 7);
     eval{
         my $key_cipher = &create_ciphering($host_key);
-        $msg = &decrypt_msg($crypted_msg, $key_cipher);
+               $msg = &decrypt_msg($crypted_msg, $key_cipher);
         $msg_hash = &transform_msg2hash($msg);
     };
     if($@) {
@@ -434,7 +416,7 @@ sub process_incoming_msg {
 
     if( not defined $msg ) {
         &main::daemon_log("WARNING: ServerPackage do not understand the message:", 5);
-        &main::daemon_log("$@", 7);
+        &main::daemon_log("$@", 8);
         return;
     }
 
@@ -443,7 +425,7 @@ sub process_incoming_msg {
     my $source = @{$msg_hash->{source}}[0];
 
     &main::daemon_log("receive '$header' at ServerPackages from $host", 1);
-    &main::daemon_log("ServerPackages: msg to process: \n$msg", 7);
+    &main::daemon_log("ServerPackages: msg to process: \n$msg", 5);
 
     my @targets = @{$msg_hash->{target}};
     my $len_targets = @targets;