Commit Graph

48036 Commits

Author SHA1 Message Date
Anders Broman fd4a111149 Don't call eth_addr_resolve() unconditionally.
svn path=/trunk/; revision=51207
2013-08-08 04:32:19 +00:00
Anders Broman 812ad4f3bf From Tommy Wu:
-          Show major and Minor version.
-          Correct SPI Name.

svn path=/trunk/; revision=51206
2013-08-08 04:31:07 +00:00
Anders Broman a46f373c54 Add an application Id.
svn path=/trunk/; revision=51205
2013-08-08 04:30:16 +00:00
Guy Harris ea72be8607 Speak of the "-d encap:" value as a linktype, rather than a DLT; if a
name is specified, it currently must be a DLT_ name rather than a
LINKTYPE_ name, as we use libpcap to do the mapping and it currently has
no API to map LINKTYPE_ names to values, but if a number is specified,
it could either be a LINKTYPE_ name or a DLT_ name if the two are
different, and we want to encourage the use of LINKTYPE_ values.

Note that in comments.

svn path=/trunk/; revision=51204
2013-08-08 04:29:08 +00:00
Guy Harris 3734d4e2b3 Point to the tcpdump.org link-layer header types page.
svn path=/trunk/; revision=51203
2013-08-08 04:18:20 +00:00
Guy Harris 81865326d0 Rename "dlt_value" to "linktype_value", and give more details in
comments about LINKTYPE_ values vs. DLT_ values.

svn path=/trunk/; revision=51202
2013-08-08 04:16:53 +00:00
Gerald Combs 62c083fe8e Compile on Qt < 5.0.
svn path=/trunk/; revision=51201
2013-08-08 00:46:19 +00:00
Gerald Combs 79454ef9fa Add initial capture filter support.
Add CaptureFilterCombo and CaptureFilterEdit classes, similar to their
display filter counterparts. Add a CaptureFilterSyntaxWorker class which
runs a syntax check in a background thread similar to the threaded code
in capture_dlg.c. Add a bunch of related signal and slot plumbing. Other
minor fixups.

svn path=/trunk/; revision=51200
2013-08-08 00:26:57 +00:00
Jeff Morriss 786adc8522 From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8954 :
This patch adds XRO (Exclude Routes) support to RSVP dissector.  It
also extends coverage of some new Attribute Flags (LSP_ATTRIBUTES object).

svn path=/trunk/; revision=51199
2013-08-07 23:07:15 +00:00
Jeff Morriss a018f63bca From Vaibhav Katkade via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9011 :
Add support for the Cisco MetaData (0x8909) ethertype.

From me:

Don't try to register the "eth.type" abbreviation; use "cmd.type" instead.
Add SVN id.
Clean up trailing white space and fix up some indentation.
Don't declare a variable static that need not be.

svn path=/trunk/; revision=51198
2013-08-07 22:52:43 +00:00
Jeff Morriss c44883cb1a From Роман Донченко via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9018 :
This patch enables Wireshark to correctly decode messages specific to the
selected key exchange method by determining and remembering that method.
It's a little incomplete in that it doesn't support the case where
first_kex_packet_follows is true, but then the current implementation
doesn't either.

It also adds/fixes dissection for the plain Diffie-Hellman key exchange and
DH group exchange messages that were broken/missing, completing support for
both of these key exchange methods.

svn path=/trunk/; revision=51197
2013-08-07 22:20:49 +00:00
Martin Kaiser 07ee14d5c1 fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9020
make sure that the loop counter is always incremented

svn path=/trunk/; revision=51196
2013-08-07 21:17:53 +00:00
Martin Kaiser 2f072ac53c add a range check for dch_id
this should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9005

svn path=/trunk/; revision=51195
2013-08-07 20:18:11 +00:00
Gerald Combs 6fea3ab734 Make sure we copy our support files to DESTDIR.
svn path=/trunk/; revision=51194
2013-08-07 18:30:21 +00:00
Pascal Quantin a2452d6926 Fix dissection of FemtoInterfaceMsg media type when it includes a mandatory LV or V IE
svn path=/trunk/; revision=51193
2013-08-07 17:34:49 +00:00
Jeff Morriss 2c81a97d55 Ensure we have both _initialize() and a corresponding _cleanup() routines for
the various name resolvers; put those two routines next to each other.

Add generic addr_resolv_init() and addr_resolv_cleanup() routines which call
all of those internal routines.

Call the generic init/cleanup routine from epan_init() and epan_cleanup().

