Commit Graph

13681 Commits

Author SHA1 Message Date
Anders Broman 687eb5a2a6 Fix for Bug Packet details have errors when decode MAP V2 PRN_ACK msg
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5076

Use:
/*
 * Dissect Multiple Choice Message
 * This function is used to decode a message, when several encoding may be used.
 * For exemple, in the last MAP version, the Cancel Location is defined like this:
 * CancelLocationArg ::= [3] IMPLICIT SEQUENCE
 * But in the previous MAP version, it was a CHOICE between a SEQUENCE and an IMSI
 * As ASN1 encoders (or software) still uses the old encoding, this function allows
 * the decoding of both versions.
 * Moreover, some optimizations (or bad practice ?) in ASN1 encoder, removes the
 * SEQUENCE tag, when only one parameter is present in the SEQUENCE.
 * This explain why the function expects 3 parameters:
 * - a [3] SEQUENCE corresponding the recent ASN1 MAP encoding
 * - a SEQUENCE for old style
 * - and a single parameter, for old version or optimizations
 *
 * The analyze of the first ASN1 tag, indicate what kind of decoding should be used,
 * if the decoding function is provided (so not a NULL function)
 */

svn path=/trunk/; revision=34001
2010-08-29 17:34:44 +00:00
Sake Blok 93cfe5571b From Cal Turney (bug 5132):
TCP bytes_in flight becomes inflated with lost packets 

This patch suspends Bytes-in-Flight calculation when missing packets are detected.


svn path=/trunk/; revision=33994
2010-08-29 15:27:20 +00:00
Gerald Combs 0d6000b5ff [Automatic manuf and enterprise-numbers update for 2010-08-29]
svn path=/trunk/; revision=33992
2010-08-29 15:03:30 +00:00
Anders Broman a009cc0605 Doxygen changes.
svn path=/trunk/; revision=33990
2010-08-29 10:47:38 +00:00
Gerald Combs 2f6dd574b7 Display 6to4 gateway IPv4 addresses and SLA IDs.
svn path=/trunk/; revision=33984
2010-08-28 20:55:32 +00:00
Bill Meier b3ed77c1b0 #inlude <emem.h> not req'd;
Use tvb_strncmp to compare for "ESIO" string in packet;
Use consistent indentation conforming to the "editor modelines";
Minor other whitespce cleanup.

svn path=/trunk/; revision=33983
2010-08-28 19:50:00 +00:00
Gerald Combs 5fb37af39a De-obfuscate the Teredo client address and add a de-obfuscated port.
svn path=/trunk/; revision=33982
2010-08-28 19:46:20 +00:00
Anders Broman a96e6b2047 Doxygen changes.
svn path=/trunk/; revision=33981
2010-08-28 19:27:19 +00:00
Gerasimos Dimitriadis fe34e9a3fb Support for eMLPP Priority IE in BSSMAP
svn path=/trunk/; revision=33971
2010-08-27 21:30:12 +00:00
Guy Harris 43ae1a4b2b Update some links.
svn path=/trunk/; revision=33969
2010-08-27 21:28:24 +00:00
Guy Harris add0764bc2 Allow Dissect As... to select the Ethernet-without-FCS dissector for a
given UDP port; this is to handle the output for the Cisco CMTS "cable
intercept" command - it encapsulates Ethernet frames in UDP packets, but
the UDP port is user-defined.

svn path=/trunk/; revision=33964
2010-08-27 21:13:26 +00:00
Gerasimos Dimitriadis 6f6fb2fd80 MNC, SANC, ISPC lists updated up to OB 960
svn path=/trunk/; revision=33963
2010-08-27 21:09:05 +00:00
Stig Bjørlykke 355e2bed0a From Owen Kirby via bug 5149:
Added a new dissector for SCoP.

svn path=/trunk/; revision=33962
2010-08-27 21:05:02 +00:00
Stig Bjørlykke ec94791339 From Frank Lahm via bug 5136:
Correct volume flags for FPGetSrvrParms.

svn path=/trunk/; revision=33961
2010-08-27 20:54:21 +00:00
Gerald Combs a3cbcbffb8 Display Teredo encapsulated IPv4 server and client addresses.
svn path=/trunk/; revision=33959
2010-08-27 19:52:17 +00:00
Stig Bjørlykke 1249a53f09 From Christian Durrer via bug 5155:
Added a new dissector for Ether-S-I/O protocol.

svn path=/trunk/; revision=33954
2010-08-27 17:18:28 +00:00
Stig Bjørlykke 551093a39a From Matthieu Lochegnies via bug 5153:
Show multiples DRDA commands from the same frame.

svn path=/trunk/; revision=33952
2010-08-27 16:30:38 +00:00
Martin Mathieson 31099a13aa Allow 3GPP release info to be displayed.
svn path=/trunk/; revision=33950
2010-08-27 13:54:05 +00:00
Stig Bjørlykke 598b89ab7f Added a check for constructed octet string to avoid a loop.
This fixes bug 5154.

svn path=/trunk/; revision=33949
2010-08-27 11:55:14 +00:00
Jaap Keuter ccc74ae967 Take in updates from the TLS registery.
svn path=/trunk/; revision=33948
2010-08-27 06:28:17 +00:00
Anders Broman a20bf7af0d Fix doxygen errors.
svn path=/trunk/; revision=33938
2010-08-26 19:40:08 +00:00
Stephen Fisher 36c2954387 Show a text string of the Windows version (if Windows 2000 or higher.)
svn path=/trunk/; revision=33936
2010-08-26 18:06:56 +00:00
Anders Broman 1c2b3b0eb9 Fix a number of doxygen directives.
svn path=/trunk/; revision=33930
2010-08-26 15:24:49 +00:00
Stig Bjørlykke 113fac8b77 From Juha Siltanen via bug 5144:
Added support for payload dissecting.

svn path=/trunk/; revision=33928
2010-08-26 13:49:23 +00:00
Anders Broman 48ac5f90ff - Try to fix a couple of doxygen comments.
- whitspace changes.

svn path=/trunk/; revision=33926
2010-08-26 06:46:30 +00:00
Gerald Combs 607b228df6 Add ws_load_library and ws_module_open, which respectively call
LoadLibrary and g_module_open only for the program directory and system
directory on Windows. Use them to replace a bunch of LoadLibrary and
g_module_open calls. Use the extension ".dll" for all the DLLs that we
load. Add comments about DLL loading in Python.

svn path=/trunk/; revision=33924
2010-08-25 20:30:59 +00:00
Tomas Kukosa f5e1f23cac Fix wrong length of CSeq Method parameter
svn path=/trunk/; revision=33920
2010-08-25 14:10:58 +00:00
Martin Mathieson c53d8b200b Let DCT2000 tree extend to end of ipprim or sctpprim bytes.
svn path=/trunk/; revision=33919
2010-08-25 13:27:27 +00:00
Martin Mathieson 3852415572 Show (again?) MAC-d PDUs inside MAC-es PDUs.
svn path=/trunk/; revision=33918
2010-08-25 13:01:00 +00:00
Stig Bjørlykke ce99177a00 Display content entry (with length) in tree.
svn path=/trunk/; revision=33914
2010-08-24 15:47:10 +00:00
Stig Bjørlykke 98493ff110 Rewrote to fetch content_tvb from dissect_ber_octet_string().
Display eContent entry (with length) in tree.

