Commit Graph

56 Commits

Author SHA1 Message Date
Peter Wu c88e525168 Documentation: convert http URLS to https
Remove some dead links or point them to archive.org while at it. All
updated links have been verified.

Change-Id: Icf02167a13d5fe9dfce39ea57525b3f185554c9d
Reviewed-on: https://code.wireshark.org/review/34028
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2019-07-20 20:51:30 +00:00
Jaap Keuter 5bf37f63a8 text2pcap: allow to set interface name
When generating a capture file from a text file it can be helpfull
to be able to set the capture interface name in the generated IDB.
This can be especially true if later on the generated captures are
merged and the individual IDB's have to be compared. Without a name
every IDB of the same datalink type will be equal and subject to
merge. Also it keeps the individual streams identifiable for the
end user.

Change-Id: I70224379d88f516a0a356bf0b46aebafb69665f0
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/31015
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-12-13 23:33:32 +00:00
Jaap Keuter a58904f387 PCAP/PCAPNG: Be consistent in documentation, etc
1) The default build configuration is to select PCAPNG as
output format, but it can be selected as PCAP. Some of the
command line tools have the option to select the output
format and default towards the build configuration.
This has to be reflected in their help output also.

2) Various documentation files are still stating that PCAP is
the default format of various tools. With the default build
configuration being PCAPNG these have to be adjusted as well.
(with lack of dynamic content the documentation can only refer
to the default build configuration format).

Change-Id: I51d19642a7ed8c99817971c1f25d20972095021e
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30951
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-12-07 06:00:14 +00:00
Jaap Keuter 36d26b38d7 Update text2pcap documentation
Various parts of the text2pcap documentation need some fixing up.
This change brings them back in line and up to date with current
features.

Change-Id: I038cf5c4943d2a4bbcc3d0fbd8f5e111dcf0d0a9
Signed-off-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-on: https://code.wireshark.org/review/30754
Tested-by: Petri Dish Buildbot
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-11-21 23:00:31 +00:00
Gerald Combs dfc7fcc815 Docs: Make our Pod documentation encoding uniform.
We've set "=encoding utf8" in wireshark.pod for a long time. Do so in
the rest of our .pod files.

Change-Id: I3ef0fb3a88ed63275b4ff4362b6afbf13d79a0bc
Reviewed-on: https://code.wireshark.org/review/29182
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-08-18 14:29:41 +00:00
Guy Harris af0f49e80d Use pcapng as the name of the file format.
At one point, I remember a discussion resulting in the official name of
the next-generation replacement for pcap format being changed to
"pcapng", with no hyphen.

Make Wireshark reflect that.

Change-Id: Ie66fb13a0fe3a8682143106dab601952e9154e2a
Reviewed-on: https://code.wireshark.org/review/25214
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-01-09 00:38:51 +00:00
Pascal Quantin bd486eb9b1 text2pcap: define max packet size to WTAP_MAX_PACKET_SIZE
Change-Id: I73ab87032e4a0c0259227622412be36aaf66a9d6
Reviewed-on: https://code.wireshark.org/review/20758
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2017-03-28 10:32:53 +00:00
Graham Bloice 86cf94ffee Text2Pcap doc update
Minor docs update

Change-Id: Iea44e4963aab75db1d875d27af41e4f38ff74e2d
Reviewed-on: https://code.wireshark.org/review/16859
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-08-03 22:11:43 +00:00
Graham Bloice 472f789b73 Text2Pcap docs update
Minor update to docs

Change-Id: If9464f00d69bb9a8bb5638f3bb0d0f73a56aad50
Reviewed-on: https://code.wireshark.org/review/16856
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-08-03 12:50:51 +00:00
Alexis La Goutte 409914a143 doc: fix spelling-error-in-manpage found by lintian
Change-Id: I848159f0c960e0e8ece09c7c96dda6deb0ec6046
Reviewed-on: https://code.wireshark.org/review/13329
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Dario Lombardo <lomato@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-16 17:55:12 +00:00
Guy Harris 23666badc5 Spaces separate bytes; they don't have to surround them.
I.e., you don't need a trailing blank, at least not with the current
version (and there shouldn't be a requirement for such an extra trailing
blank).