Create the hash tables for each name resolver in those initialization routines
in order to avoid having to repeatedly check if the table is already created
or not (and to avoid glib warnings if we neglected to perform that check):

http://www.wireshark.org/lists/wireshark-dev/201308/msg00012.html


Don't clean up   hostnames in init_dissection():    it's done already in cleanup_dissection().
Don't initialize hostnames in cleanup_dissection(): it's done already in init_dissection().

svn path=/trunk/; revision=51191
2013-08-07 16:46:08 +00:00
Gerald Combs 2dab57f425 Switch to make-services.py. Fix some variable names and version tests.
svn path=/trunk/; revision=51189
2013-08-07 16:33:39 +00:00
Jeff Morriss 56d05bfd4b It's not necessary to call epan_free() in cf_open(): cf_close() (which is
called by cf_open()) already calls epan_free().

svn path=/trunk/; revision=51188
2013-08-07 16:14:44 +00:00
Alexis La Goutte c617a6a64b Enhance LISP Dissector (Mapping, Locator and Record type...)
Convert proto_tree_add_text calls to proto_tree_add_item

(the end of my original commit...)

svn path=/trunk/; revision=51187
2013-08-07 13:44:44 +00:00
Jeff Morriss 0995eb9edd Remove some set-but-no-longer-used variables.
svn path=/trunk/; revision=51186
2013-08-07 13:26:05 +00:00
Martin Mathieson 9b85c5b17f Try to fix build by removing proto_tree_add_text() call replaced by items
svn path=/trunk/; revision=51185
2013-08-07 12:56:39 +00:00
Alexis La Goutte 90e273cb91 Enhance BGP Update
Step 4 : Convert proto_tree_add_text calls to proto_tree_add_item and use new name of RFC4271 (  Withdrawn Routes Length ...)

svn path=/trunk/; revision=51184
2013-08-07 12:05:23 +00:00
Alexis La Goutte b4beea213f Enhance LISP Dissector (Mapping, Locator and Record type...)
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51183
2013-08-07 12:05:11 +00:00
Alexis La Goutte 8da9a76650 From Matt Texier
Enhance BGP Dissector

Step 3 :Variable consistency and renaming, adding RFC and draft as comments (Preperation for next enhance...)

From me :
Fix some typo/whitespace
Make checkhf happy...

Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

svn path=/trunk/; revision=51182
2013-08-07 12:04:04 +00:00
Stig Bjørlykke aadc33fbab Do not use overlapping memory in g_snprintf.
Use consistent spacing between title and value.

svn path=/trunk/; revision=51181
2013-08-07 10:02:03 +00:00
Anders Broman 4317fade8c From Michael Mann:
the heuristics of NDMP require 28 bytes to be present in order for it to be dissected as NDMP.  NDMP is purely a heuristic dissector because TCPENCAP shares the same TCP port.
Since NDMP officially registered port 10000 with IANA, allow it to use dissector_add_uint() instead of packet-ipsec-tcp.c, and by default have TCPENCAP only rely on its heuristics.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5462

svn path=/trunk/; revision=51180
2013-08-07 04:39:32 +00:00
Anders Broman 907e735f60 From Javier Godoy:
Dissect SCSI OSD attribute identification sense data descriptor.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8971

svn path=/trunk/; revision=51179
2013-08-07 04:28:35 +00:00
Gerald Combs 79713e0ce7 Add a Python version of make-services.pl. Instead of trying to parse the
plain text version of the registry it parses the CSV version (which
should hopefully be more reliable). Tested with Pythons 2.5, 2.6, 2.7,
and 3.3.

Update the services file.

svn path=/trunk/; revision=51178
2013-08-06 23:45:51 +00:00
Jeff Morriss a1c6c09f8f Get rid of a set-but-unused variable.
Replace tabs with spaces (for consistency).

svn path=/trunk/; revision=51177
2013-08-06 21:44:21 +00:00
Jakub Zawadzki 97bddef1a2 Try to fix compilation under MSVC
__builtin_ctz() with bitmask == 0 is UB, so only do g_assert there.

svn path=/trunk/; revision=51176
2013-08-06 21:06:56 +00:00
Jakub Zawadzki 9cfac1227d Replace hfinfo pointer to same_name_prev, with same_name_prev_id.
svn path=/trunk/; revision=51175
2013-08-06 20:53:47 +00:00
Jakub Zawadzki 72ea2f9c9c Remove hfinfo->bitshift member, add hfinfo_bitshift() to get it.
svn path=/trunk/; revision=51174
2013-08-06 20:10:59 +00:00
Jakub Zawadzki 93f56d8a77 Optimize wrs_count_bitshift()
- Use __builtin_ctz for GCC/clang
- Do multiply and lookup on other platforms

