Commit Graph

35455 Commits

Author SHA1 Message Date
Stig Bjørlykke a7c5d642d5 Regenerate ASN.1 dissectors to update the #line directive.
svn path=/trunk/; revision=37118
2011-05-13 08:12:27 +00:00
Stig Bjørlykke a10ffa4ceb Build with S1AP-SonTransfer-IEs.asn
svn path=/trunk/; revision=37117
2011-05-13 07:51:27 +00:00
Guy Harris 26a6f4aac4 That's *application*/vnd.tcpdump.pcap to you.
svn path=/trunk/; revision=37116
2011-05-13 06:55:11 +00:00
Guy Harris 795cc63f41 Pcap files now have an official MIME type.
svn path=/trunk/; revision=37115
2011-05-13 06:23:58 +00:00
Guy Harris d16a7ec2b6 Pcap files now have an official MIME type.
svn path=/trunk/; revision=37114
2011-05-13 06:11:19 +00:00
Michael Tüxen a80b7e5fea Use the same default value for the snaplen in the new array as in the
old way.

svn path=/trunk/; revision=37113
2011-05-13 06:04:28 +00:00
Anders Broman 464486e1c5 We should get rid of g_mem_chunk_alloc() as it leaks memory
http://www.wireshark.org/lists/wireshark-dev/200910/msg00074.html
g_slice allocing the keys should make it possible to walk the
fragment table and free the fragments once they are g_slice_alloced.
It remains fo figure out how to do that.

svn path=/trunk/; revision=37112
2011-05-13 05:19:23 +00:00
Michael Tüxen 108e75ab4a Add a comment what needs to be changed when adopting wireshark and tshark.
svn path=/trunk/; revision=37111
2011-05-13 05:14:00 +00:00
Jeff Morriss 8058ba646a From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863 :
1. Reload framing protocol no longer encapsulates the Reload message, instead
the latter is in its own tree following Reload framing, much like IP, UDP, etc.

2. Similarly, DTLS no longer encapsulates its data payload if the payload can
be dissected. The recognized payload is in its own tree following the DTLS,
much like IP, UDP, etc.

4. DTLS now has its own heuristic table for dissecting its payload, and
reload-framing is added to this DTLS heuristic table.

6. DTLS will try to dissect its payload if the agreed upon cipher is
RSA-NULL-MD5 (0x0001) or RSA-NULL-SHA (0x0002), even when DTLS is not
configured with the client/server private keys.


Still to do: make DTLS a heuristic dissector on top of UDP (item 3 in the bug).

svn path=/trunk/; revision=37110
2011-05-13 02:48:08 +00:00
Jeff Morriss 9c9c23fae4 Allocate wslua_plugin_list even if we do not HAVE_PLUGINS
svn path=/trunk/; revision=37109
2011-05-13 00:34:31 +00:00
Gerald Combs e7f42e46b2 Try to fix distcheck.
svn path=/trunk/; revision=37108
2011-05-13 00:29:10 +00:00
Gerald Combs 1fc831c211 More OS X installer fixes and tweaks.
svn path=/trunk/; revision=37107
2011-05-12 23:46:31 +00:00
Gerald Combs d94ab5c6ba Another attempt to fix the OS X .dmg builds.
svn path=/trunk/; revision=37106
2011-05-12 22:51:10 +00:00
Gerald Combs 0d1658db91 Fix the OS X packaging build.
svn path=/trunk/; revision=37105
2011-05-12 21:42:55 +00:00
Jeff Morriss cf485a2ea1 From Johannes Jochen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5900 :
I have created a dissector for the Multiple MAC Registration Protocol based on
the exiting dissector of the Multiple Stream Reservation Protocol (bugzilla id:
4757 ) You can found the documentation of the Protocol here:
http://standards.ieee.org/getieee802/download/802.1ak-2007.pdf It's also
includes the corrections of the protocol you will found here:
http://standards.ieee.org/getieee802/download/802.1Q-2005_Cor1-2008.pdf