Change-Id: Ia2b732c74fc6020acc01a2c0c52ed3567d36d762
Reviewed-on: https://code.wireshark.org/review/6575
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-16 18:41:39 +00:00
Gerald Combs 175039128a Update the doc directory to use https://www.wireshark.org.
Change-Id: I9bfc57cb6b6ab6962b80ff58d98eb351d6f69829
Reviewed-on: https://code.wireshark.org/review/4140
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-17 00:12:26 +00:00
Jeff Morriss 3773a7561c Add command-line argument to request the version to a number of the utilities.
In some cases "-v" was already used so "-V" is the option.
Note that the version information in these utilities is much shorter than what
is presented by the big programs.

As requested by https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5804

Bug: 5804
Change-Id: I35db35a4eace2797afd895f9be7322ef39928480
Reviewed-on: https://code.wireshark.org/review/2489
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-21 01:05:02 +00:00
Chris Maynard 8411568048 Since the documentation states that, "Text2pcap understands a hexdump of the form generated by od -Ax -tx1 -v.", supply an example that actually matches that format.
In addition, change the hex bytes so that they represent a valid, well-formed packet, rather than a malformed RSVP packet.  This should allow a user to more clearly verify that the text2pcap converstion worked as expected in the event he/she desires to test text2pcap using the example provided.


svn path=/trunk/; revision=54454
2013-12-26 03:45:12 +00:00
Chris Maynard 2d132d3a38 Add a link to IANA's Assigned Internet Protocol Numbers page.
svn path=/trunk/; revision=51950
2013-09-11 17:31:24 +00:00
Guy Harris 7c3e7c9506 The argument to the -l flag to text2pcap is a LINKTYPE_ value, not a
DLT_ value, which is good because it's a numerical value and the
numerical values for some link-layer header types are OS-dependent, but
the numerical values for all LINKTYPE_ values are OS-independent.  Use
LINKTYPE_RAW, not the value for the DLT_RAW on some but not all OSes,
for raw IP.

Also, 7 is LINKTYPE_ARCNET_BSD, emphasis on the "_BSD"; there's also a
Linux encapsulation for ARCNet that is different.  Note that it's the
BSD flavor.

svn path=/trunk/; revision=51005
2013-07-29 08:30:42 +00:00
Guy Harris a4ad9e9f74 If a core Wireshark developer repeatedly can't remember that the
argument to the -F flag for pcap format is "libpcap", not "pcap", we
have a problem.  Make it "pcap", and add a backwards-compatibility hack
to support using "libpcap" as well.

Update the man pages to refer to it as pcap as well, and fix the
capitalization of "WinPcap" (see http://www.winpcap.org) while we're at
it.

Also, refer to http://www.tcpdump.org/linktypes.html for the list of
link-layer header types for pcap and pcap-ng.

svn path=/trunk/; revision=50989
2013-07-28 21:12:07 +00:00
Michael Mann 75420f4ab2 Prepend custom Destination IP and Source IP (ipv4 or ipv6) in the pcap. Bug 5650 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5650)
svn path=/trunk/; revision=49964
2013-06-16 16:50:17 +00:00
Chris Maynard 08b0f7296a If tcpdump doesn't exist, why refer to it? Omit this confusing phrase.
svn path=/trunk/; revision=49427
2013-05-20 02:21:07 +00:00
Chris Maynard 2239e7618d As forewarned at http://www.wireshark.org/lists/wireshark-dev/201304/msg00009.html, change the default snaplen to 65KiB-1. While we're at it, push the max packet size to that value as well.
Also: convert the few tabs to spaces and add modelines.


