The data contained in this repository can be downloaded to your computer using one of several clients.
Please see the documentation of your version control software client for more information.

Please select the desired protocol below to get the URL.

This URL has Read-Only access.

Statistics
| Branch: | Revision:

main_repo / capture_info.c @ master

History | View | Annotate | Download (12 KB)

# Date Author Comment
97546165 08/24/2014 04:04 AM Graham Bloice

Modify includes of config.h so that out-of-tree builds, i.e. CMake
don't pick up the in-tree copy.

Change-Id: I7ec473876cdba1a025c52362d7f6adc62d24ce71
Reviewed-on: https://code.wireshark.org/review/3798
Petri-Dish: Graham Bloice <>...
a344c973 05/23/2014 06:50 AM Guy Harris

Revert "Allow wtap_read() and wtap_seek_read() to return non-packet records."

This reverts commit c0c480d08c175eed4524ea9e73ec86298f468cf4.

A better way to do this is to have the record type be part of struct wtap_pkthdr; that keeps the metadata for the record together and requires fewer API changes. That is in-progress....
c0c480d0 05/22/2014 11:02 PM Guy Harris

Allow wtap_read() and wtap_seek_read() to return non-packet records.

This is the first step towards implementing the mechanisms requestd in
bug 8590; currently, we don't return any records other than packet
records from libwiretap, and just ignore non-packet records in the rest...
a1b1c8be 05/09/2014 01:21 AM Guy Harris

Revert "Refactor Wiretap"

This reverts commit 1abeb277f5e6bd27fbaebfecc8184e37ba9d008a.

This isn't building, and looks as if it requires significant work to fix.

Change-Id: I622b1bb243e353e874883a302ab419532b7601f2
Reviewed-on: https://code.wireshark.org/review/1568...
1abeb277 05/08/2014 11:04 PM Michael Mann

Refactor Wiretap

Start of refactoring Wiretap and breaking structures down into "generally useful fields for dissection" and "capture specific". Since this in intended as a "base" for Wiretap and Filetap, the "wft" prefix is used for "common" functionality....
a5a692c4 04/03/2014 02:55 AM Guy Harris

Handle DLT_USER2 as PKTAP, to handle Mavericks.

Change-Id: Ic58c3584994f822d5d5a1434050aaa61f86ba17c
Reviewed-on: https://code.wireshark.org/review/937
Reviewed-by: Guy Harris <>
618c27b5 04/03/2014 02:45 AM Guy Harris

Add a capture_pktap() routine and use it.

That way, the packet counts are will be valid when capturing.

Change-Id: I0a21cc817d918e7f849620db5ca6dfd84bd2cd87
Reviewed-on: https://code.wireshark.org/review/936
Reviewed-by: Guy Harris <>
29659139 03/04/2014 09:27 AM Alexis La Goutte

Remove all $Id$ from top of file

