diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/Configure /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/Configure
--- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/Configure 2008-02-02 22:00:40.000000000 -0500
+++ /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/Configure 2008-07-28 19:19:23.000000000 -0400
@@ -5,7 +5,7 @@
# Date: 2002-Apr-19 16:44 (EDT)
# Function: discover configuration info
#
-# $Id: Configure,v 1.25 2008/02/03 03:00:40 jaw Exp $
+# $Id: Configure,v 1.26 2008/07/28 23:19:23 jaw Exp $
cat< '1.2.3.4 2.3.4.5 4.5.6.7',
attrs => ['config', 'inherit'],
},
-
+
+ ip::srcport => {},
ip::resolvp => {},
ip::resolvt => {},
@@ -286,6 +288,10 @@
1;
}
+sub done {
+ my $me = shift;
+}
+
sub webpage_more {
my $me = shift;
my $fh = shift;
diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/Argus::SNMP.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/Argus::SNMP.pm
--- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/Argus::SNMP.pm 2008-07-17 00:03:10.000000000 -0400
+++ /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/Argus::SNMP.pm 2008-07-28 19:19:26.000000000 -0400
@@ -5,7 +5,7 @@
# Date: 2002-Apr-03 18:59 (EST)
# Function: testing of SNMP things - support for both v1, v2c and v3
#
-# $Id: Argus::SNMP.pm,v 1.8 2008/07/17 04:03:10 jaw Exp $
+# $Id: Argus::SNMP.pm,v 1.9 2008/07/28 23:19:26 jaw Exp $
# SNMP v1 => RFC 1157
# SNMP v2 => RFC 1905
@@ -425,7 +425,7 @@
if( $me->{snmp}{snmpversion} == 3 &&
# RFC 3414 2.2.3
($me->{snmp}{snmpauth} ne 'none') &&
- ($^T - $me->{snmp}{builttime}) >= $SNMP3_TIME_WINDOW ){
+ ($^T - $me->{snmp}{builttime}) >= $SNMP3_TIME_WINDOW - 10){
$me->{snmp}{enginetime} += $^T - $me->{snmp}{builttime};
$me->build_req();
@@ -799,6 +799,7 @@
$o->{snmp}{engineboot} = $resv->{eboot};
$o->{snmp}{enginetime} = $resv->{etime};
$o->{snmp}{discovered} = 1;
+ delete $o->{udp}{send};
$discov = 1;
$o->debug( "SNMPv3 auto-discovered engine-id" );
}
@@ -876,6 +877,7 @@
delete $o->{udp}{send};
$o->done();
}
+ delete $me->{snmp}{bulk};
return;
}
diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/Argus::SNMP::Helper.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/Argus::SNMP::Helper.pm
--- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/Argus::SNMP::Helper.pm 2008-07-16 13:12:30.000000000 -0400
+++ /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/Argus::SNMP::Helper.pm 2008-07-28 19:19:26.000000000 -0400
@@ -5,7 +5,7 @@
# Created: 2007-Jun-24 17:04 (EDT)
# Function: look up interface names, to permit easier config
#
-# $Id: Argus::SNMP::Helper.pm,v 1.9 2008/07/16 17:12:30 jaw Exp $
+# $Id: Argus::SNMP::Helper.pm,v 1.10 2008/07/28 23:19:26 jaw Exp $
# let the config file say:
# oid: ifOperStatus[Serial1/0]
@@ -58,16 +58,6 @@
snmph::rdescr => {}, # ditto. reversed
snmph::lastuptime => {}, # most recent uptime
- snmph::snmp_helper_frequency => {
- descr => 'how often the should the snmp helper be started, if needed',
- attrs => ['config', 'top', 'timespec'],
- versn => '3.6',
- },
- snmph::snmp_helper_timeout => {
- descr => 'how long to wait for an snmp helper response before giving up',
- attrs => ['config', 'top', 'timespec'],
- versn => '3.6',
- },
},
};
diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/Conf.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/Conf.pm
--- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/Conf.pm 2008-06-25 12:03:16.000000000 -0400
+++ /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/Conf.pm 2008-07-28 19:19:26.000000000 -0400
@@ -5,7 +5,7 @@
# Date: 2002-Apr-03 09:13 (EST)
# Function: config file reading
#
-# $Id: Conf.pm,v 1.63 2008/06/25 16:03:16 jaw Exp $
+# $Id: Conf.pm,v 1.64 2008/07/28 23:19:26 jaw Exp $
# some bozo put a Config.pm in the standard perl dist
package Conf;
@@ -94,6 +94,16 @@
attrs => ['config', 'top', 'timespec'],
versn => '3.5',
},
+ snmp_helper_frequency => {
+ descr => 'how often the should the snmp helper be started, if needed',
+ attrs => ['config', 'top', 'timespec'],
+ versn => '3.6',
+ },
+ snmp_helper_timeout => {
+ descr => 'how long to wait for an snmp helper response before giving up',
+ attrs => ['config', 'top', 'timespec'],
+ versn => '3.6',
+ },
max_descriptors => {
descr => 'maximum number of file descriptors available for use (see: ulimit)',
@@ -105,14 +115,14 @@
################################################################
# experimental, undocumented features - for author's use only
################################################################
- _no_addtnl => {}, # suppress additional data on Top/about
- _save_less => {}, # delay commit of Stats files
- _ctl_debug => {}, # control channel debugging
- _hide_expr => {}, # supress experimental items from display config
- _hide_comm => {}, # supress community from display config
- _dont_ntfy => {}, # notifications are not sent
- _no_images => {}, # do not display graph images
- _test_mode => {}, # do not access datadir
+ _no_addtnl => { attrs => ['config', 'top'] }, # suppress additional data on Top/about
+ _save_less => { attrs => ['config', 'top'] }, # delay commit of Stats files
+ _ctl_debug => { attrs => ['config', 'top'] }, # control channel debugging
+ _hide_expr => { attrs => ['config', 'top'] }, # supress experimental items from display config
+ _hide_comm => { attrs => ['config', 'top'] }, # supress community from display config
+ _dont_ntfy => { attrs => ['config', 'top'] }, # notifications are not sent
+ _no_images => { attrs => ['config', 'top'] }, # do not display graph images
+ _test_mode => { attrs => ['config', 'top'] }, # do not access datadir
}
};
@@ -153,7 +163,7 @@
$top->{i_am_top} = 1; # used only to pretty print the config
$top->cfinit($me, 'Top', 'Group');
$top->{cfdepth} = 0;
- $top->{notypos} = 1;
+ # $top->{notypos} = 1;
$top->{_test_mode} = 1 if $::opt_t || $::datadir eq '__' . 'DATADIR' . '__';
while( defined( $_ = $me->nextline() ) ){
@@ -190,13 +200,18 @@
$me->ungetline( "Service $_" ); # magic!
$o = Service::readconfig($me, $top);
}
- elsif( /^DARP\s/i && $::HAVE_DARP ){
+ elsif( /^DARP\s/i ) {
$me->error( "DARP block must appear before any Groups or Services" )
if $nomorespec;
$nomoredata = 1;
- $me->ungetline($_);
- DARP::readconfig($me, $top);
+ if( $::HAVE_DARP ){
+ $me->ungetline($_);
+ DARP::readconfig($me, $top);
+ }else{
+ $me->error( "DARP not available on this system" );
+ $me->eat_block();
+ }
}
elsif( /:/ ){
@@ -221,6 +236,7 @@
}
}else{
$top->{config}{$k} = $v;
+ $top->{confck}{$k} = 1 if grep {$_ eq 'top'} @{$doc->{fields}{$k}{attrs}};
}
if( my $c = $doc->{fields}{$k}{callback} ){
diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/Group.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/Group.pm
--- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/Group.pm 2008-06-25 12:03:17.000000000 -0400
+++ /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/Group.pm 2008-07-28 19:19:27.000000000 -0400
@@ -5,7 +5,7 @@
# Date: 2002-Apr-03 08:56 (EST)
# Function: the group class
#
-# $Id: Group.pm,v 1.43 2008/06/25 16:03:17 jaw Exp $
+# $Id: Group.pm,v 1.44 2008/07/28 23:19:27 jaw Exp $
package Group;
@@ -35,6 +35,7 @@
sub Host::new {
+ shift;
Group->new(@_);
}
diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/MonEl.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/MonEl.pm
--- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/MonEl.pm 2008-07-20 18:01:13.000000000 -0400
+++ /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/MonEl.pm 2008-07-28 19:19:27.000000000 -0400
@@ -5,7 +5,7 @@
# Date: 2002-Apr-02 17:11 (EST)
# Function: Monitor Element class
#
-# $Id: MonEl.pm,v 1.160 2008/07/20 22:01:13 jaw Exp $
+# $Id: MonEl.pm,v 1.161 2008/07/28 23:19:27 jaw Exp $
package MonEl;
@ISA = qw(Configable);
@@ -1309,6 +1309,7 @@
$ip = 1 if $me->{type} eq 'Service';
$ip = 0 if $me->{nostatus};
$ip = 0 if $me->{transient};
+ $ip = 0 if $me->{web}{hidden};
}
$me->{interesting} = $ip;
}else{
diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/TCP.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/TCP.pm
--- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/TCP.pm 2008-07-21 22:43:07.000000000 -0400
+++ /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/TCP.pm 2008-07-28 19:19:27.000000000 -0400
@@ -5,7 +5,7 @@
# Date: 2002-Apr-03 15:59 (EST)
# Function: testing of TCP services
#
-# $Id: TCP.pm,v 1.79 2008/07/22 02:43:07 jaw Exp $
+# $Id: TCP.pm,v 1.80 2008/07/28 23:19:27 jaw Exp $
package TCP;
@@ -183,7 +183,7 @@
IMAPS => {
port => 993, ssl => 1,
- expect => '^* OK', readhow => 'banner',
+ expect => '^\* OK', readhow => 'banner',
},
SMTPS => {
@@ -402,7 +402,8 @@
my $me = shift;
$me->SSL::cleanup() if $me->{tcp}{ssldata};
- $me->SUPER::done();
+ $me->Argus::IP::done();
+ $me->Service::done();
}
sub http_redirect {
diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/UDP.pm /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/UDP.pm
--- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/UDP.pm 2008-07-20 18:01:13.000000000 -0400
+++ /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/UDP.pm 2008-07-28 19:19:27.000000000 -0400
@@ -5,7 +5,7 @@
# Date: 2002-Apr-03 18:25 (EST)
# Function: testing of UDP services
#
-# $Id: UDP.pm,v 1.72 2008/07/20 22:01:13 jaw Exp $
+# $Id: UDP.pm,v 1.73 2008/07/28 23:19:27 jaw Exp $
package UDP;
@@ -324,12 +324,13 @@
# and also object methods
################################################################
-# sub done {
-# my $me = shift;
-#
-# $me->Service::done();
-# }
-#
+sub done {
+ my $me = shift;
+
+ $me->Argus::IP::done();
+ $me->Service::done();
+}
+
# sub isdown {
# my $me = shift;
# my $reason = shift;
diff -ruBNx HTML /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/vxml /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/vxml
--- /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080721/src/vxml 2008-03-03 10:45:18.000000000 -0500
+++ /home/hostedsites/www.jeremykister.com/data/argus/argus-dev-20080729/src/vxml 2008-07-28 19:19:28.000000000 -0400
@@ -6,7 +6,7 @@
# Created: 2005-Dec-10 15:18 (EST)
# Function: vxml cgi
#
-# $Id: vxml,v 1.12 2008/03/03 15:45:18 jaw Exp $
+# $Id: vxml,v 1.13 2008/07/28 23:19:28 jaw Exp $
# tested + works on: blix, voxeo
# does not work on: tellme
@@ -27,7 +27,7 @@
use strict;
use vars qw($datadir);
-my $vxml_record_call_p = 1;
+my $vxml_record_call_p = 0;
my $cgi = CGI->new();
my $url = $cgi->url( -path_info => 1 );
@@ -95,6 +95,8 @@
+
+
$IDTO
invalid selection.