svn path=/trunk/; revision=48738
2013-04-04 19:48:20 +00:00
Michael Tüxen 22df071cef Add support for -D option. The preamble will start with
an I or O indicating the direction of the packet. This
will be stored in the generated file if the pcap-ng
format is used.
Thanks to Jaap for suggesting to integrate this into
the preamble!

svn path=/trunk/; revision=46744
2012-12-25 22:37:40 +00:00
Michael Tüxen 2daea0a310 Add option to suppress duplicate suppression.
svn path=/trunk/; revision=46730
2012-12-25 10:29:22 +00:00
Michael Tüxen a52b0de406 Add support for writing pcap-ng files by specifying -n as an option.
Leave pcap the default file format for now. The is should be reconsidered
before the next release as it might make sense to use pcapgn as
the default as we do for dumpcap. (We can use the -P option to allow
switching back to pcap).

svn path=/trunk/; revision=46691
2012-12-22 09:43:17 +00:00
Chris Maynard 2b302230de Sort the options.
svn path=/trunk/; revision=41566
2012-03-15 15:03:08 +00:00
Jörg Mayer 801392d5d3 The libpcap puts pcap-filter into the misc section (which seems to be 7).
Refer to pcap-filter and mention tcpdump only as a fallback.

svn path=/trunk/; revision=40820
2012-02-03 09:07:24 +00:00
Guy Harris 051d46467f Speak of a "link-layer header type" rather than a "link-layer type"; a
given link-layer type, e.g. 802.11, might have multiple header types
(802.11, 802.11 plus various radio headers, Ethernet), and multiple
link-layer types might have the same header type (802.11 interfaces
might supply Ethernet headers, and Linux loopback interfaces supply
Ethernet headers as well).

Point to tcpdump.org's page of link-layer header types, rather than to
the net/bpf.h header that 1) might not exist on your system and 2) might
not be up-to-date if it does exist.

svn path=/trunk/; revision=39529
2011-10-23 22:49:11 +00:00
Stig Bjørlykke c8a187390d From Pascal Quantin via bug 1723:
Make ASCII text dump identification optional.

svn path=/trunk/; revision=38886
2011-09-05 20:03:03 +00:00
Jaap Keuter 3232869503 Make some updates to describe the newer features.
svn path=/trunk/; revision=34964
2010-11-19 00:05:38 +00:00
Chris Maynard 86db02c22e Fixed typos.
svn path=/trunk/; revision=34816
2010-11-09 03:20:15 +00:00
Bill Meier 910c5bd1a0 SYNOPSYS --> SYNOPSIS
svn path=/trunk/; revision=28338
2009-05-12 21:10:38 +00:00
Bill Meier 927fabd0e5 Update man pages; Add several missing options; Fix typos, Do minor rewording;
editcap: Add description of -i option;
 dumpcap: Add description of -S option;

svn path=/trunk/; revision=28336
2009-05-12 16:24:57 +00:00
Jaap Keuter 3e0312f184 Fix for bug 2611:
Add -v option to example "od" command line.

svn path=/trunk/; revision=25458
2008-06-16 05:32:19 +00:00
Stig Bjørlykke 2251da0817 Document the "-o dec" changes.
svn path=/trunk/; revision=24273
2008-02-05 21:40:12 +00:00
Bill Meier c387e3fbc9 When -t option: Use current date or time fields for unspecified fields; Fixes bug #1836.
svn path=/trunk/; revision=22916
2007-09-20 16:12:17 +00:00
Jörg Mayer 13fae81007 Add some programs to 'see also'
svn path=/trunk/; revision=18867
2006-08-10 09:19:03 +00:00
Guy Harris d26ea2b24d Use L<> on all links.
Don't use anything on man page references - pod2man handles that.

Don't refer to "the capture file format section" of the Wireshark man
page, as there's no section explicitly labelled as such; just refer to
the beginning of the DESCRIPTION section.