(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <>
579e7e19 02/25/2014 12:43 PM Michal Labedzki

Wireshark: Add option to choose format type of capture file

The best heuristic can fail, so add possibility to manually choose
capture file format type, so not correctly recognize file format can be
loaded in Wireshark.

On the other side now it is possible to open capture file...
deb2b236 12/21/2013 12:23 PM Jakub Zawadzki

Add missing includes

svn path=/trunk/; revision=54332
db25270d 11/16/2013 09:55 PM Guy Harris

Move the epan/filesystem.c routines to wsutil; they're not specific to
packet dissection, they're specific to the entire Wireshark suite of
programs.

svn path=/trunk/; revision=53377
853da2eb 11/08/2013 04:53 AM Guy Harris

The "file types" we have are actually combinations of types and
subtypes, e.g. Network Monitor version 1 and Network Monitor version 2
are separate "file types", even though they both come from Network
Monitor.

Rename various functions, #defines, and variables appropriately....
8596d17d 05/22/2013 03:44 AM Guy Harris

Pull the capture-session state information out of capture_opts and put
it into a separate capture_session structure. capture_opts should
contain only user-specified option information (and stuff directly
derived from it, such as the "capturing from a pipe" flag)....
78631020 10/16/2012 05:50 PM Jakub Zawadzki

Add wtap_pseudo_header union to wtap_pkthdr structure.
Use pkthdr instead of pseudo_header as argument for dissecting.

svn path=/trunk/; revision=45601
3551a86c 09/19/2012 09:29 PM Jeff Morriss

We always HAVE_CONFIG_H so don't bother checking whether we have it or not.

svn path=/trunk/; revision=45015
83511169 08/02/2012 12:54 PM Guy Harris

From Richard Stearn: support for AX.25, including support for
LINKTYPE_AX25.

svn path=/trunk/; revision=44211
4fc130af 08/02/2012 02:45 AM Guy Harris

From Richard Stearn: AX.25 KISS protocol support.

Part 1 of the fix for bug 7529.

svn path=/trunk/; revision=44202
bf81b42e 06/28/2012 06:56 PM Jakub Zawadzki

Update Free Software Foundation address.

(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
ec69aa8d 05/02/2012 12:03 AM Guy Harris

Rename the NetMon 802.11 radio header and radiotap 802.11 radio header
dissector source files to match the "packet-ieee80211-XXX" pattern used
for other 802.11 radio header dissectors.

svn path=/trunk/; revision=42380
0275247b 05/01/2012 11:11 PM Guy Harris

Use WTAP_ENCAP_IEEE_802_11_xxx for all the "802.11 plus radio header"
encapsulations.

For pre-V9 AiroPeek captures, leave the radio information in the packet
data, just as we do with the Prism, AVS, radiotap, and NetMon headers.
Add a dissector for it.

svn path=/trunk/; revision=42379
d94bd07f 12/13/2011 04:53 AM Guy Harris

Rename WTAP_ERR_BAD_RECORD to WTAP_ERR_BAD_FILE; it really reports any
form of corruption/bogosity in a file, including in a file header as
well as in records in the file. Change the error message
wtap_strerror() returns for it to reflect that.

Use it for some file header problems for which it wasn't already being...
89599bbb 05/19/2011 12:56 AM Michael Tüxen

Fix the capture info dialog. Reset the EOF state such that the
number get actually updated.

svn path=/trunk/; revision=37279
6cbf6ce1 04/21/2011 05:41 AM Guy Harris

Add a new WTAP_ERR_DECOMPRESS error, and use that for errors discovered
by the gunzipping code. Have it also supply a err_info string, and
report it. Have file_error() supply an err_info string.

Put "the file" - or, for WTAP_ERR_DECOMPRESS, "the compressed file", to...
75568093 03/22/2011 07:25 AM Stig Bjørlykke

Rewrote error reporting to avoid using a 2048 bytes stack buffer.

Coverity 726.

svn path=/trunk/; revision=36245
2e4f755e 10/12/2010 03:26 PM Bill Meier

Define some vars & fcns as static;
Also: do some minor reformmating and cleanup of whitespace.

svn path=/trunk/; revision=34492
3eadb385 08/12/2008 12:44 AM Anders Broman

From Alexey Neyman:
Implement dissector for IPMB (DLT_IPMB_LINUX, 209).

svn path=/trunk/; revision=25986
f441b894 06/23/2008 11:38 PM Guy Harris

Add gtk/capture_globals.h, to declare global_capture_opts, so files that
don't need global_capture_opts don't need to have it declared and thus
don't need capture_options defined.

Include gtk/capture_globals in the files in question.

Change some more capture_opts references to refer to...
2a691a0a 06/23/2008 09:23 PM Guy Harris

Have capture_info_ui_create() and capture_info_open() take a pointer to
the capture_opts structure as an argument, rather than just a pointer to
the interface name.

Don't declare a global "capture_opts" pointer, as we don't define it any
more.

svn path=/trunk/; revision=25570
9198a2a1 12/18/2007 03:01 AM Guy Harris

Fold the Prism and AVS header dissectors into packet-ieee80211.c, and
have them use least some of the radio-information fields, so that the
same field name can be used for multiple radio header types. The AVS
header can supply the data rate in bits/second, so have that field be in...
25409eb3 10/05/2007 06:39 PM Jeff Morriss

If wtap_open_offline() fails, print the errno too

svn path=/trunk/; revision=23077
cb8dab02 08/30/2007 07:52 AM Stig Bjørlykke

And include packet-wlancap.h

svn path=/trunk/; revision=22752
d25d8240 08/30/2007 07:28 AM Stig Bjørlykke

Count IEEE 802.11 WLAN AVS packets.

svn path=/trunk/; revision=22750
0c4cb64c 06/26/2007 03:38 PM Gerald Combs

Add capture counts for PPI.

svn path=/trunk/; revision=22195
59d6c8ea 11/05/2006 05:46 PM Ulf Lamping

change all file offsets from long to gint64 so we can - theoretically - handle files > 2GB correct.

Please distclean Win32 builds!

svn path=/trunk/; revision=19814
8958bab6 05/31/2006 01:38 PM Gerald Combs

Tethereal/tethereal -> TShark/tshark.

svn path=/trunk/; revision=18268
f68d6e4c 05/28/2006 04:28 PM Anders Broman

Ethereal->Wireshark

svn path=/trunk/; revision=18235
89f022b1 05/21/2006 01:12 AM Ronnie Sahlberg

name change

svn path=/trunk/; revision=18197
8ac0325b 02/28/2006 08:46 PM Guy Harris

Clean up indentation a bit.

In "capture_input_new_file()", don't call the callbacks unless we
succeed in opening the new file. Have "capture_info_new_file()" return
a success/failure indication.

Improve the message logged when we fail to open the new file if we're...
41c941b4 01/23/2006 11:56 AM Guy Harris

Call capture_radiotap() when capturing on a device supplying Radiotap
headers.

Fix capture_radiotap() to check for padding between the 802.11 header
and the 802.11 payload and to call different capture routines depending
on whether it's present or not, and create capture_ieee80211_datapad()...
21a9b081 12/12/2005 08:17 PM Ulf Lamping

don't try to close wtap, if we couldn't load the wiretap file

svn path=/trunk/; revision=16771
0b1f2585 12/06/2005 05:56 PM Guy Harris

Clean up capture_enc(), export it, and use it in the capture window.

svn path=/trunk/; revision=16709
2e6b1ac3 12/03/2005 11:20 PM Guy Harris

Declare "capture_info_packet()"'s as static, to match the definition.

Declare the "pd" argument to be "const guchar *", to match the way
packet data is declared elsewhere, and so that if the headers
"capture_info.c" includes don't define "u_char" it still compiles....
e829856c 12/03/2005 09:04 PM Ulf Lamping

move the complete functionality of the capture info dialog from capture_loop.c to capture_info.c and call it from capture.c (instead of capture_loop.c).

This way, the capture child don't need to now any of the packet_counter things (no epan/packet.h and all alike)....
f856dbaf 12/03/2005 05:38 PM Ulf Lamping

split some parts of the packet counting functions into their own files capture_info(.c/.h),
so we can use it from the main program

svn path=/trunk/; revision=16668