farrokhi/nfdump
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add missing json output format help text

Browse Source
This commit is contained in:
Peter Haag 2018-02-11 12:45:46 +01:00
parent 2b4cfc7e8a
commit 9e2e0c487c
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2018-02-11
- Add missing json output format help text
2018-01-06 2018-01-06
- Merge pull request #51 Influxdb from Luca. Thx for the patch - Merge pull request #51 Influxdb from Luca. Thx for the patch

11
bin/nfdump.c
View File

@ -1,6 +1,5 @@
/* /*
* Copyright (c) 2017, Peter Haag * Copyright (c) 2018, 2017 Peter Haag
* Copyright (c) 2014, Peter Haag
* Copyright (c) 2009, Peter Haag * Copyright (c) 2009, Peter Haag
* Copyright (c) 2004-2008, SWITCH - Teleinformatikdienste fuer Lehre und Forschung * Copyright (c) 2004-2008, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
* All rights reserved. * All rights reserved.
@ -29,13 +28,6 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
* $Author: haag $
*
* $Id: nfdump.c 69 2010-09-09 07:17:43Z haag $
*
* $LastChangedRevision: 69 $
*
*
*/ */
#include "config.h" #include "config.h"
@ -311,6 +303,7 @@ static void usage(char *name) {
"\t\t long Standard output line format with additional fields.\n" "\t\t long Standard output line format with additional fields.\n"
"\t\t extended Even more information.\n" "\t\t extended Even more information.\n"
"\t\t csv ',' separated, machine parseable output format.\n" "\t\t csv ',' separated, machine parseable output format.\n"
"\t\t json json output format.\n"
"\t\t pipe '|' separated legacy machine parseable output format.\n" "\t\t pipe '|' separated legacy machine parseable output format.\n"
"\t\t\tmode may be extended by '6' for full IPv6 listing. e.g.long6, extended6.\n" "\t\t\tmode may be extended by '6' for full IPv6 listing. e.g.long6, extended6.\n"
"-E <file>\tPrint exporter ans sampling info for collected flows.\n" "-E <file>\tPrint exporter ans sampling info for collected flows.\n"