svn path=/trunk/; revision=18694
2006-07-09 22:45:48 +00:00
Gerald Combs eb71f7fb96 Rename the main executable to "wireshark", along with more conversions:
ethereal.com -> wireshark.org
  mailing lists and addresses
  ETHEREAL -> WIRESHARK
  Man pages
  Automake/Autoconf names


svn path=/trunk/; revision=18271
2006-05-31 19:12:15 +00:00
Jaap Keuter 95fc8d3c59 Provide options to work with defaults of text2pcap.
svn path=/trunk/; revision=17682
2006-03-20 11:45:36 +00:00
Ulf Lamping 351befac24 add <> to the option parameters
svn path=/trunk/; revision=17004
2006-01-11 20:57:29 +00:00
Guy Harris ba2d24a6c0 text2pcap can add fake SCTP headers.
svn path=/trunk/; revision=15670
2005-09-02 16:50:51 +00:00
Ulf Lamping e3d1a255a1 build a list of the input file formats instead of a floating text,
added program names to HTML titles,
various minor fixes

svn path=/trunk/; revision=10686
2004-04-25 09:02:04 +00:00
Guy Harris 3e857b5789 Clean up the example for the "-m" flag.
svn path=/trunk/; revision=7573
2003-04-27 00:50:06 +00:00
Guy Harris 6df423d0be From Matthijs Melchior:
-  added option -m to set maximum packet length
-  added option -T to generate TCP headers
-  UDP headers now have a correct checksum
-  default capture timestamp is current time, usec field counts packets
-  UDP and TCP headers are mutually exclusive
-  changed etherenet addresses, now sends from 1 -> 2 ....

svn path=/trunk/; revision=7571
2003-04-27 00:41:52 +00:00
Gerald Combs b01ee2624c Obscure more email addresses.
svn path=/trunk/; revision=7334
2003-03-10 04:29:13 +00:00
Guy Harris 1dd6c308ce Mention the "-h" flag.
Fix up the list of arguments to "-S" in the synopsis.

svn path=/trunk/; revision=5900
2002-07-21 20:28:35 +00:00
Guy Harris c3b66ffa9c From Michael Tuexen:
The -S option has been changed such that the payload protocol
	identifier can be specified instead of the verification tag.

	The error messages for -s -S have been corrected.

Update the text2pcap man page to reflect the "-S" change.

svn path=/trunk/; revision=5150
2002-04-13 18:36:24 +00:00
Guy Harris 2abe1ac0a6 From Andrew Feren:
Man pages don't have any notion of external links and there
	isn't enough information for pod2html to resolve the links for
	manpages in the "See Also" section of the man pages.  As a
	result running pod2html generates a bunch of warning messages
	and just emphasizes/italicizes the text.

	Therefore, we change the link (L<name>) command to an emphasizes
	(I<name>) command.  The net result is the same, but you don't get
	the warnings when generating HTML docs.

	At some point in the future someone might want to do the work to
	get the links to generate correctly, but until then this will
	shut up pod2html.

svn path=/trunk/; revision=5021
2002-03-26 06:15:08 +00:00
Guy Harris 287425df9c From Michael Tuexen:
put a CRC32C checksum into the header of SCTP packets;

	add a new "-S" option that is similar to "-s" but that also
	includes the DATA chunk header, for input files that contain
	only SCTP payloads.

svn path=/trunk/; revision=4580
2002-01-20 22:36:03 +00:00
Guy Harris 28d7063364 Put the "-s" option in the SYNOPSIS section.
svn path=/trunk/; revision=4554
2002-01-16 21:06:22 +00:00
Guy Harris 4deaae7705 SCTP support in text2pcap, and fix to usage message for "-u", from
Michael Tuexen.

Documentation of SCTP support in text2pcap, from me.

svn path=/trunk/; revision=4553
2002-01-16 21:05:10 +00:00