[bwm-tools-devel] COMMIT - r35 - in trunk: . bwm_firewall bwm_graph bwmd
Brought to you by:
nkukard
Menu
▾
▴
[bwm-tools-devel] COMMIT - r35 - in trunk: . bwm_firewall bwm_graph bwmd
|
From: SVN C. <sv...@li...> - 2005-01-10 12:03:20
|
Author: nkukard
Date: 2005-01-10 14:02:47 +0200 (Mon, 10 Jan 2005)
New Revision: 35
Modified:
trunk/Makefile.am
trunk/Makefile.in
trunk/bwm_firewall/bwm_firewall.c
trunk/bwm_graph/bwm_graph.c
trunk/bwm_graph/graph.c
trunk/bwmd/bwmd.c
trunk/configure
trunk/configure.ac
Log:
* Fixed unused option in bwm_graph
* Fixed small typo in bwm_firewall
* Added doc directory to that being built
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2005-01-10 12:00:08 UTC (rev 34)
+++ trunk/Makefile.am 2005-01-10 12:02:47 UTC (rev 35)
@@ -17,9 +17,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-SUBDIRS=lib bwm_firewall bwm_graph bwmd bwm_monitor
+SUBDIRS=lib bwm_firewall bwm_graph bwmd bwm_monitor doc
EXTRA_DIST=include/autoclass.h include/common.h include/flow.h include/flowControl.h include/ipq.h
EXTRA_DIST+=include/libipq.h include/misc.h include/report.h include/xmlConf.h
-EXTRA_DIST+=doc/Configuration doc/Install doc/example.xml
-
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2005-01-10 12:00:08 UTC (rev 34)
+++ trunk/Makefile.in 2005-01-10 12:02:47 UTC (rev 35)
@@ -198,11 +198,10 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = lib bwm_firewall bwm_graph bwmd bwm_monitor
+SUBDIRS = lib bwm_firewall bwm_graph bwmd bwm_monitor doc
EXTRA_DIST = include/autoclass.h include/common.h include/flow.h \
include/flowControl.h include/ipq.h include/libipq.h \
- include/misc.h include/report.h include/xmlConf.h \
- doc/Configuration doc/Install doc/example.xml
+ include/misc.h include/report.h include/xmlConf.h
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@@ -391,7 +390,7 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
- $(mkdir_p) $(distdir)/doc $(distdir)/include
+ $(mkdir_p) $(distdir)/include
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
Modified: trunk/bwm_firewall/bwm_firewall.c
===================================================================
--- trunk/bwm_firewall/bwm_firewall.c 2005-01-10 12:00:08 UTC (rev 34)
+++ trunk/bwm_firewall/bwm_firewall.c 2005-01-10 12:02:47 UTC (rev 35)
@@ -130,7 +130,7 @@
// COMPAT: Do not genrate nodes for formatting spaces
- LIBXML_TEST_VERSION
+ LIBXML_TEST_VERSION
xmlKeepBlanksDefault(0);
// FIXME - check if file exists
Modified: trunk/bwm_graph/bwm_graph.c
===================================================================
--- trunk/bwm_graph/bwm_graph.c 2005-01-10 12:00:08 UTC (rev 34)
+++ trunk/bwm_graph/bwm_graph.c 2005-01-10 12:02:47 UTC (rev 35)
@@ -54,7 +54,7 @@
printf(" --graph-date Add date information under graph\n");
printf(" --graph-title=<graph_title> Title of graph\n");
printf(" --graph-total Add totals per flow at bottom of graph\n");
- printf(" --graph-maxRate Specify your own maxRate value\n");
+// printf(" --graph-maxRate Specify your own maxRate value\n");
printf(" --graph-vert-title=<graph_title>\n");
printf(" Vertical title of graph\n");
printf("\n");
@@ -73,12 +73,12 @@
{"start",1,0,'s'},
{"end",1,0,'e'},
{"help",0,0,'h'},
- {"graph-filename",0,0,1},
+ {"graph-filename",1,0,1},
{"graph-avg",0,0,2},
{"graph-date",0,0,3},
{"graph-title",1,0,4},
{"graph-total",0,0,5},
- {"graph-maxRate",0,0,6},
+// {"graph-maxRate",1,0,6},
{"graph-vert-title",1,0,7},
{0,0,0,0}
};
@@ -163,9 +163,11 @@
case 5:
options->graph_total = 1;
break;
+/*
case 6:
options->graph_maxRate = 1;
break;
+*/
case 7:
options->verticalTitle = strndup(optarg,BUFFER_SIZE);
break;
Modified: trunk/bwm_graph/graph.c
===================================================================
--- trunk/bwm_graph/graph.c 2005-01-10 12:00:08 UTC (rev 34)
+++ trunk/bwm_graph/graph.c 2005-01-10 12:02:47 UTC (rev 35)
@@ -622,7 +622,7 @@
// Check if we must display our cute little line
if (hasOptions)
ADD_SINGLE_PARAM(params,numParams,"COMMENT:%s\\c","- * - * -");
- ADD_SINGLE_PARAM(params,numParams,"COMMENT:%s\\c","Graph generated by bwm_tools v"PACKAGE_VERSION" (http://bwmtools.lbsd.net)");
+ ADD_SINGLE_PARAM(params,numParams,"COMMENT:%s\\c","Graph generated by bwm_tools v"PACKAGE_VERSION" (http://bwm-tools.lbsd.net)");
// Call rrd tool
optind = 0; opterr = 0;
Modified: trunk/bwmd/bwmd.c
===================================================================
--- trunk/bwmd/bwmd.c 2005-01-10 12:00:08 UTC (rev 34)
+++ trunk/bwmd/bwmd.c 2005-01-10 12:02:47 UTC (rev 35)
@@ -1,6 +1,6 @@
/*
* bwmd.c - BWM Daemon
- * Copyright (C) 2003-2004, Linux Based Systems Design
+ * Copyright (C) 2003-2005, Linux Based Systems Design
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -105,7 +105,7 @@
};
- printf("BWM Daemon v%s - Copyright (c) 2003-2004 Linux Based Systems Design\n\n",PACKAGE_VERSION);
+ printf("BWM Daemon v%s - Copyright (c) 2003-2005 Linux Based Systems Design\n\n",PACKAGE_VERSION);
// Loop with options
while (1)
Modified: trunk/configure
===================================================================
--- trunk/configure 2005-01-10 12:00:08 UTC (rev 34)
+++ trunk/configure 2005-01-10 12:02:47 UTC (rev 35)
@@ -23430,7 +23430,7 @@
XML_CFLAGS=$XML_CPPFLAGS
- ac_config_files="$ac_config_files Makefile lib/Makefile bwm_firewall/Makefile bwm_graph/Makefile bwmd/Makefile bwm_monitor/Makefile"
+ ac_config_files="$ac_config_files Makefile lib/Makefile bwm_firewall/Makefile bwm_graph/Makefile bwmd/Makefile bwm_monitor/Makefile doc/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -23994,6 +23994,7 @@
"bwm_graph/Makefile" ) CONFIG_FILES="$CONFIG_FILES bwm_graph/Makefile" ;;
"bwmd/Makefile" ) CONFIG_FILES="$CONFIG_FILES bwmd/Makefile" ;;
"bwm_monitor/Makefile" ) CONFIG_FILES="$CONFIG_FILES bwm_monitor/Makefile" ;;
+ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2005-01-10 12:00:08 UTC (rev 34)
+++ trunk/configure.ac 2005-01-10 12:02:47 UTC (rev 35)
@@ -100,5 +100,6 @@
bwm_graph/Makefile
bwmd/Makefile
bwm_monitor/Makefile
+ doc/Makefile
])
AC_OUTPUT
|