svn path=/trunk/; revision=33912
2010-08-24 15:43:32 +00:00
Stig Bjørlykke 1a5f73299e Display octet string fragments for RTSE segment data.
svn path=/trunk/; revision=33911
2010-08-24 15:09:11 +00:00
Stig Bjørlykke 8b6c6a3dbf Display constructed octet strings with correct hf_id.
Show octet string fragments as for reassembly.

svn path=/trunk/; revision=33910
2010-08-24 15:08:07 +00:00
Stig Bjørlykke f3f59dbf95 Indicate abort and abort-reason in info column.
svn path=/trunk/; revision=33908
2010-08-24 11:36:10 +00:00
Anders Broman 5371cb66b9 From Christian Durrer:
Not all Ether-S-Bus telegrams are recognized and displayed correctly.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5123

svn path=/trunk/; revision=33903
2010-08-24 05:38:49 +00:00
Gerald Combs a875855c39 Display ISATAP encapsulated IPv4 addresses.
svn path=/trunk/; revision=33900
2010-08-24 00:24:44 +00:00
Stephen Fisher b4addc04fe The ARP hardware type and operation code are listed with the IANA in decimal notation, not hex.
svn path=/trunk/; revision=33898
2010-08-23 23:09:32 +00:00
Stig Bjørlykke d0dfefaca8 Fix for attribute boolean, from bug 5127.
svn path=/trunk/; revision=33887
2010-08-23 09:17:03 +00:00
Gerald Combs 66c34b8293 [Automatic manuf and enterprise-numbers update for 2010-08-22]
svn path=/trunk/; revision=33881
2010-08-22 15:03:30 +00:00
Gerald Combs a766c88c52 Add a "summary in tree" option similar to v4.
svn path=/trunk/; revision=33878
2010-08-21 17:45:03 +00:00
Jeff Morriss 486562f263 Add some code to prefs_cleanup() to free (most of the) memory associated with the preferences. This only happens during shutdown so it's not fixing a memory leak, but it makes me more comfortable to know where the preferences memory is freed.
svn path=/trunk/; revision=33874
2010-08-21 04:26:26 +00:00
Jeff Morriss b05ee41bc0 Remove duplicate definition of COL_MAX_LEN and COL_MAX_INFO_LEN: apparently no one needs them in this file (probably because they're marked as "don't use"). Now they are only defined in column_info.h .
svn path=/trunk/; revision=33871
2010-08-21 03:31:30 +00:00
Gerald Combs 71c99df326 If we have something that looks like a stateless autoconfiguration
address, add the corresponding MAC address to the tree.

svn path=/trunk/; revision=33870
2010-08-21 00:19:32 +00:00
Jeff Morriss 1fcaf7fb3f Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5114 (infinite loop in
bootp dissector when dissecting packetcable MTA capabilities).

Limit the tlv_len to G_MAXUINT16 to prevent an integer overflow from causing us to
increment the working offset by 0 (thus causing us to loop).

svn path=/trunk/; revision=33846
2010-08-19 02:17:01 +00:00
Gerasimos Dimitriadis 296be75cb8 Fix for Bug 5052:
Good ZigBee Beacon detected as malformed

In ZigBee 2006 the Tx-Offset is optional, while in the 2007 and
later versions, the Tx-Offset is a required value. Since both 2006 and
and 2007 versions have the same protocol version (2), we should treat
the Tx-Offset as well as the update ID as optional elements

svn path=/trunk/; revision=33842
2010-08-18 21:12:26 +00:00
Martin Mathieson b7158c4e2d Fix ipprim IPv6 port number offsets.
svn path=/trunk/; revision=33840
2010-08-18 10:47:21 +00:00
Martin Mathieson 75af18e3a8 Show IPv6 addresses in ipprim summary line.
svn path=/trunk/; revision=33839
2010-08-18 10:33:54 +00:00
Anders Broman 1b9da2fcf0 Fix indentation.
svn path=/trunk/; revision=33838
2010-08-18 08:09:37 +00:00
Gerasimos Dimitriadis 6ebc2acff4 Updates due to ITU Operational Bulletins 956 and 957
svn path=/trunk/; revision=33833
2010-08-17 22:48:39 +00:00
Gerasimos Dimitriadis 27b4dfa426 The Mobile Status msg in BSSAP+ has IMSI as first possible IE
svn path=/trunk/; revision=33832
2010-08-17 21:35:26 +00:00
Martin Mathieson a0387bbbc6 Change a channel type #define to be contiguous with others.
svn path=/trunk/; revision=33831
2010-08-17 16:12:29 +00:00
Jörg Mayer 90b105c5e6 Commit 33815 renamed packet-nt-sonmp.c to packet-ndp.c
svn path=/trunk/; revision=33827
2010-08-17 07:00:58 +00:00
Bill Meier 09e845ba03 Fix two typos/bugs (introduced by me in the previous commit).
svn path=/trunk/; revision=33825
2010-08-17 01:01:48 +00:00
Bill Meier 3398f73455 From Tom Hughes: FastCGI dissector.
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5067

From me: - Fix one bug;
         - Add a comment about some code which doesn't display info
            in COL_INFO as intended due to what seems to be a Wireshark bug in 
            tcp_dissect_pdus() when there are multiple records in a 
            TCP frame.

svn path=/trunk/; revision=33824
2010-08-17 00:51:44 +00:00
Stephen Fisher 139d2e3af2 Clarify that the "Sequence number" is given in big endian representation and the "Sequence number (LE)" is little endian.
svn path=/trunk/; revision=33822
2010-08-16 22:28:23 +00:00
Stephen Fisher 62a058ef5d Change the protocol name from "Nortel NDP" to "Nortel Discovery Protocol" in the protocol registration.
svn path=/trunk/; revision=33821
2010-08-16 22:01:12 +00:00
Stephen Fisher 67aa3ba7d1 Fix display of Client's FQDN and clear up the confusion with the S, O and N bits from the RFC descriptions.
svn path=/trunk/; revision=33820
2010-08-16 21:41:29 +00:00
Stephen Fisher a81a8dd250 Modernize the SONMP ("SynOptics Network Management Protocol") dissector by renaming it to NDP ("Nortel Discovery Protocol") and do some basic cleanup.
svn path=/trunk/; revision=33815
2010-08-16 17:19:42 +00:00
Guy Harris cd67ad0047 Clean up indentation.
svn path=/trunk/; revision=33814
2010-08-16 17:19:15 +00:00
Anders Broman 9da9ac87d3 Typo - wrong IE code for APN aggregate maximum bit rate in message
Activate default EPS bearer context request.

svn path=/trunk/; revision=33813
2010-08-16 15:31:13 +00:00
Martin Mathieson d8be0764d3 Set length of 'PDU Block Header' subtrees.
svn path=/trunk/; revision=33812
2010-08-16 15:14:01 +00:00
Anders Broman 63bffd3ac5 From rodebiet:
tvb_get_bits32 produces malformed_packet if no_of_bits < 25 and tvb remaining = 3
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5080

svn path=/trunk/; revision=33811
2010-08-16 15:13:54 +00:00
Stig Bjørlykke 3b07f8f423 Removed some TAB's.
svn path=/trunk/; revision=33810
2010-08-16 09:12:39 +00:00
Stig Bjørlykke 8f4b929469 Added Info for RTTPapdu.
svn path=/trunk/; revision=33809
2010-08-16 09:11:01 +00:00
Anders Broman 03dc7a7f67 From Slava:
This patch adds to the Infiniband dissector the ability to dissect EoIB
(Ethernet-over-Infiniband) traffic which uses Mellanox Technologies Ltd's
standard for encapsulating Ethernet traffic inside Infiniband packets.

This patch is submitted on behalf of Mellanox Technologies Ltd.

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

svn path=/trunk/; revision=33808
2010-08-16 05:48:40 +00:00
Anders Broman fbb6393e18 From Christian Durrer:
- Support for extended packet size for read/write block telegrams
- Added expert info for bad CRC, telegram retries and NAK responses
- Removed amount of retries which has not been displayed correctly
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5088

svn path=/trunk/; revision=33807
2010-08-16 05:42:01 +00:00
Anders Broman 4d450d131e From Stephen Donnelly:
Add BFS extension header decoding to ERF dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5113

svn path=/trunk/; revision=33806
2010-08-16 05:34:12 +00:00
Gerald Combs 1f118813e7 [Automatic manuf and enterprise-numbers update for 2010-08-15]
svn path=/trunk/; revision=33801
2010-08-15 15:03:33 +00:00
Stig Bjørlykke 90cb202dbd Added proto_item_prepend_text().
svn path=/trunk/; revision=33800
2010-08-14 17:24:21 +00:00
Stig Bjørlykke 026f4dfa7b Fixed guint64 printf modifier.
svn path=/trunk/; revision=33799
2010-08-14 17:22:22 +00:00
Anders Broman 856f205c27 Fix up decoding of bitfields in the aligned variant.
svn path=/trunk/; revision=33798
2010-08-14 16:42:41 +00:00
Anders Broman b2f660f0d3 Add missing break, should fix bug
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5110

svn path=/trunk/; revision=33794
2010-08-13 11:57:18 +00:00
Stig Bjørlykke 30875d714c Do not load lua-scripts starting with '.'
svn path=/trunk/; revision=33793
2010-08-13 11:18:44 +00:00
Jaap Keuter 05397615d1 Update ZRTP dissector to draft-22.
svn path=/trunk/; revision=33789
2010-08-12 16:39:29 +00:00
Martin Mathieson dbb4538ec8 Improve the way the encoded FP variant is interpreted.
svn path=/trunk/; revision=33785
2010-08-12 15:30:56 +00:00
Stig Bjørlykke e3aab56e64 Added support for RFC5482: User Timeout Option.
svn path=/trunk/; revision=33784
2010-08-12 14:09:08 +00:00
Martin Mathieson c642bae035 From Pascal Quantin:
The decoder expects to do not have any extra byte after the RAR bodies.

But according to 3GPP 36.321 8.8.0 chapter 6.1.5, the eNodeB is allowed to put padding at the end of the RAR PDU:

" A MAC PDU consists of a MAC header and zero or more MAC Random Access Responses (MAC RAR) and optionally padding as described in figure 6.1.5-4.
[...]

Padding may occur after the last MAC RAR. Presence and length of padding is implicit based on TB size, size of MAC header and number of RARs."

svn path=/trunk/; revision=33783
2010-08-12 09:03:05 +00:00
Martin Mathieson bbc98aa015 Fix a duplicate/copy-pasted filter field name.
svn path=/trunk/; revision=33782
2010-08-12 08:53:08 +00:00
Stig Bjørlykke dfb24f48d8 From Chris Maynard via bug 5105:
IP should not compute the header checksum if within an error packet
such as ICMP.

svn path=/trunk/; revision=33780
2010-08-12 06:26:21 +00:00
Anders Broman 3f9913f7ed Do DISSECTOR_ASSERT_NOT_REACHED(); if golmb coded data is > 32 bits.
svn path=/trunk/; revision=33778
2010-08-11 21:56:19 +00:00
Anders Broman b1568cb247 Update the comment.
svn path=/trunk/; revision=33777
2010-08-11 21:52:35 +00:00
Anders Broman ccf8787370 Add a warning message if H264 profile-level-id parameter wasn't
posible to parse.

svn path=/trunk/; revision=33776
2010-08-11 21:39:22 +00:00
Stig Bjørlykke 7de3dc3167 Call tvb_get_bits32() if leading_zero_bits > 16.
svn path=/trunk/; revision=33775
2010-08-11 21:37:04 +00:00
Stig Bjørlykke 894f256912 Added check for valid tvb before calling tvb_length().
svn path=/trunk/; revision=33774
2010-08-11 21:27:35 +00:00
Jeff Morriss 0c4308e2c6 Remove non-ASCII characters.
svn path=/trunk/; revision=33771
2010-08-11 13:42:28 +00:00
Stig Bjørlykke 742655b349 Make it compile.
svn path=/trunk/; revision=33770
2010-08-11 12:30:33 +00:00
Anders Broman ce06f1f63e Remove redundant chek_col.
svn path=/trunk/; revision=33769
2010-08-11 12:13:24 +00:00
Anders Broman 936eb850a1 From Frank Schorr:
NetrLogonControl2 - Control_data_information "name" not being decoded.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5071

svn path=/trunk/; revision=33768
2010-08-11 12:07:25 +00:00
Anders Broman a14663836a From Holger Freyther:
packet-gsm_ipa.c: Decode MGCP that is encapsulated inside the stream.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5068

svn path=/trunk/; revision=33767
2010-08-11 11:59:47 +00:00
Anders Broman e9f4c63c1d From Aamer Akhter:
NetFlow forwarding status and template fixes.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5083

svn path=/trunk/; revision=33766
2010-08-11 11:54:25 +00:00
Anders Broman 90a6c7d484 From Herbert Lischka:
Resolves problems reported in bug #5090
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5090

I have 3 potentially risks of endless loop eliminated
the rest is cosmetic

svn path=/trunk/; revision=33765
2010-08-11 11:43:04 +00:00
Anders Broman 4b9747a74d Add a komment about the format of the MSRP path parameter.
svn path=/trunk/; revision=33764
2010-08-11 11:33:40 +00:00
Anders Broman 26274eb701 From Cal Turney:
Remember folder of capture selected from Welcome screen file dialog.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5038

svn path=/trunk/; revision=33758
2010-08-10 11:36:18 +00:00
Stig Bjørlykke 92312f16e9 Declare error as volatile to avoid warning on opensolaris:
variable 'error' might be clobbered by `longjmp' or `vfork'

svn path=/trunk/; revision=33754
2010-08-10 07:43:05 +00:00
Guy Harris 9a45206220 Dissect SMB_FILE_ATTRIBUTES, when used as file attributes rather than
search attributes, as a 16-bit quantity, with only the bits specified by
section 2.2.1.2.4 of [MS-CIFS].  Use dissect_file_ext_attr() in all
cases where we're dissecting SMB_EXT_FILE_ATTR, as specified by section
2.2.1.2.3 of [MS-CIFS].

svn path=/trunk/; revision=33753
2010-08-10 07:04:20 +00:00
Gerald Combs e1fff26bbe Future-proof a for loop.
svn path=/trunk/; revision=33752
2010-08-09 22:54:03 +00:00
Jaap Keuter 61e6d3eb0e From David Aggeler:
- Finally, better reassembly using fragment_add_seq_next().
  The previous mode is still supported.
- Fixed sporadic decoding and export issues. Always decode 
  association negotiation, since performance check (tree==NULL)
  is now only in dissect_dcm_pdv_fragmented(). 
- Added one more PDV length check
- Show Association Headers as individual items
- Code cleanup. i.e. moved a few lookup functions to be closer 
  to the dissection.

svn path=/trunk/; revision=33751
2010-08-09 19:28:09 +00:00
Bill Meier dd678865b8 Fix another compile error.
(Note to self: take the time to read *all* the compiler error output before committing).

svn path=/trunk/; revision=33750
2010-08-09 18:53:18 +00:00
Bill Meier 349242d7bc Fix another compile error :(
svn path=/trunk/; revision=33749
2010-08-09 18:46:23 +00:00
Bill Meier 012503635f Fix a compile error.
svn path=/trunk/; revision=33748
2010-08-09 18:40:12 +00:00
Bill Meier 6de0c799d8 From Herbert Lischka: "corrected the dissection of reassembled UDP packets".
See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5051

From me:
- Move proto_register... and proto_reg_handoff.. to the end of the file;
- Define a function as static;
- Minor reformatting and whitespace cleanup.

svn path=/trunk/; revision=33747
2010-08-09 18:20:07 +00:00
Stephen Fisher 9e9e052224 Fix typo in my last commit that broke compilation
svn path=/trunk/; revision=33746
2010-08-09 16:53:44 +00:00
Stephen Fisher a9c7d90278 Update to latest device descriptions
svn path=/trunk/; revision=33745
2010-08-09 16:50:08 +00:00
Stig Bjørlykke 6f5b3e381c Make it compile without HAVE_C_ARES and HAVE_GETHOSTBYNAME2.
svn path=/trunk/; revision=33742
2010-08-09 11:19:15 +00:00
Stig Bjørlykke fcc9f7a569 Protect tvb_* functions in a TRY-CATCH block.
This fixes bug 5087.

svn path=/trunk/; revision=33735
2010-08-08 19:04:35 +00:00
Anders Broman d7e5218d7a From Roberto Morro:
Added support for Organization Specific Slow Protocol (OSSP)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4966

svn path=/trunk/; revision=33734
2010-08-08 16:42:57 +00:00
Gerald Combs 82ce5f971f [Automatic manuf and enterprise-numbers update for 2010-08-08]
svn path=/trunk/; revision=33730
2010-08-08 15:03:36 +00:00
Anders Broman c9a7fade6a From Cal Turney:
Optionally display Wireshark version in the main window's title bar.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5040

svn path=/trunk/; revision=33729
2010-08-07 14:37:37 +00:00
Jaap Keuter cdf617b620 From Jay Crisman:
I have attached a very simple patch to add the 'calv' packet type.

svn path=/trunk/; revision=33727
2010-08-06 17:52:59 +00:00
Jaap Keuter 4853835a36 From Tan Kean Siong:
Dissect the SMB Tree_Connect_Andx Request and Response properly with
extension request and response which are documented in [MS-SMB] — v20100711

svn path=/trunk/; revision=33726
2010-08-06 17:46:27 +00:00
Bill Meier c802a0918e From John Sullivan: Fix for 'Uninitialised pointer in packet-rtsp.c causes crash'
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5081

svn path=/trunk/; revision=33725
2010-08-06 14:34:14 +00:00
Bill Meier ae0b5bc5be Move proto_item_set_len() outside of an if statement so NPDU length is properly set;
Also: 'if (check_col())' no longer required;
      Minor revision of some comments;
      Whitespace cleanup;

svn path=/trunk/; revision=33724
2010-08-06 12:46:56 +00:00
Jeff Morriss 79d1d439c7 Fix number of arguments to format
svn path=/trunk/; revision=33720
2010-08-05 19:33:20 +00:00
Anders Broman dd21be32a3 From Christian Durrer:
- Added more info for detecting S-Bus telegrams
- Added the display filter sbus.retry for finding re-sent request telegrams
- Added the possibility to jump from the request telegram to the response
telegram
- Added response time to the response telegram
- Added telegram types "Read/Write Block"
- Corrected the "Read System Info" telegram (CRC was not correctly calculated)
- Changed my EMail address
- Small typos corrected

svn path=/trunk/; revision=33718
2010-08-05 19:01:27 +00:00
Stig Bjørlykke 5dc817d6d6 Initialize tpcph to avoid warnings from clang:
"The left operand of '>>' is a garbage value".

svn path=/trunk/; revision=33713
2010-08-05 07:09:59 +00:00
Martin Mathieson b91b0515cc Update bit_offset whether calling MAC dissector or not.
svn path=/trunk/; revision=33711
2010-08-04 14:42:09 +00:00
Stig Bjørlykke 8e314dbb8f Ensure we don't index into a NULL pointer.
svn path=/trunk/; revision=33710
2010-08-04 13:34:50 +00:00
Stig Bjørlykke 1ce4466261 Initialize confounder to ensure it has a known value.
svn path=/trunk/; revision=33709
2010-08-04 13:34:05 +00:00
Stig Bjørlykke f4955fcae2 Avoid a possible dereference of null pointer.
svn path=/trunk/; revision=33708
2010-08-04 13:32:44 +00:00
Stig Bjørlykke faeed4e56e Avoid a possible dereference of null pointer.
svn path=/trunk/; revision=33707
2010-08-04 13:32:09 +00:00
Anders Broman 0848d851cf From Slava:
The Infiniband dissector currently uses a heuristic where it attempts to parse
IBA payloads as if they contained encapsulated traffic with an Ethertype
header. While a relatively common occurrence and thus a fairly useful feature,
this heuristic in many cases causes false-positives which invoke unneeded
dissectors and generate noise in the form of unjustified "malformed packet"
errors these dissectors cause. This patch adds a checkbox to the Infiniband
preferences menu that allows users to disable this feature if desired. The
option remains on by default.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5062

svn path=/trunk/; revision=33703
2010-08-03 17:08:52 +00:00
Anders Broman dff27826ec From Slava:
Infiniband RoCE dissection.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5060

svn path=/trunk/; revision=33702
2010-08-03 16:57:02 +00:00
Anders Broman 9c824270f7 From Brandon Skari:
MySQL dissector doesn't dissect query responses.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5058

svn path=/trunk/; revision=33701
2010-08-03 16:25:13 +00:00
Bill Meier 45a1908a85 (Trivial) Fix a typo.
svn path=/trunk/; revision=33700
2010-08-03 16:06:48 +00:00
Stephen Fisher 0056d74d01 Remove question marks in preference titles.
svn path=/trunk/; revision=33699
2010-08-03 15:29:51 +00:00
Martin Mathieson 7b5d7d2e33 Add a preference to call MAC for TBs (on by default).
Improve info column display for HS-DSCH Capacity Request messages.
Removed calls to check_col().
Removed a few tabs.

svn path=/trunk/; revision=33698
2010-08-03 14:26:35 +00:00
Stig Bjørlykke f8ec869e41 Decode Browse Domain Announcement version and signature if signature
matches 0xaa55.

I don't know the historic reason for decoding this as "Mysterious Field",
but newer of Network Monitor (3.4) does show this as version and signature.

svn path=/trunk/; revision=33696
2010-08-03 11:22:08 +00:00
Stig Bjørlykke ea7db26373 Added some missing elements from MS Certificate:
- Previous Cert Hash
- Virtual Base
- Next Publisher

svn path=/trunk/; revision=33695
2010-08-03 08:55:07 +00:00
Gerald Combs 7e0e3b696b Revert r30979, which removed the window size in SYN packets. People were
asking where it went.

svn path=/trunk/; revision=33694
2010-08-03 00:09:41 +00:00
Bill Meier dac0bf77ed Fix cases where the type of a for loop variable is smaller than the type of the "end" variable.
In some cases the usage may have been benign since it can be seen by code inspection that the maximum value of the end variable can't exceed the maximum value of the loop variable.
However, on general principles, all the usages have been fixed.

svn path=/trunk/; revision=33692
2010-08-02 13:09:01 +00:00
Stig Bjørlykke f3d2b22899 Mark encryptedData as unused, to avoid warnings when not HAVE_LIBGCRYPT.
svn path=/trunk/; revision=33691
2010-08-02 08:52:39 +00:00
Stig Bjørlykke 33099036fe Added missing include <string.h>.
svn path=/trunk/; revision=33690
2010-08-02 08:46:36 +00:00
Anders Broman 9092ed1aa2 Try to fix the GTP' header dissection a bit.
svn path=/trunk/; revision=33689
2010-08-01 20:55:29 +00:00
Gerald Combs 081ff40308 [Automatic manuf and enterprise-numbers update for 2010-08-01]
svn path=/trunk/; revision=33685
2010-08-01 15:03:31 +00:00
Jörg Mayer ed7871ca54 - Comment: some abbreviations used
- Fix dissection of MU_RF_STATS_BLOCK
- Try to dissect embedded 802.11 frames (only works for the
  header, there seems to be a constant value of 0xa8b7 between
  wireless header and wireless data.

svn path=/trunk/; revision=33682
2010-07-30 20:11:37 +00:00
Guy Harris 11b9ed0426 Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't
include the FCS, and use it for the Daintree SNA file format.  While
we're at it, explicitly check to make sure the purported packet length
gives it at least one byte of packet data, and fix some print formats to
use %u for unsigned values.

svn path=/trunk/; revision=33678
2010-07-30 02:30:50 +00:00
Gerald Combs 3f0a833811 Use ep-allocated strings for our data source names.
svn path=/trunk/; revision=33676
2010-07-29 22:46:10 +00:00
Martin Mathieson b10fb789ef Don't use sprintf().
svn path=/trunk/; revision=33668
2010-07-29 09:39:52 +00:00
Martin Mathieson 4a4f1965e9 Improve display of tty lines.
svn path=/trunk/; revision=33667
2010-07-29 09:30:09 +00:00
Anders Broman 02738f27b6 From Pascal Quantin:
The attached patch fixes the dissection of the PDN Disconnect Request message
in case the optional Protocol Configuration Options IE is not present.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5065

svn path=/trunk/; revision=33654
2010-07-28 21:13:05 +00:00
Martin Mathieson 0319e1f71a Allow DRB frames to be passed to PDCP (where they may be decoded as IP).
svn path=/trunk/; revision=33649
2010-07-28 16:58:13 +00:00
Anders Broman d4182159b6 Split dissection of GTP and GTP' in ordet to try to fix bug
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5055

svn path=/trunk/; revision=33648
2010-07-28 16:13:56 +00:00
Guy Harris deae609c44 Backing out r33631 for now - it has a number of issues.
svn path=/trunk/; revision=33646
2010-07-28 01:12:41 +00:00
Bill Meier 36044cd298 (Trivial) Fix a typo.
svn path=/trunk/; revision=33638
2010-07-26 19:24:06 +00:00
Bill Meier 7be91cb9e9 Fix potential infinite loop: for (guint8=0; guint8 < int; guint8++);
Fixes bug #5053.

svn path=/trunk/; revision=33637
2010-07-26 19:00:44 +00:00
Bill Meier c6b76a7ea2 packet-mip6.h has been removed....
svn path=/trunk/; revision=33633
2010-07-26 14:16:57 +00:00
Bill Meier 10ffe67574 Move contents of packet-mip6.h to packet-mip6.c
- packet-mip6.h is not used elsewhere;
  - packet-mip6.h includes value string definitions.
Rename enum variables to be more distinct: ... ==> MIP6_...
Whitespace cleanup.

svn path=/trunk/; revision=33632
2010-07-26 13:32:13 +00:00
Anders Broman 2bd0983a36 From Cal Turney:
Optionally display Wireshark version in the main window's title bar.
(Modified to include SVN version).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5040

svn path=/trunk/; revision=33631
2010-07-26 13:23:30 +00:00
Anders Broman 1315fe5d29 From John Sucaet:
The committed changes in 33624 did not include all fixes of the previous patch
file - Please add the fix for the field description of the 8-bit Deep Hops Left
field
Attached file contains this fix (+as well as small correction to the field
descriptions of V and F flags, according to the terminology of RFC 4944)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5047

svn path=/trunk/; revision=33630
2010-07-26 13:04:10 +00:00
Anders Broman 643061bc71 From KATAOKA Toshihiro:
I've made next updates for MIPv6 Mobility Options.

- Restart Counter
- IPv4 Default Router Address
 I've made some minor change re-using same type of header fields.

- IPv4 Home Address field in several IPv4 related mobility options.
- Status field in several IPv4 related mobility options.
- Prefix Len field in several IPv4 related mobility options.

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

svn path=/trunk/; revision=33629
2010-07-25 18:24:43 +00:00
Gerald Combs fccb2829e7 [Automatic manuf and enterprise-numbers update for 2010-07-25]
svn path=/trunk/; revision=33625
2010-07-25 15:03:38 +00:00
Jaap Keuter 7ca6e3a655 From John Sucaet:
packet-6lowpan.c dissects the non-compressed ipv6 fields in an order different
from the one specified in RFC 4944 §10.3.1. 
The patch fixes the wrong order and an additional problem with the dissection 
of the mesh header: support for the Deep Hops Left field (RFC 4944 §5.2)

svn path=/trunk/; revision=33624
2010-07-23 20:19:05 +00:00
Jaap Keuter afc25e015c From Jan van den Boom:
Correct the V and F flag interpretation in the Mesh Addressing Type and Header
for correct address interpretation.

svn path=/trunk/; revision=33623
2010-07-23 19:40:32 +00:00
Stig Bjørlykke 187bd52890 Corrected length check for I05 Downstream Service.
svn path=/trunk/; revision=33615
2010-07-22 10:07:25 +00:00
Guy Harris a887d3a9f3 In the frame_data structure, expand the per-packet
encapsulation/data-link type to 16 bits, and shuffle some fields to
eliminate some unnecessary padding - the net result should be no change
in the structure size for 32 bits and a few bytes removed for 64 bits.

This allows more encapsulation types - we've just about run out of the
ones that fit in a signed 8-bit integer - and thus should fix bug 5025.

svn path=/trunk/; revision=33613
2010-07-22 09:11:16 +00:00
Jaap Keuter 7b80ce5598 From Zachary Mark:
It appears that SCSI_SPC_ACCESS_CONTROL_IN is incorrectly set to opcode 0x85 
where the actual opcode is 0x86.  0x85 is the opcode for the 16-byte version 
of the ATA PASSTHROUGH command of the SAT standards family.

svn path=/trunk/; revision=33611
2010-07-21 19:31:56 +00:00
Stig Bjørlykke ba6c5161ba Use correct length for I04/I05 Envelope headers.
svn path=/trunk/; revision=33606
2010-07-21 14:43:02 +00:00
Stig Bjørlykke 77ee2eac8d Added "Attribute Aggregation Rule Mask" from PKT-SP-MM-I05-091029.
svn path=/trunk/; revision=33605
2010-07-21 14:17:00 +00:00
Martin Mathieson 21ec91d326 Fix warnings as seen in gcc 3.4.6
svn path=/trunk/; revision=33604
2010-07-21 12:29:32 +00:00
Stig Bjørlykke a731837323 From KATAOKA Toshihiro via bug 5033:
3GPP GTPv2 header Update:
- piggybacked flag
- sequence number

From me:
Updated the comments for sequence number.

svn path=/trunk/; revision=33603
2010-07-21 10:28:46 +00:00
Stig Bjørlykke ab345f6bda Fixed adding a boolean value as a custom column.
This is reported in bug 5039.

svn path=/trunk/; revision=33602
2010-07-21 09:47:24 +00:00
Bill Meier aa3ba1a1b5 From Alex Burlyga: Make hf_nfs_slotid4 useful again.
"hf_slotid4 is used for all possible slotid fields in sequence op. This patch
 separates them out and makes it useful for filtering."

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

svn path=/trunk/; revision=33601
2010-07-21 01:43:14 +00:00
Bill Meier 2910c9949a (Trivial) add a few comments about date/time formats.
svn path=/trunk/; revision=33600
2010-07-21 01:38:11 +00:00
Gerald Combs 46bd1dac98 Initialize a variable. Fixes bug 5026.
svn path=/trunk/; revision=33596
2010-07-20 17:16:42 +00:00
Stig Bjørlykke f3dab52b93 From Mat Ford via bug 5031:
Minor update to packet-ipv6.h to reference the correct RFC, and more accurately
describe the ip6_un1_flow data structure.

svn path=/trunk/; revision=33595
2010-07-20 16:18:18 +00:00
Bill Meier 4c14b405a1 (Minor) use NULL instead of "" for hf[] blurbs.
svn path=/trunk/; revision=33593
2010-07-20 15:41:42 +00:00
Martin Mathieson 5a2ca22658 Minor formatting change.
svn path=/trunk/; revision=33590
2010-07-20 13:27:20 +00:00
Jörg Mayer 0e4e77fe2e Add dissectors/packet-netmon-802_11.c
svn path=/trunk/; revision=33588
2010-07-20 08:28:49 +00:00
Jörg Mayer 8c03a4472a Updading opensuse 11.2 -> 11.3 updated gcc to 4.5.0, which created
a few warnings that needed fixing when compiling with -Werror.

svn path=/trunk/; revision=33587
2010-07-20 08:27:34 +00:00
Gerald Combs 844e3e122a Use sscanf() to parse clientaddr4 instead of trying to parse it
ourselves. Add support for IPv6 addresses. Fixes bug 5019.

svn path=/trunk/; revision=33585
2010-07-19 21:47:51 +00:00
Guy Harris d1751061c8 Initial support for Network Monitor 802.11 radio header.
svn path=/trunk/; revision=33583
2010-07-19 18:00:20 +00:00
Martin Mathieson 703635b979 Give up dissecting a MAC PDU if we see control LCIDs after data ones.
This saves us getting into a mess trying to keep track of PDU sizes in an array...

svn path=/trunk/; revision=33582
2010-07-19 14:14:47 +00:00
Stig Bjørlykke 22fed2a3c6 Removed call to check_col().
svn path=/trunk/; revision=33581
2010-07-19 13:55:12 +00:00
Stig Bjørlykke f790332923 Added SharedResourceID.
svn path=/trunk/; revision=33580
2010-07-19 13:31:02 +00:00
Stig Bjørlykke 6722384a7d Added some bootp option strings from IANA.
svn path=/trunk/; revision=33571
2010-07-18 16:20:29 +00:00
Stig Bjørlykke 461934238f Added "LISP Canonical Address Format (LCAF)".
svn path=/trunk/; revision=33570
2010-07-18 16:05:48 +00:00
Stig Bjørlykke 31c67f8a03 Added some ARP options from RFC 5494.
svn path=/trunk/; revision=33568
2010-07-18 16:01:11 +00:00
Stig Bjørlykke 28006dfb4f Use correct length for the IPv6 item.
svn path=/trunk/; revision=33565
2010-07-18 15:06:13 +00:00
Gerald Combs f1cf8c0ff0 [Automatic manuf and enterprise-numbers update for 2010-07-18]
svn path=/trunk/; revision=33564
2010-07-18 15:03:32 +00:00
Stig Bjørlykke 35073fe5a7 Added some values from IANA's icmpv6-parameters.
Note: option 29 and 30 still not dissected according to RFC 5271.

svn path=/trunk/; revision=33563
2010-07-18 12:09:14 +00:00
Stig Bjørlykke becb46a421 Added some updates from RFC 4443.
svn path=/trunk/; revision=33562
2010-07-18 11:47:43 +00:00
Stig Bjørlykke 039c0ccac0 Show the reserved values in type 135, 137 and 143 in the packet tree.
This fixes the issues in bug 5018.

svn path=/trunk/; revision=33561
2010-07-18 11:07:04 +00:00
Jaap Keuter 2e98191ed3 From KATAOKA Toshihiro:
Additional patch reparing proto.avvrb.

svn path=/trunk/; revision=33560
2010-07-17 21:43:25 +00:00
Jaap Keuter eabe057c1a From KATAOKA Toshihiro:
I've made some update for MIPv6 Mobility Options according to the IETF RFCs.
See also: http://www.iana.org/assignments/mobility-parameters/mobility-parameters.xhtml#mobility-parameters-2

svn path=/trunk/; revision=33558
2010-07-17 07:55:28 +00:00
Jaap Keuter 09b3f1eef0 From Robert Ancell:
XDMCP Query contains authentication names, not authorization names.

svn path=/trunk/; revision=33557
2010-07-16 20:57:08 +00:00
Martin Mathieson e88b2f1fc9 Make frames containing Malformed expert items match with "malformed" display filter.
svn path=/trunk/; revision=33551
2010-07-16 11:17:32 +00:00
Jörg Mayer db6a3e655e Fix for bug 5008:
- Interval is now a 12 bit value in 1/100 s.
- The address type of the virtual address is the address type
  of the network protocol.

Bugs: Currently the mbz and the interval don't look nice.
      The checksum is incorrect (but it was incorrect with the
      old code as well, so it isn't a regression).

svn path=/trunk/; revision=33550
2010-07-16 09:52:43 +00:00
Jörg Mayer 55352783c3 Make whitespace consistent (in preparation for bug 5008)
svn path=/trunk/; revision=33549
2010-07-16 07:48:50 +00:00
Guy Harris 4b6f53894a There shouldn't be any need to build stuff in the top-level directory
with the Lua or libgnutls flags, as nothing in the top-level directory
should use them directly.

However, libwireshark *does* require the Lua flags, so use them.

svn path=/trunk/; revision=33534
2010-07-15 03:31:51 +00:00
Guy Harris 9b7176f7b4 If we have neither libgnutls nor libgcrypt,
epan_get_runtime_version_info() does nothing, and thus doesn't use its
argument.

svn path=/trunk/; revision=33532
2010-07-15 03:22:49 +00:00
Guy Harris cc3540b0fb Move the code to get version information for libraries used by
libwireshark into libwireshark, and call it only in programs linked with
libwireshark.  That way, programs that don't link with libwireshark
don't have to link with libgcrypt or libgnutls solely so that they can
say that they're linked with a particular version of libgcrypt or
libgnutls.

Don't link dumpcap with libgcrypt or libgnutls any more.

svn path=/trunk/; revision=33531
2010-07-15 02:07:16 +00:00
Stig Bjørlykke 30f105640f Don't pass tvb data to col_set_str(), as it will not stay around.
Added support for Note (dumping as text).
Renamed Info to Power (as used in PacketLogger).

svn path=/trunk/; revision=33526
2010-07-14 20:24:38 +00:00
Anders Broman b5753ef3fc Add a field for "Revision Level Indicator" in the "MS Radio Access Capability IE".
svn path=/trunk/; revision=33518
2010-07-14 12:01:05 +00:00
Gerald Combs 3a5ba15b4d Rename a variable. "tmp_len" was too similar to "tmp_length".
svn path=/trunk/; revision=33506
2010-07-13 22:49:17 +00:00
Gerald Combs 041cd31c9e Revert get_ber_length() back to r32530, which removes all of the changes
back to and including my attempt to make it iterative. Move its guts
back into try_get_ber_length() and add a recursion level check.

This should fix CVE-2010-2284 and preserve existing behavior without
introducing any new regressions (such as bug 5000).

svn path=/trunk/; revision=33505
2010-07-13 22:41:34 +00:00
Martin Mathieson db478debbd Allocate tap structs rather than using one static struct.
svn path=/trunk/; revision=33503
2010-07-13 16:25:34 +00:00
Stig Bjørlykke a0022b31f2 From Mellanox Technologies Ltd. via bug 5004:
Added missing variable assignment for dst_qp.

svn path=/trunk/; revision=33501
2010-07-13 14:38:23 +00:00
Gerald Combs cfe9b05691 Add length checks.
svn path=/trunk/; revision=33488
2010-07-12 17:30:14 +00:00
Gerald Combs 55d68ba4bc [Automatic manuf and enterprise-numbers update for 2010-07-11]
svn path=/trunk/; revision=33484
2010-07-11 15:03:33 +00:00
Jaap Keuter f33d886525 Fix for bug 4993:
Mac support flags are little endian too.

svn path=/trunk/; revision=33483
2010-07-10 09:47:20 +00:00
Gerald Combs b4a8226906 Check our field lengths. Should fix the recent randpkt errors.
svn path=/trunk/; revision=33481
2010-07-09 20:27:02 +00:00
Gerald Combs edb7f000dc Assume that if we have more than 500 levels of nested indefinite lengths
we have a malformed packet.

svn path=/trunk/; revision=33480
2010-07-09 17:07:34 +00:00
Bill Meier 05b7c16830 Implement a separate pref for enabling tracking of tcp window scaling
(instead of including this pref as part of enabling tcp relative sequence numbers).

svn path=/trunk/; revision=33479
2010-07-09 01:46:11 +00:00
Bill Meier 40c1c5b28b From Ian Schorr: "NFSv4 COMMIT Calls not decoding"
NFSv4 COMMIT Requests are not decoded.  NFS "malformed packet" logic is
tripped.

This was a bug introduced with the changes in bug 4975.  The dissector
erroneously tries to decode 4 bytes past the end of the packet.

A patch is attached that fixes that, as well as adds "Offset" info in the Info
column for COMMIT calls.

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

svn path=/trunk/; revision=33478
2010-07-09 00:23:27 +00:00
Stig Bjørlykke e64762a0d8 From Thomas Dreibholz via bug 4989:
Extend the SSP dissector to support the SSP Environment message type.

svn path=/trunk/; revision=33476
2010-07-08 14:14:11 +00:00
Anders Broman 7f90713b6e from Tarjei Knapstad.
Minor cleanups in packet-xml dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4987

svn path=/trunk/; revision=33475
2010-07-08 12:55:03 +00:00
Jeff Morriss b0cf38c06c Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4854 (crash when adding
2nd info column):

Duplicate col_do_append_sep_va_fstr()'s code into col_append_fstr() and
col_append_sep_fstr() (and remove col_do_append_sep_va_fstr()) because we need
to call va_start() and va_end() after each call to g_vsnprintf().  (This is a
followon to rev 32961.)

svn path=/trunk/; revision=33472
2010-07-08 02:54:26 +00:00
Jeff Morriss 4e76ef92cb For: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4984#c4 : In try_get_ber_length() don't let a negative length make us go backwards. This should eliminate a possible infinite loop and appears to /help/ limit the depth of recursion.
svn path=/trunk/; revision=33471
2010-07-07 22:00:44 +00:00
Gerald Combs 820be405e2 Fix a buffer overflow found by recent randpkt testing. Replace raw data
pointer access with tvb_memcpy() and tvb_get_ntohs().

svn path=/trunk/; revision=33470
2010-07-07 21:27:13 +00:00
Martin Mathieson 28681e2200 From Pascal Quantin: Add offset of 1 to FMS.
svn path=/trunk/; revision=33467
2010-07-07 17:13:53 +00:00
Jeff Morriss c24f16ad44 Fix infinite recursion reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4984 : In try_get_ber_length() make sure we move forward before recursing.
svn path=/trunk/; revision=33464
2010-07-07 15:52:09 +00:00
Jörg Mayer 359bd13cc9 Some dissectors are added in dissectors/dcerpc/CMakeLists.txt
Remove them here.

svn path=/trunk/; revision=33463
2010-07-07 13:46:08 +00:00
Jörg Mayer eb686a2146 Synchronize dissector lists between CMakeLists.txt and
dissectors/Makefile.common:

The following dissectors were missing from CM:
  dissectors/packet-dcerpc-budb.c
  dissectors/packet-dcerpc-butc.c
  dissectors/packet-dcerpc-drsuapi.c
  dissectors/packet-gsmtap.c

Both: Whitespace fixes and reordering.

svn path=/trunk/; revision=33462
2010-07-07 13:25:36 +00:00
Jaap Keuter 0494e951b8 Fix for bug 4982:
Handle concatenated Status and other message.

svn path=/trunk/; revision=33457
2010-07-06 17:22:12 +00:00
Jeff Morriss 4522f9b0a4 Limit the number of operations to 128 (arbitrary number) to keep us from attempting to mallocate way too much memory. This fixes the fuzz failure reported in bug 4976.
svn path=/trunk/; revision=33456
2010-07-06 14:57:54 +00:00
Anders Broman c5ddd5a253 Add miising else handling a zero msg_auth_code.
svn path=/trunk/; revision=33455
2010-07-06 13:21:34 +00:00
Guy Harris 80c8a18da7 Use G_GINT64_CONSTANT() to make a 64-bit all-bits-set constant.
svn path=/trunk/; revision=33454
2010-07-06 09:51:28 +00:00
Guy Harris 39f85d188c No need to add a fake field with the opcode as a string - you can just
compare the real opcode field against a string.

svn path=/trunk/; revision=33452
2010-07-06 08:43:07 +00:00
Stig Bjørlykke 8f686e8af0 Try checking for G_MAXUINT64 instead of 0xffffffffffffffff.
svn path=/trunk/; revision=33451
2010-07-06 07:45:38 +00:00
Stig Bjørlykke c7f2634f52 Removed non-ASCII characters.
svn path=/trunk/; revision=33450
2010-07-06 06:54:51 +00:00
Stig Bjørlykke 22056542a8 Fix the build on OSX.
svn path=/trunk/; revision=33449
2010-07-06 06:40:34 +00:00
Anders Broman 4a16e04cc0 Fix:
packet-nfs.c:699: warning: type defaults to 'int' in declaration of 'nfsv4_operation_tiers'

packet-nfs.c:9583: warning: unused variable 'saved_fh_hash'
packet-nfs.c:9580: warning: unused variable 'name'

svn path=/trunk/; revision=33448
2010-07-06 05:53:18 +00:00
Anders Broman 7bded303a4 Fix "checked api failed"
svn path=/trunk/; revision=33447
2010-07-06 05:46:52 +00:00
Anders Broman 0b0db7e0d7 From Brett Kuskie:
Enhancement of the dcerpc-svcctl dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4858

svn path=/trunk/; revision=33446
2010-07-06 04:43:45 +00:00
Anders Broman 36f5046490 From Frank Schorr:
The packet-nbns.c dissector picks random data as the NBSS PDU length in certain situations.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4914

svn path=/trunk/; revision=33445
2010-07-06 04:32:21 +00:00
Anders Broman 85a9a2cd21 From Sven Eckelmann:
Dissector/packet-batadv: Add support for icmp rr.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4922

svn path=/trunk/; revision=33444
2010-07-06 04:27:01 +00:00
Anders Broman 8d917e7bca From Andrew Feren:
Several small fixes to NetFlow decoding.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4962

svn path=/trunk/; revision=33443
2010-07-06 04:20:27 +00:00
Anders Broman a13bf525a8 From Ian Schorr:
NFSv4 usability enhancements (Info column summaries, filterable fields).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4975

svn path=/trunk/; revision=33442
2010-07-06 04:13:54 +00:00
Jörg Mayer 3bef8584a4 So many people who love to use easy to remember ports.
Improve heuristics to exclude cases where the traffic
definitely isn't Cisco's IPSEC inside TCP.

Does this obsolete the NDMP protocol check?

svn path=/trunk/; revision=33441
2010-07-05 23:21:58 +00:00
Anders Broman 7e2f42090d From Jouni Malinen:
Add dissecting for IEEE 802.11u GAS frames.

svn path=/trunk/; revision=33439
2010-07-05 20:04:46 +00:00
Martin Mathieson 8bf9b7a3b3 Change type back to 16-bit to fix buildbot.
Will change subframe numbers to 8-bit later.

svn path=/trunk/; revision=33438
2010-07-05 17:28:28 +00:00
Martin Mathieson b2a872cd9f Show grant-subframe from context info.
svn path=/trunk/; revision=33437
2010-07-05 16:45:36 +00:00
Anders Broman 419dd3e945 From Jouni Malinen:
Add dissecting for SA Query Action frames (IEEE 802.11w)

svn path=/trunk/; revision=33436
2010-07-05 16:05:21 +00:00
Anders Broman 1962892ac0 From Jouni Malinen:
Add a proto tree item for Current Channel in DS Parameter Set element.

svn path=/trunk/; revision=33435
2010-07-05 15:59:11 +00:00
Martin Mathieson b7f136ae41 Check range of supplied subframe number. If out, set back to max (9) and
add expert info error.  Should fix bug 4970.

svn path=/trunk/; revision=33432
2010-07-05 10:50:27 +00:00
Martin Mathieson 735ec2d6d2 For DL HARQ retx, support knowing result or not.
svn path=/trunk/; revision=33431
2010-07-05 10:35:17 +00:00
Stig Bjørlykke 7b64be6a80 Revert COL_DSCP_VALUE back to value set in packet-ip.c.
Right justify COL_DSCP_VALUE (and COL_DCE_CALL as in the old packet list).

svn path=/trunk/; revision=33430
2010-07-05 09:05:27 +00:00
Gerald Combs 2f1e6127aa [Automatic manuf and enterprise-numbers update for 2010-07-04]
svn path=/trunk/; revision=33426
2010-07-04 15:03:32 +00:00
Stig Bjørlykke ab215a67d5 Code cleanup:
- Use ep_strdup_printf instead of ep_alloc + g_snprintf
- Untabify

svn path=/trunk/; revision=33414
2010-07-02 13:15:44 +00:00
Guy Harris 63a0810874 oid_encoded2string() returns a const char *; don't assign it to a char
*.

Don't declare variables in the middle of a block; not all the compilers
we use support that.

svn path=/trunk/; revision=33409
2010-07-02 03:50:30 +00:00
Bill Meier 89015cb584 From Sven Eckelmann: Fix size of seqno in icmp packets
See Bug #4921: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4921

svn path=/trunk/; revision=33405
2010-07-01 19:19:03 +00:00
Bill Meier b88b612f02 From Sven Eckelmann: Add support for v11 packet format
"Please add support for v11 ogm packets used in linux 2.6.36"
See: Bug #4920: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4920

svn path=/trunk/; revision=33404
2010-07-01 18:42:41 +00:00
Gerald Combs ad7b7cc679 Don't add raw bytes to the tree.
svn path=/trunk/; revision=33403
2010-07-01 17:57:53 +00:00
Gerald Combs a7df969fb1 Have get_ber_length() set the length to 0 by default. This restores behavior
that was lost recently.

svn path=/trunk/; revision=33402
2010-07-01 16:35:37 +00:00
Bill Meier f1c540a54c Rework ethernet address resolution: step 3 of 3:
- Primarily: ethernet name lookup returns either
   unresolved or resolved ethernet name depending upon whether 
   MAC Name resolution is disabled or enabled.
   Previously: Unresolved or resolved name cached at first reference
   and then always returned for future references no matter whether
   MAC Name Resolution was enabled or disabled. 
- Also: Refactor ethernet, manuf & well-known-addr related code;

ToDo: (separately): Redisplay when 'MAC name resolution' enabled/disabled. 

svn path=/trunk/; revision=33401
2010-07-01 15:11:02 +00:00
Gerald Combs 622f07b95e Initialize MechType_oid in the right place.
svn path=/trunk/; revision=33396
2010-07-01 00:44:21 +00:00
Gerald Combs 6aaa5874c6 Initialize more variables.
svn path=/trunk/; revision=33392
2010-07-01 00:11:14 +00:00
Gerald Combs caff9b5513 Initialize a variable.
svn path=/trunk/; revision=33390
2010-06-30 23:45:24 +00:00
Gerald Combs a629fe9c3f Initialize some variables.
svn path=/trunk/; revision=33389
2010-06-30 23:40:05 +00:00
Gerald Combs 47c6bf912f Initialize a variable.
svn path=/trunk/; revision=33388
2010-06-30 23:36:24 +00:00