svn path=/trunk/; revision=37104
2011-05-12 21:37:55 +00:00
Jörg Mayer 811afde69e Play catch up with recent configure.in changes:
- Link dumpcap (and only dumpcap) against gthread
- gtk/gsm_a_stat.c and gtk/menus.c are dirty when configured with UI_MANAGER=1
- Add support run "cmake ... -DWANT_PACKET_EDITOR=1 ..."


svn path=/trunk/; revision=37103
2011-05-12 21:13:00 +00:00
Jeff Morriss 4a90e977e0 From Richard Brodie via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5800 :
Fix compilation if we HAVE_LIBGNUTLS but we do not HAVE_LIBGCRYPT.  (The
former can be built using libnettle instead of the latter.)

svn path=/trunk/; revision=37102
2011-05-12 20:51:53 +00:00
Jeff Morriss 86f69833bf We need both gthread and gmodule.
svn path=/trunk/; revision=37101
2011-05-12 20:35:13 +00:00
Chris Maynard 8e99ec73a2 From Yaniv Kaul via bug 5858: Fix some "set but not used" warnings. I
committed a variation of his patch that deleted unused variables rather than
#if 0'ing them out, and I also kept dissect_dnp3_al()'s return values, even if
it's not currently being checked, just in case the commented code is ever
uncommented and the return value ends up being checked later on.  Lastly, I
also added what appeared to be some missing DNP3_AL_UNS's.

svn path=/trunk/; revision=37100
2011-05-12 20:32:28 +00:00
Jakub Zawadzki 63981c8b35 Packet editor: support for saving changed frames.
svn path=/trunk/; revision=37099
2011-05-12 19:47:49 +00:00
Michael Tüxen c64c481e06 Add support for multiple interfaces when processing the -L option.
This is based on work of Irene Ruengeler.

svn path=/trunk/; revision=37098
2011-05-12 19:25:44 +00:00
Chris Maynard 9dacc3d6a1 Use rcode instead of repeated uses of "flags & F_RCODE". One change submitted
from Yaniv Kaul via bug 5858; the other 2 from me.

svn path=/trunk/; revision=37097
2011-05-12 19:24:55 +00:00
Gerald Combs 3c274a3bfe Remove "--version ..." to see if it fixes the builds.
svn path=/trunk/; revision=37096
2011-05-12 19:09:53 +00:00
Michael Tüxen 3501febf60 Initialize the glib thread system on all platforms, not only on Windows.
This requires to be linked against a different library. This is only
required for dumpcap, but the configure files currently doesn't check
this in a target specific way. So use these libs for all binaries.

svn path=/trunk/; revision=37095
2011-05-12 18:55:24 +00:00
Michael Tüxen a58caaf6f7 Add some more details (name of the interface and number of captured packets)
to the message showed when dumpcap is finishing.

This patch is the first one of a series which will add support for
capturing on multiple interfaces to dumpcap.

This patch is based on work of Irene Ruengeler.

svn path=/trunk/; revision=37094
2011-05-12 18:03:04 +00:00
Gerald Combs 835d5e4ec7 Switch to an installer package for OS X instead of a draggable app
bundle. There are still a few rough edges but it's an improvement over
what we currently have. Fixes bug 5756.

