diff --git a/docs/CHANGELOG b/docs/CHANGELOG index ce38f8674..03825c024 100644 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -7,6 +7,7 @@ - CVE-2018-17582 heap-buffer-overflow in get_next_packet (#484) - Out-of-tree build (#482) - CVE-2018-13112 heap-buffer-overflow in get_l2len (#477 dup #408) + - manpage typos (#413) 01/18/2018 Version 4.3.0 beta1 - Travis CI build fails due to new build images (#432) diff --git a/src/tcpbridge_opts.def b/src/tcpbridge_opts.def index 93a1a8c6c..30240e73c 100644 --- a/src/tcpbridge_opts.def +++ b/src/tcpbridge_opts.def @@ -4,9 +4,9 @@ * Copyright (c) 2001-2010 Aaron Turner * Copyright (c) 2013-2018 Fred Klassen - AppNeta * - * The Tcpreplay Suite of tools is free software: you can redistribute it - * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * The Tcpreplay Suite of tools is free software: you can redistribute it + * and/or modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or with the authors permission any later version. * * The Tcpreplay Suite is distributed in the hope that it will be useful, @@ -25,7 +25,7 @@ autogen definitions options; copyright = { date = "2000-2018"; owner = "Aaron Turner and Fred Klassen"; - eaddr = "tcpreplay-users@lists.sourceforge.net"; + eaddr = "tcpreplay-users@lists.sourceforge.net"; type = gpl; author = <<- EOText Copyright 2013-2018 Fred Klassen - AppNeta @@ -66,7 +66,7 @@ include = "#include \"defines.h\"\n" homerc = "$$/"; explain = <<- EOExplain -tcpbridge is a tool for selectively briding network traffic across two interfaces +tcpbridge is a tool for selectively bridging network traffic across two interfaces and optionally modifying the packets in between EOExplain; @@ -98,12 +98,12 @@ tcpbridge can only send packets as fast as your computer's interface, processor and system bus will allow. Connecting both interfaces to the same subnet may create a broadcast storm and -take down the network. Improper use of the packet editing functions may have +take down the network. Improper use of the packet editing functions may have other undefined and possible negative consequences. Some operating systems by default do not allow for forging source MAC addresses. Please consult your operating system's documentation and the -tcpreplay FAQ if you experiance this issue. +tcpreplay FAQ if you experience this issue. EOMan; /* @@ -121,7 +121,7 @@ flag = { arg-default = 0; descrip = "Enable debugging output"; doc = <<- EOText -If configured with --enable-debug, then you can specify a verbosity +If configured with --enable-debug, then you can specify a verbosity level for debugging output. Higher numbers increase verbosity. EOText; }; @@ -156,8 +156,8 @@ flag = { max = 1; descrip = "Send and receive in only one direction"; doc = <<- EOText -Normally, tcpbridge will send and receive traffic in both directions -(bi-directionally). However, if you choose this option, traffic will +Normally, tcpbridge will send and receive traffic in both directions +(bi-directionally). However, if you choose this option, traffic will be sent uni-directionally. EOText; }; @@ -257,7 +257,7 @@ corresponds to the packet number in the capture file. @example --include=P:1-5,9,15,72- @end example -would send packets 1 thru 5, the 9th and 15th packet, and packets 72 until the +would send packets 1 through 5, the 9th and 15th packet, and packets 72 until the end of the file @item F:'' - BPF filter. See the @file{tcpdump(8)} man page for syntax. @@ -304,7 +304,7 @@ corresponds to the packet number in the capture file. @example --exclude=P:1-5,9,15,72- @end example -would drop packets 1 thru 5, the 9th and 15th packet, and packets 72 until the +would drop packets 1 through 5, the 9th and 15th packet, and packets 72 until the end of the file @end table EOText; diff --git a/src/tcpedit/tcpedit_opts.def b/src/tcpedit/tcpedit_opts.def index 5cb19f69b..a01347c5e 100644 --- a/src/tcpedit/tcpedit_opts.def +++ b/src/tcpedit/tcpedit_opts.def @@ -2,9 +2,9 @@ * Copyright (c) 2001-2010 Aaron Turner * Copyright (c) 2013-2018 Fred Klassen - AppNeta * - * The Tcpreplay Suite of tools is free software: you can redistribute it - * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * The Tcpreplay Suite of tools is free software: you can redistribute it + * and/or modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or with the authors permission any later version. * * The Tcpreplay Suite is distributed in the hope that it will be useful, @@ -30,7 +30,7 @@ flag = { stack-arg; descrip = "Rewrite TCP/UDP ports"; doc = <<- EOText -Specify a list of comma delimited port mappingings consisting of +Specify a list of comma delimited port mappings consisting of colon delimited port number pairs. Each colon delimited port pair consists of the port to match followed by the port number to rewrite. @@ -51,11 +51,11 @@ flag = { descrip = "Randomize src/dst IPv4/v6 addresses w/ given seed"; max = 1; doc = <<- EOText -Causes the source and destination IPv4/v6 addresses to be pseudo +Causes the source and destination IPv4/v6 addresses to be pseudo randomized but still maintain client/server relationships. -Since the randomization is deterministic based on the seed, +Since the randomization is deterministic based on the seed, you can reuse the same seed value to recreate the traffic. -EOText; +EOText; }; flag = { @@ -82,7 +82,7 @@ IPv6 Example: @example --pnat=[2001:db8::/32]:[dead::/16],[2001:db8::/32]:[::ffff:0:0/96] @end example -EOText; +EOText; }; flag = { @@ -141,7 +141,7 @@ flag = { value = b; descrip = "Skip rewriting broadcast/multicast IPv4/v6 addresses"; doc = <<- EOText -By default --seed, --pnat and --endpoints will rewrite +By default --seed, --pnat and --endpoints will rewrite broadcast and multicast IPv4/v6 and MAC addresses. Setting this flag will keep broadcast/multicast IPv4/v6 and MAC addresses from being rewritten. EOText; @@ -153,7 +153,7 @@ flag = { descrip = "Force recalculation of IPv4/TCP/UDP header checksums"; doc = <<- EOText Causes each IPv4/v6 packet to have their checksums recalculated and -fixed. Automatically enabled for packets modified with @samp{--seed}, +fixed. Automatically enabled for packets modified with @samp{--seed}, @samp{--pnat}, @samp{--endpoints} or @samp{--fixlen}. EOText; }; @@ -167,7 +167,7 @@ flag = { default = DEFAULT_MTU; descrip = "Override default MTU length (1500 bytes)"; doc = <<- EOText -Override the default 1500 byte MTU size for determining the maximum padding length +Override the default 1500 byte MTU size for determining the maximum padding length (--fixlen=pad) or when truncating (--mtu-trunc). EOText; }; @@ -177,7 +177,7 @@ flag = { max = 1; descrip = "Truncate packets larger then specified MTU"; doc = <<- EOText -Similar to --fixlen, this option will truncate data in packets from Layer 3 and above to be +Similar to --fixlen, this option will truncate data in packets from Layer 3 and above to be no larger then the MTU. EOText; }; @@ -189,7 +189,7 @@ flag = { doc = <<- EOText Note, this option is pretty dangerous! We do not actually check to see if a FCS actually exists in the frame, we just blindly delete the last 4 bytes. Hence, -you should only use this if you know know that your OS provides the FCS when +you should only use this if you know know that your OS provides the FCS when reading raw packets. EOText; }; @@ -240,7 +240,7 @@ flag = { arg-range = "0->1048575"; max = 1; doc = <<- EOText -Allows you to override the 20bit IPv6 Flow Label field. Has no effect on IPv4 +Allows you to override the 20bit IPv6 Flow Label field. Has no effect on IPv4 packets. EOText; }; @@ -259,7 +259,7 @@ to reflect the stored packet length. @table @bullet @item @var{pad} -Truncated packets will be padded out so that the packet length matches the +Truncated packets will be padded out so that the packet length matches the IPv4 total length @item @var{trunc} @@ -279,9 +279,9 @@ flag = { descrip = "Fuzz 1 in X packets. Edit bytes, length, or emulate packet drop"; doc = <<- EOText This fuzzing was designed as to test layer 7 protocols such as voip protocols. -It modifies randomly 1 out of X packets (where X = @var{--fuzz-factor}) in order -for stateful protocols to cover more of their code. The random fuzzing actions -focus on data start and end because it often is the part of the data application +It modifies randomly 1 out of X packets (where X = @var{--fuzz-factor}) in order +for stateful protocols to cover more of their code. The random fuzzing actions +focus on data start and end because it often is the part of the data application protocols base their decisions on. Possible fuzzing actions list: @@ -289,7 +289,7 @@ Possible fuzzing actions list: * reduce packet size * edit packet Bytes: * Not all Bytes have the same probability of appearance in real life. - Replace with 0x00, 0xFF, or a random byte with equal likelyhook + Replace with 0x00, 0xFF, or a random byte with equal likelihood. * Not all Bytes have the same significance in a packet. Replace the start, the end, or the middle of the packet with equal likelihood. * do nothing (7 out of 8 packets) @@ -307,8 +307,8 @@ flag = { doc = <<- EOText Sets the ratio of for @var{--fuzz-seed} option. By default this value is 8, which means 1 in 8 packets are modified by fuzzing. Note that this ratio is -based on the random number genereated by the supplied fuzz seed. Therefore by -default you cannot expect that exactly every eighth packet will be modified. +based on the random number generated by the supplied fuzz seed. Therefore by +default you cannot expect that exactly every eighth packet will be modified. EOText; }; diff --git a/src/tcpliveplay_opts.def b/src/tcpliveplay_opts.def index 8a20f9243..ccce4eefe 100644 --- a/src/tcpliveplay_opts.def +++ b/src/tcpliveplay_opts.def @@ -38,7 +38,7 @@ include = "#include \"defines.h\"\n" "#include \n" "#include \n" "#include \n"; - + homerc = "$$/"; @@ -48,21 +48,21 @@ homerc = "$$/"; #endif explain = <<- EOExplain -This program, 'tcpliveplay' replays a captured set of packets using new TCP -connections with the captured TCP payloads against a remote host in order to -do comprehensive vulnerability testings. +This program, 'tcpliveplay' replays a captured set of packets using new TCP +connections with the captured TCP payloads against a remote host in order to +do comprehensive vulnerability testing. EOExplain; detail = <<- EODetail -The basic operation of tcpliveplay is it rewrites the given pcap file -in a scheduled event format and responds with the apporiate packet if +The basic operation of tcpliveplay is it rewrites the given pcap file +in a scheduled event format and responds with the appropriate packet if the remote host meets tcp protocal's SEQ/ACK expectation. Once expectations -are met, then the local packets are sent with the same payload except with -new tcp SEQ & ACK numbers meeting the response from the remote hose. +are met, then the local packets are sent with the same payload except with +new tcp SEQ & ACK numbers meeting the response from the remote hose. -The inputted pcap file are rewritten to start at the first encounter of the -SYN packet for correct operation making this packet be the first action in -the event schedule of local host doing the replay. +The input pcap file are rewritten to start at the first encounter of the +SYN packet for correct operation making this packet be the first action in +the event schedule of local host doing the replay. For more details, please see the Tcpreplay Manual at: http://tcpreplay.appneta.com @@ -85,15 +85,15 @@ tcpdump(1), tcpprep(1), tcprewrite(1), tcpreplay(1) tcpliveplay can only send packets as fast as your computer's interface, processor and system bus will allow. -If the remote host responds differently than expected (meaning differently -than remote captured data) due to network changes then the replay abort +If the remote host responds differently than expected (meaning differently +than remote captured data) due to network changes then the replay abort and ask you to try again. -The replay only modifies layer 2 and 3 of each packet during the replay. -The payload is replayed exactly the same as the original capture. +The replay only modifies layer 2 and 3 of each packet during the replay. +The payload is replayed exactly the same as the original capture. Timing may be an issue because the tcpliveplay sends the appropriate packet -once the remote host's packet meets the correct expectation. +once the remote host's packet meets the correct expectation. EOMan; /* @@ -111,7 +111,7 @@ flag = { arg-default = 0; descrip = "Enable debugging output"; doc = <<- EOText -If configured with --enable-debug, then you can specify a verbosity +If configured with --enable-debug, then you can specify a verbosity level for debugging output. Higher numbers increase verbosity. EOText; }; diff --git a/src/tcpprep_opts.def b/src/tcpprep_opts.def index 715777955..552dff5d6 100644 --- a/src/tcpprep_opts.def +++ b/src/tcpprep_opts.def @@ -4,9 +4,9 @@ * Copyright (c) 2001-2010 Aaron Turner * Copyright (c) 2013-2018 Fred Klassen - AppNeta * - * The Tcpreplay Suite of tools is free software: you can redistribute it - * and/or modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * The Tcpreplay Suite of tools is free software: you can redistribute it + * and/or modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or with the authors permission any later version. * * The Tcpreplay Suite is distributed in the hope that it will be useful, @@ -23,7 +23,7 @@ autogen definitions options; copyright = { date = "2000-2018"; owner = "Aaron Turner and Fred Klassen"; - eaddr = "tcpreplay-users@lists.sourceforge.net"; + eaddr = "tcpreplay-users@lists.sourceforge.net"; type = gpl; author = <<- EOText Copyright 2013-2018 Fred Klassen - AppNeta @@ -66,8 +66,8 @@ EOExplain; detail = <<- EODetail The basic operation of tcpreplay is to resend all packets from the -input file(s) out a single file. Tcpprep processes a pcap file and -applies a set of user-specified rules to create a cache file which +input file(s) out a single file. Tcpprep processes a pcap file and +applies a set of user-specified rules to create a cache file which tells tcpreplay whether or not to send each packet and which interface the packet should be sent out of. @@ -92,7 +92,7 @@ flag = { arg-default = 0; descrip = "Enable debugging output"; doc = <<- EOText -If configured with --enable-debug, then you can specify a verbosity +If configured with --enable-debug, then you can specify a verbosity level for debugging output. Higher numbers increase verbosity. EOText; }; @@ -140,15 +140,15 @@ for clients and servers. Valid hints are: @table @bullet @item @var{bridge} -Bridge mode processes each packet to try to determine if the sender is a +Bridge mode processes each packet to try to determine if the sender is a client or server. Once all the packets are processed, the results are weighed according to the server/client ratio (@samp{--ratio}) and systems are assigned an interface. If tcpprep is unable to determine what role a system plays, tcpprep will abort. @item @var{router} -Router mode works just like bridge mode, except that after weighing is done, -systems which are undetermined are considered a server if they fall inside a +Router mode works just like bridge mode, except that after weighing is done, +systems which are undetermined are considered a server if they fall inside a network known to contain other servers. Router has a greater chance of successfully splitting clients and servers but is not 100% foolproof. @item @@ -162,8 +162,8 @@ treated as servers. Server mode should always complete successfully. @item @var{first} First mode works by looking at the first time each IP is seen in the SRC and DST -fields in the IP header. If the host is first seen in the SRC field, it is a -client and if it's first seen in the DST field, it is marked as a server. This +fields in the IP header. If the host is first seen in the SRC field, it is a +client and if it's first seen in the DST field, it is marked as a server. This effectively replicates the processing of the tomahawk test tool. First mode should always complete successfully. @end table @@ -222,7 +222,7 @@ flag = { char ebuf[EBUF_SIZE]; tcpprep->options->mode = REGEX_MODE; - if ((regex_error = regcomp(&tcpprep->options->preg, OPT_ARG(REGEX), + if ((regex_error = regcomp(&tcpprep->options->preg, OPT_ARG(REGEX), REG_EXTENDED|REG_NOSUB))) { regerror(regex_error, &tcpprep->options->preg, ebuf, EBUF_SIZE); errx(-1, "Unable to compile regex: %s", ebuf); @@ -250,7 +250,7 @@ flag = { EOPort; doc = <<- EOText -Specifies that TCP and UDP traffic over IPv4 and IPv6 should be classified +Specifies that TCP and UDP traffic over IPv4 and IPv6 should be classified as client or server based upon the destination port of the header. EOText; }; @@ -284,7 +284,7 @@ flag = { descrip = "Matches to be client instead of server"; doc = <<- EOText Normally the @samp{--mac}, @samp{--regex} and @samp{--cidr} flags specify are used to specify -the servers and non-IP packets are classified as clients. By using @samp{--reverse}, these +the servers and non-IP packets are classified as clients. By using @samp{--reverse}, these features are reversed so that the flags specify clients and non-IP packets are classified as servers. EOText; @@ -300,7 +300,7 @@ flag = { /* our comment_len is only 16bit - myargs[] */ if (strlen(OPT_ARG(COMMENT)) > ((1 << 16) - 1 - MYARGS_LEN)) - errx(-1, "Comment length %zu is longer then max allowed (%d)", + errx(-1, "Comment length %zu is longer then max allowed (%d)", strlen(OPT_ARG(COMMENT)), (1 << 16) - 1 - MYARGS_LEN); /* save the comment */ @@ -417,7 +417,7 @@ corresponds to the packet number in the capture file. @example -x P:1-5,9,15,72- @end example -would skip packets 1 thru 5, the 9th and 15th packet, and packets 72 until the +would skip packets 1 through 5, the 9th and 15th packet, and packets 72 until the end of the file @end table EOText;