svn path=/trunk/; revision=51173
2013-08-06 19:53:54 +00:00
Anders Broman fcc3728630 From Chris Bontje:
RTAC Serial Dissector Improvement for INFO Column Display.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9016

svn path=/trunk/; revision=51172
2013-08-06 17:18:40 +00:00
Anders Broman 06c37f8665 Add code and a preference to use GSM SAPI to call sub dissectors.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9017

svn path=/trunk/; revision=51171
2013-08-06 17:11:42 +00:00
Anders Broman cc7c777f55 Store the port number as a string for the unresolved ports to avoid repeated calls to getservbyport() for all unresolved ports.
svn path=/trunk/; revision=51170
2013-08-06 17:07:20 +00:00
Jakub Zawadzki f6c55aa296 app_mem_usage fixes:
- Add missing feature test macro for pread()
- Fix $Id$ line

svn path=/trunk/; revision=51169
2013-08-06 16:38:36 +00:00
Martin Kaiser 1cfc59d2da remove unused variable numelem
this fixes
  CC     libdissectors_la-packet-scsi-smc.lo
packet-scsi-smc.c: In function 'dissect_smc_readelementstatus':
packet-scsi-smc.c:467:11: error: variable 'numelem' set but not used
[-Werror=unused-but-set-variable]


svn path=/trunk/; revision=51168
2013-08-06 07:33:49 +00:00
Jörg Mayer bde81de2c9 Improve loop a bit to reduce likelihood of dissector asserts
svn path=/trunk/; revision=51167
2013-08-06 04:55:48 +00:00
Michael Mann ac5ceb45fa Convert a few proto_tree_add_text to pacify checkAPIs.pl. Looks like the "proper" fix for the remaining calls would be to setup additional field types (to remove the tvb_get_ptr calls)
svn path=/trunk/; revision=51166
2013-08-06 01:11:55 +00:00
Michael Mann 1577a6992e Replace all proto_tree_add_text with filterable items.
svn path=/trunk/; revision=51165
2013-08-06 00:14:06 +00:00
Guy Harris 6a1626f907 Make sure serv_proto is set to the appropriate string value in all
cases; set it before we do the hash table lookup.  Don't initialize
serv_proto to null when we declare it - that covers up cases where we
fail to set it correctly.

Clean up indentation.

svn path=/trunk/; revision=51164
2013-08-05 20:23:45 +00:00
Jakub Zawadzki 518ac53e2c Make some global variables static
svn path=/trunk/; revision=51163
2013-08-05 20:15:06 +00:00
Martin Kaiser 5c813d0afe remove unnecessary if (tree) checks in packet-hdcp2.c,
which uses ptvcursor

svn path=/trunk/; revision=51162
2013-08-05 20:08:16 +00:00
Gerald Combs f22f8cc841 Fix the Python version check. Hopefully no one is running 1.5 or 1.6.
svn path=/trunk/; revision=51161
2013-08-05 20:08:11 +00:00
Martin Kaiser 0048fbc0d4 it's and, not or ;-)
this fixes
  CC     libwireshark_la-addr_resolv.lo
addr_resolv.c: In function 'serv_name_lookup':
addr_resolv.c:666:3: error: logical 'or' of collectively exhaustive tests is always true [-Werror=logical-op]

svn path=/trunk/; revision=51160
2013-08-05 19:40:22 +00:00
Jakub Zawadzki f4bcbeb9f2 Keep result of [new_]register_dissector in some dissectors. [2 of x]
(don't create new dissector handle if we can use already existing one)

svn path=/trunk/; revision=51159
2013-08-05 19:09:44 +00:00
Gerald Combs d3af98bb91 Don't force the use of Python 2.x, similar (but not identical to)
r51128. Print a warning if we're building with Python < 2.5.

svn path=/trunk/; revision=51158
2013-08-05 18:57:00 +00:00
Michael Mann 7207378cbd Replace global variable that was just used to pass data between dissectors with call_dissector_with_data.
svn path=/trunk/; revision=51157
2013-08-05 18:14:09 +00:00
Jakub Zawadzki 5fa2a99087 Keep result of [new_]register_dissector in some dissectors.
svn path=/trunk/; revision=51156
2013-08-05 18:09:43 +00:00