Commit Graph

43951 Commits

Author SHA1 Message Date
Alexis La Goutte 553f751e01 From Simon Barber via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8094 Add support for RA and TA to all 802.11 frame formats
svn path=/trunk/; revision=46561
2012-12-16 15:34:23 +00:00
Alexis La Goutte 4c58eabc9a Remove unused ett_nfs_security_label variable
svn path=/trunk/; revision=46560
2012-12-16 15:34:13 +00:00
Gerald Combs b3f410b1c2 [Automatic manuf, services and enterprise-numbers update for 2012-12-16]
svn path=/trunk/; revision=46558
2012-12-16 15:03:34 +00:00
Pascal Quantin c246a087df Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8027 :
Fix tshark hex bytes output

svn path=/trunk/; revision=46557
2012-12-16 09:52:40 +00:00
Pascal Quantin 9a2fbb1978 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8098 :
Incorrect dissection of SAC and RAC in 3GPP ULI AVP

svn path=/trunk/; revision=46556
2012-12-16 08:58:46 +00:00
Jeff Morriss d206dacb95 Initialize a variable to avoid a (false) may-be-used-uninitialized warning turned error.
svn path=/trunk/; revision=46555
2012-12-16 02:37:06 +00:00
Jeff Morriss fde266096c File missed in r46553.
svn path=/trunk/; revision=46554
2012-12-16 02:13:30 +00:00
Jeff Morriss 01fd357171 Handle hop-by-hop-id collisions (when matching requests and answers) better:
instead of storing the requests in an se_tree (keyed by hop-by-hop-id),
store an se_tree which is itself keyed by frame number.  When looking for
a matching request, first find the tree of pdus (by hop-by-hop-id) and then
look for the largest frame number less than or equal to the answer's frame
number.  Also verify that the end-to-end-id matches.

Move the conversation structure out of packet-diameter.h: it's only used in
packet-diameter.c

svn path=/trunk/; revision=46553
2012-12-16 01:12:59 +00:00
Martin Mathieson b369116122 Don't cast away constness of passed-in tap structs.
svn path=/trunk/; revision=46552
2012-12-16 00:43:37 +00:00
Pascal Quantin 2dbf4f6fff Strengthen BT-uTP heuristic dissector and add a preference to enable it (disabled by default)
svn path=/trunk/; revision=46551
2012-12-16 00:28:38 +00:00
Martin Mathieson 460d6be1af Don't cast away const qualifier.
svn path=/trunk/; revision=46550
2012-12-16 00:25:25 +00:00
Martin Mathieson b7e64d6571 Fix some clang warnings.
svn path=/trunk/; revision=46549
2012-12-16 00:15:26 +00:00
Martin Mathieson 76966a2cec Check that system frame number is in range.
svn path=/trunk/; revision=46548
2012-12-16 00:02:50 +00:00
Pascal Quantin d5c14b47db Add a missing ENC_ASCII
svn path=/trunk/; revision=46547
2012-12-15 20:12:17 +00:00
Evan Huus b2e8a9b188 Link qtshark with libui_dirty on unix.
It's now possible to build qtshark with autotools and QtCreator if you add some
extra symlinks and fiddle with LD_LIBRARY_PATH.

svn path=/trunk/; revision=46546
2012-12-15 17:10:39 +00:00
Michael Mann ed7b3f276f From Masatake Yamato, adding preference names used with -o option to tooltip text. Bug 6641 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6641)
svn path=/trunk/; revision=46545
2012-12-15 12:43:13 +00:00
Michael Mann bb7217ab4b From bug 6123, Fix further dissection of data in TCP packets with the Riverbed Transparency options (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6123)
Allow Raw Data dissector to dissect TCP packets with Riverbed Transparency options if sport dissector (found only in Riverbed) is not found.

#BACKPORT

svn path=/trunk/; revision=46544
2012-12-15 04:28:41 +00:00
Gerald Combs 044a0257e6 Add a missing backslash.
svn path=/trunk/; revision=46543
2012-12-15 01:55:28 +00:00
Gerald Combs 81c2fd6cbe Set SVN properties.
svn path=/trunk/; revision=46542
2012-12-15 01:05:17 +00:00
Gerald Combs 5c2c5aed87 Rename the search type menu items to more accurately reflect what we're
actually doing and what users are likely to want to do.  Rename the
search enum values and functions to reflect what we're actually doing
and add a comment explaining why making searches more correct might make
searching worse.  Add a search bar to the Qt main window, thus
continuing the War On Gratuitous Dialogs.

Clear out any previous temporary label stack items before adding a new one.

