ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/host/ihost-perl/ihost.pl
(Generate patch)

Comparing projects/cms/source/host/ihost-perl/ihost.pl (file contents):
Revision 1.8 by pjm2, Mon Jan 29 09:19:16 2001 UTC vs.
Revision 1.11 by pjm2, Thu Feb 1 09:10:52 2001 UTC

# Line 48 | Line 48 | $seq_no = 1;
48   $last_udp_time = time;
49   $last_tcp_time = time;
50   while (1) {
51 <    if (time >= $last_udp_time + $udp_update_time) {
51 >    my($time) = time;
52 >    if ($time >= $last_udp_time + $udp_update_time) {
53          &send_udp_packet();
54 <        $last_udp_time = time;
54 >        $last_udp_time = $time;
55      }
56 <    if (time >= $last_tcp_time + $tcp_update_time) {
56 >    if ($time >= $last_tcp_time + $tcp_update_time) {
57          &send_tcp_heartbeat();
58 <        $last_tcp_time = time;
58 >        $last_tcp_time = $time;
59      }
60 <    `sleep 1`;
60 >    my($next_udp) = $udp_update_time - $time + $last_udp_time;
61 >    my($next_tcp) = $tcp_update_time - $time + $last_tcp_time;
62 >    my($delay);
63 >    if ($next_udp < $next_tcp) {
64 >        $delay = $next_udp
65 >    }
66 >    else {
67 >        $delay = $next_tcp;
68 >    }
69 >    `sleep $delay`;
70   }
71  
72   exit(0);
# Line 67 | Line 77 | sub tcp_configure() {
77                                       PeerAddr => $filter_manager_addr,
78                                       PeerPort => $filter_manager_port,
79                                       Proto => 'tcp'
80 <                                    ) or die "Could not perform configuration via TCP: $!\n";
80 >                                    );
81 >    if (!defined $sock) {
82 >        print "IHOST ERROR: Could not connect to $filter_manager_addr:$filter_manager_port.\n";
83 >        print "Please check that there is an i-scream server at this address.\n";
84 >        print "Program ended.\n";
85 >        exit(1);
86 >    }
87  
72    die "Could not connect to the i-scream filter manager: $!\n" unless $sock;
73
88      # Now run through the configuration process.
89      my($response);
90      
# Line 191 | Line 205 | sub send_udp_packet() {
205          <platform>$packet{"packet.os.platform"}</platform>
206          <sysname>$packet{"packet.os.sysname"}</sysname>
207          <version>$packet{"packet.os.version"}</version>
208 +        <uptime>$packet{"packet.os.uptime"}</uptime>
209      </os>
210      <users>
211          <count>$packet{"packet.users.count"}</count>
# Line 243 | Line 258 | sub send_tcp_heartbeat() {
258                                       PeerAddr => $filter_addr,
259                                       PeerPort => $tcp_port,
260                                       Proto => 'tcp'
261 <                                    ) or die "Could not perform heartbeat via TCP: $!\n";
262 <
263 <    die "Could not connect to the i-scream filter: $!\n" unless $sock;
261 >                                    );
262 >    if (!defined $sock) {
263 >        print "IHOST WARNING: Failed to deliver a heartbeat to the i-scream filter.\n";
264 >        return;
265 >    }
266  
267      # Now run through the configuration process.
268      my($response);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines