From 3706613247512954e2ed43d13a016788e387ac0e Mon Sep 17 00:00:00 2001 From: rettenbe Date: Mon, 25 May 2009 14:57:01 +0000 Subject: [PATCH] consider if incoming msg is form an old version of gosa-si-server or from a new server version git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13667 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-si/gosa-si-server | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gosa-si/gosa-si-server b/gosa-si/gosa-si-server index dd816bd3b..296ae6fb1 100755 --- a/gosa-si/gosa-si-server +++ b/gosa-si/gosa-si-server @@ -905,7 +905,6 @@ sub send_msg_to_target { if( $error == 0 ) { # send xml msg print $socket $crypted_msg.";$own_source_address\n"; - daemon_log("$session_id INFO: send ".$header."msg to $address", 5); daemon_log("$session_id DEBUG: message:\n$msg", 9); @@ -3530,9 +3529,17 @@ POE::Component::Server::TCP->new( ClientInput => sub { my ($kernel, $input, $heap, $session) = @_[KERNEL, ARG0, HEAP, SESSION]; my $session_id = $session->ID; - my $remote_ip = $heap->{'remote_ip'}; + $input =~ /;([\d\.]*:[\d]*)$/ ; + if (defined $1) + { + &daemon_log("$session_id DEBUG: incoming message from '$1'", 7); + } + else + { + my $remote_ip = $heap->{'remote_ip'}; + &daemon_log("$session_id DEBUG: incoming message from '$remote_ip'", 7); + } push(@msgs_to_decrypt, $input); - &daemon_log("$session_id DEBUG: incoming message from '$remote_ip'", 7); $kernel->yield("msg_to_decrypt"); }, InlineStates => { -- 2.30.2