Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug #413 manpage typos #500

Merged
merged 1 commit into from
Oct 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
24 changes: 12 additions & 12 deletions src/tcpbridge_opts.def
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
* Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
* Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - 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,
Expand All @@ -25,7 +25,7 @@ autogen definitions options;
copyright = {
date = "2000-2018";
owner = "Aaron Turner and Fred Klassen";
eaddr = "[email protected]";
eaddr = "[email protected]";
type = gpl;
author = <<- EOText
Copyright 2013-2018 Fred Klassen - AppNeta
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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;

/*
Expand All @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand Down Expand Up @@ -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>'
- BPF filter. See the @file{tcpdump(8)} man page for syntax.
Expand Down Expand Up @@ -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;
Expand Down
42 changes: 21 additions & 21 deletions src/tcpedit/tcpedit_opts.def
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
* Copyright (c) 2001-2010 Aaron Turner <aturner at synfin dot net>
* Copyright (c) 2013-2018 Fred Klassen <tcpreplay at appneta dot com> - 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,
Expand All @@ -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.

Expand All @@ -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 = {
Expand All @@ -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 = {
Expand Down Expand Up @@ -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;
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand All @@ -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;
};
Expand Down Expand Up @@ -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;
};
Expand All @@ -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}
Expand All @@ -279,17 +279,17 @@ 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:
* drop packet
* 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)
Expand All @@ -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;
};

Expand Down
34 changes: 17 additions & 17 deletions src/tcpliveplay_opts.def
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ include = "#include \"defines.h\"\n"
"#include <stdbool.h>\n"
"#include <sys/types.h>\n"
"#include <unistd.h>\n";



homerc = "$$/";
Expand All @@ -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
Expand All @@ -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;

/*
Expand All @@ -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;
};
Expand Down
Loading