svn path=/trunk/; revision=46541
2012-12-15 01:04:39 +00:00
Evan Huus 92cfec56b8 Basic wmem string-buffer. Not yet feature-equivalent to the emem version.
svn path=/trunk/; revision=46540
2012-12-15 00:46:36 +00:00
Anders Broman d075b08ad2 Try to cast avay:
follow_tcp.c(323) : warning C4267: '=' : conversion from 'size_t' to 'int', possible loss of data
follow_tcp.c(327) : warning C4244: '=' : conversion from '__int64' to 'int', possible loss of data
follow_tcp.c(529) : warning C4267: '=' : conversion from 'size_t' to 'uInt', possible loss of data

svn path=/trunk/; revision=46539
2012-12-14 12:02:59 +00:00
Anders Broman 39c816931c Copy-paste error.
svn path=/trunk/; revision=46538
2012-12-14 11:54:35 +00:00
Anders Broman eba8fb9328 From Martin Isaksson:
- Initiiate GTP header to zero.
- Dont' load TEID unconditionaly, it might not be present.

svn path=/trunk/; revision=46537
2012-12-14 11:27:38 +00:00
Evan Huus 85dcc2d2c0 Fixed uninitialized value warning.
I am now *very* impressed by GCC's flow analysis.

svn path=/trunk/; revision=46536
2012-12-14 03:00:08 +00:00
Martin Kaiser 90f0616d25 fix compiler warning
follow_tcp.c: In function ‘follow_read_tcp_stream’:
follow_tcp.c:432: error: ‘gunzip’ may be used uninitialized in this function
make[2]: *** [libgtkui_a-follow_tcp.o] Error 1

set default value to 'not gzipped'


svn path=/trunk/; revision=46535
2012-12-14 02:35:12 +00:00
Martin Kaiser 387323569d fix
packet-h248_3gpp.c: In function ‘dissect_3gcsd_plmnbc’:
packet-h248_3gpp.c:168: error: cast to pointer from integer of different size
make[5]: *** [libdissectors_la-packet-h248_3gpp.lo] Error 1

I guess the last parameter of dissect_3gcsd_plmnbc() is a pointer to a
boolean variable. Call it implicit_param, not implicit, as there's
already a global variable 'implicit'.

Feel free to correct the fix if I got it wrong.

svn path=/trunk/; revision=46534
2012-12-14 02:27:05 +00:00
Anders Broman ca01731e86 Revert back to the original patch which actuallly worked.
svn path=/trunk/; revision=46533
2012-12-13 20:29:46 +00:00
Michael Mann 7141f3c00c Bug 3528 - When following an HTTP tcp stream decode gzip data automatically (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528)
Use Anders' "corrected" patch instead of the original.

svn path=/trunk/; revision=46532
2012-12-13 20:19:11 +00:00
Anders Broman 4f6998a6a5 From John Batty:- the h248_3GCSD_properties_vals array was missing entry 0 that defines the package name. - the h248_package_3GCSD structure was missing entries for the signal and event definitions (which were already been defined) For the plmnbc decoder, I found an existing decoder de_bearer_cap that could decode this field, so added a small function to call through to that The 3gtfo package definition was also missing the package name. https://bugs.wireshark.org/bugzilla/process_bug.cgi I fixed up the call to dissect_ber_octet_string() to use sub_tvb.
svn path=/trunk/; revision=46531
2012-12-13 20:17:17 +00:00
Michael Mann a37f60e4f6 Bug 3528 - When following an HTTP tcp stream decode gzip data automatically (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3528)
includes patch from bug (with actual functionality) + changes to makefiles to make it compile/link on Windows

svn path=/trunk/; revision=46530
2012-12-13 19:59:57 +00:00
Bill Meier 5a8c275b26 General cleanup:
- Localize some variables; remove unneeded initializers;
- Reformat some hf[] entries;
- Whitespace; style; long lines.

svn path=/trunk/; revision=46529
2012-12-13 18:17:47 +00:00
Pascal Quantin e5fc8a400e Fix what seems to be a typo error
svn path=/trunk/; revision=46528
2012-12-13 17:57:37 +00:00
Bill Meier e790f93057 Remove some commented out code as per Wido Kelling:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8002#c9

svn path=/trunk/; revision=46527
2012-12-13 16:27:40 +00:00
Pascal Quantin 53edadd49b From John Batty via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8087 :
H.248 MEGACO PkgName property is poorly formatted

svn path=/trunk/; revision=46526
2012-12-13 14:24:44 +00:00
Pascal Quantin 548313e656 From Ojab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8082 :
cisco-sm dissector enhancement