svn path=/trunk/; revision=37093
2011-05-12 18:02:00 +00:00
Gerald Combs f9fad8cd75 "tshark -D" writes to stderr now.
svn path=/trunk/; revision=37092
2011-05-12 17:49:15 +00:00
Chris Maynard 10ed235707 WANT_PACKET_EDITOR fixups for Windows.
svn path=/trunk/; revision=37091
2011-05-12 17:46:54 +00:00
Chris Maynard 29ec75d29e Add snai, mpf and efi to bf_tree, not tree. Fixes Coverity CID 1045.
svn path=/trunk/; revision=37090
2011-05-12 17:26:54 +00:00
Chris Maynard dbc48efbe8 Wrap assoc_tree within #if 0 ... #endif. Fixes Coverity CID 1049.
svn path=/trunk/; revision=37089
2011-05-12 17:25:43 +00:00
Chris Maynard a847fd391f Add token to query_tree instead of to tree. Fixes Coverity CID 1057.
svn path=/trunk/; revision=37088
2011-05-12 17:23:38 +00:00
Chris Maynard ea41f9a9d9 Delete eth_addr; it was assigned a value but never used. Fixes Coverity 1070.
svn path=/trunk/; revision=37087
2011-05-12 17:21:49 +00:00
Chris Maynard 1f1789fa41 Use nonce_2_item instead of incorrect nonce_1_item. Fixes Coverity CID 1071.
svn path=/trunk/; revision=37086
2011-05-12 17:19:10 +00:00
Chris Maynard a01a527166 Delete acm as it is assigned but never used. Fixes Coverity 1072.
svn path=/trunk/; revision=37085
2011-05-12 17:16:45 +00:00
Jakub Zawadzki b680407847 Conditional support for packet-editor [default=no].
svn path=/trunk/; revision=37084
2011-05-12 17:14:59 +00:00
Chris Maynard 21363344ec Add text to fac_subtree instead of fac_tree. Fixes Coverity CID 1129.
svn path=/trunk/; revision=37083
2011-05-12 17:14:36 +00:00
Michael Tüxen 2d6cd58f91 Add support for handling multiple interfaces as command line
parameters. An array of interface specific data is handled
in addition to the current way.
This change should not have any effect right now, it will
be used by dumpcap when supporting multiple interfaces
(and tshark/wireshark... in the future).


svn path=/trunk/; revision=37082
2011-05-12 16:54:16 +00:00
Jakub Zawadzki 12d8f46860 Fix double free.
compr is also freed outside loop. So free it only when returning.

Might be related with bug #5908, but I don't have access to that bug ;-)

svn path=/trunk/; revision=37081
2011-05-12 16:31:42 +00:00
Anders Broman d9c5fa2537 Remove check_col, use ENC_BIG_ENDIAN.
svn path=/trunk/; revision=37080
2011-05-12 15:48:51 +00:00
Anders Broman 4857270e0b Copy-paste error.
svn path=/trunk/; revision=37079
2011-05-12 15:40:32 +00:00
Anders Broman bce6b09c8a Convetr more menus to GUIManager.
svn path=/trunk/; revision=37078
2011-05-12 15:17:28 +00:00
Jeff Morriss 14e2a91fdf Include config.h (for WS_MSVC_NORETURN) and g_gnuc.h (for G_GNUC_NORETURN)
svn path=/trunk/; revision=37077
2011-05-12 13:50:44 +00:00
Michael Tüxen 93377f5236 Another whitespace cleanup.
svn path=/trunk/; revision=37076
2011-05-12 12:06:19 +00:00
Stig Bjørlykke 0fc261ab54 Corrected endif.
svn path=/trunk/; revision=37075
2011-05-12 11:17:22 +00:00
Stig Bjørlykke 624a041e6f Indicate Signed Receipt in info column.
svn path=/trunk/; revision=37074
2011-05-12 11:06:42 +00:00
Michael Tüxen 4b303018d1 Clean up some indentation. A purely whitespace change.
svn path=/trunk/; revision=37073
2011-05-12 10:58:14 +00:00
Anders Broman 50e30e3c70 Make the use of UIManager a configure option.
NOTE Only for Windows.

Additional moves to UIManager.

svn path=/trunk/; revision=37072
2011-05-12 10:56:26 +00:00
Stig Bjørlykke 516442af8f Prefix "fragments" with IPv6, as is done with IPv4.
svn path=/trunk/; revision=37071
2011-05-12 10:27:30 +00:00
Stig Bjørlykke 1becef31f0 Use IPv4 as protocol name, to align with IPv6.
svn path=/trunk/; revision=37070
2011-05-12 10:27:02 +00:00
Jeff Morriss 009156289f Fix the test.sh failures based on Guy's suggestion in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5445#c15 :
Add a new tap flag to indicate that a tap listener is just a "dissector helper",
that is, a tap which is used by a dissector to help it do its dissection but
does not, itself, require dissection.

Use this new flag in the dissectors which register taps.

Remove the (now-unused) have_tap_listeners() function.

svn path=/trunk/; revision=37069
2011-05-12 03:18:34 +00:00