Menu
▾
▴
benson-commit — Benson Commit Mailing List
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(27) |
Jul
(24) |
Aug
(64) |
Sep
(15) |
Oct
(72) |
Nov
(28) |
Dec
(44) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(72) |
Feb
(58) |
Mar
(33) |
Apr
(3) |
May
(5) |
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
(24) |
Nov
(29) |
Dec
(12) |
| 2003 |
Jan
(37) |
Feb
(44) |
Mar
(13) |
Apr
(23) |
May
(9) |
Jun
(3) |
Jul
|
Aug
(7) |
Sep
(33) |
Oct
(30) |
Nov
(31) |
Dec
(11) |
| 2004 |
Jan
(4) |
Feb
(35) |
Mar
(14) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
(5) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(2) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Bob T. <bt...@us...> - 2003-08-22 00:08:05
|
Update of /cvsroot/benson/benson3 In directory sc8-pr-cvs1:/tmp/cvs-serv18364 Modified Files: ChangeLog Log Message: Some simple changes added in. Index: ChangeLog =================================================================== RCS file: /cvsroot/benson/benson3/ChangeLog,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -r1.33 -r1.34 *** ChangeLog 26 Jun 2003 20:23:22 -0000 1.33 --- ChangeLog 22 Aug 2003 00:07:58 -0000 1.34 *************** *** 1,4 **** version 3.1a5 ! - Adding in the disk/vfs monitor - Revised the network code, actually completely overhauled the network code. - Added duration attribute for suppress btrap to Benson module. --- 1,4 ---- version 3.1a5 ! - Adding in the disk/vfs monitor (and then disabled it) - Revised the network code, actually completely overhauled the network code. - Added duration attribute for suppress btrap to Benson module. |
|
From: Bob T. <bt...@us...> - 2003-06-27 14:25:39
|
Update of /cvsroot/benson/benson3/scripts/cgi
In directory sc8-pr-cvs1:/tmp/cvs-serv24931/scripts/cgi
Modified Files:
suppress.cgi.tmpl
Log Message:
updated the duration for suppress.cgi.tmpl
Index: suppress.cgi.tmpl
===================================================================
RCS file: /cvsroot/benson/benson3/scripts/cgi/suppress.cgi.tmpl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** suppress.cgi.tmpl 21 Feb 2003 17:01:56 -0000 1.7
--- suppress.cgi.tmpl 27 Jun 2003 14:25:34 -0000 1.8
***************
*** 235,240 ****
my $sepoch_secs = timelocal(0,$smin,$shour,$sday,$smonth-1,$syear);
my $duration_secs = ($dhour * 3600) + ($dmin * 60);
- my $depoch_secs = $sepoch_secs + $duration_secs;
- my $endtime = POSIX::strftime("%Y-%m-%d_%T", localtime($depoch_secs));
print <<EOT;
<html>
--- 235,238 ----
***************
*** 245,249 ****
EOT
foreach my $agent (@agents) {
! my $message = "suppress agent:$agent starttime:$syear-$smonth-$sday\_$shour:$smin:00 endtime:$endtime reason:$reason";
print "<b>Suppressing host $agent...";
$queue->submit(severity => "informational",
--- 243,247 ----
EOT
foreach my $agent (@agents) {
! my $message = "suppress agent:$agent starttime:$syear-$smonth-$sday\_$shour:$smin:00 duration:$duration_secs reason:$reason";
print "<b>Suppressing host $agent...";
$queue->submit(severity => "informational",
|
|
From: Bob T. <bt...@us...> - 2003-06-26 20:23:27
|
Update of /cvsroot/benson/benson3 In directory sc8-pr-cvs1:/tmp/cvs-serv16923 Modified Files: ChangeLog Log Message: Added duration to the benson handler. Index: ChangeLog =================================================================== RCS file: /cvsroot/benson/benson3/ChangeLog,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -r1.32 -r1.33 *** ChangeLog 12 May 2003 03:31:00 -0000 1.32 --- ChangeLog 26 Jun 2003 20:23:22 -0000 1.33 *************** *** 2,5 **** --- 2,6 ---- - Adding in the disk/vfs monitor - Revised the network code, actually completely overhauled the network code. + - Added duration attribute for suppress btrap to Benson module. version 3.1a4 |
|
From: Bob T. <bt...@us...> - 2003-06-26 20:23:27
|
Update of /cvsroot/benson/benson3/handlers
In directory sc8-pr-cvs1:/tmp/cvs-serv16923/handlers
Modified Files:
S05benson.pm
Log Message:
Added duration to the benson handler.
Index: S05benson.pm
===================================================================
RCS file: /cvsroot/benson/benson3/handlers/S05benson.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** S05benson.pm 11 Nov 2002 05:23:55 -0000 1.6
--- S05benson.pm 26 Jun 2003 20:23:22 -0000 1.7
***************
*** 18,21 ****
--- 18,34 ----
my $starttime = $hash{starttime} || "0000-00-00_00:00:00";
my $endtime = $hash{endtime} || "0000-00-00_00:00:00";
+ if(defined $hash{duration}) {
+ # calculate startime in epoch seconds
+ my ($date, $time) = split /\_/, $starttime;
+ my ($year, $month, $day) = split /\-/, $date;
+ my ($hour, $minute, $second) = split /\:/, $time;
+ $month = $month - 1;
+ $year = $year - 1900; # make it perl year kosher
+ my $start_seconds = POSIX::strftime("%s", $second, $minute, $hour, $day, $month, $year);
+ # add duration
+ $start_seconds = $start_seconds + $hash{duration};
+ # convert seconds to endtime format
+ $endtime = POSIX::strftime("%Y-%m-%d_%H:%M:%S", localtime($start_seconds));
+ }
$reason = $reason || "No Reason";
|
|
From: Bob T. <bt...@us...> - 2003-05-12 03:31:03
|
Update of /cvsroot/benson/benson3 In directory sc8-pr-cvs1:/tmp/cvs-serv20375 Modified Files: ChangeLog Log Message: Updated the changelog. Index: ChangeLog =================================================================== RCS file: /cvsroot/benson/benson3/ChangeLog,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -r1.31 -r1.32 *** ChangeLog 9 Apr 2003 18:31:34 -0000 1.31 --- ChangeLog 12 May 2003 03:31:00 -0000 1.32 *************** *** 1,5 **** version 3.1a5 - Adding in the disk/vfs monitor ! - Revised the network code version 3.1a4 --- 1,5 ---- version 3.1a5 - Adding in the disk/vfs monitor ! - Revised the network code, actually completely overhauled the network code. version 3.1a4 |
|
From: Bob T. <bt...@us...> - 2003-05-12 03:29:47
|
Update of /cvsroot/benson/benson3/src/network In directory sc8-pr-cvs1:/tmp/cvs-serv19884 Added Files: network_client.c v31_network_client.c Log Message: starting to add the network client code. --- NEW FILE: network_client.c --- --- NEW FILE: v31_network_client.c --- |
|
From: Bob T. <bt...@us...> - 2003-05-12 03:29:01
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv19584/autom4te.cache
Modified Files:
requests
Log Message:
lots of networking code changes.
Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** requests 25 Apr 2003 02:39:30 -0000 1.8
--- requests 12 May 2003 03:28:55 -0000 1.9
***************
*** 17,33 ****
{
'm4_pattern_forbid' => 1,
- 'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
- 'AC_FUNC_WAIT3' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_FUNC_GETMNTENT' => 1,
'AC_TYPE_MODE_T' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRTOD' => 1,
--- 17,33 ----
{
'm4_pattern_forbid' => 1,
'AC_C_VOLATILE' => 1,
+ 'AC_TYPE_OFF_T' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_FUNC_WAIT3' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
! 'AC_STRUCT_TM' => 1,
'AC_TYPE_MODE_T' => 1,
+ 'AC_FUNC_GETMNTENT' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRTOD' => 1,
***************
*** 52,59 ****
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
- 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_FUNC_VPRINTF' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_STRUCT_TIMEZONE' => 1,
--- 52,59 ----
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_STRCOLL' => 1,
+ 'AC_FUNC_VPRINTF' => 1,
'AC_PROG_YACC' => 1,
'AC_STRUCT_TIMEZONE' => 1,
***************
*** 80,86 ****
'AC_PROG_CPP' => 1,
'AC_C_INLINE' => 1,
- 'AC_C_CONST' => 1,
- 'AC_TYPE_PID_T' => 1,
'AC_PROG_LEX' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
--- 80,86 ----
'AC_PROG_CPP' => 1,
'AC_C_INLINE' => 1,
'AC_PROG_LEX' => 1,
+ 'AC_TYPE_PID_T' => 1,
+ 'AC_C_CONST' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
***************
*** 88,93 ****
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
- 'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
--- 88,93 ----
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_CHECK_LIB' => 1,
+ 'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
***************
*** 96,106 ****
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AC_FUNC_MKTIME' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
- 'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
--- 96,106 ----
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
'AM_CONDITIONAL' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AC_PROG_LN_S' => 1,
+ 'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
***************
*** 121,137 ****
{
'm4_pattern_forbid' => 1,
- 'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
- 'AC_FUNC_WAIT3' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AC_FUNC_GETMNTENT' => 1,
'AC_TYPE_MODE_T' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRTOD' => 1,
--- 121,137 ----
{
'm4_pattern_forbid' => 1,
'AC_C_VOLATILE' => 1,
+ 'AC_TYPE_OFF_T' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_FUNC_WAIT3' => 1,
'AC_FUNC_LSTAT' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
! 'AC_STRUCT_TM' => 1,
'AC_TYPE_MODE_T' => 1,
+ 'AC_FUNC_GETMNTENT' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRTOD' => 1,
***************
*** 156,163 ****
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
- 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_FUNC_VPRINTF' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_STRUCT_TIMEZONE' => 1,
--- 156,163 ----
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
'AC_FUNC_FORK' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_STRCOLL' => 1,
+ 'AC_FUNC_VPRINTF' => 1,
'AC_PROG_YACC' => 1,
'AC_STRUCT_TIMEZONE' => 1,
***************
*** 184,190 ****
'AC_PROG_CPP' => 1,
'AC_C_INLINE' => 1,
- 'AC_C_CONST' => 1,
- 'AC_TYPE_PID_T' => 1,
'AC_PROG_LEX' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
--- 184,190 ----
'AC_PROG_CPP' => 1,
'AC_C_INLINE' => 1,
'AC_PROG_LEX' => 1,
+ 'AC_TYPE_PID_T' => 1,
+ 'AC_C_CONST' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
***************
*** 192,197 ****
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
- 'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
--- 192,197 ----
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_CHECK_LIB' => 1,
+ 'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
***************
*** 200,210 ****
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
- 'AC_FUNC_MKTIME' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
- 'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
--- 200,210 ----
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
'AM_CONDITIONAL' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AC_PROG_LN_S' => 1,
+ 'AC_FUNC_MEMCMP' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
|
|
From: Bob T. <bt...@us...> - 2003-05-12 03:29:00
|
Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv19584/src/network
Modified Files:
Makefile.am Makefile.in network.h network_utils.c
v31_network_request.c
Log Message:
lots of networking code changes.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** Makefile.am 11 May 2003 08:01:12 -0000 1.4
--- Makefile.am 12 May 2003 03:28:56 -0000 1.5
***************
*** 1,4 ****
! lib_LTLIBRARIES = libbnnetwork.la
libbnnetwork_la_SOURCES = network_master.c network_listener.c network_utils.c v31_network_request.c
libbnnetwork_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@ @top_srcdir@/src/perl/libbnperl.la
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
--- 1,6 ----
! lib_LTLIBRARIES = libbnnetwork.la libbnclient.la
libbnnetwork_la_SOURCES = network_master.c network_listener.c network_utils.c v31_network_request.c
libbnnetwork_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@ @top_srcdir@/src/perl/libbnperl.la
+ libbnclient_la_SOURCES = network_client.c network_utils.c v31_network_client.c
+ libbnclient_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.in 7 Apr 2003 04:23:59 -0000 1.3
--- Makefile.in 12 May 2003 03:28:56 -0000 1.4
***************
*** 138,144 ****
unamepath = @unamepath@
uniqpath = @uniqpath@
! lib_LTLIBRARIES = libbnnetwork.la
libbnnetwork_la_SOURCES = network_master.c network_listener.c network_utils.c v31_network_request.c
! libbnnetwork_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@ @top_srcdir@/src/libbenson.la @top_srcdir@/src/perl/libbnperl.la
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
subdir = src/network
--- 138,146 ----
unamepath = @unamepath@
uniqpath = @uniqpath@
! lib_LTLIBRARIES = libbnnetwork.la libbnclient.la
libbnnetwork_la_SOURCES = network_master.c network_listener.c network_utils.c v31_network_request.c
! libbnnetwork_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@ @top_srcdir@/src/perl/libbnperl.la
! libbnclient_la_SOURCES = network_client.c network_utils.c v31_network_client.c
! libbnclient_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
subdir = src/network
***************
*** 148,151 ****
--- 150,157 ----
LTLIBRARIES = $(lib_LTLIBRARIES)
+ libbnclient_la_LIBADD =
+ am_libbnclient_la_OBJECTS = network_client.lo network_utils.lo \
+ v31_network_client.lo
+ libbnclient_la_OBJECTS = $(am_libbnclient_la_OBJECTS)
libbnnetwork_la_LIBADD =
am_libbnnetwork_la_OBJECTS = network_master.lo network_listener.lo \
***************
*** 156,162 ****
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/network_listener.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/network_master.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/network_utils.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/v31_network_request.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
--- 162,170 ----
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/network_client.Plo \
! @AMDEP_TRUE@ ./$(DEPDIR)/network_listener.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/network_master.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/network_utils.Plo \
+ @AMDEP_TRUE@ ./$(DEPDIR)/v31_network_client.Plo \
@AMDEP_TRUE@ ./$(DEPDIR)/v31_network_request.Plo
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
***************
*** 167,173 ****
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
! DIST_SOURCES = $(libbnnetwork_la_SOURCES)
DIST_COMMON = Makefile.am Makefile.in
! SOURCES = $(libbnnetwork_la_SOURCES)
all: all-am
--- 175,181 ----
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
! DIST_SOURCES = $(libbnclient_la_SOURCES) $(libbnnetwork_la_SOURCES)
DIST_COMMON = Makefile.am Makefile.in
! SOURCES = $(libbnclient_la_SOURCES) $(libbnnetwork_la_SOURCES)
all: all-am
***************
*** 208,211 ****
--- 216,221 ----
rm -f "$${dir}/so_locations"; \
done
+ libbnclient.la: $(libbnclient_la_OBJECTS) $(libbnclient_la_DEPENDENCIES)
+ $(LINK) -rpath $(libdir) $(libbnclient_la_LDFLAGS) $(libbnclient_la_OBJECTS) $(libbnclient_la_LIBADD) $(LIBS)
libbnnetwork.la: $(libbnnetwork_la_OBJECTS) $(libbnnetwork_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libbnnetwork_la_LDFLAGS) $(libbnnetwork_la_OBJECTS) $(libbnnetwork_la_LIBADD) $(LIBS)
***************
*** 217,223 ****
--- 227,235 ----
-rm -f *.tab.c
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_client.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_listener.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_master.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/network_utils.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/v31_network_client.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/v31_network_request.Plo@am__quote@
Index: network.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** network.h 5 Apr 2003 00:00:15 -0000 1.3
--- network.h 12 May 2003 03:28:56 -0000 1.4
***************
*** 12,15 ****
--- 12,25 ----
#include "config.h"
+ #define DST_MAXSIZE 256
+
+ typedef struct benson_netconnect_context {
+ char destination[DST_MAXSIZE];
+ short port;
+ int connfd;
+ FILE *input;
+ FILE *output;
+ } bn_netconnect_ctx;
+
typedef struct benson_netlisten_context {
short port;
Index: network_utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_utils.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** network_utils.c 11 May 2003 08:01:12 -0000 1.3
--- network_utils.c 12 May 2003 03:28:56 -0000 1.4
***************
*** 1,4 ****
--- 1,32 ----
#include "network.h"
+ int ibn_tcp_connect(bn_netconnect_ctx *current_ctx)
+ {
+ struct hostent *hp;
+ struct sockaddr_in addr;
+ int sock;
+
+ if(!(hp=gethostbyname(current_ctx->destination))) {
+ fprintf(stderr, "Couldn't resolve hostname: %s\n", hstrerror(h_errno));
+ return ERROR;
+ }
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_addr=*(struct in_addr*)hp->h_addr_list[0];
+ addr.sin_family=AF_INET;
+ addr.sin_port=htons(current_ctx->port);
+
+ if((current_ctx->connfd=socket(AF_INET, SOCK_STREAM, IPPROTO_TCP))<0) {
+ fprintf(stderr, "Couldn't create socket(): %s\n", strerror(errno));
+ return ERROR;
+ }
+ if(connect(current_ctx->connfd, (struct sockaddr *)&addr, sizeof(addr))<0) {
+ fprintf(stderr, "Couldn't connect() to host: %s\n", strerror(errno));
+ return ERROR;
+ }
+ endhostent();
+
+ return GOOD;
+ }
+
int ibn_tcp_listen(bn_netlisten_ctx *current_ctx)
{
Index: v31_network_request.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_request.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** v31_network_request.c 11 May 2003 06:42:43 -0000 1.5
--- v31_network_request.c 12 May 2003 03:28:56 -0000 1.6
***************
*** 185,193 ****
bnet_ack_v31 resp_ack;
printf("benson trap received\n");
rc = process_trap_v31(&req_pkt, server_ref);
- memset(&resp_hdr, 0, sizeof(bnet_resp_v31));
- memset(&resp_ack, 0, sizeof(bnet_ack_v31));
rc = fwrite(request_header, sizeof(bn_req_hdr), 1, conn_ctx->output);
--- 185,195 ----
bnet_ack_v31 resp_ack;
+ memset(&resp_hdr, 0, sizeof(bnet_resp_v31));
+ memset(&resp_ack, 0, sizeof(bnet_ack_v31));
+
printf("benson trap received\n");
rc = process_trap_v31(&req_pkt, server_ref);
+ resp_hdr.resp.trap.rc = htons(rc);
rc = fwrite(request_header, sizeof(bn_req_hdr), 1, conn_ctx->output);
|
|
From: Bob T. <bt...@us...> - 2003-05-12 03:29:00
|
Update of /cvsroot/benson/benson3/src In directory sc8-pr-cvs1:/tmp/cvs-serv19584/src Modified Files: Makefile.in Log Message: lots of networking code changes. Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/Makefile.in,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -r1.40 -r1.41 *** Makefile.in 11 May 2003 08:02:03 -0000 1.40 --- Makefile.in 12 May 2003 03:28:56 -0000 1.41 *************** *** 152,156 **** libbenson_la_SOURCES = ssl.c network.c error.c utils.c cfgctl.c database.c psaf_queue.c bsm.c rules_cfg.c INCLUDES = -I@top_srcdir@/include -I@top_srcdir@ ! SUBDIRS = perl monitors AUTOMAKE_OPTIONS = dejagnu --- 152,156 ---- libbenson_la_SOURCES = ssl.c network.c error.c utils.c cfgctl.c database.c psaf_queue.c bsm.c rules_cfg.c INCLUDES = -I@top_srcdir@/include -I@top_srcdir@ ! SUBDIRS = perl monitors network AUTOMAKE_OPTIONS = dejagnu |
|
From: Bob T. <bt...@us...> - 2003-05-12 03:29:00
|
Update of /cvsroot/benson/benson3/src/tests/network In directory sc8-pr-cvs1:/tmp/cvs-serv19584/src/tests/network Modified Files: Makefile.am Makefile.in Log Message: lots of networking code changes. Index: Makefile.am =================================================================== RCS file: /cvsroot/benson/benson3/src/tests/network/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.am 7 Apr 2003 04:23:59 -0000 1.2 --- Makefile.am 12 May 2003 03:28:56 -0000 1.3 *************** *** 1,8 **** noinst_PROGRAMS = netlistenertest netconfigtest netmastertest netlistenertest_SOURCES = netlistenertest.c ! netlistenertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ netconfigtest_SOURCES = netconfigtest.c ! netconfigtest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ netmastertest_SOURCES = netmastertest.c ! netmastertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@/src/network --- 1,14 ---- noinst_PROGRAMS = netlistenertest netconfigtest netmastertest netlistenertest_SOURCES = netlistenertest.c ! netlistenertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la \ ! @top_srcdir@/src/libbenson.la \ ! @PERL_LDFLAGS@ netconfigtest_SOURCES = netconfigtest.c ! netconfigtest_LDADD = @top_srcdir@/src/network/libbnnetwork.la \ ! @top_srcdir@/src/libbenson.la \ ! @PERL_LDFLAGS@ netmastertest_SOURCES = netmastertest.c ! netmastertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la \ ! @top_srcdir@/src/libbenson.la \ ! @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@/src/network Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/tests/network/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Makefile.in 7 Apr 2003 04:23:59 -0000 1.2 --- Makefile.in 12 May 2003 03:28:56 -0000 1.3 *************** *** 140,148 **** noinst_PROGRAMS = netlistenertest netconfigtest netmastertest netlistenertest_SOURCES = netlistenertest.c ! netlistenertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ netconfigtest_SOURCES = netconfigtest.c ! netconfigtest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ netmastertest_SOURCES = netmastertest.c ! netmastertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@/src/network subdir = src/tests/network --- 140,157 ---- noinst_PROGRAMS = netlistenertest netconfigtest netmastertest netlistenertest_SOURCES = netlistenertest.c ! netlistenertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la \ ! @top_srcdir@/src/libbenson.la \ ! @PERL_LDFLAGS@ ! netconfigtest_SOURCES = netconfigtest.c ! netconfigtest_LDADD = @top_srcdir@/src/network/libbnnetwork.la \ ! @top_srcdir@/src/libbenson.la \ ! @PERL_LDFLAGS@ ! netmastertest_SOURCES = netmastertest.c ! netmastertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la \ ! @top_srcdir@/src/libbenson.la \ ! @PERL_LDFLAGS@ ! INCLUDES = -I@top_srcdir@/include -I@top_srcdir@/src/network subdir = src/tests/network *************** *** 156,168 **** am_netconfigtest_OBJECTS = netconfigtest.$(OBJEXT) netconfigtest_OBJECTS = $(am_netconfigtest_OBJECTS) ! netconfigtest_DEPENDENCIES = @top_srcdir@/src/network/libbnnetwork.la netconfigtest_LDFLAGS = am_netlistenertest_OBJECTS = netlistenertest.$(OBJEXT) netlistenertest_OBJECTS = $(am_netlistenertest_OBJECTS) ! netlistenertest_DEPENDENCIES = @top_srcdir@/src/network/libbnnetwork.la netlistenertest_LDFLAGS = am_netmastertest_OBJECTS = netmastertest.$(OBJEXT) netmastertest_OBJECTS = $(am_netmastertest_OBJECTS) ! netmastertest_DEPENDENCIES = @top_srcdir@/src/network/libbnnetwork.la netmastertest_LDFLAGS = --- 165,180 ---- am_netconfigtest_OBJECTS = netconfigtest.$(OBJEXT) netconfigtest_OBJECTS = $(am_netconfigtest_OBJECTS) ! netconfigtest_DEPENDENCIES = @top_srcdir@/src/network/libbnnetwork.la \ ! @top_srcdir@/src/libbenson.la netconfigtest_LDFLAGS = am_netlistenertest_OBJECTS = netlistenertest.$(OBJEXT) netlistenertest_OBJECTS = $(am_netlistenertest_OBJECTS) ! netlistenertest_DEPENDENCIES = @top_srcdir@/src/network/libbnnetwork.la \ ! @top_srcdir@/src/libbenson.la netlistenertest_LDFLAGS = am_netmastertest_OBJECTS = netmastertest.$(OBJEXT) netmastertest_OBJECTS = $(am_netmastertest_OBJECTS) ! netmastertest_DEPENDENCIES = @top_srcdir@/src/network/libbnnetwork.la \ ! @top_srcdir@/src/libbenson.la netmastertest_LDFLAGS = |
|
From: Bob T. <bt...@us...> - 2003-05-11 08:02:13
|
Update of /cvsroot/benson/benson3/src
In directory sc8-pr-cvs1:/tmp/cvs-serv10474
Modified Files:
Makefile.am Makefile.in bensond.c bn_network.c utils.c
Log Message:
Using the new version interfacee networking code
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** Makefile.am 25 Apr 2003 02:39:31 -0000 1.36
--- Makefile.am 11 May 2003 08:02:03 -0000 1.37
***************
*** 2,6 ****
sbin_PROGRAMS = bensond
bensond_SOURCES = bensond.c bn_monitor.c bn_network.c bn_rules.c
! bensond_LDADD = libbenson.la perl/libbnperl.la monitors/libbnmonitors.la @PERL_LDFLAGS@
btrap_SOURCES = btrap.c
btrap_LDADD = libbenson.la @PERL_LDFLAGS@
--- 2,6 ----
sbin_PROGRAMS = bensond
bensond_SOURCES = bensond.c bn_monitor.c bn_network.c bn_rules.c
! bensond_LDADD = libbenson.la perl/libbnperl.la monitors/libbnmonitors.la network/libbnnetwork.la @PERL_LDFLAGS@
btrap_SOURCES = btrap.c
btrap_LDADD = libbenson.la @PERL_LDFLAGS@
***************
*** 13,17 ****
libbenson_la_SOURCES = ssl.c network.c error.c utils.c cfgctl.c database.c psaf_queue.c bsm.c rules_cfg.c
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
! SUBDIRS = perl monitors
AUTOMAKE_OPTIONS = dejagnu
--- 13,17 ----
libbenson_la_SOURCES = ssl.c network.c error.c utils.c cfgctl.c database.c psaf_queue.c bsm.c rules_cfg.c
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
! SUBDIRS = perl monitors network
AUTOMAKE_OPTIONS = dejagnu
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/Makefile.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** Makefile.in 25 Apr 2003 02:39:31 -0000 1.39
--- Makefile.in 11 May 2003 08:02:03 -0000 1.40
***************
*** 141,145 ****
sbin_PROGRAMS = bensond
bensond_SOURCES = bensond.c bn_monitor.c bn_network.c bn_rules.c
! bensond_LDADD = libbenson.la perl/libbnperl.la monitors/libbnmonitors.la @PERL_LDFLAGS@
btrap_SOURCES = btrap.c
btrap_LDADD = libbenson.la @PERL_LDFLAGS@
--- 141,145 ----
sbin_PROGRAMS = bensond
bensond_SOURCES = bensond.c bn_monitor.c bn_network.c bn_rules.c
! bensond_LDADD = libbenson.la perl/libbnperl.la monitors/libbnmonitors.la network/libbnnetwork.la @PERL_LDFLAGS@
btrap_SOURCES = btrap.c
btrap_LDADD = libbenson.la @PERL_LDFLAGS@
***************
*** 183,187 ****
bensond_OBJECTS = $(am_bensond_OBJECTS)
bensond_DEPENDENCIES = libbenson.la perl/libbnperl.la \
! monitors/libbnmonitors.la
bensond_LDFLAGS =
am_btrap_OBJECTS = btrap.$(OBJEXT)
--- 183,187 ----
bensond_OBJECTS = $(am_bensond_OBJECTS)
bensond_DEPENDENCIES = libbenson.la perl/libbnperl.la \
! monitors/libbnmonitors.la network/libbnnetwork.la
bensond_LDFLAGS =
am_btrap_OBJECTS = btrap.$(OBJEXT)
Index: bensond.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bensond.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** bensond.c 24 Feb 2003 07:43:04 -0000 1.29
--- bensond.c 11 May 2003 08:02:04 -0000 1.30
***************
*** 54,58 ****
}
if(!strcmp(argv[0], "bn_network")) {
! bn_network_daemon(argc,argv,env);
syslog(LOG_ERR, "bn_network process returned unexpectedly.");
closelog();
--- 54,59 ----
}
if(!strcmp(argv[0], "bn_network")) {
! bn_network_daemon();
! // bn_network_daemon(argc,argv,env);
syslog(LOG_ERR, "bn_network process returned unexpectedly.");
closelog();
Index: bn_network.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/bn_network.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -r1.35 -r1.36
*** bn_network.c 26 Jan 2003 20:55:38 -0000 1.35
--- bn_network.c 11 May 2003 08:02:05 -0000 1.36
***************
*** 7,11 ****
#include <benson/benson.h>
!
void
--- 7,11 ----
#include <benson/benson.h>
! #include "network/network.h"
void
***************
*** 27,210 ****
}
! int
! process_trap (bnet_req req_pkt, SV* server_ref)
! {
! char destination[DST_MAXSIZE];
! char agent[AGT_MAXSIZE];
! char severity[SEV_MAXSIZE];
! char subsystem[SUB_MAXSIZE];
! char message[MSG_MAXSIZE];
! char status[STA_MAXSIZE];
! SV* alert_ref;
! SV* result;
! int rc;
!
! safe_insert(destination, req_pkt.inet.destination, DST_MAXSIZE);
! safe_insert(agent, req_pkt.inet.agent,AGT_MAXSIZE);
! safe_insert(severity, req_pkt.data.trap.severity, SEV_MAXSIZE);
! safe_insert(subsystem, req_pkt.data.trap.subsystem, SUB_MAXSIZE);
! safe_insert(message, req_pkt.data.trap.message, MSG_MAXSIZE);
! safe_insert(status, "initial", STA_MAXSIZE);
!
! ENTER;
! SAVETMPS;
!
! bn_require_module("Benson::Alert");
! bn_require_module("Benson::Handlers::Network::Submit");
! alert_ref = sv_2mortal(bn_new_object("Benson::Alert", 0));
! bn_set_attribute(alert_ref, "destination", newSVpv(destination, 0));
! bn_set_attribute(alert_ref, "agent", newSVpv(agent, 0));
! bn_set_attribute(alert_ref, "severity", newSVpv(severity, 0));
! bn_set_attribute(alert_ref, "subsystem", newSVpv(subsystem, 0));
! bn_set_attribute(alert_ref, "message", newSVpv(message, 0));
! bn_set_attribute(alert_ref, "status", newSVpv(status, 0));
! bn_set_attribute(alert_ref, "server", SvREFCNT_inc(server_ref));
!
! result = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Submit", alert_ref));
! rc = SvIV(result);
!
! FREETMPS;
! LEAVE;
!
! return rc;
! }
!
! short
! process_acknowledge (bnet_req req_pkt, SV *server_ref)
! {
! char id[ID_MAXSIZE];
! char status[STA_MAXSIZE];
! SV *acknowledge_ref;
! SV *rc;
! unsigned int rc_int;
!
! safe_insert(id, req_pkt.data.acknowledge.identity, ID_MAXSIZE);
! safe_insert(status, "acknowledge", STA_MAXSIZE);
! ENTER;
! SAVETMPS;
!
! printf("Acknowledge ID: %s\n", id);
! bn_require_module("Benson::Alert");
! bn_require_module("Benson::Handlers::Network::Update");
! acknowledge_ref = sv_2mortal(bn_new_object("Benson::Alert", 0));
! bn_set_attribute(acknowledge_ref, "identity", newSVpv(id, 0));
! bn_set_attribute(acknowledge_ref, "status", newSVpv(status, 0));
! bn_set_attribute(acknowledge_ref, "server", SvREFCNT_inc(server_ref));
!
! rc = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Update", acknowledge_ref));
!
! FREETMPS;
! LEAVE;
!
! return (short)SvIV(rc);
! }
!
! short
! process_update_status (bnet_req req_pkt, SV *server_ref)
! {
! char id[ID_MAXSIZE];
! char status[STA_MAXSIZE];
! SV *update_ref;
! SV *rc;
!
! safe_insert(id, req_pkt.data.update_status.identity, ID_MAXSIZE);
! safe_insert(status, req_pkt.data.update_status.status, STA_MAXSIZE);
! ENTER;
! SAVETMPS;
!
! printf("Update ID: %s\n", id);
! bn_require_module("Benson::Alert");
! bn_require_module("Benson::Handlers::Network::Update");
! update_ref = sv_2mortal(bn_new_object("Benson::Alert", 0));
! bn_set_attribute(update_ref, "identity", newSVpv(id, 0));
! bn_set_attribute(update_ref, "status", newSVpv(status, 0));
! bn_set_attribute(update_ref, "server", SvREFCNT_inc(server_ref));
!
! rc = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Update", update_ref));
!
! FREETMPS;
! LEAVE;
!
! return (short)SvIV(rc);
! }
!
! void *process_alertlist (bnet_req req_pkt, SV *server_ref)
! {
! int max_num_alerts;
! SV* result;
! SV* alert;
! SV* max_alerts;
! SV** svp;
! HV* header;
! HV* fields;
! AV* alerts;
! void *response_ptr;
! bnet_resp *resp_hdr;
! struct benson_alertlist_response *resp_alerts_ptr;
! int ctr = 0;
! int total_packet_size = 0;
! int resp_hdr_size;
!
! ENTER;
! SAVETMPS;
!
! bn_require_module("Benson::Handlers::Network::Alertlist");
! result = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Alertlist", server_ref));
! header = (HV*)SvRV(result);
! max_alerts = *hv_fetch(header, "max_alerts", 10, FALSE);
! alerts = (AV*)SvRV(*hv_fetch(header, "alerts", 6, FALSE));
!
! resp_hdr_size = sizeof(bnet_resp);
! total_packet_size = (sizeof(struct benson_alertlist_response) * (av_len(alerts) + 1)) + resp_hdr_size;
!
! response_ptr = malloc(total_packet_size);
!
! resp_hdr = (bnet_resp *) response_ptr;
! safe_insert(resp_hdr->benson, PACKAGE, BNH_MAXSIZE);
! safe_insert(resp_hdr->version, VERSION, VER_MAXSIZE);
! resp_hdr->resp.total_alerts = htons(av_len(alerts) + 1);
!
! resp_alerts_ptr = (struct benson_alertlist_response *) (response_ptr + resp_hdr_size);
!
! while((alert = av_pop(alerts)) != &PL_sv_undef) {
! struct benson_alertlist_response insert;
! fields = (HV*)SvRV(alert);
! safe_insert(insert.identity, SvPVX(*hv_fetch(fields, "identity", 8, FALSE)), ID_MAXSIZE);
! safe_insert(insert.inet.destination, SvPVX(*hv_fetch(fields, "destination", 11, FALSE)), DST_MAXSIZE);
! safe_insert(insert.inet.agent, SvPVX(*hv_fetch(fields, "agent", 5, FALSE)), AGT_MAXSIZE);
! safe_insert(insert.trap.severity, SvPVX(*hv_fetch(fields, "severity", 8, FALSE)), SEV_MAXSIZE);
! safe_insert(insert.trap.subsystem, SvPVX(*hv_fetch(fields, "subsystem", 9, FALSE)), SUB_MAXSIZE);
! safe_insert(insert.trap.message, SvPVX(*hv_fetch(fields, "message", 7, FALSE)), MSG_MAXSIZE);
! safe_insert(insert.misc.updated, SvPVX(*hv_fetch(fields, "updated", 7, FALSE)), UPD_MAXSIZE);
! safe_insert(insert.misc.status, SvPVX(*hv_fetch(fields, "status", 6, FALSE)), STA_MAXSIZE);
! memcpy(&resp_alerts_ptr[ctr++], &insert, sizeof(struct benson_alertlist_response));
! }
!
! FREETMPS;
! LEAVE;
!
! return response_ptr;
! }
!
! int bn_network_daemon(int argc, char *argv[], char *env[])
! {
! int listenfd, connfd;
! int read_offset = 0;
! int rc;
! int port = 0;
! int request_timeout = 0;
! int response_timeout = 0;
! int alertlist_timeout = 0;
! unsigned short function;
pid_t pid;
! unsigned char config_file[256];
unsigned char error_logfile[256];
- unsigned char RequestTimeout[DVALUE_LENGTH];
- unsigned char ResponseTimeout[DVALUE_LENGTH];
- unsigned char AlertlistTimeout[DVALUE_LENGTH];
- unsigned char Port[DVALUE_LENGTH];
-
- PerlInterpreter *benson_perl;
- SV *server_ref;
// Make me a daemon, baby
--- 27,34 ----
}
! int bn_network_daemon() {
pid_t pid;
! int rc;
unsigned char error_logfile[256];
// Make me a daemon, baby
***************
*** 227,401 ****
setvbuf(stdout, (char *)NULL, _IONBF, 0);
- openlog(argv[0], LOG_PID, LOG_DAEMON);
-
- if((rc = load_config()) == ERROR) {
- fprintf(stderr, "bn_network_daemon(): load_config() failed.");
- exit(EXIT_FAILURE);
- }
-
- if((rc = cfg_helper(FIND, "Port", Port)) == ERROR) {
- fprintf(stderr, "bn_network_daemon(): A port was not configured, and I am not assuming anything.");
- exit(EXIT_FAILURE);
- } else {
- port = atoi(Port);
- }
-
- if((rc = cfg_helper(FIND, "RequestTimeout", RequestTimeout)) == ERROR) {
- fprintf(stderr, "RequestTimeout unspecified defaulting to 10 seconds.");
- request_timeout = 10;
- } else {
- request_timeout = atoi(RequestTimeout);
- }
- if((rc = cfg_helper(FIND, "ResponseTimeout", ResponseTimeout)) == ERROR) {
- fprintf(stderr, "AlertlistTimeout unspecified defaulting to 10 seconds.");
- response_timeout = 10;
- } else {
- response_timeout = atoi(ResponseTimeout);
- }
- if((rc = cfg_helper(FIND, "AlertlistTimeout", AlertlistTimeout)) == ERROR) {
- fprintf(stderr, "AlertlistTimeout unspecified defaulting to 60 seconds.");
- alertlist_timeout = 60;
- } else {
- alertlist_timeout = atoi(AlertlistTimeout);
- }
-
- rc = cfg_helper(SHUTDOWN, NULL, NULL);
-
- (void)(int) signal(SIGCHLD, SIG_IGN);
- (void)(int) signal(SIGINT, sig_int);
- (void)(int) signal(SIGTERM, sig_int);
-
- listenfd = ibn_tcp_listen(port);
-
- while(1) {
- struct sockaddr peer_addr;
- socklen_t peer_addr_size = (socklen_t)sizeof(struct sockaddr);
- do {
- if((connfd=accept(listenfd, &peer_addr, &peer_addr_size))<0)
- perror("accept() failed");
- } while(errno == EINTR);
- closelog();
-
- ibn_next_sequence();
- if(pid=fork()) {
- close(connfd);
- }
- else {
- short rc;
- int w, r;
- bnet_req req_pkt;
- PerlInterpreter *net_perl;
- FILE *sockout, *sockin;
-
- signal(SIGALRM, sig_alarm);
- sockout = fdopen(connfd, "w");
- sockin = fdopen(connfd, "r");
-
- net_perl = bn_perl_initialize(argc, argv, env, 1);
-
- bn_require_module("Benson::Server");
- bn_require_module("Benson::Handlers::Config");
- bn_require_module("Benson::Handlers::Init");
- server_ref = bn_new_object("Benson::Server", 0);
-
- snprintf(config_file, 255, "%s/etc/benson.conf", BENSON_HOME);
- config_file[255] = '\0';
-
- bn_set_attribute(server_ref, "ConfigFile", newSVpv(config_file, 0));
- bn_call_handler("Benson::Handlers::Config", server_ref);
- bn_call_handler("Benson::Handlers::Init", server_ref);
- openlog("bn_network[child]", 0, LOG_DAEMON);
-
- alarm(request_timeout);
- r = fread(&req_pkt, sizeof(bnet_req), 1, sockin);
- alarm(0); /* Reset alarm */
-
- function = ntohs(req_pkt.function);
- if(function == BENSON_TRAP) {
- bnet_resp resp_hdr;
- bnet_ack resp_ack;
-
- alarm(response_timeout);
- rc = process_trap(req_pkt, server_ref);
-
- resp_hdr.resp.trap.rc = htons(rc);
- rc = fwrite(&resp_hdr, sizeof(bnet_resp), 1, sockout);
- if(rc < 1) {
- printf("fwrite() error\n");
- }
- fflush(sockout);
-
- rc = fread(&resp_ack, sizeof(bnet_ack), 1, sockin);
- if(rc < 1) {
- printf("fread() error\n");
- }
- } else if(function == BENSON_ALERTLIST) {
- void *response;
- bnet_resp *resp_hdr;
- bnet_ack resp_ack;
- fd_set wfds;
- int response_size = sizeof(bnet_resp);
- int retval;
- int rc;
-
- alarm(alertlist_timeout);
- response = process_alertlist(req_pkt, server_ref);
- resp_hdr = (bnet_resp *) response;
- response_size += (ntohs(resp_hdr->resp.total_alerts)) * sizeof(struct benson_alertlist_response);
-
- rc = fwrite(response, response_size, 1, sockout);
- if(rc < 1) {
- printf("fwrite() error\n");
- }
- fflush(sockout);
-
- rc = fread(&resp_ack, sizeof(bnet_ack), 1, sockin);
- if(rc < 1) {
- printf("fread() error\n");
- }
- free(response);
- } else if(function == BENSON_ACKNOWLEDGE) {
- bnet_resp resp_hdr;
- bnet_ack resp_ack;
-
- alarm(response_timeout);
- rc = process_acknowledge(req_pkt, server_ref);
- resp_hdr.resp.acknowledge.rc = htons(rc);
- rc = fwrite(&resp_hdr, sizeof(bnet_resp), 1, sockout);
- if(rc < 1) {
- printf("fwrite() error\n");
- }
- fflush(sockout);
-
- rc = fread(&resp_ack, sizeof(bnet_ack), 1, sockin);
- if(rc < 1) {
- printf("fread() error\n");
- }
- } else if(function == BENSON_UPDATE_STATUS) {
- bnet_resp resp_hdr;
- bnet_ack resp_ack;
-
- alarm(response_timeout);
- rc = process_update_status(req_pkt, server_ref);
- resp_hdr.resp.update_status.rc = htons(rc);
- rc = fwrite(&resp_hdr, sizeof(bnet_resp), 1, sockout);
- if(rc < 1) {
- printf("fwrite() error\n");
- }
- fflush(sockout);
-
- rc = fread(&resp_ack, sizeof(bnet_ack), 1, sockin);
- if(rc < 1) {
- printf("fread() error\n");
- }
- }
- fclose(stderr);
- close(connfd);
- close(listenfd);
- closelog();
- exit(EXIT_SUCCESS);
- }
- }
exit(EXIT_SUCCESS);
}
--- 51,56 ----
setvbuf(stdout, (char *)NULL, _IONBF, 0);
+ rc = network_master();
exit(EXIT_SUCCESS);
}
Index: utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/utils.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** utils.c 26 Feb 2003 18:25:01 -0000 1.11
--- utils.c 11 May 2003 08:02:06 -0000 1.12
***************
*** 94,119 ****
}
- int ibn_tcp_listen(int port)
- {
- int sock;
- struct sockaddr_in sin;
- int val=1;
- if((sock=socket(AF_INET,SOCK_STREAM,0))<0)
- err_exit("Couldn't make socket()");
-
- memset(&sin, 0, sizeof(sin));
- sin.sin_addr.s_addr=INADDR_ANY;
- sin.sin_family=AF_INET;
- sin.sin_port=htons(port);
- setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
- setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &val, sizeof(val));
-
- if(bind(sock,(struct sockaddr *)&sin, sizeof(sin))<0)
- err_exit("Couldn't bind()");
- listen(sock, 10);
-
- return (sock);
- }
-
int ibn_next_sequence(void) {
extern int sequence;
--- 94,97 ----
|
|
From: Bob T. <bt...@us...> - 2003-05-11 08:01:19
|
Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv10198
Modified Files:
Makefile.am network_listener.c network_master.c
network_utils.c
Log Message:
Updated a whole bunch of files for no reason, this maybe bad, but there is more error checking.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Makefile.am 7 Apr 2003 04:23:59 -0000 1.3
--- Makefile.am 11 May 2003 08:01:12 -0000 1.4
***************
*** 1,4 ****
lib_LTLIBRARIES = libbnnetwork.la
libbnnetwork_la_SOURCES = network_master.c network_listener.c network_utils.c v31_network_request.c
! libbnnetwork_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@ @top_srcdir@/src/libbenson.la @top_srcdir@/src/perl/libbnperl.la
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
--- 1,4 ----
lib_LTLIBRARIES = libbnnetwork.la
libbnnetwork_la_SOURCES = network_master.c network_listener.c network_utils.c v31_network_request.c
! libbnnetwork_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@ @top_srcdir@/src/perl/libbnperl.la
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
Index: network_listener.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_listener.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** network_listener.c 5 Apr 2003 04:38:23 -0000 1.5
--- network_listener.c 11 May 2003 08:01:12 -0000 1.6
***************
*** 17,21 ****
if((rc = ibn_tcp_listen(current_ctx)) == ERROR) {
! fprintf(stderr, "ibn_tcp_listen() failure: ");
return ERROR;
}
--- 17,21 ----
if((rc = ibn_tcp_listen(current_ctx)) == ERROR) {
! fprintf(stderr, "ibn_tcp_listen() failure for reason \"%s\"", strerror(errno));
return ERROR;
}
***************
*** 36,49 ****
do {
if((conn_ctx->connfd = accept(current_ctx->listenfd, &conn_ctx->peer_addr, &peer_addr_size)) < 0) {
! fprintf(stderr, "network_listener_acccept(): accept() failed\n");
}
} while(errno == EINTR);
if((conn_ctx->output = fdopen(conn_ctx->connfd, "w")) == NULL) {
! fprintf(stderr, "network_listener_accept(): fdopen(write) failed.\n");
return ERROR;
}
if((conn_ctx->input = fdopen(conn_ctx->connfd, "r")) == NULL) {
! fprintf(stderr, "network_listener_accept(): fdopen(read) failed.\n");
return ERROR;
}
--- 36,49 ----
do {
if((conn_ctx->connfd = accept(current_ctx->listenfd, &conn_ctx->peer_addr, &peer_addr_size)) < 0) {
! fprintf(stderr, "network_listener_accept(): accept() failed for reason \"%s\"\n", strerror(errno));
}
} while(errno == EINTR);
if((conn_ctx->output = fdopen(conn_ctx->connfd, "w")) == NULL) {
! fprintf(stderr, "network_listener_accept(): fdopen(write) failed for reason \"%s\"\n", strerror(errno));
return ERROR;
}
if((conn_ctx->input = fdopen(conn_ctx->connfd, "r")) == NULL) {
! fprintf(stderr, "network_listener_accept(): fdopen(read) failed for reason \"%s\".\n", strerror(errno));
return ERROR;
}
***************
*** 68,72 ****
/* wipe it's mind clean of sin */
if(memset(conn_ctx, 0, length) == NULL) {
! fprintf(stderr, "network_listen_accept_cleanup() failed for some reason.\n");
return ERROR;
}
--- 68,72 ----
/* wipe it's mind clean of sin */
if(memset(conn_ctx, 0, length) == NULL) {
! fprintf(stderr, "network_listen_accept_cleanup() failed for reason \"%s\".\n", strerror(errno));
return ERROR;
}
***************
*** 82,86 ****
assert(conn_ctx->input != NULL);
! bytes_read = fread(request_header, sizeof(bn_req_hdr), 1, conn_ctx->input);
if(strcmp(request_header->benson, PACKAGE) != GOOD) {
--- 82,86 ----
assert(conn_ctx->input != NULL);
! bytes_read = fread(request_header, sizeof(bn_req_hdr), 1, conn_ctx->input);
if(strcmp(request_header->benson, PACKAGE) != GOOD) {
Index: network_master.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_master.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** network_master.c 5 Apr 2003 04:38:23 -0000 1.4
--- network_master.c 11 May 2003 08:01:12 -0000 1.5
***************
*** 6,9 ****
--- 6,10 ----
int rc = 0;
+ memset(&main_ctx, 0, sizeof(bn_netlisten_ctx));
main_ctx.port = 9021;
***************
*** 18,21 ****
--- 19,23 ----
pid_t pid;
bn_netaccept_ctx connection_ctx;
+ memset(&connection_ctx, 0, sizeof(bn_netaccept_ctx));
network_listener_accept(&main_ctx, &connection_ctx);
Index: network_utils.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/network_utils.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** network_utils.c 4 Apr 2003 19:31:06 -0000 1.2
--- network_utils.c 11 May 2003 08:01:12 -0000 1.3
***************
*** 7,11 ****
int val=1;
if((sock=socket(AF_INET, SOCK_STREAM, 0)) < 0) {
! fprintf(stderr, "Couldn't create socket()\n");
return ERROR;
}
--- 7,11 ----
int val=1;
if((sock=socket(AF_INET, SOCK_STREAM, 0)) < 0) {
! fprintf(stderr, "Couldn't create socket() for reason \"%s\"\n", strerror(errno));
return ERROR;
}
***************
*** 18,27 ****
if(bind(sock, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
! fprintf(stderr, "Couldn't bind() socket to port\n");
return ERROR;
}
- listen(sock, 10);
current_ctx->listenfd = sock;
-
return GOOD;
}
--- 18,29 ----
if(bind(sock, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
! fprintf(stderr, "Couldn't bind() socket to port for reason \"%s\"\n", strerror(errno));
! return ERROR;
! }
! if(listen(sock, 10) < 0) {
! fprintf(stderr, "Couldn't listen() on socket for reason \"%s\"\n", strerror(errno));
return ERROR;
}
current_ctx->listenfd = sock;
return GOOD;
}
|
|
From: Bob T. <bt...@us...> - 2003-05-11 06:42:48
|
Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv22132
Modified Files:
v31_network_request.c
Log Message:
Fully functioning v31 network request code.
Index: v31_network_request.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_request.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** v31_network_request.c 25 Apr 2003 02:39:31 -0000 1.4
--- v31_network_request.c 11 May 2003 06:42:43 -0000 1.5
***************
*** 76,80 ****
short
! process_update_status(bnet_req_v31 *req_pkt, SV *server_ref)
{
char id[ID_MAXSIZE_v31];
--- 76,80 ----
short
! process_update_status_v31(bnet_req_v31 *req_pkt, SV *server_ref)
{
char id[ID_MAXSIZE_v31];
***************
*** 105,109 ****
}
! void *process_alertlist_v31 (bnet_req_v31 *req_pkt, SV *server_ref)
{
int max_num_alerts;
--- 105,109 ----
}
! void *process_alertlist_v31 (bnet_req_v31 *req_pkt, SV *server_ref, bnet_resp_v31 *resp_hdr)
{
int max_num_alerts;
***************
*** 123,138 ****
bn_require_module("Benson::Handlers::Network::Alertlist");
! result = sv_2mortal(
! (SV*)bn_call_handler("Benson::Handlers::Network::Alertlist", server_ref)
! );
header = (HV*) SvRV(result);
max_alerts = *hv_fetch(header, "max_alerts", 10, FALSE);
alerts = (AV*)SvRV(*hv_fetch(header, "alerts", 6, FALSE));
response_size = (sizeof(bn_alertlist_response_v31) * (av_len(alerts) + 1));
! response_ptr = malloc(response_size);
}
--- 123,154 ----
bn_require_module("Benson::Handlers::Network::Alertlist");
! result = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Alertlist", server_ref));
header = (HV*) SvRV(result);
max_alerts = *hv_fetch(header, "max_alerts", 10, FALSE);
alerts = (AV*)SvRV(*hv_fetch(header, "alerts", 6, FALSE));
+ resp_hdr->resp.total_alerts = htons(av_len(alerts) + 1);
+
response_size = (sizeof(bn_alertlist_response_v31) * (av_len(alerts) + 1));
! resp_alerts_ptr = malloc(response_size);
! while((alert = av_pop(alerts)) != &PL_sv_undef) {
! bn_alertlist_response_v31 insert;
! fields = (HV*)SvRV(alert);
! safe_insert(insert.identity, SvPVX(*hv_fetch(fields, "identity", 8, FALSE)), ID_MAXSIZE_v31);
! safe_insert(insert.inet.destination, SvPVX(*hv_fetch(fields, "destination", 11, FALSE)), DST_MAXSIZE_v31);
! safe_insert(insert.inet.agent, SvPVX(*hv_fetch(fields, "agent", 5, FALSE)), AGT_MAXSIZE_v31);
! safe_insert(insert.trap.severity, SvPVX(*hv_fetch(fields, "severity", 8, FALSE)), SEV_MAXSIZE_v31);
! safe_insert(insert.trap.subsystem, SvPVX(*hv_fetch(fields, "subsystem", 9, FALSE)), SUB_MAXSIZE_v31);
! safe_insert(insert.trap.message, SvPVX(*hv_fetch(fields, "message", 7, FALSE)), MSG_MAXSIZE_v31);
! safe_insert(insert.misc.updated, SvPVX(*hv_fetch(fields, "updated", 7, FALSE)), UPD_MAXSIZE_v31);
! safe_insert(insert.misc.status, SvPVX(*hv_fetch(fields, "status", 6, FALSE)), STA_MAXSIZE_v31);
! memcpy(&resp_alerts_ptr[ctr++], &insert, sizeof(bn_alertlist_response_v31));
! }
+ FREETMPS;
+ LEAVE;
+ return resp_alerts_ptr;
}
***************
*** 181,189 ****
--- 197,249 ----
rc = fread(&resp_ack, sizeof(bnet_ack_v31), 1, conn_ctx->input);
} else if(function == BENSON_ALERTLIST_v31) {
+ bnet_resp_v31 resp_hdr;
+ bnet_ack_v31 resp_ack;
+ void *response;
+ int response_size;
+
printf("benson alertlist received\n");
+ memset(&resp_hdr, 0, sizeof(bnet_resp_v31));
+ memset(&resp_ack, 0, sizeof(bnet_ack_v31));
+
+ response = process_alertlist_v31(&req_pkt, server_ref, &resp_hdr);
+ response_size = (ntohs(resp_hdr.resp.total_alerts) * sizeof(bn_alertlist_response_v31));
+
+ rc = fwrite(request_header, sizeof(bn_req_hdr), 1, conn_ctx->output);
+ rc = fwrite(&resp_hdr, sizeof(bnet_resp_v31), 1, conn_ctx->output);
+ rc = fwrite(response, response_size, 1, conn_ctx->output);
+ fflush(conn_ctx->output);
+
+ rc = fread(&resp_ack, sizeof(bnet_ack_v31), 1, conn_ctx->input);
+ free(response);
} else if(function == BENSON_ACKNOWLEDGE_v31) {
+ bnet_resp_v31 resp_hdr;
+ bnet_ack_v31 resp_ack;
+
printf("benson acknowledge received\n");
+ rc = process_acknowledge_v31(&req_pkt, server_ref);
+
+ memset(&resp_hdr, 0, sizeof(bnet_resp_v31));
+ memset(&resp_ack, 0, sizeof(bnet_ack_v31));
+
+ rc = fwrite(request_header, sizeof(bn_req_hdr), 1, conn_ctx->output);
+ rc = fwrite(&resp_hdr, sizeof(bnet_resp_v31), 1, conn_ctx->output);
+ fflush(conn_ctx->output);
+
+ rc = fread(&resp_hdr, sizeof(bnet_ack_v31), 1, conn_ctx->input);
} else if(function == BENSON_UPDATE_STATUS_v31) {
+ bnet_resp_v31 resp_hdr;
+ bnet_ack_v31 resp_ack;
+
printf("benson update status received\n");
+ rc = process_update_status_v31(&req_pkt, server_ref);
+
+ memset(&resp_hdr, 0, sizeof(bnet_resp_v31));
+ memset(&resp_ack, 0, sizeof(bnet_ack_v31));
+
+ rc = fwrite(request_header, sizeof(bn_req_hdr), 1, conn_ctx->output);
+ rc = fwrite(&resp_hdr, sizeof(bnet_resp_v31), 1, conn_ctx->output);
+ fflush(conn_ctx->output);
+
+ rc = fread(&resp_hdr, sizeof(bnet_ack_v31), 1, conn_ctx->input);
} else {
printf("unrecognized function\n");
|
|
From: Bob T. <bt...@us...> - 2003-04-25 02:39:36
|
Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv16872/src/network
Modified Files:
v31_network_request.c
Log Message:
update to the network code.
Index: v31_network_request.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_request.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** v31_network_request.c 7 Apr 2003 04:23:59 -0000 1.3
--- v31_network_request.c 25 Apr 2003 02:39:31 -0000 1.4
***************
*** 97,101 ****
bn_set_attribute(acknowledge_ref, "server", SvREFCNT_inc(server_ref));
! rc = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Update",acknowledge_ref));
FREETMPS;
--- 97,101 ----
bn_set_attribute(acknowledge_ref, "server", SvREFCNT_inc(server_ref));
! rc = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Update", acknowledge_ref));
FREETMPS;
***************
*** 105,109 ****
}
! void *process_alertlist_v31 (bnet_req *req_pkt, SV *server_ref))
{
int max_num_alerts;
--- 105,109 ----
}
! void *process_alertlist_v31 (bnet_req_v31 *req_pkt, SV *server_ref)
{
int max_num_alerts;
***************
*** 123,130 ****
bn_require_module("Benson::Handlers::Network::Alertlist");
! result = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Alertlist"), server_ref));
header = (HV*) SvRV(result);
max_alerts = *hv_fetch(header, "max_alerts", 10, FALSE);
! alerts = (AV*)SvRV(*hv_fetch(header, "alerts", 6, FALSE);
response_size = (sizeof(bn_alertlist_response_v31) * (av_len(alerts) + 1));
--- 123,132 ----
bn_require_module("Benson::Handlers::Network::Alertlist");
! result = sv_2mortal(
! (SV*)bn_call_handler("Benson::Handlers::Network::Alertlist", server_ref)
! );
header = (HV*) SvRV(result);
max_alerts = *hv_fetch(header, "max_alerts", 10, FALSE);
! alerts = (AV*)SvRV(*hv_fetch(header, "alerts", 6, FALSE));
response_size = (sizeof(bn_alertlist_response_v31) * (av_len(alerts) + 1));
|
|
From: Bob T. <bt...@us...> - 2003-04-25 02:39:36
|
Update of /cvsroot/benson/benson3/src/tests/monitors In directory sc8-pr-cvs1:/tmp/cvs-serv16872/src/tests/monitors Modified Files: Makefile.am Makefile.in Log Message: update to the network code. Index: Makefile.am =================================================================== RCS file: /cvsroot/benson/benson3/src/tests/monitors/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile.am 14 Mar 2003 02:26:33 -0000 1.3 --- Makefile.am 25 Apr 2003 02:39:31 -0000 1.4 *************** *** 1,10 **** noinst_PROGRAMS = procmontest disklibtest diskmontest procmontest_SOURCES = procmontest.c ! procmontest_LDADD = @top_srcdir@/src/libbenson.la @top_srcdir@/src/perl/libbnperl.a \ ! @top_srcdir@/src/monitors/libbnmonitors.la @PERL_LDFLAGS@ disklibtest_SOURCES = disklibtest.c ! disklibtest_LDADD = @top_srcdir@/src/monitors/disk/libbndisk.la @PERL_LDFLAGS@ diskmontest_SOURCES = diskmontest.c ! diskmontest_LDADD = @top_srcdir@/src/libbenson.la @top_srcdir@/src/perl/libbnperl.a \ ! @top_srcdir@/src/monitors/libbnmonitors.la @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@ --- 1,16 ---- noinst_PROGRAMS = procmontest disklibtest diskmontest procmontest_SOURCES = procmontest.c ! procmontest_LDADD = @top_srcdir@/src/libbenson.la \ ! @top_srcdir@/src/perl/libbnperl.la \ ! @top_srcdir@/src/monitors/libbnmonitors.la \ ! @PERL_LDFLAGS@ disklibtest_SOURCES = disklibtest.c ! disklibtest_LDADD = @top_srcdir@/src/monitors/disk/libbndisk.la \ ! @top_srcdir@/src/perl/libbnperl.la \ ! @PERL_LDFLAGS@ diskmontest_SOURCES = diskmontest.c ! diskmontest_LDADD = @top_srcdir@/src/libbenson.la \ ! @top_srcdir@/src/perl/libbnperl.la \ ! @top_srcdir@/src/monitors/libbnmonitors.la \ ! @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@ Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/tests/monitors/Makefile.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** Makefile.in 14 Mar 2003 02:26:33 -0000 1.3 --- Makefile.in 25 Apr 2003 02:39:31 -0000 1.4 *************** *** 76,79 **** --- 76,80 ---- MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ + NETWORK_VERSION = @NETWORK_VERSION@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ *************** *** 139,150 **** noinst_PROGRAMS = procmontest disklibtest diskmontest procmontest_SOURCES = procmontest.c ! procmontest_LDADD = @top_srcdir@/src/libbenson.la @top_srcdir@/src/perl/libbnperl.a \ ! @top_srcdir@/src/monitors/libbnmonitors.la @PERL_LDFLAGS@ disklibtest_SOURCES = disklibtest.c ! disklibtest_LDADD = @top_srcdir@/src/monitors/disk/libbndisk.la @PERL_LDFLAGS@ diskmontest_SOURCES = diskmontest.c ! diskmontest_LDADD = @top_srcdir@/src/libbenson.la @top_srcdir@/src/perl/libbnperl.a \ ! @top_srcdir@/src/monitors/libbnmonitors.la @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@ --- 140,158 ---- noinst_PROGRAMS = procmontest disklibtest diskmontest procmontest_SOURCES = procmontest.c ! procmontest_LDADD = @top_srcdir@/src/libbenson.la \ ! @top_srcdir@/src/perl/libbnperl.la \ ! @top_srcdir@/src/monitors/libbnmonitors.la \ ! @PERL_LDFLAGS@ disklibtest_SOURCES = disklibtest.c ! disklibtest_LDADD = @top_srcdir@/src/monitors/disk/libbndisk.la \ ! @top_srcdir@/src/perl/libbnperl.la \ ! @PERL_LDFLAGS@ ! diskmontest_SOURCES = diskmontest.c ! diskmontest_LDADD = @top_srcdir@/src/libbenson.la \ ! @top_srcdir@/src/perl/libbnperl.la \ ! @top_srcdir@/src/monitors/libbnmonitors.la \ ! @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@ *************** *** 159,168 **** am_disklibtest_OBJECTS = disklibtest.$(OBJEXT) disklibtest_OBJECTS = $(am_disklibtest_OBJECTS) ! disklibtest_DEPENDENCIES = @top_srcdir@/src/monitors/disk/libbndisk.la disklibtest_LDFLAGS = am_diskmontest_OBJECTS = diskmontest.$(OBJEXT) diskmontest_OBJECTS = $(am_diskmontest_OBJECTS) diskmontest_DEPENDENCIES = @top_srcdir@/src/libbenson.la \ ! @top_srcdir@/src/perl/libbnperl.a \ @top_srcdir@/src/monitors/libbnmonitors.la diskmontest_LDFLAGS = --- 167,177 ---- am_disklibtest_OBJECTS = disklibtest.$(OBJEXT) disklibtest_OBJECTS = $(am_disklibtest_OBJECTS) ! disklibtest_DEPENDENCIES = @top_srcdir@/src/monitors/disk/libbndisk.la \ ! @top_srcdir@/src/perl/libbnperl.la disklibtest_LDFLAGS = am_diskmontest_OBJECTS = diskmontest.$(OBJEXT) diskmontest_OBJECTS = $(am_diskmontest_OBJECTS) diskmontest_DEPENDENCIES = @top_srcdir@/src/libbenson.la \ ! @top_srcdir@/src/perl/libbnperl.la \ @top_srcdir@/src/monitors/libbnmonitors.la diskmontest_LDFLAGS = *************** *** 170,174 **** procmontest_OBJECTS = $(am_procmontest_OBJECTS) procmontest_DEPENDENCIES = @top_srcdir@/src/libbenson.la \ ! @top_srcdir@/src/perl/libbnperl.a \ @top_srcdir@/src/monitors/libbnmonitors.la procmontest_LDFLAGS = --- 179,183 ---- procmontest_OBJECTS = $(am_procmontest_OBJECTS) procmontest_DEPENDENCIES = @top_srcdir@/src/libbenson.la \ ! @top_srcdir@/src/perl/libbnperl.la \ @top_srcdir@/src/monitors/libbnmonitors.la procmontest_LDFLAGS = |
|
From: Bob T. <bt...@us...> - 2003-04-25 02:39:36
|
Update of /cvsroot/benson/benson3/src In directory sc8-pr-cvs1:/tmp/cvs-serv16872/src Modified Files: Makefile.am Makefile.in Log Message: update to the network code. Index: Makefile.am =================================================================== RCS file: /cvsroot/benson/benson3/src/Makefile.am,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -r1.35 -r1.36 *** Makefile.am 9 Apr 2003 18:30:51 -0000 1.35 --- Makefile.am 25 Apr 2003 02:39:31 -0000 1.36 *************** *** 4,12 **** bensond_LDADD = libbenson.la perl/libbnperl.la monitors/libbnmonitors.la @PERL_LDFLAGS@ btrap_SOURCES = btrap.c ! btrap_LDADD = libbenson.la ack_SOURCES = acknowledge.c ! ack_LDADD = libbenson.la alertlist_SOURCES = alertlist.c ! alertlist_LDADD = libbenson.la lib_LTLIBRARIES = libbenson.la libbenson_la_LDFLAGS = -no-undefined -version-info @LIBTOOL_VERSION@ --- 4,12 ---- bensond_LDADD = libbenson.la perl/libbnperl.la monitors/libbnmonitors.la @PERL_LDFLAGS@ btrap_SOURCES = btrap.c ! btrap_LDADD = libbenson.la @PERL_LDFLAGS@ ack_SOURCES = acknowledge.c ! ack_LDADD = libbenson.la @PERL_LDFLAGS@ alertlist_SOURCES = alertlist.c ! alertlist_LDADD = libbenson.la @PERL_LDFLAGS@ lib_LTLIBRARIES = libbenson.la libbenson_la_LDFLAGS = -no-undefined -version-info @LIBTOOL_VERSION@ Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/Makefile.in,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -r1.38 -r1.39 *** Makefile.in 9 Apr 2003 18:30:52 -0000 1.38 --- Makefile.in 25 Apr 2003 02:39:31 -0000 1.39 *************** *** 143,151 **** bensond_LDADD = libbenson.la perl/libbnperl.la monitors/libbnmonitors.la @PERL_LDFLAGS@ btrap_SOURCES = btrap.c ! btrap_LDADD = libbenson.la ack_SOURCES = acknowledge.c ! ack_LDADD = libbenson.la alertlist_SOURCES = alertlist.c ! alertlist_LDADD = libbenson.la lib_LTLIBRARIES = libbenson.la libbenson_la_LDFLAGS = -no-undefined -version-info @LIBTOOL_VERSION@ --- 143,151 ---- bensond_LDADD = libbenson.la perl/libbnperl.la monitors/libbnmonitors.la @PERL_LDFLAGS@ btrap_SOURCES = btrap.c ! btrap_LDADD = libbenson.la @PERL_LDFLAGS@ ack_SOURCES = acknowledge.c ! ack_LDADD = libbenson.la @PERL_LDFLAGS@ alertlist_SOURCES = alertlist.c ! alertlist_LDADD = libbenson.la @PERL_LDFLAGS@ lib_LTLIBRARIES = libbenson.la libbenson_la_LDFLAGS = -no-undefined -version-info @LIBTOOL_VERSION@ |
|
From: Bob T. <bt...@us...> - 2003-04-25 02:39:36
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv16872/autom4te.cache
Modified Files:
requests
Log Message:
update to the network code.
Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** requests 7 Apr 2003 04:23:59 -0000 1.7
--- requests 25 Apr 2003 02:39:30 -0000 1.8
***************
*** 16,113 ****
],
{
! 'AC_CANONICAL_SYSTEM' => 1,
! 'AC_HEADER_STAT' => 1,
! 'AC_FUNC_STRFTIME' => 1,
! 'AC_PROG_RANLIB' => 1,
'AC_C_VOLATILE' => 1,
! 'AC_FUNC_WAIT3' => 1,
! 'AC_CONFIG_AUX_DIR' => 1,
'AC_REPLACE_FNMATCH' => 1,
! 'AC_FUNC_SETPGRP' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_FUNC_SETVBUF_REVERSED' => 1,
! 'AC_HEADER_SYS_WAIT' => 1,
! 'AC_TYPE_UID_T' => 1,
! 'AC_CHECK_LIB' => 1,
! 'AM_CONDITIONAL' => 1,
! 'AC_PROG_LN_S' => 1,
! 'AC_FUNC_MEMCMP' => 1,
! 'AM_PROG_CC_C_O' => 1,
! 'AC_FUNC_FORK' => 1,
! 'AC_FUNC_GETGROUPS' => 1,
! 'AC_HEADER_MAJOR' => 1,
! 'AC_FUNC_STRNLEN' => 1,
'AC_FUNC_STRTOD' => 1,
! 'AC_HEADER_DIRENT' => 1,
! 'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_MBRTOWC' => 1,
! 'AC_CONFIG_FILES' => 1,
! 'AC_FUNC_ALLOCA' => 1,
! 'AC_C_CONST' => 1,
! 'AC_CHECK_MEMBERS' => 1,
! 'AC_FUNC_REALLOC' => 1,
! 'AC_FUNC_OBSTACK' => 1,
! 'include' => 1,
! 'AC_FUNC_LSTAT' => 1,
'AC_STRUCT_TIMEZONE' => 1,
'AC_FUNC_GETPGRP' => 1,
! 'AC_CHECK_HEADERS' => 1,
! 'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_CHECK_TYPES' => 1,
! 'AC_TYPE_MODE_T' => 1,
! 'AC_PROG_YACC' => 1,
! 'AC_FUNC_STRERROR_R' => 1,
! 'AC_TYPE_PID_T' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
! 'AC_STRUCT_ST_BLOCKS' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
! 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
! 'AC_TYPE_SIGNAL' => 1,
! 'AC_PROG_GCC_TRADITIONAL' => 1,
'AC_PROG_CPP' => 1,
- 'AC_FUNC_STAT' => 1,
- 'AC_PROG_INSTALL' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AC_FUNC_STRCOLL' => 1,
- 'AC_LIBSOURCE' => 1,
'AC_C_INLINE' => 1,
! 'AC_FUNC_CHOWN' => 1,
! 'AC_FUNC_GETMNTENT' => 1,
! 'AC_INIT' => 1,
'AC_PROG_LEX' => 1,
! 'AH_OUTPUT' => 1,
! 'AC_HEADER_STDC' => 1,
'AC_FUNC_GETLOADAVG' => 1,
! 'AC_TYPE_SIZE_T' => 1,
! 'AC_CHECK_FUNCS' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_MKTIME' => 1,
! 'AC_PROG_MAKE_SET' => 1,
! 'AC_PROG_CXX' => 1,
! 'AC_CANONICAL_HOST' => 1,
! 'm4_pattern_allow' => 1,
! 'AC_FUNC_CLOSEDIR_VOID' => 1,
! 'm4_include' => 1,
! 'AC_PROG_AWK' => 1,
! 'm4_pattern_forbid' => 1,
! 'AC_FUNC_VPRINTF' => 1,
'AC_CONFIG_HEADERS' => 1,
! 'AC_PATH_X' => 1,
! 'AC_TYPE_OFF_T' => 1,
! 'AC_FUNC_MALLOC' => 1,
! 'AC_FUNC_ERROR_AT_LINE' => 1,
! 'AM_MAINTAINER_MODE' => 1,
! 'AC_FUNC_FSEEKO' => 1,
! 'AC_FUNC_MMAP' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AM_INIT_AUTOMAKE' => 1,
! 'AC_SUBST' => 1,
! 'AC_PROG_CC' => 1,
! 'AC_PROG_LIBTOOL' => 1
}
], 'Request' ),
bless( [
! '1',
1,
[
--- 16,113 ----
],
{
! 'm4_pattern_forbid' => 1,
! 'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
! 'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
! 'AC_PROG_LIBTOOL' => 1,
! 'AC_FUNC_STAT' => 1,
! 'AC_FUNC_WAIT3' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
! 'AC_FUNC_LSTAT' => 1,
! 'AC_FUNC_GETMNTENT' => 1,
! 'AC_TYPE_MODE_T' => 1,
! 'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRTOD' => 1,
! 'AC_FUNC_STRNLEN' => 1,
! 'AC_PROG_CXX' => 1,
! 'AC_PATH_X' => 1,
! 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
! 'AC_PROG_AWK' => 1,
! 'AC_HEADER_STDC' => 1,
! 'AC_HEADER_MAJOR' => 1,
! 'AC_FUNC_ERROR_AT_LINE' => 1,
! 'AC_PROG_GCC_TRADITIONAL' => 1,
! 'AC_LIBSOURCE' => 1,
'AC_FUNC_MBRTOWC' => 1,
! 'AC_STRUCT_ST_BLOCKS' => 1,
! 'AC_TYPE_SIGNAL' => 1,
! 'AC_TYPE_UID_T' => 1,
! 'AC_PROG_MAKE_SET' => 1,
! 'AC_CONFIG_AUX_DIR' => 1,
! 'm4_pattern_allow' => 1,
! 'AC_DEFINE_TRACE_LITERAL' => 1,
! 'AC_FUNC_STRERROR_R' => 1,
! 'AC_PROG_CC' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
! 'AC_FUNC_FORK' => 1,
! 'AC_FUNC_VPRINTF' => 1,
! 'AC_FUNC_STRCOLL' => 1,
! 'AC_PROG_YACC' => 1,
'AC_STRUCT_TIMEZONE' => 1,
+ 'AC_INIT' => 1,
+ 'AC_FUNC_CHOWN' => 1,
+ 'AC_SUBST' => 1,
+ 'AC_FUNC_ALLOCA' => 1,
+ 'AC_CANONICAL_HOST' => 1,
'AC_FUNC_GETPGRP' => 1,
! 'AC_PROG_RANLIB' => 1,
! 'AM_INIT_AUTOMAKE' => 1,
! 'AC_FUNC_SETPGRP' => 1,
! 'AC_CONFIG_SUBDIRS' => 1,
! 'AC_FUNC_MMAP' => 1,
! 'AC_FUNC_REALLOC' => 1,
! 'AC_TYPE_SIZE_T' => 1,
'AC_CHECK_TYPES' => 1,
! 'AC_CHECK_MEMBERS' => 1,
! 'AM_MAINTAINER_MODE' => 1,
! 'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
! 'AC_HEADER_STAT' => 1,
! 'AC_FUNC_STRFTIME' => 1,
'AC_PROG_CPP' => 1,
'AC_C_INLINE' => 1,
! 'AC_C_CONST' => 1,
! 'AC_TYPE_PID_T' => 1,
'AC_PROG_LEX' => 1,
! 'AC_CONFIG_FILES' => 1,
! 'include' => 1,
! 'AC_FUNC_SETVBUF_REVERSED' => 1,
! 'AC_PROG_INSTALL' => 1,
! 'AM_GNU_GETTEXT' => 1,
! 'AC_FUNC_OBSTACK' => 1,
! 'AC_CHECK_LIB' => 1,
! 'AC_FUNC_MALLOC' => 1,
! 'AC_FUNC_GETGROUPS' => 1,
'AC_FUNC_GETLOADAVG' => 1,
! 'AH_OUTPUT' => 1,
! 'AC_FUNC_FSEEKO' => 1,
! 'AM_PROG_CC_C_O' => 1,
'AC_FUNC_MKTIME' => 1,
! 'AC_CANONICAL_SYSTEM' => 1,
! 'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
! 'AC_HEADER_SYS_WAIT' => 1,
! 'AC_FUNC_MEMCMP' => 1,
! 'AC_PROG_LN_S' => 1,
! 'm4_include' => 1,
! 'AC_HEADER_DIRENT' => 1,
! 'AC_CHECK_FUNCS' => 1
}
], 'Request' ),
bless( [
! 1,
1,
[
***************
*** 120,213 ****
],
{
! 'AC_CANONICAL_SYSTEM' => 1,
! 'AC_HEADER_STAT' => 1,
! 'AC_FUNC_STRFTIME' => 1,
! 'AC_PROG_RANLIB' => 1,
'AC_C_VOLATILE' => 1,
! 'AC_FUNC_WAIT3' => 1,
! 'AC_CONFIG_AUX_DIR' => 1,
'AC_REPLACE_FNMATCH' => 1,
! 'AC_FUNC_SETPGRP' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_FUNC_SETVBUF_REVERSED' => 1,
! 'AC_HEADER_SYS_WAIT' => 1,
! 'AC_TYPE_UID_T' => 1,
! 'AC_CHECK_LIB' => 1,
! 'AM_CONDITIONAL' => 1,
! 'AC_PROG_LN_S' => 1,
! 'AC_FUNC_MEMCMP' => 1,
! 'AM_PROG_CC_C_O' => 1,
! 'AC_FUNC_FORK' => 1,
! 'AC_FUNC_GETGROUPS' => 1,
! 'AC_HEADER_MAJOR' => 1,
! 'AC_FUNC_STRNLEN' => 1,
'AC_FUNC_STRTOD' => 1,
! 'AC_HEADER_DIRENT' => 1,
! 'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_MBRTOWC' => 1,
! 'AC_CONFIG_FILES' => 1,
! 'AC_FUNC_ALLOCA' => 1,
! 'AC_FUNC_REALLOC' => 1,
! 'AC_CHECK_MEMBERS' => 1,
! 'AC_C_CONST' => 1,
! 'AC_FUNC_OBSTACK' => 1,
! 'include' => 1,
! 'AC_FUNC_LSTAT' => 1,
'AC_STRUCT_TIMEZONE' => 1,
'AC_FUNC_GETPGRP' => 1,
! 'AC_DEFINE_TRACE_LITERAL' => 1,
! 'AC_CHECK_HEADERS' => 1,
! 'AC_TYPE_MODE_T' => 1,
'AC_CHECK_TYPES' => 1,
! 'AC_PROG_YACC' => 1,
! 'AC_TYPE_PID_T' => 1,
! 'AC_FUNC_STRERROR_R' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
! 'AC_STRUCT_ST_BLOCKS' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
! 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
! 'AC_TYPE_SIGNAL' => 1,
! 'AC_PROG_GCC_TRADITIONAL' => 1,
'AC_PROG_CPP' => 1,
- 'AC_FUNC_STAT' => 1,
- 'AC_PROG_INSTALL' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
- 'AM_GNU_GETTEXT' => 1,
- 'AC_FUNC_STRCOLL' => 1,
- 'AC_LIBSOURCE' => 1,
'AC_C_INLINE' => 1,
! 'AC_FUNC_CHOWN' => 1,
! 'AC_FUNC_GETMNTENT' => 1,
'AC_PROG_LEX' => 1,
! 'AC_INIT' => 1,
! 'AH_OUTPUT' => 1,
! 'AC_HEADER_STDC' => 1,
'AC_FUNC_GETLOADAVG' => 1,
! 'AC_TYPE_SIZE_T' => 1,
! 'AC_CHECK_FUNCS' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_MKTIME' => 1,
! 'AC_PROG_MAKE_SET' => 1,
! 'AC_PROG_CXX' => 1,
! 'AC_CANONICAL_HOST' => 1,
! 'AC_FUNC_CLOSEDIR_VOID' => 1,
! 'm4_pattern_allow' => 1,
! 'm4_include' => 1,
! 'm4_pattern_forbid' => 1,
! 'AC_PROG_AWK' => 1,
! 'AC_FUNC_VPRINTF' => 1,
'AC_CONFIG_HEADERS' => 1,
! 'AC_TYPE_OFF_T' => 1,
! 'AC_PATH_X' => 1,
! 'AC_FUNC_MALLOC' => 1,
! 'AC_FUNC_ERROR_AT_LINE' => 1,
! 'AM_MAINTAINER_MODE' => 1,
! 'AC_FUNC_FSEEKO' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AC_FUNC_MMAP' => 1,
! 'AM_INIT_AUTOMAKE' => 1,
! 'AC_SUBST' => 1,
! 'AC_PROG_LIBTOOL' => 1,
! 'AC_PROG_CC' => 1
}
], 'Request' )
--- 120,213 ----
],
{
! 'm4_pattern_forbid' => 1,
! 'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
! 'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
! 'AC_PROG_LIBTOOL' => 1,
! 'AC_FUNC_STAT' => 1,
! 'AC_FUNC_WAIT3' => 1,
'AC_HEADER_TIME' => 1,
! 'AC_STRUCT_TM' => 1,
! 'AM_AUTOMAKE_VERSION' => 1,
! 'AC_FUNC_LSTAT' => 1,
! 'AC_FUNC_GETMNTENT' => 1,
! 'AC_TYPE_MODE_T' => 1,
! 'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRTOD' => 1,
! 'AC_FUNC_STRNLEN' => 1,
! 'AC_PROG_CXX' => 1,
! 'AC_PATH_X' => 1,
! 'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
! 'AC_PROG_AWK' => 1,
! 'AC_HEADER_STDC' => 1,
! 'AC_HEADER_MAJOR' => 1,
! 'AC_FUNC_ERROR_AT_LINE' => 1,
! 'AC_PROG_GCC_TRADITIONAL' => 1,
! 'AC_LIBSOURCE' => 1,
'AC_FUNC_MBRTOWC' => 1,
! 'AC_STRUCT_ST_BLOCKS' => 1,
! 'AC_TYPE_SIGNAL' => 1,
! 'AC_TYPE_UID_T' => 1,
! 'AC_PROG_MAKE_SET' => 1,
! 'AC_CONFIG_AUX_DIR' => 1,
! 'm4_pattern_allow' => 1,
! 'AC_DEFINE_TRACE_LITERAL' => 1,
! 'AC_FUNC_STRERROR_R' => 1,
! 'AC_PROG_CC' => 1,
! 'AC_DECL_SYS_SIGLIST' => 1,
! 'AC_FUNC_FORK' => 1,
! 'AC_FUNC_VPRINTF' => 1,
! 'AC_FUNC_STRCOLL' => 1,
! 'AC_PROG_YACC' => 1,
'AC_STRUCT_TIMEZONE' => 1,
+ 'AC_INIT' => 1,
+ 'AC_FUNC_CHOWN' => 1,
+ 'AC_SUBST' => 1,
+ 'AC_FUNC_ALLOCA' => 1,
+ 'AC_CANONICAL_HOST' => 1,
'AC_FUNC_GETPGRP' => 1,
! 'AC_PROG_RANLIB' => 1,
! 'AM_INIT_AUTOMAKE' => 1,
! 'AC_FUNC_SETPGRP' => 1,
! 'AC_CONFIG_SUBDIRS' => 1,
! 'AC_FUNC_MMAP' => 1,
! 'AC_FUNC_REALLOC' => 1,
! 'AC_TYPE_SIZE_T' => 1,
'AC_CHECK_TYPES' => 1,
! 'AC_CHECK_MEMBERS' => 1,
! 'AM_MAINTAINER_MODE' => 1,
! 'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
! 'AC_HEADER_STAT' => 1,
! 'AC_FUNC_STRFTIME' => 1,
'AC_PROG_CPP' => 1,
'AC_C_INLINE' => 1,
! 'AC_C_CONST' => 1,
! 'AC_TYPE_PID_T' => 1,
'AC_PROG_LEX' => 1,
! 'AC_CONFIG_FILES' => 1,
! 'include' => 1,
! 'AC_FUNC_SETVBUF_REVERSED' => 1,
! 'AC_PROG_INSTALL' => 1,
! 'AM_GNU_GETTEXT' => 1,
! 'AC_FUNC_OBSTACK' => 1,
! 'AC_CHECK_LIB' => 1,
! 'AC_FUNC_MALLOC' => 1,
! 'AC_FUNC_GETGROUPS' => 1,
'AC_FUNC_GETLOADAVG' => 1,
! 'AH_OUTPUT' => 1,
! 'AC_FUNC_FSEEKO' => 1,
! 'AM_PROG_CC_C_O' => 1,
'AC_FUNC_MKTIME' => 1,
! 'AC_CANONICAL_SYSTEM' => 1,
! 'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
! 'AC_HEADER_SYS_WAIT' => 1,
! 'AC_FUNC_MEMCMP' => 1,
! 'AC_PROG_LN_S' => 1,
! 'm4_include' => 1,
! 'AC_HEADER_DIRENT' => 1,
! 'AC_CHECK_FUNCS' => 1
}
], 'Request' )
|
|
From: Bob T. <bt...@us...> - 2003-04-09 18:31:38
|
Update of /cvsroot/benson/benson3 In directory sc8-pr-cvs1:/tmp/cvs-serv3198 Modified Files: ChangeLog Log Message: Updated the changelog Index: ChangeLog =================================================================== RCS file: /cvsroot/benson/benson3/ChangeLog,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -r1.30 -r1.31 *** ChangeLog 5 Mar 2003 16:57:42 -0000 1.30 --- ChangeLog 9 Apr 2003 18:31:34 -0000 1.31 *************** *** 1,4 **** --- 1,5 ---- version 3.1a5 - Adding in the disk/vfs monitor + - Revised the network code version 3.1a4 |
|
From: Bob T. <bt...@us...> - 2003-04-09 18:30:56
|
Update of /cvsroot/benson/benson3/src In directory sc8-pr-cvs1:/tmp/cvs-serv2797/src Modified Files: Makefile.am Makefile.in Log Message: minor changes to the build environment for the CLI utils. Index: Makefile.am =================================================================== RCS file: /cvsroot/benson/benson3/src/Makefile.am,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -r1.34 -r1.35 *** Makefile.am 24 Feb 2003 07:43:03 -0000 1.34 --- Makefile.am 9 Apr 2003 18:30:51 -0000 1.35 *************** *** 2,12 **** sbin_PROGRAMS = bensond bensond_SOURCES = bensond.c bn_monitor.c bn_network.c bn_rules.c ! bensond_LDADD = libbenson.la perl/libbnperl.a monitors/libbnmonitors.la @PERL_LDFLAGS@ btrap_SOURCES = btrap.c ! btrap_LDADD = libbenson.la @PERL_LDFLAGS@ ack_SOURCES = acknowledge.c ! ack_LDADD = libbenson.la perl/libbnperl.a @PERL_LDFLAGS@ alertlist_SOURCES = alertlist.c ! alertlist_LDADD = libbenson.la @PERL_LDFLAGS@ lib_LTLIBRARIES = libbenson.la libbenson_la_LDFLAGS = -no-undefined -version-info @LIBTOOL_VERSION@ --- 2,12 ---- sbin_PROGRAMS = bensond bensond_SOURCES = bensond.c bn_monitor.c bn_network.c bn_rules.c ! bensond_LDADD = libbenson.la perl/libbnperl.la monitors/libbnmonitors.la @PERL_LDFLAGS@ btrap_SOURCES = btrap.c ! btrap_LDADD = libbenson.la ack_SOURCES = acknowledge.c ! ack_LDADD = libbenson.la alertlist_SOURCES = alertlist.c ! alertlist_LDADD = libbenson.la lib_LTLIBRARIES = libbenson.la libbenson_la_LDFLAGS = -no-undefined -version-info @LIBTOOL_VERSION@ Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/Makefile.in,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -r1.37 -r1.38 *** Makefile.in 24 Feb 2003 07:43:03 -0000 1.37 --- Makefile.in 9 Apr 2003 18:30:52 -0000 1.38 *************** *** 76,79 **** --- 76,80 ---- MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ + NETWORK_VERSION = @NETWORK_VERSION@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ *************** *** 140,150 **** sbin_PROGRAMS = bensond bensond_SOURCES = bensond.c bn_monitor.c bn_network.c bn_rules.c ! bensond_LDADD = libbenson.la perl/libbnperl.a monitors/libbnmonitors.la @PERL_LDFLAGS@ btrap_SOURCES = btrap.c ! btrap_LDADD = libbenson.la @PERL_LDFLAGS@ ack_SOURCES = acknowledge.c ! ack_LDADD = libbenson.la perl/libbnperl.a @PERL_LDFLAGS@ alertlist_SOURCES = alertlist.c ! alertlist_LDADD = libbenson.la @PERL_LDFLAGS@ lib_LTLIBRARIES = libbenson.la libbenson_la_LDFLAGS = -no-undefined -version-info @LIBTOOL_VERSION@ --- 141,151 ---- sbin_PROGRAMS = bensond bensond_SOURCES = bensond.c bn_monitor.c bn_network.c bn_rules.c ! bensond_LDADD = libbenson.la perl/libbnperl.la monitors/libbnmonitors.la @PERL_LDFLAGS@ btrap_SOURCES = btrap.c ! btrap_LDADD = libbenson.la ack_SOURCES = acknowledge.c ! ack_LDADD = libbenson.la alertlist_SOURCES = alertlist.c ! alertlist_LDADD = libbenson.la lib_LTLIBRARIES = libbenson.la libbenson_la_LDFLAGS = -no-undefined -version-info @LIBTOOL_VERSION@ *************** *** 172,176 **** am_ack_OBJECTS = acknowledge.$(OBJEXT) ack_OBJECTS = $(am_ack_OBJECTS) ! ack_DEPENDENCIES = libbenson.la perl/libbnperl.a ack_LDFLAGS = am_alertlist_OBJECTS = alertlist.$(OBJEXT) --- 173,177 ---- am_ack_OBJECTS = acknowledge.$(OBJEXT) ack_OBJECTS = $(am_ack_OBJECTS) ! ack_DEPENDENCIES = libbenson.la ack_LDFLAGS = am_alertlist_OBJECTS = alertlist.$(OBJEXT) *************** *** 181,185 **** bn_network.$(OBJEXT) bn_rules.$(OBJEXT) bensond_OBJECTS = $(am_bensond_OBJECTS) ! bensond_DEPENDENCIES = libbenson.la perl/libbnperl.a \ monitors/libbnmonitors.la bensond_LDFLAGS = --- 182,186 ---- bn_network.$(OBJEXT) bn_rules.$(OBJEXT) bensond_OBJECTS = $(am_bensond_OBJECTS) ! bensond_DEPENDENCIES = libbenson.la perl/libbnperl.la \ monitors/libbnmonitors.la bensond_LDFLAGS = |
|
From: Bob T. <bt...@us...> - 2003-04-07 04:24:06
|
Update of /cvsroot/benson/benson3/src/tests/network In directory sc8-pr-cvs1:/tmp/cvs-serv22915/src/tests/network Modified Files: Makefile.am Makefile.in Log Message: latest networking code and build modifications. Index: Makefile.am =================================================================== RCS file: /cvsroot/benson/benson3/src/tests/network/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile.am 2 Apr 2003 19:21:26 -0000 1.1 --- Makefile.am 7 Apr 2003 04:23:59 -0000 1.2 *************** *** 1,8 **** noinst_PROGRAMS = netlistenertest netconfigtest netmastertest netlistenertest_SOURCES = netlistenertest.c ! netlistenertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la netconfigtest_SOURCES = netconfigtest.c ! netconfigtest_LDADD = @top_srcdir@/src/network/libbnnetwork.la netmastertest_SOURCES = netmastertest.c ! netmastertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la INCLUDES = -I@top_srcdir@/include -I@top_srcdir@/src/network --- 1,8 ---- noinst_PROGRAMS = netlistenertest netconfigtest netmastertest netlistenertest_SOURCES = netlistenertest.c ! netlistenertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ netconfigtest_SOURCES = netconfigtest.c ! netconfigtest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ netmastertest_SOURCES = netmastertest.c ! netmastertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@/src/network Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/tests/network/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile.in 2 Apr 2003 19:21:26 -0000 1.1 --- Makefile.in 7 Apr 2003 04:23:59 -0000 1.2 *************** *** 140,148 **** noinst_PROGRAMS = netlistenertest netconfigtest netmastertest netlistenertest_SOURCES = netlistenertest.c ! netlistenertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la netconfigtest_SOURCES = netconfigtest.c ! netconfigtest_LDADD = @top_srcdir@/src/network/libbnnetwork.la netmastertest_SOURCES = netmastertest.c ! netmastertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la INCLUDES = -I@top_srcdir@/include -I@top_srcdir@/src/network subdir = src/tests/network --- 140,148 ---- noinst_PROGRAMS = netlistenertest netconfigtest netmastertest netlistenertest_SOURCES = netlistenertest.c ! netlistenertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ netconfigtest_SOURCES = netconfigtest.c ! netconfigtest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ netmastertest_SOURCES = netmastertest.c ! netmastertest_LDADD = @top_srcdir@/src/network/libbnnetwork.la @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@/src/network subdir = src/tests/network |
|
From: Bob T. <bt...@us...> - 2003-04-07 04:24:06
|
Update of /cvsroot/benson/benson3/src/perl
In directory sc8-pr-cvs1:/tmp/cvs-serv22915/src/perl
Modified Files:
Makefile.am Makefile.in
Log Message:
latest networking code and build modifications.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/src/perl/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.am 31 Aug 2001 03:42:23 -0000 1.1
--- Makefile.am 7 Apr 2003 04:23:59 -0000 1.2
***************
*** 1,3 ****
! noinst_LIBRARIES = libbnperl.a
! libbnperl_a_SOURCES = perl_util.c
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
--- 1,4 ----
! lib_LTLIBRARIES = libbnperl.la
! libbnperl_la_SOURCES = perl_util.c
! libbnperl_la_LDFLAGS = -no-undefined -version-info @LIBTOOL_VERSION@
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/perl/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Makefile.in 31 Aug 2001 03:42:23 -0000 1.1
--- Makefile.in 7 Apr 2003 04:23:59 -0000 1.2
***************
*** 1,5 ****
! # Makefile.in generated automatically by automake 1.4 from Makefile.am
! # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
--- 1,7 ----
! # Makefile.in generated by automake 1.7 from Makefile.am.
! # @configure_input@
! # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
***************
*** 11,55 ****
# PARTICULAR PURPOSE.
!
! SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
-
- bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
- includedir = @includedir@
- oldincludedir = /usr/include
-
- DESTDIR =
-
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
-
top_builddir = ../..
! ACLOCAL = @ACLOCAL@
! AUTOCONF = @AUTOCONF@
! AUTOMAKE = @AUTOMAKE@
! AUTOHEADER = @AUTOHEADER@
!
INSTALL = @INSTALL@
! INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
! INSTALL_DATA = @INSTALL_DATA@
! INSTALL_SCRIPT = @INSTALL_SCRIPT@
! transform = @program_transform_name@
!
NORMAL_INSTALL = :
PRE_INSTALL = :
--- 13,33 ----
# PARTICULAR PURPOSE.
! @SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ../..
! am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
! install_sh_DATA = $(install_sh) -c -m 644
! install_sh_PROGRAM = $(install_sh) -c
! install_sh_SCRIPT = $(install_sh) -c
! INSTALL_HEADER = $(INSTALL_DATA)
! transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
***************
*** 58,181 ****
PRE_UNINSTALL = :
POST_UNINSTALL = :
- host_alias = @host_alias@
host_triplet = @host@
AMTAR = @AMTAR@
! AS = @AS@
AWK = @AWK@
CC = @CC@
DEPDIR = @DEPDIR@
- DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
EXEEXT = @EXEEXT@
HAVE_X11 = @HAVE_X11@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIBTOOL_VERSION = @LIBTOOL_VERSION@
LN_S = @LN_S@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
! OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PERL_CFLAGS = @PERL_CFLAGS@
PERL_LDFLAGS = @PERL_LDFLAGS@
RANLIB = @RANLIB@
STRIP = @STRIP@
VERSION = @VERSION@
am__include = @am__include@
am__quote = @am__quote@
install_sh = @install_sh@
perlpath = @perlpath@
pythonpath = @pythonpath@
sedpath = @sedpath@
sortpath = @sortpath@
tclpath = @tclpath@
trpath = @trpath@
uniqpath = @uniqpath@
!
! noinst_LIBRARIES = libbnperl.a
! libbnperl_a_SOURCES = perl_util.c
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = ../../config.h
! CONFIG_CLEAN_FILES =
! LIBRARIES = $(noinst_LIBRARIES)
!
!
! DEFS = @DEFS@ -I. -I$(srcdir) -I../..
! CPPFLAGS = @CPPFLAGS@
! LDFLAGS = @LDFLAGS@
! LIBS = @LIBS@
! X_CFLAGS = @X_CFLAGS@
! X_LIBS = @X_LIBS@
! X_EXTRA_LIBS = @X_EXTRA_LIBS@
! X_PRE_LIBS = @X_PRE_LIBS@
! libbnperl_a_LIBADD =
! libbnperl_a_OBJECTS = perl_util.$(OBJEXT)
! AR = ar
! CFLAGS = @CFLAGS@
! COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
! DIST_COMMON = Makefile.am Makefile.in
!
! DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- TAR = tar
- GZIP_ENV = --best
- DEP_FILES = .deps/perl_util.P
- SOURCES = $(libbnperl_a_SOURCES)
- OBJECTS = $(libbnperl_a_OBJECTS)
-
- all: all-redirect
.SUFFIXES:
! .SUFFIXES: .S .c .lo .o .obj .s
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && $(AUTOMAKE) --gnu src/perl/Makefile
!
! Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
! cd $(top_builddir) \
! && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
!
!
! mostlyclean-noinstLIBRARIES:
!
! clean-noinstLIBRARIES:
! -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
!
! distclean-noinstLIBRARIES:
!
! maintainer-clean-noinstLIBRARIES:
!
! # FIXME: We should only use cygpath when building on Windows,
! # and only if it is available.
! .c.obj:
! $(COMPILE) -c `cygpath -w $<`
! .s.o:
! $(COMPILE) -c $<
! .S.o:
! $(COMPILE) -c $<
mostlyclean-compile:
! -rm -f *.o core *.core
! -rm -f *.$(OBJEXT)
!
! clean-compile:
distclean-compile:
-rm -f *.tab.c
! maintainer-clean-compile:
! .s.lo:
! $(LIBTOOL) --mode=compile $(COMPILE) -c $<
! .S.lo:
! $(LIBTOOL) --mode=compile $(COMPILE) -c $<
mostlyclean-libtool:
--- 36,253 ----
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_triplet = @host@
+ ACLOCAL = @ACLOCAL@
+ AMDEP_FALSE = @AMDEP_FALSE@
+ AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
! AUTOCONF = @AUTOCONF@
! AUTOHEADER = @AUTOHEADER@
! AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
DEPDIR = @DEPDIR@
ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
EXEEXT = @EXEEXT@
HAVE_X11 = @HAVE_X11@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LIBTOOL_VERSION = @LIBTOOL_VERSION@
LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
+ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
! NETWORK_VERSION = @NETWORK_VERSION@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
PERL_CFLAGS = @PERL_CFLAGS@
PERL_LDFLAGS = @PERL_LDFLAGS@
RANLIB = @RANLIB@
+ SET_MAKE = @SET_MAKE@
+ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+ X_CFLAGS = @X_CFLAGS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_LIBS = @X_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_RANLIB = @ac_ct_RANLIB@
+ ac_ct_STRIP = @ac_ct_STRIP@
+ am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__include = @am__include@
am__quote = @am__quote@
+ bindir = @bindir@
+ build = @build@
+ build_alias = @build_alias@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
+ datadir = @datadir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+ host_alias = @host_alias@
+ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ includedir = @includedir@
+ infodir = @infodir@
install_sh = @install_sh@
+ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ oldincludedir = @oldincludedir@
perlpath = @perlpath@
+ prefix = @prefix@
+ program_transform_name = @program_transform_name@
pythonpath = @pythonpath@
+ sbindir = @sbindir@
sedpath = @sedpath@
+ sharedstatedir = @sharedstatedir@
sortpath = @sortpath@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
tclpath = @tclpath@
trpath = @trpath@
+ unamepath = @unamepath@
uniqpath = @uniqpath@
! lib_LTLIBRARIES = libbnperl.la
! libbnperl_la_SOURCES = perl_util.c
! libbnperl_la_LDFLAGS = -no-undefined -version-info @LIBTOOL_VERSION@
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
+ subdir = src/perl
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
! CONFIG_HEADER = $(top_builddir)/config.h
! CONFIG_CLEAN_FILES =
! LTLIBRARIES = $(lib_LTLIBRARIES)
!
! libbnperl_la_LIBADD =
! am_libbnperl_la_OBJECTS = perl_util.lo
! libbnperl_la_OBJECTS = $(am_libbnperl_la_OBJECTS)
!
! DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
! depcomp = $(SHELL) $(top_srcdir)/depcomp
! am__depfiles_maybe = depfiles
! @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/perl_util.Plo
! COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
! $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
! LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \
! $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
! LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
! $(AM_LDFLAGS) $(LDFLAGS) -o $@
! DIST_SOURCES = $(libbnperl_la_SOURCES)
! DIST_COMMON = Makefile.am Makefile.in
! SOURCES = $(libbnperl_la_SOURCES)
! all: all-am
.SUFFIXES:
! .SUFFIXES: .c .lo .o .obj
! $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
! cd $(top_srcdir) && \
! $(AUTOMAKE) --gnu src/perl/Makefile
! Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
! cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
! libLTLIBRARIES_INSTALL = $(INSTALL)
! install-libLTLIBRARIES: $(lib_LTLIBRARIES)
! @$(NORMAL_INSTALL)
! $(mkinstalldirs) $(DESTDIR)$(libdir)
! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! if test -f $$p; then \
! f="`echo $$p | sed -e 's|^.*/||'`"; \
! echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f"; \
! $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(libdir)/$$f; \
! else :; fi; \
! done
! uninstall-libLTLIBRARIES:
! @$(NORMAL_UNINSTALL)
! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! p="`echo $$p | sed -e 's|^.*/||'`"; \
! echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p"; \
! $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
! done
! clean-libLTLIBRARIES:
! -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
! @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
! dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
! test "$$dir" = "$$p" && dir=.; \
! echo "rm -f \"$${dir}/so_locations\""; \
! rm -f "$${dir}/so_locations"; \
! done
! libbnperl.la: $(libbnperl_la_OBJECTS) $(libbnperl_la_DEPENDENCIES)
! $(LINK) -rpath $(libdir) $(libbnperl_la_LDFLAGS) $(libbnperl_la_OBJECTS) $(libbnperl_la_LIBADD) $(LIBS)
mostlyclean-compile:
! -rm -f *.$(OBJEXT) core *.core
distclean-compile:
-rm -f *.tab.c
! @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/perl_util.Plo@am__quote@
! distclean-depend:
! -rm -rf ./$(DEPDIR)
! .c.o:
! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
!
! .c.obj:
! @am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
!
! .c.lo:
! @am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
! @am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
! @am__fastdepCC_TRUE@ then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
! @am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
! @am__fastdepCC_TRUE@ fi
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
! @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
! @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
mostlyclean-libtool:
***************
*** 186,304 ****
distclean-libtool:
! maintainer-clean-libtool:
! libbnperl.a: $(libbnperl_a_OBJECTS) $(libbnperl_a_DEPENDENCIES)
! -rm -f libbnperl.a
! $(AR) cru libbnperl.a $(libbnperl_a_OBJECTS) $(libbnperl_a_LIBADD)
! $(RANLIB) libbnperl.a
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP)
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! here=`pwd` && cd $(srcdir) \
! && mkid -f$$here/ID $$unique $(LISP)
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS)'; \
! unique=`for i in $$list; do echo $$i; done | \
! awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
! || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags $$unique $(LISP) -o $$here/TAGS)
!
! mostlyclean-tags:
!
! clean-tags:
distclean-tags:
! -rm -f TAGS ID
!
! maintainer-clean-tags:
! distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
!
! subdir = src/perl
distdir: $(DISTFILES)
! here=`cd $(top_builddir) && pwd`; \
! top_distdir=`cd $(top_distdir) && pwd`; \
! distdir=`cd $(distdir) && pwd`; \
! cd $(top_srcdir) \
! && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/perl/Makefile
! @for file in $(DISTFILES); do \
! d=$(srcdir); \
if test -d $$d/$$file; then \
! cp -pr $$/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
! || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
! || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
-
- DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
- -include $(DEP_FILES)
-
- mostlyclean-depend:
-
- clean-depend:
-
- distclean-depend:
- -rm -rf .deps
-
- maintainer-clean-depend:
-
- %.o: %.c
- @echo '$(COMPILE) -c $<'; \
- $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-cp .deps/$(*F).pp .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm .deps/$(*F).pp
-
- %.lo: %.c
- @echo '$(LTCOMPILE) -c $<'; \
- $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
- @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
- < .deps/$(*F).pp > .deps/$(*F).P; \
- tr ' ' '\012' < .deps/$(*F).pp \
- | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
- >> .deps/$(*F).P; \
- rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
- dvi: dvi-am
check-am: all-am
check: check-am
! installcheck-am:
! installcheck: installcheck-am
! install-exec-am:
! install-exec: install-exec-am
! install-data-am:
! install-data: install-data-am
- install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-am
! uninstall-am:
uninstall: uninstall-am
- all-am: Makefile $(LIBRARIES)
- all-redirect: all-am
- install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
mostlyclean-generic:
--- 258,368 ----
distclean-libtool:
+ -rm -f libtool
+ uninstall-info-am:
! ETAGS = etags
! ETAGSFLAGS =
! CTAGS = ctags
! CTAGSFLAGS =
tags: TAGS
! ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! mkid -fID $$unique
! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
! test -z "$(ETAGS_ARGS)$$tags$$unique" \
! || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
! $$tags $$unique
!
! ctags: CTAGS
! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
! $(TAGS_FILES) $(LISP)
! tags=; \
! here=`pwd`; \
! list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
! unique=`for i in $$list; do \
! if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
! done | \
! $(AWK) ' { files[$$0] = 1; } \
! END { for (i in files) print i; }'`; \
! test -z "$(CTAGS_ARGS)$$tags$$unique" \
! || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
! $$tags $$unique
!
! GTAGS:
! here=`$(am__cd) $(top_builddir) && pwd` \
! && cd $(top_srcdir) \
! && gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
! -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
! DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
! top_distdir = ../..
! distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
! @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
! list='$(DISTFILES)'; for file in $$list; do \
! case $$file in \
! $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
! esac; \
! if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
! dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
! if test "$$dir" != "$$file" && test "$$dir" != "."; then \
! dir="/$$dir"; \
! $(mkinstalldirs) "$(distdir)$$dir"; \
! else \
! dir=''; \
! fi; \
if test -d $$d/$$file; then \
! if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
! cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
! fi; \
! cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
else \
test -f $(distdir)/$$file \
! || cp -p $$d/$$file $(distdir)/$$file \
! || exit 1; \
fi; \
done
check-am: all-am
check: check-am
! all-am: Makefile $(LTLIBRARIES)
! installdirs:
! $(mkinstalldirs) $(DESTDIR)$(libdir)
install: install-am
! install-exec: install-exec-am
! install-data: install-data-am
uninstall: uninstall-am
+ install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ INSTALL_STRIP_FLAG=-s \
+ `test -z '$(STRIP)' || \
+ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
mostlyclean-generic:
***************
*** 307,354 ****
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
maintainer-clean-generic:
! mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \
! mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
! mostlyclean-generic
! mostlyclean: mostlyclean-am
! clean-am: clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
! clean-depend clean-generic mostlyclean-am
! clean: clean-am
! distclean-am: distclean-noinstLIBRARIES distclean-compile \
! distclean-libtool distclean-tags distclean-depend \
! distclean-generic clean-am
! -rm -f libtool
! distclean: distclean-am
! maintainer-clean-am: maintainer-clean-noinstLIBRARIES \
! maintainer-clean-compile maintainer-clean-libtool \
! maintainer-clean-tags maintainer-clean-depend \
! maintainer-clean-generic distclean-am
! @echo "This command is intended for maintainers to use;"
! @echo "it deletes files that may require special tools to rebuild."
maintainer-clean: maintainer-clean-am
! .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
! clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
! mostlyclean-compile distclean-compile clean-compile \
! maintainer-clean-compile mostlyclean-libtool distclean-libtool \
! clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
! distclean-tags clean-tags maintainer-clean-tags distdir \
! mostlyclean-depend distclean-depend clean-depend \
! maintainer-clean-depend info-am info dvi-am dvi check check-am \
! installcheck-am installcheck install-exec-am install-exec \
! install-data-am install-data install-am install uninstall-am uninstall \
! all-redirect all-am all installdirs mostlyclean-generic \
! distclean-generic clean-generic maintainer-clean-generic clean \
! mostlyclean distclean maintainer-clean
# Tell versions [3.59,3.63) of GNU make to not export all variables.
--- 371,437 ----
distclean-generic:
-rm -f Makefile $(CONFIG_CLEAN_FILES)
maintainer-clean-generic:
! @echo "This command is intended for maintainers to use"
! @echo "it deletes files that may require special tools to rebuild."
! clean: clean-am
! clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
! mostlyclean-am
! distclean: distclean-am
! distclean-am: clean-am distclean-compile distclean-depend \
! distclean-generic distclean-libtool distclean-tags
! dvi: dvi-am
! dvi-am:
! info: info-am
!
! info-am:
!
! install-data-am:
!
! install-exec-am: install-libLTLIBRARIES
!
! install-info: install-info-am
!
! install-man:
!
! installcheck-am:
maintainer-clean: maintainer-clean-am
! maintainer-clean-am: distclean-am maintainer-clean-generic
!
! mostlyclean: mostlyclean-am
!
! mostlyclean-am: mostlyclean-compile mostlyclean-generic \
! mostlyclean-libtool
!
! pdf: pdf-am
!
! pdf-am:
!
! ps: ps-am
+ ps-am:
+
+ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libLTLIBRARIES clean-libtool ctags distclean \
+ distclean-compile distclean-depend distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am info \
+ info-am install install-am install-data install-data-am \
+ install-exec install-exec-am install-info install-info-am \
+ install-libLTLIBRARIES install-man install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-info-am \
+ uninstall-libLTLIBRARIES
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
|
From: Bob T. <bt...@us...> - 2003-04-07 04:24:06
|
Update of /cvsroot/benson/benson3/src/tests In directory sc8-pr-cvs1:/tmp/cvs-serv22915/src/tests Modified Files: Makefile.am Makefile.in Log Message: latest networking code and build modifications. Index: Makefile.am =================================================================== RCS file: /cvsroot/benson/benson3/src/tests/Makefile.am,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** Makefile.am 21 Mar 2003 20:13:06 -0000 1.7 --- Makefile.am 7 Apr 2003 04:23:59 -0000 1.8 *************** *** 1,19 **** noinst_PROGRAMS = configtest btraptest alertlisttest acktest queuetest bsmtest rulescfgtest utilstest configtest_SOURCES = configtest.c ! configtest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ btraptest_SOURCES = btraptest.c ! btraptest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ alertlisttest_SOURCES = alertlisttest.c ! alertlisttest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ acktest_SOURCES = acktest.c ! acktest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ queuetest_SOURCES = queuetest.c ! queuetest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ bsmtest_SOURCES = bsmtest.c ! bsmtest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ utilstest_SOURCES = utilstest.c ! utilstest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ rulescfgtest_SOURCES = rulescfgtest.c ! rulescfgtest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@ --- 1,19 ---- noinst_PROGRAMS = configtest btraptest alertlisttest acktest queuetest bsmtest rulescfgtest utilstest configtest_SOURCES = configtest.c ! configtest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ btraptest_SOURCES = btraptest.c ! btraptest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ alertlisttest_SOURCES = alertlisttest.c ! alertlisttest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ acktest_SOURCES = acktest.c ! acktest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ queuetest_SOURCES = queuetest.c ! queuetest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ bsmtest_SOURCES = bsmtest.c ! bsmtest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ utilstest_SOURCES = utilstest.c ! utilstest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ rulescfgtest_SOURCES = rulescfgtest.c ! rulescfgtest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@ Index: Makefile.in =================================================================== RCS file: /cvsroot/benson/benson3/src/tests/Makefile.in,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** Makefile.in 21 Mar 2003 20:13:06 -0000 1.8 --- Makefile.in 7 Apr 2003 04:23:59 -0000 1.9 *************** *** 76,79 **** --- 76,80 ---- MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ + NETWORK_VERSION = @NETWORK_VERSION@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ *************** *** 139,157 **** noinst_PROGRAMS = configtest btraptest alertlisttest acktest queuetest bsmtest rulescfgtest utilstest configtest_SOURCES = configtest.c ! configtest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ btraptest_SOURCES = btraptest.c ! btraptest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ alertlisttest_SOURCES = alertlisttest.c ! alertlisttest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ acktest_SOURCES = acktest.c ! acktest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ queuetest_SOURCES = queuetest.c ! queuetest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ bsmtest_SOURCES = bsmtest.c ! bsmtest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ utilstest_SOURCES = utilstest.c ! utilstest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ rulescfgtest_SOURCES = rulescfgtest.c ! rulescfgtest_LDADD = ../libbenson.la ../perl/libbnperl.a @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@ --- 140,158 ---- noinst_PROGRAMS = configtest btraptest alertlisttest acktest queuetest bsmtest rulescfgtest utilstest configtest_SOURCES = configtest.c ! configtest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ btraptest_SOURCES = btraptest.c ! btraptest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ alertlisttest_SOURCES = alertlisttest.c ! alertlisttest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ acktest_SOURCES = acktest.c ! acktest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ queuetest_SOURCES = queuetest.c ! queuetest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ bsmtest_SOURCES = bsmtest.c ! bsmtest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ utilstest_SOURCES = utilstest.c ! utilstest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ rulescfgtest_SOURCES = rulescfgtest.c ! rulescfgtest_LDADD = ../libbenson.la ../perl/libbnperl.la @PERL_LDFLAGS@ INCLUDES = -I@top_srcdir@/include -I@top_srcdir@ *************** *** 170,202 **** am_acktest_OBJECTS = acktest.$(OBJEXT) acktest_OBJECTS = $(am_acktest_OBJECTS) ! acktest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.a acktest_LDFLAGS = am_alertlisttest_OBJECTS = alertlisttest.$(OBJEXT) alertlisttest_OBJECTS = $(am_alertlisttest_OBJECTS) ! alertlisttest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.a alertlisttest_LDFLAGS = am_bsmtest_OBJECTS = bsmtest.$(OBJEXT) bsmtest_OBJECTS = $(am_bsmtest_OBJECTS) ! bsmtest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.a bsmtest_LDFLAGS = am_btraptest_OBJECTS = btraptest.$(OBJEXT) btraptest_OBJECTS = $(am_btraptest_OBJECTS) ! btraptest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.a btraptest_LDFLAGS = am_configtest_OBJECTS = configtest.$(OBJEXT) configtest_OBJECTS = $(am_configtest_OBJECTS) ! configtest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.a configtest_LDFLAGS = am_queuetest_OBJECTS = queuetest.$(OBJEXT) queuetest_OBJECTS = $(am_queuetest_OBJECTS) ! queuetest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.a queuetest_LDFLAGS = am_rulescfgtest_OBJECTS = rulescfgtest.$(OBJEXT) rulescfgtest_OBJECTS = $(am_rulescfgtest_OBJECTS) ! rulescfgtest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.a rulescfgtest_LDFLAGS = am_utilstest_OBJECTS = utilstest.$(OBJEXT) utilstest_OBJECTS = $(am_utilstest_OBJECTS) ! utilstest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.a utilstest_LDFLAGS = --- 171,203 ---- am_acktest_OBJECTS = acktest.$(OBJEXT) acktest_OBJECTS = $(am_acktest_OBJECTS) ! acktest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la acktest_LDFLAGS = am_alertlisttest_OBJECTS = alertlisttest.$(OBJEXT) alertlisttest_OBJECTS = $(am_alertlisttest_OBJECTS) ! alertlisttest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la alertlisttest_LDFLAGS = am_bsmtest_OBJECTS = bsmtest.$(OBJEXT) bsmtest_OBJECTS = $(am_bsmtest_OBJECTS) ! bsmtest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la bsmtest_LDFLAGS = am_btraptest_OBJECTS = btraptest.$(OBJEXT) btraptest_OBJECTS = $(am_btraptest_OBJECTS) ! btraptest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la btraptest_LDFLAGS = am_configtest_OBJECTS = configtest.$(OBJEXT) configtest_OBJECTS = $(am_configtest_OBJECTS) ! configtest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la configtest_LDFLAGS = am_queuetest_OBJECTS = queuetest.$(OBJEXT) queuetest_OBJECTS = $(am_queuetest_OBJECTS) ! queuetest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la queuetest_LDFLAGS = am_rulescfgtest_OBJECTS = rulescfgtest.$(OBJEXT) rulescfgtest_OBJECTS = $(am_rulescfgtest_OBJECTS) ! rulescfgtest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la rulescfgtest_LDFLAGS = am_utilstest_OBJECTS = utilstest.$(OBJEXT) utilstest_OBJECTS = $(am_utilstest_OBJECTS) ! utilstest_DEPENDENCIES = ../libbenson.la ../perl/libbnperl.la utilstest_LDFLAGS = |
|
From: Bob T. <bt...@us...> - 2003-04-07 04:24:06
|
Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv22915/src/network
Modified Files:
Makefile.am Makefile.in v31_network_request.c
Log Message:
latest networking code and build modifications.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.am 5 Apr 2003 04:38:23 -0000 1.2
--- Makefile.am 7 Apr 2003 04:23:59 -0000 1.3
***************
*** 1,4 ****
lib_LTLIBRARIES = libbnnetwork.la
libbnnetwork_la_SOURCES = network_master.c network_listener.c network_utils.c v31_network_request.c
! libbnnetwork_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
--- 1,4 ----
lib_LTLIBRARIES = libbnnetwork.la
libbnnetwork_la_SOURCES = network_master.c network_listener.c network_utils.c v31_network_request.c
! libbnnetwork_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@ @top_srcdir@/src/libbenson.la @top_srcdir@/src/perl/libbnperl.la
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
Index: Makefile.in
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Makefile.in 5 Apr 2003 04:38:23 -0000 1.2
--- Makefile.in 7 Apr 2003 04:23:59 -0000 1.3
***************
*** 140,144 ****
lib_LTLIBRARIES = libbnnetwork.la
libbnnetwork_la_SOURCES = network_master.c network_listener.c network_utils.c v31_network_request.c
! libbnnetwork_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
subdir = src/network
--- 140,144 ----
lib_LTLIBRARIES = libbnnetwork.la
libbnnetwork_la_SOURCES = network_master.c network_listener.c network_utils.c v31_network_request.c
! libbnnetwork_la_LDFLAGS = -no-undefined -version-info @NETWORK_VERSION@ @top_srcdir@/src/libbenson.la @top_srcdir@/src/perl/libbnperl.la
INCLUDES = -I@top_srcdir@/include -I@top_srcdir@
subdir = src/network
Index: v31_network_request.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_request.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** v31_network_request.c 6 Apr 2003 23:03:30 -0000 1.2
--- v31_network_request.c 7 Apr 2003 04:23:59 -0000 1.3
***************
*** 5,12 ****
--- 5,137 ----
int process_trap_v31(bnet_req_v31 *req_pkt, SV* server_ref)
{
+ char destination[DST_MAXSIZE_v31];
+ char agent[AGT_MAXSIZE_v31];
+ char severity[SEV_MAXSIZE_v31];
+ char subsystem[SUB_MAXSIZE_v31];
+ char message[MSG_MAXSIZE_v31];
+ char status[STA_MAXSIZE_v31];
+ SV *alert_ref;
+ SV *result;
+ int rc;
+
+ safe_insert(destination, req_pkt->inet.destination, DST_MAXSIZE_v31);
+ safe_insert(agent, req_pkt->inet.agent, AGT_MAXSIZE_v31);
+ safe_insert(severity, req_pkt->data.trap.severity, SEV_MAXSIZE_v31);
+ safe_insert(subsystem, req_pkt->data.trap.subsystem, SUB_MAXSIZE_v31);
+ safe_insert(message, req_pkt->data.trap.message, MSG_MAXSIZE_v31);
+ safe_insert(status, "initial", STA_MAXSIZE_v31);
+
+ ENTER;
+ SAVETMPS;
+
+ bn_require_module("Benson::Alert");
+ bn_require_module("Benson::Handlers::Network::Submit");
+ alert_ref = sv_2mortal(bn_new_object("Benson::Alert", 0));
+ bn_set_attribute(alert_ref, "destination", newSVpv(destination, 0));
+ bn_set_attribute(alert_ref, "agent", newSVpv(agent, 0));
+ bn_set_attribute(alert_ref, "severity", newSVpv(severity, 0));
+ bn_set_attribute(alert_ref, "subsystem", newSVpv(subsystem, 0));
+ bn_set_attribute(alert_ref, "message", newSVpv(message, 0));
+ bn_set_attribute(alert_ref, "status", newSVpv(status, 0));
+ bn_set_attribute(alert_ref, "server", SvREFCNT_inc(server_ref));
+
+ result = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Submit", alert_ref));
+ rc = SvIV(result);
+
+ FREETMPS;
+ LEAVE;
+
return GOOD;
}
+ short
+ process_acknowledge_v31(bnet_req_v31 *req_pkt, SV *server_ref)
+ {
+ char id[ID_MAXSIZE_v31];
+ char status[STA_MAXSIZE_v31];
+ SV *acknowledge_ref;
+ SV *rc;
+ unsigned int rc_int;
+
+ safe_insert(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v31);
+ safe_insert(status, "acknowledge", STA_MAXSIZE_v31);
+
+ ENTER;
+ SAVETMPS;
+
+ bn_require_module("Benson::Alert");
+ bn_require_module("Benson::Handlers::Network::Update");
+ acknowledge_ref = sv_2mortal(bn_new_object("Benson::Alert", 0));
+ bn_set_attribute(acknowledge_ref, "identity", newSVpv(id, 0));
+ bn_set_attribute(acknowledge_ref, "status", newSVpv(status, 0));
+ bn_set_attribute(acknowledge_ref, "server", SvREFCNT_inc(server_ref));
+
+ rc = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Update",acknowledge_ref));
+
+ FREETMPS;
+ LEAVE;
+
+ return (short)SvIV(rc);
+ }
+
+ short
+ process_update_status(bnet_req_v31 *req_pkt, SV *server_ref)
+ {
+ char id[ID_MAXSIZE_v31];
+ char status[STA_MAXSIZE_v31];
+ SV *acknowledge_ref;
+ SV *rc;
+ unsigned int rc_int;
+
+ safe_insert(id, req_pkt->data.acknowledge.identity, ID_MAXSIZE_v31);
+ safe_insert(status, req_pkt->data.update_status.status, STA_MAXSIZE_v31);
+
+ ENTER;
+ SAVETMPS;
+
+ bn_require_module("Benson::Alert");
+ bn_require_module("Benson::Handlers::Network::Update");
+ acknowledge_ref = sv_2mortal(bn_new_object("Benson::Alert", 0));
+ bn_set_attribute(acknowledge_ref, "identity", newSVpv(id, 0));
+ bn_set_attribute(acknowledge_ref, "status", newSVpv(status, 0));
+ bn_set_attribute(acknowledge_ref, "server", SvREFCNT_inc(server_ref));
+
+ rc = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Update",acknowledge_ref));
+
+ FREETMPS;
+ LEAVE;
+
+ return (short)SvIV(rc);
+ }
+
+ void *process_alertlist_v31 (bnet_req *req_pkt, SV *server_ref))
+ {
+ int max_num_alerts;
+ SV *result;
+ SV *alert;
+ SV *max_alerts;
+ HV *header;
+ HV *fields;
+ AV *alerts;
+ void *response_ptr;
+ bn_alertlist_response_v31 *resp_alerts_ptr;
+ int ctr = 0;
+ int response_size = 0;
+
+ ENTER;
+ SAVETMPS;
+
+ bn_require_module("Benson::Handlers::Network::Alertlist");
+ result = sv_2mortal((SV*)bn_call_handler("Benson::Handlers::Network::Alertlist"), server_ref));
+ header = (HV*) SvRV(result);
+ max_alerts = *hv_fetch(header, "max_alerts", 10, FALSE);
+ alerts = (AV*)SvRV(*hv_fetch(header, "alerts", 6, FALSE);
+
+ response_size = (sizeof(bn_alertlist_response_v31) * (av_len(alerts) + 1));
+
+ response_ptr = malloc(response_size);
+
+ }
int network_request_parser_v31(bn_netaccept_ctx *conn_ctx, bn_req_hdr *request_header)
***************
*** 38,42 ****
bn_call_handler("Benson::Handlers::Init", server_ref);
-
if(function == BENSON_TRAP_v31) {
bnet_resp_v31 resp_hdr;
--- 163,166 ----
***************
*** 45,48 ****
--- 169,175 ----
printf("benson trap received\n");
rc = process_trap_v31(&req_pkt, server_ref);
+
+ memset(&resp_hdr, 0, sizeof(bnet_resp_v31));
+ memset(&resp_ack, 0, sizeof(bnet_ack_v31));
rc = fwrite(request_header, sizeof(bn_req_hdr), 1, conn_ctx->output);
|
|
From: Bob T. <bt...@us...> - 2003-04-07 04:24:05
|
Update of /cvsroot/benson/benson3/autom4te.cache
In directory sc8-pr-cvs1:/tmp/cvs-serv22915/autom4te.cache
Modified Files:
requests
Log Message:
latest networking code and build modifications.
Index: requests
===================================================================
RCS file: /cvsroot/benson/benson3/autom4te.cache/requests,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** requests 2 Apr 2003 19:21:23 -0000 1.6
--- requests 7 Apr 2003 04:23:59 -0000 1.7
***************
*** 29,34 ****
'AC_HEADER_SYS_WAIT' => 1,
'AC_TYPE_UID_T' => 1,
- 'AM_CONDITIONAL' => 1,
'AC_CHECK_LIB' => 1,
'AC_PROG_LN_S' => 1,
'AC_FUNC_MEMCMP' => 1,
--- 29,34 ----
'AC_HEADER_SYS_WAIT' => 1,
'AC_TYPE_UID_T' => 1,
'AC_CHECK_LIB' => 1,
+ 'AM_CONDITIONAL' => 1,
'AC_PROG_LN_S' => 1,
'AC_FUNC_MEMCMP' => 1,
***************
*** 47,62 ****
'AC_CHECK_MEMBERS' => 1,
'AC_FUNC_REALLOC' => 1,
- 'include' => 1,
'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_STRUCT_TIMEZONE' => 1,
'AC_FUNC_GETPGRP' => 1,
- 'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_CHECK_HEADERS' => 1,
! 'AC_TYPE_MODE_T' => 1,
'AC_CHECK_TYPES' => 1,
'AC_PROG_YACC' => 1,
- 'AC_TYPE_PID_T' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_STRUCT_ST_BLOCKS' => 1,
--- 47,62 ----
'AC_CHECK_MEMBERS' => 1,
'AC_FUNC_REALLOC' => 1,
'AC_FUNC_OBSTACK' => 1,
+ 'include' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_STRUCT_TIMEZONE' => 1,
'AC_FUNC_GETPGRP' => 1,
'AC_CHECK_HEADERS' => 1,
! 'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_CHECK_TYPES' => 1,
+ 'AC_TYPE_MODE_T' => 1,
'AC_PROG_YACC' => 1,
'AC_FUNC_STRERROR_R' => 1,
+ 'AC_TYPE_PID_T' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_STRUCT_ST_BLOCKS' => 1,
***************
*** 87,109 ****
'AC_PROG_CXX' => 1,
'AC_CANONICAL_HOST' => 1,
- 'AC_FUNC_CLOSEDIR_VOID' => 1,
'm4_pattern_allow' => 1,
'm4_include' => 1,
- 'm4_pattern_forbid' => 1,
'AC_PROG_AWK' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_CONFIG_HEADERS' => 1,
- 'AC_TYPE_OFF_T' => 1,
'AC_PATH_X' => 1,
'AC_FUNC_MALLOC' => 1,
- 'AM_MAINTAINER_MODE' => 1,
'AC_FUNC_ERROR_AT_LINE' => 1,
'AC_FUNC_FSEEKO' => 1,
- 'AC_STRUCT_TM' => 1,
'AC_FUNC_MMAP' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_SUBST' => 1,
! 'AC_PROG_LIBTOOL' => 1,
! 'AC_PROG_CC' => 1
}
], 'Request' ),
--- 87,109 ----
'AC_PROG_CXX' => 1,
'AC_CANONICAL_HOST' => 1,
'm4_pattern_allow' => 1,
+ 'AC_FUNC_CLOSEDIR_VOID' => 1,
'm4_include' => 1,
'AC_PROG_AWK' => 1,
+ 'm4_pattern_forbid' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_PATH_X' => 1,
+ 'AC_TYPE_OFF_T' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_ERROR_AT_LINE' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
'AC_FUNC_FSEEKO' => 1,
'AC_FUNC_MMAP' => 1,
+ 'AC_STRUCT_TM' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_SUBST' => 1,
! 'AC_PROG_CC' => 1,
! 'AC_PROG_LIBTOOL' => 1
}
], 'Request' ),
***************
*** 133,138 ****
'AC_HEADER_SYS_WAIT' => 1,
'AC_TYPE_UID_T' => 1,
- 'AM_CONDITIONAL' => 1,
'AC_CHECK_LIB' => 1,
'AC_PROG_LN_S' => 1,
'AC_FUNC_MEMCMP' => 1,
--- 133,138 ----
'AC_HEADER_SYS_WAIT' => 1,
'AC_TYPE_UID_T' => 1,
'AC_CHECK_LIB' => 1,
+ 'AM_CONDITIONAL' => 1,
'AC_PROG_LN_S' => 1,
'AC_FUNC_MEMCMP' => 1,
***************
*** 151,166 ****
'AC_CHECK_MEMBERS' => 1,
'AC_C_CONST' => 1,
- 'include' => 1,
'AC_FUNC_OBSTACK' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_STRUCT_TIMEZONE' => 1,
'AC_FUNC_GETPGRP' => 1,
- 'AC_CHECK_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
! 'AC_CHECK_TYPES' => 1,
'AC_TYPE_MODE_T' => 1,
'AC_PROG_YACC' => 1,
- 'AC_FUNC_STRERROR_R' => 1,
'AC_TYPE_PID_T' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_STRUCT_ST_BLOCKS' => 1,
--- 151,166 ----
'AC_CHECK_MEMBERS' => 1,
'AC_C_CONST' => 1,
'AC_FUNC_OBSTACK' => 1,
+ 'include' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_STRUCT_TIMEZONE' => 1,
'AC_FUNC_GETPGRP' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
! 'AC_CHECK_HEADERS' => 1,
'AC_TYPE_MODE_T' => 1,
+ 'AC_CHECK_TYPES' => 1,
'AC_PROG_YACC' => 1,
'AC_TYPE_PID_T' => 1,
+ 'AC_FUNC_STRERROR_R' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_STRUCT_ST_BLOCKS' => 1,
***************
*** 191,213 ****
'AC_PROG_CXX' => 1,
'AC_CANONICAL_HOST' => 1,
- 'm4_pattern_allow' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'm4_include' => 1,
- 'AC_PROG_AWK' => 1,
'm4_pattern_forbid' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_CONFIG_HEADERS' => 1,
- 'AC_PATH_X' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_FUNC_MALLOC' => 1,
- 'AM_MAINTAINER_MODE' => 1,
'AC_FUNC_ERROR_AT_LINE' => 1,
'AC_FUNC_FSEEKO' => 1,
- 'AC_FUNC_MMAP' => 1,
'AC_STRUCT_TM' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_SUBST' => 1,
! 'AC_PROG_CC' => 1,
! 'AC_PROG_LIBTOOL' => 1
}
], 'Request' )
--- 191,213 ----
'AC_PROG_CXX' => 1,
'AC_CANONICAL_HOST' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
+ 'm4_pattern_allow' => 1,
'm4_include' => 1,
'm4_pattern_forbid' => 1,
+ 'AC_PROG_AWK' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_TYPE_OFF_T' => 1,
+ 'AC_PATH_X' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_ERROR_AT_LINE' => 1,
+ 'AM_MAINTAINER_MODE' => 1,
'AC_FUNC_FSEEKO' => 1,
'AC_STRUCT_TM' => 1,
+ 'AC_FUNC_MMAP' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_SUBST' => 1,
! 'AC_PROG_LIBTOOL' => 1,
! 'AC_PROG_CC' => 1
}
], 'Request' )
|
|
From: Bob T. <bt...@us...> - 2003-04-06 23:03:39
|
Update of /cvsroot/benson/benson3/src/network
In directory sc8-pr-cvs1:/tmp/cvs-serv19190
Modified Files:
v31_network_request.c v31_request.h
Log Message:
Latest v31 network code updates to new networking code.
Index: v31_network_request.c
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_network_request.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** v31_network_request.c 5 Apr 2003 04:38:23 -0000 1.1
--- v31_network_request.c 6 Apr 2003 23:03:30 -0000 1.2
***************
*** 2,5 ****
--- 2,13 ----
#include "v31_request.h"
+
+ int process_trap_v31(bnet_req_v31 *req_pkt, SV* server_ref)
+ {
+ return GOOD;
+ }
+
+
+
int network_request_parser_v31(bn_netaccept_ctx *conn_ctx, bn_req_hdr *request_header)
{
***************
*** 8,11 ****
--- 16,22 ----
int bytes_read;
bnet_req_v31 req_pkt;
+ PerlInterpreter *request_perl;
+ SV *server_ref;
+ char config_file[255];
function = ntohs(request_header->function);
***************
*** 13,16 ****
--- 24,42 ----
bytes_read = fread(&req_pkt, sizeof(bnet_req_v31), 1, conn_ctx->input);
+ request_perl = bn_perl_initialize(0, NULL, NULL, 1);
+
+ bn_require_module("Benson::Server");
+ bn_require_module("Benson::Handlers::Config");
+ bn_require_module("Benson::Handlers::Init");
+ server_ref = bn_new_object("Benson::Server", 0);
+
+ snprintf(config_file, 255, "%s/etc/benson.conf", BENSON_HOME);
+ config_file[255] = '\0';
+
+ bn_set_attribute(server_ref, "ConfigFile", newSVpv(config_file, 0));
+ bn_call_handler("Benson::Handlers::Config", server_ref);
+ bn_call_handler("Benson::Handlers::Init", server_ref);
+
+
if(function == BENSON_TRAP_v31) {
bnet_resp_v31 resp_hdr;
***************
*** 18,28 ****
printf("benson trap received\n");
! fwrite(request_header, sizeof(bn_req_hdr), 1, conn_ctx->output);
! fwrite(&resp_hdr, sizeof(bnet_resp_v31), 1, conn_ctx->output);
fflush(conn_ctx->output);
! fread(&resp_ack, sizeof(bnet_ack_v31), 1, conn_ctx->input);
! // rc = process_trap_v31(req_pkt);
} else if(function == BENSON_ALERTLIST_v31) {
printf("benson alertlist received\n");
}
return GOOD;
--- 44,62 ----
printf("benson trap received\n");
! rc = process_trap_v31(&req_pkt, server_ref);
!
! rc = fwrite(request_header, sizeof(bn_req_hdr), 1, conn_ctx->output);
! rc = fwrite(&resp_hdr, sizeof(bnet_resp_v31), 1, conn_ctx->output);
fflush(conn_ctx->output);
!
! rc = fread(&resp_ack, sizeof(bnet_ack_v31), 1, conn_ctx->input);
} else if(function == BENSON_ALERTLIST_v31) {
printf("benson alertlist received\n");
+ } else if(function == BENSON_ACKNOWLEDGE_v31) {
+ printf("benson acknowledge received\n");
+ } else if(function == BENSON_UPDATE_STATUS_v31) {
+ printf("benson update status received\n");
+ } else {
+ printf("unrecognized function\n");
}
return GOOD;
Index: v31_request.h
===================================================================
RCS file: /cvsroot/benson/benson3/src/network/v31_request.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** v31_request.h 5 Apr 2003 04:38:23 -0000 1.1
--- v31_request.h 6 Apr 2003 23:03:31 -0000 1.2
***************
*** 10,13 ****
--- 10,15 ----
#define __v31_request_h
+ #include <benson/perl_util.h>
+
#define BENSON_TRAP_v31 1
|