svn path=/trunk/; revision=46525
2012-12-13 09:59:20 +00:00
Pascal Quantin 252c23c744 From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8083 :
Abstract some constants by defines in tcp_graph.c

svn path=/trunk/; revision=46524
2012-12-12 22:08:02 +00:00
Bill Meier 53eccd2b40 General cleanup:
- Don't call expert...() under 'if (tree)';
- Make some functions static;
- Localize some variables; remove some uneeded initializers;
- Reformat some hf[] entries;
- Do whitespace fixes (including "4 space tabs").

svn path=/trunk/; revision=46523
2012-12-12 21:40:35 +00:00
Bill Meier 708e463c47 From Wido Kelling: [Profinet] Updated disecction regarding the IEC 61158
(with a few minor fixes by me).

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

major change:
 reassembling of PNIO fragments (only works if OpenSafty dissector is disabled)

minor changes:
 improved handling of DFP Frames

added / updated
 MRP Block decoding
 ARServerBlock
 ARVendorBlock
 PDInterfaceDataReal
 PDInterfaceAdjust
 PDPortStatistic
 SubdirFrameData corrected display and subblocks added
 PDIRGlobalData complete dissection
 decoding of FrameDataProperties and ARTypes updated to conform the STD
 removed now usuported RTC2 ranges


svn path=/trunk/; revision=46522
2012-12-12 18:47:59 +00:00
Stig Bjørlykke f6f46de2ca Moved users table lookup to find_oid_by_pres_ctx_id() so other
dissectors (acse, ros, rtse) can benefit from the configured settings.

svn path=/trunk/; revision=46520
2012-12-12 15:17:36 +00:00
Jeff Morriss 349e61ce9e tshark now accepts -g.
svn path=/trunk/; revision=46519
2012-12-12 14:11:53 +00:00
Anders Broman 5c1bc94608 "Fill" a couple of value_string(ext)
svn path=/trunk/; revision=46518
2012-12-12 12:48:12 +00:00
Bill Meier 93fdffd70d General cleanup:
- Fix instance of offset changed under 'if (tree)' and used after 'if (tree)';
- Create/use some extended value strings;
- #if 0 an unused value_string array;
- Localize some variables & remove some uneeded initializers;
- Fix some whitespace & long lines.

svn path=/trunk/; revision=46516
2012-12-12 03:38:46 +00:00
Jeff Morriss 20211340e5 Make the "-g" argument to tshark actually work (by passing it to dumpcap).
svn path=/trunk/; revision=46515
2012-12-12 03:25:35 +00:00
Jeff Morriss 47efce2889 Move setting of WIRESHARK_ABORT_ON_DISSECTOR_BUG together with other Wireshark-specific variables (instead of with the MacOS-specific variables).
svn path=/trunk/; revision=46514
2012-12-12 02:22:14 +00:00
Jeff Morriss 05ee001d73 Document the "-g" option to dumpcap.
Add that option to tshark, too, and document it.

The option can't be given to Wireshark because the GUI already has a "-g"
(goto packet).

svn path=/trunk/; revision=46513
2012-12-12 02:07:08 +00:00
Jeff Morriss 7033cc7220 Fix some indentation.
svn path=/trunk/; revision=46512
2012-12-12 01:50:44 +00:00
Bill Meier 9bb7c0f6b9 From Adam Butcher: Add SAKKE support to MIKEY dissector
... adds support for ECCSI signature type, SAKKE payload,
MIKEY-TICKET ID Role types (required for MIKEY-SAKKE KMS
role identifiers) to the MIKEY dissector.

The related specifications are:
  http://tools.ietf.org/html/rfc6509    MIKEY-SAKKE
   (http://tools.ietf.org/html/rfc6507  ECCSI)
   (http://tools.ietf.org/html/rfc6508  SAKKE)
  http://tools.ietf.org/html/rfc6043    MIKEY-TICKET (ID Role types only)

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

svn path=/trunk/; revision=46511
2012-12-12 01:28:21 +00:00
Evan Huus 48c653481a Use the complete fragment length to reassembly SSL frames. The old method
of picking them up one at a time failed on jumbo frames.

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

svn path=/trunk/; revision=46510
2012-12-12 00:02:34 +00:00
Alexis La Goutte b0f4c129f0 Update .git(bzr)ignore when build qt with Autotools (generated *.moc.cpp for UI files and *.rcc.cpp for ressources files)
svn path=/trunk/; revision=46509
2012-12-11 23:24:13 +00:00