prepare server for bus mac address handling

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

diff --git a/gosa-si/modules/SIPackages.pm b/gosa-si/modules/SIPackages.pm
index 0af55bcae77dc8fd71ea961561a13e719f84f79a..fa4d03fd5b948e8200649f76c8ca88446aff6da4 100644 (file)
--- a/gosa-si/modules/SIPackages.pm
+++ b/gosa-si/modules/SIPackages.pm
@@ -344,10 +344,6 @@ sub register_at_bus {
     my $msg_hash = &create_xml_hash("here_i_am", $server_address, $bus_address);
     my $msg = &create_xml_string($msg_hash);
 
-print STDERR "bus_key:$bus_key\n";
-print STDERR "msg:$msg\n";
-
-
     &main::send_msg_to_target($msg, $bus_address, $bus_key, "here_i_am");
     return $msg;
 #    my $answer = "";
@@ -420,11 +416,11 @@ sub process_incoming_msg {
                }
     }
 
-    if( $error == 0) {
-        if( 0 == @out_msg_l ) {
-                       push(@out_msg_l, $msg);
-        }
-    }
+#    if( $error == 0) {
+#        if( 0 == @out_msg_l ) {
+#                      push(@out_msg_l, $msg);
+#        }
+#    }
     
     return \@out_msg_l;
 }
@@ -554,6 +550,7 @@ sub here_i_am {
     
 
     # add entry to known_clients_db
+    my $act_timestamp = &get_time;
     my $res = $main::known_clients_db->add_dbentry( {table=>'known_clients', 
                                                 primkey=>'hostname',
                                                 hostname=>$source,
@@ -561,7 +558,7 @@ sub here_i_am {
                                                 macaddress=>$mac_address,
                                                 status=>'registered',
                                                 hostkey=>$new_passwd,
-                                                timestamp=>&get_time,
+                                                timestamp=>$act_timestamp,
                                                 } );
 
     if ($res != 0)  {
@@ -583,6 +580,8 @@ sub here_i_am {
 
         # send update msg to bus
         $out_hash = &create_xml_hash("new_client", $server_address, $bus_address, $source);
+        &add_content2xml_hash($out_hash, "macaddress", $mac_address);
+        &add_content2xml_hash($out_hash, "timestamp", $act_timestamp);
         my $new_client_out = &create_xml_string($out_hash);
         push(@out_msg_l, $new_client_out);
         &main::daemon_log("send bus msg that client '$source' has registerd at server '$server_address'", 3);