Menu
▾
▴
[OpenCALEA-devel] SF.net SVN: opencalea: [36] trunk
|
From: <jn...@us...> - 2007-05-14 19:48:28
|
Revision: 36
http://opencalea.svn.sourceforge.net/opencalea/?rev=36&view=rev
Author: jnorell
Date: 2007-05-14 12:48:26 -0700 (Mon, 14 May 2007)
Log Message:
-----------
Documentation update (and small length check in df_collector).
Modified Paths:
--------------
trunk/doc/MICRO-HOWTO
trunk/doc/Makefile.am
trunk/doc/Makefile.in
trunk/doc/README
trunk/doc/TODO
trunk/doc/TODO.df_collector
trunk/doc/TODO.lea_collector
trunk/doc/TODO.tap
trunk/man/controllerd.8
trunk/man/df_collector.8
trunk/man/lea_collector.8
trunk/src/df_collector.c
Added Paths:
-----------
trunk/doc/TODO.opencalea
Removed Paths:
-------------
trunk/doc/TODO.collector
trunk/doc/TODO.controller
Modified: trunk/doc/MICRO-HOWTO
===================================================================
--- trunk/doc/MICRO-HOWTO 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/doc/MICRO-HOWTO 2007-05-14 19:48:26 UTC (rev 36)
@@ -17,28 +17,42 @@
RUNNING
--- Start a lea_collector, say on localhost
+-- Read opencalea.conf(5) man page
- lea_collector -t /tmp/cmii.txt
+ man 5 opencalea.conf
+-- Copy the sample opencalea.conf to /etc/opencalea/opencalea.conf
+ and edit to suit your needs.
+
+ mkdir /etc/opencalea
+ cp etc/opencalea/opencalea.conf /etc/opencalea/
+ vi /etc/opencalea/opencalea.conf
+
+-- Start a lea_collector, eg. on localhost
+
+ lea_collector
+
+-- Start a df_collector, eg. on localhost
+
+ df_collector
+
-- Start a tap sending data to it
- tap -x x -y y -z z -f "host 1.2.3.4"
+ tap -x "Host 1.2.3.4" -y MyTestCaseID host 1.2.3.4
PROGRAMS
-lea_collector:
- Currently accepts data from tap(8); needs started before tap(8).
-
tap:
- A network tap, currently sends data to a lea_collector(8).
+ A network tap, sends data to a df_collector(8).
Install on IAPs that will collect packets from the network.
-collector:
- Used to start/stop taps by a controller(8) client; install on
- same machines as tap(8).
+df_collector:
+ A DF (Delivery Function), which collects data for an opencalea
+ network and sends to the LEA (Law Enforcement Agency). For
+ testing, use lea_collector.
-controller:
- Connects to a collector(8) to start/stop taps(8).
+lea_collector:
+ A sample LEA CF (Collection Function); accepts data from
+ df_collector(8).
Modified: trunk/doc/Makefile.am
===================================================================
--- trunk/doc/Makefile.am 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/doc/Makefile.am 2007-05-14 19:48:26 UTC (rev 36)
@@ -2,13 +2,12 @@
opencaleadir = $(datadir)/opencalea
dist_opencalea_DATA = LICENSE \
- TODO.collector \
- TODO.controller \
- TODO.df_collector \
- TODO.lea_collector \
- TODO.tap \
README \
- TODO \
MICRO-HOWTO \
- AUTHORS
+ AUTHORS \
+ TODO \
+ TODO.opencalea \
+ TODO.df_collector \
+ TODO.lea_collector \
+ TODO.tap
Modified: trunk/doc/Makefile.in
===================================================================
--- trunk/doc/Makefile.in 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/doc/Makefile.in 2007-05-14 19:48:26 UTC (rev 36)
@@ -165,15 +165,12 @@
top_srcdir = @top_srcdir@
opencaleadir = $(datadir)/opencalea
dist_opencalea_DATA = LICENSE \
- TODO.collector \
- TODO.controller \
- TODO.df_collector \
- TODO.lea_collector \
- TODO.tap \
- README \
- TODO \
- MICRO-HOWTO \
- AUTHORS
+ AUTHORS \
+ TODO \
+ TODO.opencalea \
+ TODO.df_collector \
+ TODO.lea_collector \
+ TODO.tap
all: all-am
Modified: trunk/doc/README
===================================================================
--- trunk/doc/README 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/doc/README 2007-05-14 19:48:26 UTC (rev 36)
@@ -37,6 +37,9 @@
https://www.atis.org/docstore/product.aspx?id=21221
(currently a pre-published ANSI standard)
+ OpenCALEA is contributing to the design of the WISPA calea standard.
+Support will be added as the standard is created.
+
LICENSE:
OpenCALEA is distributed under terms of the modified BSD license.
Modified: trunk/doc/TODO
===================================================================
--- trunk/doc/TODO 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/doc/TODO 2007-05-14 19:48:26 UTC (rev 36)
@@ -3,24 +3,21 @@
GENERAL
------
--- implement config files, including some variables like:
+-- create/implement control architecture
-[LEA_COLLECTOR]
-capturefile_basedir = /var/lib/opencalea/{CaseID}/{IASP_ID}
+-- add WISPA standard support (when available)
--- define interface to, and create df_collector
-
--- implement ASN/BER between df_collector and lea_collector
-
--- change default port numbers to something not reserved
-
-
DOCUMENTATION
-------------
--- create man pages
-
-- create some security pointers/info
(currently going in man pages)
+-- improve the HOWTO
+
+-- create some sample forms for tracking CALEA intercepts
+
+-- create some general CALEA guidelines covering the overall
+ issue, not just specifics of installing/running OpenCALEA
+
Deleted: trunk/doc/TODO.collector
===================================================================
--- trunk/doc/TODO.collector 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/doc/TODO.collector 2007-05-14 19:48:26 UTC (rev 36)
@@ -1,21 +0,0 @@
-OpenCALEA collector TODO
-
--- rename to "cmd_collector" or something more self-descriptive
-
--- create a method to invoke other commands beside tap(8)
- (or rename to "tap_collector", and make similar "collector"
- programs for other CmII/CmC agents)
-
--- better command parsing
-
--- fix process monitoring (eg. if a tap(8) exits/dies, need
- to catch that and clean up the process list)
-
--- implement authentication for controller!!
-
--- tcp connection from controller(s)
-
--- tcp wrappers support
-
--- run as non-root, with tap(8) setuid
-
Deleted: trunk/doc/TODO.controller
===================================================================
--- trunk/doc/TODO.controller 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/doc/TODO.controller 2007-05-14 19:48:26 UTC (rev 36)
@@ -1,8 +0,0 @@
-OpenCALEA controller TODO
-
--- better command parsing
-
--- implement authentication to collector!!
-
--- tcp connection to controller
-
Modified: trunk/doc/TODO.df_collector
===================================================================
--- trunk/doc/TODO.df_collector 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/doc/TODO.df_collector 2007-05-14 19:48:26 UTC (rev 36)
@@ -1,11 +1,8 @@
OpenCALEA df_collector TODO
--- define an interface to send CmII and CmC events to,
-potentially using xml so 3rd party CmII/CmC agents are
-easier to create
+-- Implement tcpwrappers and possibly also internal acls to only
+ accept traffic from agents we're supposed to
--- convert the CmII/CmC agent interface data to ASN.1/BER
-to send to lea_collector
+-- Implement some authentication between agents and df_collector,
+ and to/from controllerd
--- accept CmII (and CmC?) on tcp socket
-
Modified: trunk/doc/TODO.lea_collector
===================================================================
--- trunk/doc/TODO.lea_collector 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/doc/TODO.lea_collector 2007-05-14 19:48:26 UTC (rev 36)
@@ -1,7 +1,5 @@
OpenCALEA lea_collector TODO
--- change to receive ASN/BER from df_collector once df_collector is created
-
-- Save data to a default location based on CaseID, time, pid and optionally
IaspID. Eg.
Copied: trunk/doc/TODO.opencalea (from rev 27, trunk/doc/TODO.controller)
===================================================================
--- trunk/doc/TODO.opencalea (rev 0)
+++ trunk/doc/TODO.opencalea 2007-05-14 19:48:26 UTC (rev 36)
@@ -0,0 +1,4 @@
+OpenCALEA opencalea (controlling ui) TODO
+
+-- implement authentication to controllerd
+
Modified: trunk/doc/TODO.tap
===================================================================
--- trunk/doc/TODO.tap 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/doc/TODO.tap 2007-05-14 19:48:26 UTC (rev 36)
@@ -1,14 +1,11 @@
OpenCALEA tap TODO
--- change to use df_collector interface
+-- implement additional output formats (raw, pcap, wispa)
--- re-impliment always dropping root privs once some install
-documentation covers that
+-- implement authentication to (and from?) df_collector
--- remove "-f" flag, and use all remaining commandline args
-(after getopt) as the filter
+-- implement authentication to/from collectord
--- target design for running as root and changing uid asap
-(though support running as a user with appropriate capabilities).
-ultimately collector should run as non-root, with tap setuid.
+-- change -x -y and -z requirement according to -c type
+ (eg. some content types won't need ContentID or IAPSystemID)
Modified: trunk/man/controllerd.8
===================================================================
--- trunk/man/controllerd.8 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/man/controllerd.8 2007-05-14 19:48:26 UTC (rev 36)
@@ -30,7 +30,7 @@
.\" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" */
-.TH "controllerd" "8" "conceptware-0.0.1" "The OpenCALEA Project" "OpenCALEA"
+.TH "controllerd" "8" "svn-20070514" "The OpenCALEA Project" "OpenCALEA"
.SH "NAME"
.LP
controllerd \- OpenCALEA Control Daemon
@@ -46,12 +46,10 @@
[\fB\-D\fR \fIdebug\-file\fR]
[\fB\-l\fR \fIlog\-level\fR]
[\fB\-L\fR \fIlogfile\fR]
-
+[\fB\-h\fR]
.SH "DESCRIPTION"
.LP
-This program is the Control Daemon from the OpenCALEA project. It runs as a daemon, listening for tcp connections from OpenCALEA control agents. It is used to tie together all the disparate pieces by sending/receiving messages to start and stop things, check status, and also handles the surveillance log.
-.LP
-\fBcontrollerd\fR(8) design is still being considered as it's being developed. It may end up being stateful and able to detect/recover from crashes, or could end up event driven and stateless (manual crash recovery). Check back soon for more info.
+This program is the Control Daemon from the OpenCALEA project. It runs as a daemon, listening for tcp connections from OpenCALEA control agents. It is used to tie together all the disparate pieces by sending/receiving messages to start and stop things and check status.
.SH "OPTIONS"
.LP
@@ -120,6 +118,10 @@
.br
Default: \fBLog_Destination\fR from config file or \fBsyslog\fR.
+
+.TP
+\fB\-h\fR
+Prints help / usage message.
.SH "FILES"
.LP
.TP
@@ -135,14 +137,11 @@
\fBcontrollerd\fR
.SH "AUTHORS"
.LP
-Jesse Norell <je...@kc...>
-.br
-Henry F. Camacho Jr. <hf...@un...>
+Norman Brandinger <no...@go...>
.SH "SEE ALSO"
.LP
-\fIcontroller\fR(8), \fIdhcp_cmii_controller\fR(8),
-\fIopencalea\fR(8), \fIradius_cmii_controller\fR(8),
-\fItap_controller\fR(8)
+\fIopencalea\fR(8), \fIdhcp_cmii_controller\fR(8),
+\fIradius_cmii_controller\fR(8), \fItap_controller\fR(8)
.LP
\fIcontrollerd.conf\fR(5), \fIopencalea.conf\fR(5)
.LP
@@ -161,7 +160,7 @@
OpenCALEA is following the development of the WISPA standard for data capture and will add support when possible.
.SH "SECURITY"
.LP
-\fBcontrollerd\fR(8) is currently conceptware. This section will be updated as the implementation unfolds.
+This section will be updated as the implementation unfolds.
.SH "BUGS"
.LP
Please report all bugs to the OpenCALEA mailing list at:
Modified: trunk/man/df_collector.8
===================================================================
--- trunk/man/df_collector.8 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/man/df_collector.8 2007-05-14 19:48:26 UTC (rev 36)
@@ -30,7 +30,7 @@
.\" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" */
-.TH "df_collector" "8" "svn-20070502" "The OpenCALEA Project" "OpenCALEA"
+.TH "df_collector" "8" "svn-20070514" "The OpenCALEA Project" "OpenCALEA"
.SH "NAME"
.LP
df_collector \- OpenCALEA Delivery Function (DF)
@@ -42,13 +42,12 @@
[\fB\-g\fR \fIgroup\fR]
[\fB\-b\fR \fIbind\-addr\fR]
[\fB\-p\fR \fIdf\-port\fR]
-[\fB\-d\fR \fIdestination\fR]
-[\fB\-M\fR \fIcf\-cmc\-port\fR]
-[\fB\-N\fR \fIcf\-cmii\-port\fR]
[\fB\-v\fR [\fI...\fR]]
[\fB\-D\fR \fIdebug\-file\fR]
[\fB\-l\fR \fIlog\-level\fR]
[\fB\-L\fR \fIlogfile\fR]
+[\fB\-L\fR]
+[\fB\-h\fR]
.SH "DESCRIPTION"
.LP
@@ -96,33 +95,39 @@
Default: \fBDF_Port\fR from config file or \fB41805\fR.
.TP
-\fB\-d\fR \fIdestination\fR
-Specifies the \fIdestination\fR CF host to send CmII and CmC to.
-For testing this host should be running \fIlea_collector\fR(8).
+\fB\-v\fR [\fI...\fR]
+Enable debugging (\fB\-d\fR was taken). Use multiple times to increase verbosity.
.br
-Default: \fBCF_Destination\fR \fBlocalhost\fR (127.0.0.1).
+Default: \fBDebug_Level\fR from config file or off.
.TP
-\fB\-M\fR \fIcf\-cmc\-port\fR
-Specifies the \fIport\fR on \fIdestination\fR above to send CmC data to.
+\fB\-D\fR \fIdebug\-file\fR
+Specifies where to debug to.
+Valid values are \fBstdout\fR, \fBstderr\fR, \fBsyslog\fR or a \fIfilename\fR.
.br
-Default: \fBCF_CmC_Port\fR from config file or \fB41820\fR.
+Default: \fBDebug_Destination\fR from config file or \fBsyslog\fR.
.TP
-\fB\-N\fR \fIcf\-cmii\-port\fR
-Specifies the \fIport\fR on \fIdestination\fR above to send CmII data to.
+\fB\-l\fR \fIlog\-level\fR
+Specifies log level.
+\fIlog\-level\fR should be a numeric value from \fB1\fR (least) to \fB5\fR (most).
.br
-Default: \fBCF_CmII_Port\fR from config file or \fB41810\fR.
+Default: \fBLog_Level\fR from config file or \fB1\fR.
.TP
-\fB\-o\fR \fIcmii\-output\-format\fR
-Specifies the \fICmII output format\fR. Valid values are \fBber\fR or \fBxml\fR.
+\fB\-L\fR \fIlogfile\fR
+Specifies where to log to.
+Valid values are \fBstdout\fR, \fBstderr\fR, \fBsyslog\fR or a \fIfilename\fR.
+
.br
-Default: \fBCmII_Output_Format\fR from config file or \fBber\fR.
+Default: \fBLog_Destination\fR from config file or \fBsyslog\fR.
+.TP
+\fB\-h\fR
+Prints help / usage message.
.SH "FILES"
.LP
.TP
@@ -139,6 +144,8 @@
.SH "AUTHORS"
.LP
Norman Brandinger <no...@go...>
+.br
+Jesse Norell <je...@kc...>
.SH "SEE ALSO"
.LP
\fIcontrollerd\fR(8), \fIlea_collector\fR(8), \fIopencalea\fR(8),
@@ -161,7 +168,9 @@
OpenCALEA is following the development of the WISPA standard for data capture and will add support when possible.
.SH "SECURITY"
.LP
-This section will be updated as the implementation unfolds.
+\fBdf_collector\fR(8) can accept UDP or TCP input; use of TCP reduces risk of malicious packet injection from illegitimate sources.
+.LP
+Currently \fBdf_collector\fR(8) does not support tcp wrappers or have any client connection restrictions.
.SH "BUGS"
.LP
Please report all bugs to the OpenCALEA mailing list at:
Modified: trunk/man/lea_collector.8
===================================================================
--- trunk/man/lea_collector.8 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/man/lea_collector.8 2007-05-14 19:48:26 UTC (rev 36)
@@ -30,87 +30,122 @@
.\" * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" */
-.TH "lea_collector" "8" "svn-20070502" "The OpenCALEA Project" "OpenCALEA"
+.TH "lea_collector" "8" "svn-20070514" "The OpenCALEA Project" "OpenCALEA"
.SH "NAME"
.LP
lea_collector \- OpenCALEA Law Enforcement Agency (LEA) Collection Function (CF)
.SH "SYNTAX"
.LP
\fBlea_collector\fR
-\fB\-t\fR \fIcmii\-capture\-file\fR
-[\fB\-f\fR \fIcmc\-capture\-file\fR]
-[\fB\-b\fR \fIbind\-addr\fR]
+[\fB\-f\fR \fIconfig\-file\fR]
[\fB\-u\fR \fIuser\fR]
[\fB\-g\fR \fIgroup\fR]
-[\fB\-m\fR \fIcmc\-port\fR]
-[\fB\-n\fR \fIcmii\-port\fR]
-[\fB\-x\fR]
+[\fB\-b\fR \fIbind\-addr\fR]
+[\fB\-p\fR \fIcmii\-port\fR]
+[\fB\-c\fR \fIcmii\-content\-type\fR]
+[\fB\-P\fR \fIcmc\-port\fR]
+[\fB\-C\fR \fIcmc\-content\-type\fR]
[\fB\-v\fR [\fI...\fR]]
[\fB\-D\fR \fIdebug\-file\fR]
[\fB\-l\fR \fIlog\-level\fR]
[\fB\-L\fR \fIlogfile\fR]
+[\fB\-h\fR]
.SH "DESCRIPTION"
.LP
-This program is a LEA (Law Enforcement Agency) CF (Collection Function) from the OpenCALEA project. It currently only accepts data from one or more \fItap\fR(8) programs, outputs a plaintext \fIcmii\-capture\-file\fR and optionally also a \fIcmc\-capture\-file\fR in pcap format.
-.LP
-\fBlea_collector\fR(8) is planned to undergo substantial redesign with the implementation of \fBdf_collector\fR(8).
+This program is a LEA (Law Enforcement Agency) CF (Collection Function) from the OpenCALEA project. It accepts data from one or more \fIdf_collector\fR(8) programs, which is the collective output of an OpenCALEA network for an intercept.
.SH "OPTIONS"
.LP
.TP
-\fB\-t\fR \fIcmii\-capture\-file\fR
-Specify the file to write CmII data to (plaintext).
-.br
-Default: none.
+\fB\-f\fR \fIconfig\-file\fR
+Specifies an alternate \fIconfig file\fR.
-.TP
-\fB\-f\fR \fIcmc\-capture\-file\fR
-Specify file to save CmC data to (pcap format).
-\fBlea_collector\fR will not listen on the
-\fIcmc\-port\fR if you do not use this option.
.br
-Default: none.
+Default: see FILES below.
.TP
-\fB\-b\fR \fIbind\-addr\fR
-Specifies the ip address to bind to.
-.br
-Default: \fBBind_Addr\fR from config file or 0.0.0.0 (any)
-
-.TP
\fB\-u\fR \fIuser\fR
Specifies the \fIuser\fR to change to if run as root.
+
.br
Default: \fBUser\fR from config file or \fBcalea\fR.
.TP
\fB\-g\fR \fIgroup\fR
Specifies the \fIgroup\fR to change to if run as root.
+
.br
-Default: \fBGroup\fR from config file or \fBcalea\fR.
+Default: \fBGroup\fR from config file or \fBcalea\fR
.TP
-\fB\-m\fR \fIcmc\-port\fR
-Specifies the \fIport\fR to listen on for CmC data.
-Requires \fB\-f\fR to be specified.
+\fB\-b\fR \fIbind\-addr\fR
+Specifies the ip address to bind to.
+
.br
-Default: \fBCmC_Port\fR from config file or \fB6666\fR (this will change).
+Default: \fBBind_Addr\fR from config file or 0.0.0.0 (any)
.TP
-\fB\-n\fR \fIcmii\-port\fR
+\fB\-p\fR \fIcmii\-port\fR
Specifies the \fIport\fR to listen on for CmII data.
+As all intercepts include Identifying Information,
+you must always provide this port.
+
.br
-Default: \fBCmII_Port\fR from config file or \fB6667\fR (this will change).
+Default: \fBCmII_Port\fR from config file or \fB41810\fR.
+Required: yes
+TP>
+\fB\-c\fR \fIcmii\-content\-type\fR
+Specifies the type of CmII content to receive.
+Valid values of \fIcmii\-content\-type\fR are:
+
+.br
+\fBvop\-cii\fR Receive ATIS VOP CII.
+.br
+\fBias\-cmii\fR Receive ATIS IAS CmII.
+.br
+\fBraw\fR Receive OSI layer 3 packets (no formatting).
+.br
+\fBpcap\fR Receive packets with link layer headers in pcap format.
+
+.br
+Default: \fBCmII_Content_Type\fR from config file.
+.br
+Required: yes.
+
.TP
-\fB\-x\fR
-Enable cooked format. A description of that would be great.
+\fB\-P\fR \fIcmc\-port\fR
+Specifies the \fIport\fR to listen on for CmC data.
+Only required for full content intercepts.
+
.br
-Default: disabled.
+Default: \fBCmC_Port\fR from config file or \fB41820\fR.
+TP>
+\fB\-C\fR \fIcmc\-content\-type\fR
+Specifies the type of CmC content to receive.
+Valid values of \fIcmc\-content\-type\fR are:
+
+.br
+\fBvop\-cc\fR Receive ATIS VOP CC (CC\-APDU).
+.br
+\fBias\-cmc\fR Receive ATIS IAS CmC (IAS\-CC\-APDU).
+.br
+\fBias\-cmc\-udp\fR Receive ATIS IAS CmC (Annex D.3.1 udp encapsulation)
+.br
+\fBraw\fR Receive OSI layer 3 packets (no formatting).
+.br
+\fBpcap\fR Receive packets with link layer headers in pcap format.
+
+.br
+Default: \fBCmC_Content_Type\fR from config file.
+.br
+Required: yes.
+
.TP
\fB\-v\fR [\fI...\fR]
Enable debugging (\fB\-d\fR was taken). Use multiple times to increase verbosity.
+
.br
Default: \fBDebug_Level\fR from config file or off.
@@ -118,6 +153,7 @@
\fB\-D\fR \fIdebug\-file\fR
Specifies where to debug to.
Valid values are \fBstdout\fR, \fBstderr\fR, \fBsyslog\fR or a \fIfilename\fR.
+
.br
Default: \fBDebug_Destination\fR from config file or \fBsyslog\fR.
@@ -125,6 +161,7 @@
\fB\-l\fR \fIlog\-level\fR
Specifies log level.
\fIlog\-level\fR should be a numeric value from \fB1\fR (least) to \fB5\fR (most).
+
.br
Default: \fBLog_Level\fR from config file or \fB1\fR.
@@ -132,8 +169,13 @@
\fB\-L\fR \fIlogfile\fR
Specifies where to log to.
Valid values are \fBstdout\fR, \fBstderr\fR, \fBsyslog\fR or a \fIfilename\fR.
+
.br
Default: \fBLog_Destination\fR from config file or \fBsyslog\fR.
+
+.TP
+\fB\-h\fR
+Prints help / usage message.
.SH "FILES"
.LP
\fBNote: config files are not yet used\fR
Modified: trunk/src/df_collector.c
===================================================================
--- trunk/src/df_collector.c 2007-05-14 15:39:37 UTC (rev 35)
+++ trunk/src/df_collector.c 2007-05-14 19:48:26 UTC (rev 36)
@@ -90,7 +90,7 @@
int i=0;
/* command line options processing */
- while (( i = getopt ( argc, argv, "f:u:g:b:p:m:n:vD:l:L:h" )) != -1 ) {
+ while (( i = getopt ( argc, argv, "f:u:g:b:p:vD:l:L:h" )) != -1 ) {
switch ( i ) {
case 'f': // config file
@@ -310,9 +310,9 @@
/* Make CmII directory based on the CaseID */
/*******************************************/
bzero(filename,MAX_LINE);
- strcat(filename,cmii_path);
- strcat(filename,"/");
- strcat(filename,(char *)ctrlmsg->ctrlh.intercept.CaseID);
+ strncat(filename,cmii_path,MAX_LINE - strlen(filename));
+ strncat(filename,"/",MAX_LINE - strlen(filename));
+ strncat(filename,(char *)ctrlmsg->ctrlh.intercept.CaseID,MAX_LINE - strlen(filename));
status = mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
if (status == -1) {
switch (errno) {
@@ -320,7 +320,8 @@
debug_5("df_collector: CmII mkdir %s", strerror(errno));
break;
default:
- debug_5("df_collector: CmII mkdir %s", strerror(errno));
+ debug_2("df_collector: CmII mkdir %s", strerror(errno));
+ log_2("df_collector: CmII mkdir %s", strerror(errno));
}
}
@@ -343,9 +344,9 @@
/* Make CmC directory based on the CaseID */
/******************************************/
bzero(filename,MAX_LINE);
- strcat(filename,cmc_path);
- strcat(filename,"/");
- strcat(filename,(char *)ctrlmsg->ctrlh.intercept.CaseID);
+ strncat(filename,cmc_path,MAX_LINE - strlen(filename));
+ strncat(filename,"/",MAX_LINE - strlen(filename));
+ strncat(filename,(char *)ctrlmsg->ctrlh.intercept.CaseID,MAX_LINE - strlen(filename));
status = mkdir(filename, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
if (status == -1) {
switch (errno) {
@@ -353,7 +354,8 @@
debug_5("df_collector: CmC mkdir %s", strerror(errno));
break;
default:
- debug_5("df_collector: CmC mkdir %s", strerror(errno));
+ debug_2("df_collector: CmC mkdir %s", strerror(errno));
+ log_2("df_collector: CmC mkdir %s", strerror(errno));
}
}
@@ -668,7 +670,7 @@
printf ( " [-f config-file]" );
printf ( " [-u user] [-g group]" );
printf ( " [-b bind-addr] " );
- printf ( " [-m cmc-port] [-n cmii-port] [-x]" );
+ printf ( " [-p df-port] " );
printf ( " [-v [...]] [-D debug-file]" );
printf ( " [-l log-level ] [-L logfile]" );
printf ( " [-h]" );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
