Commit Graph

18601 Commits

Author SHA1 Message Date
Martin Mathieson b3c3bd6e93 Call mac_lte_drx_control_element_received and make it static again
svn path=/trunk/; revision=52318
2013-10-01 16:19:42 +00:00
Pascal Quantin df5848517f From Didier Gautheron via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9210 :
Add 'deflate' to SIP Content-Encoding

svn path=/trunk/; revision=52315
2013-10-01 14:49:01 +00:00
Pascal Quantin 8e2c3bad06 Add MPS extensions as found on http://compliance.usb.org/mbim/
svn path=/trunk/; revision=52314
2013-10-01 14:47:03 +00:00
Michael Mann 0334c5b425 Remove check_col from generated DCE/RPC dissectors. Bug 8804 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8804).
I still couldn't figure out how to generate the source, so I made the modifications to the generated dissectors "manually" (search/replace tool in VS) that would match the "PIDL source" included here.

I will be sending the "PIDL source" (non dissector files) to the samba team.

svn path=/trunk/; revision=52313
2013-10-01 14:45:03 +00:00
Evan Huus c6371f0f6d Add cast.
svn path=/trunk/; revision=52312
2013-10-01 13:09:51 +00:00
Evan Huus 3955de8abf Add some additional checks around the radiotap iterator initialization, to fix
the invalid access errors in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9212

(also add modelines)

svn path=/trunk/; revision=52311
2013-10-01 13:07:25 +00:00
Michael Mann 55371ca87d Remove check_col for all non-generated DCE/RPC dissectors.
svn path=/trunk/; revision=52310
2013-10-01 13:02:12 +00:00
Pascal Quantin 233a6cd8b7 Sort alphabetically the list
svn path=/trunk/; revision=52309
2013-10-01 07:41:30 +00:00
Pascal Quantin 3c10ffd3d5 Plug MBIM dissector to USB one
With this change and the use of USBPcap, it becomes possible to dissect MBIM messages on Windows 8.1

svn path=/trunk/; revision=52308
2013-09-30 20:38:23 +00:00
Pascal Quantin d837d9f82c Fix compilation warnings
svn path=/trunk/; revision=52307
2013-09-30 20:36:38 +00:00
Pascal Quantin 5cb299d39d Add basic request / response tracking
svn path=/trunk/; revision=52306
2013-09-30 20:16:58 +00:00
Michael Mann 1e5ff9125a Add some expert info. The main reason for doing this was there were a bunch of proto_tree_add_bytes_format calls that were passing hf_ variables that weren't of type FT_BYTES, and I assume that should lead to a dissector assert/fuzzbot failure.
For consistency all places that "didn't have enough bytes", got an expert message, regardless of whether the upcoming field itself was a FT_BYTES type.

svn path=/trunk/; revision=52304
2013-09-30 18:02:32 +00:00
Michael Mann c70b1a548b Convert proto_tree_add_int_format calls to proto_tree_add_int_format_value where appropriate.
svn path=/trunk/; revision=52301
2013-09-30 16:10:40 +00:00
Michael Mann 50fd09f99e Convert proto_tree_add_int64_format calls to proto_tree_add_int64_format_value where appropriate.
svn path=/trunk/; revision=52300
2013-09-30 15:59:27 +00:00
Michael Mann ffaeb8a433 Convert proto_tree_add_uint64_format calls to proto_tree_add_uint64_format_value where appropriate.
svn path=/trunk/; revision=52299
2013-09-30 15:52:24 +00:00
Michael Mann 47bca84efb Convert proto_tree_add_double_format calls to proto_tree_add_double_format_value where appropriate.
svn path=/trunk/; revision=52298
2013-09-30 15:42:18 +00:00
Michael Mann cf80442912 Convert some proto_tree_add_string_format calls to something more appropriate.
There seem to be several cases of proto_tree_add_string_format where a "string" value/filter doesn't really make sense because it's always empty, and is just being used as a "filterable subtree header (placeholder)".  They appear to be more for "presense" than "value" and should probably be FT_NONE, although I'd almost argue for removing the filter in favor of  proto_tree_add_text.

svn path=/trunk/; revision=52296
2013-09-30 15:21:09 +00:00
Evan Huus 67da8b61fd From Peter Paluch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9160
Extend the BPDU dissector in packet-bpdu.c so that it recognizes and displays
the PVID TLV in Cisco's PVST+/RPVST+ BPDUs.

svn path=/trunk/; revision=52294
2013-09-30 11:57:14 +00:00
Martin Mathieson acf8fbb75d Deep copy needed (clang warning flagged by Alexis!)
svn path=/trunk/; revision=52291
2013-09-30 10:15:50 +00:00
Alexis La Goutte 8a95992860 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=52287
2013-09-30 09:03:06 +00:00
Alexis La Goutte fe92d7a217 Fix indent (use 4 spaces)
svn path=/trunk/; revision=52286
2013-09-30 09:02:56 +00:00
Alexis La Goutte 2f3a181f67 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
svn path=/trunk/; revision=52285
2013-09-30 09:02:44 +00:00
Evan Huus d1544e8311 Use array_length macro in two places. Add modelines. Remove trailing whitespace.
svn path=/trunk/; revision=52281
2013-09-30 00:05:43 +00:00
Pascal Quantin c8be3dcee2 Add a MBIM (Mobile Broadband Interface Model) dissector
Still to be done:
- fragmentation support
- plug the MBIM dissector on USB dissector

svn path=/trunk/; revision=52279
2013-09-29 22:50:27 +00:00
Jörg Mayer 5cd75ac8d5 As pointed out in bug 9127, tcpdump dissects Juniper Attributes
quite well - reimplement that in Wireshark.

There is room for improvement in this patch, e.g. use subtrees for
the subattributes.

svn path=/trunk/; revision=52278
2013-09-29 22:40:25 +00:00
Evan Huus f3e28f33f0 Remove unused variable.
svn path=/trunk/; revision=52276
2013-09-29 21:06:44 +00:00
Michael Mann e6f1bd9056 Convert several proto_tree_add_bytes_format calls to proto_tree_add_bytes_format_value.
svn path=/trunk/; revision=52272
2013-09-29 18:19:29 +00:00
Guy Harris 33583f2c27 Removing the assignments to "str" was an error, as its value is returned
from the functions.

svn path=/trunk/; revision=52271
2013-09-29 18:07:33 +00:00
Michael Mann 33ae47f7ad Cleanup some proto_tree_add_ipv4_format calls that shouldn't be.
svn path=/trunk/; revision=52270
2013-09-29 17:18:56 +00:00
Michael Mann e5846873f4 Convert proto_tree_add_time_format to either proto_tree_add_time or proto_tree_add_time_format_value.
Only proto_tree_add_time_format calls remaining are in packet-ncp2222.inc, which may just need some additional filters.

svn path=/trunk/; revision=52269
2013-09-29 16:40:01 +00:00
Michael Mann da2adc77a9 Convert proto_tree_add_ipxnet_format to proto_tree_add_ipxnet_format_value. Now proto_tree_add_ipxnet_format is currently unused.
svn path=/trunk/; revision=52268
2013-09-29 15:49:04 +00:00
Evan Huus dcbc510a4c From Peter Van Eynde via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9187

Fix some minor length calculation mistakes in the WCCP decoder.

svn path=/trunk/; revision=52260
2013-09-28 23:26:23 +00:00
Anders Broman 8157963907 Start dissect multipart messages.
svn path=/trunk/; revision=52237
2013-09-28 08:58:06 +00:00
Jörg Mayer 1306b0f349 Hack for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9127

With 6 unknown bytes leading to the two known values for the
last two bytes this cannot yet be properly dissected. Dissect
the one known case. More traces with additional properties
required to get more sense into the first 6 bytes.

svn path=/trunk/; revision=52233
2013-09-27 20:33:29 +00:00
Martin Mathieson 9e93af2470 And also where it is declared. Doesn't VSC++ warn about anything?
svn path=/trunk/; revision=52232
2013-09-27 16:40:50 +00:00
Martin Mathieson e8488209f8 Temporarily make an uncalled function non-static, until it gets called
svn path=/trunk/; revision=52231
2013-09-27 16:38:45 +00:00
Martin Mathieson e4186e832d Remove unused parameter
svn path=/trunk/; revision=52230
2013-09-27 16:29:05 +00:00
Martin Mathieson f655b556f7 Another step towards DRX support in LTE MAC
svn path=/trunk/; revision=52229
2013-09-27 16:18:09 +00:00
Jörg Mayer 703dad7c53 Fix:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-openflow.c: In function ‘dissect_openflow_v_1_3’:
/home/jmayer/work/wireshark/svn/trunk/epan/dissectors/packet-openflow.c:1125:18: error: variable ‘version’ set but not used [-Werror=unused-but-set-variable]
     guint8 type, version;

Remove some trailing whitespace.

svn path=/trunk/; revision=52228
2013-09-27 08:06:44 +00:00
Anders Broman 1662d89793 Fix:
packet-openflow.c:577:31: error: "/*" within comment
packet-openflow.c:655:24: error: "/*" within comment
cc1: warnings being treated as errors
packet-openflow.c: In function 'dissect_openflow_features_reply_v1_3':
packet-openflow.c:671: warning: unused parameter 'pinfo'
packet-openflow.c:671: warning: unused parameter 'length'
packet-openflow.c: In function 'dissect_openflow_multipart_request_v1_3':
packet-openflow.c:809: warning: unused parameter 'pinfo'
packet-openflow.c:809: warning: unused parameter 'length'
packet-openflow.c: At top level:
packet-openflow.c:1033: warning: return type defaults to 'int'
packet-openflow.c:1119: warning: return type defaults to 'int'

svn path=/trunk/; revision=52226
2013-09-26 21:21:54 +00:00
Anders Broman 408ba7bade From beroset@mindspring.com:
c1222 dissector has wrong tag value for BER-encoding of calling_AE_qualifier

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

svn path=/trunk/; revision=52225
2013-09-26 21:15:44 +00:00
Anders Broman a8a0450aa7 Start refactoring to dissect each version separatly.
svn path=/trunk/; revision=52223
2013-09-26 21:05:04 +00:00
Guy Harris 5ee2b14a10 Do all checks against the reported length; a packet that wasn't captured
in its entirety due to a snapshot length being specified is not
malformed.

Instead of checking for the the sum of the offset and the value length
being less than the offset, check whether the TLV length is <= 4 and, if
so, just quit at that point (that also handles the "value is zero
length" case).  That makes sure that valuelength isn't negative; given
that length is < 65536, valuelength < 65532, so that won't cause offset
to overflow, so that means offset won't go backwards.

svn path=/trunk/; revision=52220
2013-09-25 22:53:53 +00:00
Anders Broman 49b08e6694 From Masayuki Takemura:
According to 3GPP R8/R9/R10/R11, the mobility option "3GPP Specific PMIPv6 error
code" is 1 octet length.

However, in the source file packet-mip6.c, the length of the option is set to 4 octets (around line 1744):

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

svn path=/trunk/; revision=52218
2013-09-25 21:11:25 +00:00
Anders Broman 0fdbb8ca25 Dissect bssmap_reroute_cmd and bssmap_reroute_complete and
add new IE dissection to bssmap_cl3_info.

svn path=/trunk/; revision=52217
2013-09-25 21:06:05 +00:00
Anders Broman 19fdb497d4 Add the abillity to let vendor AVP subdisectors add Message type to the info column.
svn path=/trunk/; revision=52216
2013-09-25 20:58:37 +00:00
Michael Mann 376c5792a1 Minor correction to dissection of DLR frames in Ethernet/IP dissector. Bug 9186 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9186)
From Joakim Wiberg

svn path=/trunk/; revision=52215
2013-09-25 19:13:10 +00:00
Evan Huus eb64e871ba Prevent offset overflow in DTP dissector. Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9184

Also add modelines.

svn path=/trunk/; revision=52214
2013-09-25 16:57:21 +00:00
Evan Huus 95bc2da1e8 Require the NTLMSSP response contents to be long enough before we try to memcpy
it. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9182

svn path=/trunk/; revision=52213
2013-09-25 16:41:09 +00:00
Jörg Mayer 31f9c281ad Beginning to work on bug 9127 (Juniper proprietary TLV in RSVP):
- Print hexdump of unknown or vendor specific toplevel TLVs
- Try to print the name of type 204 (something still missing)

svn path=/trunk/; revision=52212
2013-09-25 10:11:07 +00:00
Evan Huus 71e0d23701 From Chris Bontje via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9180
A few enhancements to the SEL Fast Message (selfm) Dissector:
- Final piece of dissection for standard Fast Meter messages to display pad byte
  (if present) and single-byte checksum footer.
- Enhancement to digital word display to show 1-byte bit patterns on proto_item
  without requiring user to expand tree.

svn path=/trunk/; revision=52210
2013-09-24 22:42:27 +00:00
Pascal Quantin 019e64f58d Upgrade RRC dissector to v11.7.0
svn path=/trunk/; revision=52202
2013-09-24 17:56:17 +00:00
Jeff Morriss 31267e5a21 From Wido Kelling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9176 :
Fix decoding of the Auto-Negotiation bits in LLDP (they were off by one).

svn path=/trunk/; revision=52199
2013-09-24 01:12:44 +00:00
Jeff Morriss 221f85fd67 From robionekenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9173 :
This enhancement add the missing structure CAUT, some missing integer
converted to Strings and some field that were unknown to a better explanation. 

Sorted alphabetically the MQCFINT_Parse VALS structure to better find what is
missing in this VALS structure

svn path=/trunk/; revision=52198
2013-09-24 01:04:10 +00:00
Jeff Morriss 6d255f8633 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6596 :
Allow reading SSL keylog files with carriage returns.

svn path=/trunk/; revision=52197
2013-09-24 00:31:49 +00:00
Pascal Quantin d74564d6cf Ensure to release an existing DRX configuration when receiving a RRC Connection Setup message
svn path=/trunk/; revision=52193
2013-09-23 21:21:58 +00:00
Pascal Quantin 15ba18d1df Upgrade LPPa dissector to v11.3.0
svn path=/trunk/; revision=52192
2013-09-23 20:20:36 +00:00
Anders Broman db64bbc559 Add dissection of new IEs in UL_UNITDATA
svn path=/trunk/; revision=52191
2013-09-23 19:02:33 +00:00
Martin Mathieson eb7cb19709 Another step towards tracking UE DRX state
svn path=/trunk/; revision=52190
2013-09-23 17:34:18 +00:00
Michael Mann d09b1dbe8f DTP Dissector Enhancements
1) Corrections to the naming and terminology of DTP, its TLVs, types and values

2) Improvements to the dissection of Trunk Status and Trunk Type TLVs whose values and meaning have not been properly decoded so far

3) Improvements to the dissection of the Domain TLV (now using proto_tree_add_item() to display its value; this also allows for filtering operations)

4) Minor cleanups to the code (mainly renaming the macro names to make them more consistent)


From Peter Paluch, Bug 9156 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9156)

svn path=/trunk/; revision=52189
2013-09-23 15:54:29 +00:00
Evan Huus 2a1175c963 Tiny indentation fix.
svn path=/trunk/; revision=52188
2013-09-23 12:09:58 +00:00
Alexis La Goutte bd3d51b5fe Fix Function call argument is an uninitialized value warning found by Clang
svn path=/trunk/; revision=52186
2013-09-23 07:20:53 +00:00
Alexis La Goutte 2b301cefb9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=52185
2013-09-23 07:20:45 +00:00
Alexis La Goutte 044951858f Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=52184
2013-09-23 07:20:38 +00:00
Alexis La Goutte 5576d25672 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=52183
2013-09-23 07:20:28 +00:00
Pascal Quantin 102c452bcb More emem -> wmem conversion:
- tvb_get_g_stringz()/tvb_get_ephemeral_stringz()/tvb_get_seasonal_stringz() -> tvb_get_stringz()
- tvb_get_g_stringz_enc()/tvb_get_ephemeral_stringz_enc() -> tvb_get_stringz_enc()
- tvb_get_ephemeral_unicode_stringz() -> tvb_get_unicode_stringz()
- tvb_bcd_dig_to_ep_str() -> tvb_bcd_dig_to_wmem_packet_str()
- update docs accordingly

svn path=/trunk/; revision=52180
2013-09-22 20:04:35 +00:00
Michael Tüxen 9175c79ac1 Update SCTP PPIDs and use newly assigned value.
svn path=/trunk/; revision=52175
2013-09-22 17:16:02 +00:00
Pascal Quantin a0c53ffaa1 emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly

svn path=/trunk/; revision=52172
2013-09-22 15:50:55 +00:00
Evan Huus 6df83e8078 Add _g_ to the names of functions that allocate glib memory. This is a bit more
explicit, and frees up the "generic" names (like tvb_memdup) for new signatures
that take the appropriate wmem pool.

Majority of the conversion done with sed.

svn path=/trunk/; revision=52164
2013-09-21 17:04:41 +00:00
Evan Huus 8abfcaea79 Lower the default RTMPT max reassembly size. A bigger bandaid for
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6898

svn path=/trunk/; revision=52163
2013-09-21 16:27:55 +00:00
Pascal Quantin 514b38fbdd Make it more obvious that the function is using wmem memory
svn path=/trunk/; revision=52162
2013-09-21 11:08:35 +00:00
Pascal Quantin 857dbb03b6 From Mathias Guettler via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9159 :
ESIS dissector exception due to incorrect length parameter to 'proto_tree_add_uint'

svn path=/trunk/; revision=52160
2013-09-20 19:40:26 +00:00
Michael Mann 61c9a77cd9 Bugfix a few items:
1. Correct Interface Flag enumeration
2. Dissect ARP data without making it look like its an ARP packet by disabling column writing.

svn path=/trunk/; revision=52157
2013-09-20 18:35:10 +00:00
Evan Huus 4212b20048 Don't use g_strv_length on a single string, just use strlen. Also do the
null-check *before* calling strlen (if it's even necessary?)

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

svn path=/trunk/; revision=52156
2013-09-20 14:41:22 +00:00
Anders Broman f3e76b0953 Indicate Sequence of 0 length.
svn path=/trunk/; revision=52155
2013-09-20 14:20:06 +00:00
Anders Broman 95c5f81c83 DCH-ID can be 255
svn path=/trunk/; revision=52154
2013-09-20 14:19:31 +00:00
Anders Broman 067ca19a47 Try to make heuristic slightly faster.
svn path=/trunk/; revision=52153
2013-09-20 14:06:43 +00:00
Alexis La Goutte 9c5ff393aa From Chun-Yeow via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9163 Ability to Decode the Number of Mesh Peerings
Decode the mesh formation information fields related to the number of mesh peerings

Signed-off-by: Chun-Yeow Yeoh <yeohchunyeow@cozybit.com>

svn path=/trunk/; revision=52152
2013-09-19 21:16:46 +00:00
Alexis La Goutte 23f9100542 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers
Really add support for AEAD ciphers (GCM)

GCM uses counter mode with authentication tags (the latter is currently
not supported). As for the key material, there is no MAC (because the
auth tag is supposed to verify the authenticity).

Finally, correct the GCM cipher suite definitions: IV block size of
4 bytes and GCM instead of CBC mode.

svn path=/trunk/; revision=52150
2013-09-19 20:27:12 +00:00
Alexis La Goutte a87da76132 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers
Use IV from record for CBC mode, add padding/IV length check

Add summary of RFCs to make it more obvious why certain parts (IV, MAC,
padding) are used. Merge DTLS and TLS blocks for extracting IV. This
saves an unnecessary memmove() because the input pointer is, well, just
a local variable and can therefore be incremented.

Validate padding and IV lengths before using it. A crash could occur
if the explicit IV is missing (this would make memmove write before its
buffer). The missing padding check had as implication that a misleading
error is returning with a negative length (not exploitable).

Use IV from record for CBC mode, previously it decrypted the first block
incorrectly and then threw this "decrypted" IV away. Now it extracts the
IV and uses this for decrypting the first fragment block. (remember that
CBC xor's the output of the block cipher with the previous ciphertext
(or IV for the first block)).

This is a preparation for GCM which does not have a MAC. The skip_mac
branch is necessary to make the compiler happy in this patch, 'mac'
could otherwise be uninitialised.

svn path=/trunk/; revision=52149
2013-09-19 20:27:05 +00:00
Alexis La Goutte cf7f5dd3ad From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers
Correct cipher suites list, add TLS_ annotations

Add official TLS_ names as comment and correct:
- 6: RC2 is a block cipher using MD5, not stream+SHA.
- 25,26,27: should be SHA instead of MD5
- 98: DES export is a block cipher using 56-bits[1], not stream.
- 99: DES export should be using 56-bits[1].
- 138: removed commented RC4 cipher because it is not a block cipher

Besides these comments and corrections, there are no further changes.

 [1]: http://tools.ietf.org/html/draft-ietf-tls-56-bit-ciphersuites-00

svn path=/trunk/; revision=52148
2013-09-19 20:26:57 +00:00
Alexis La Goutte f4a4271320 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers
Drop export_cipher and dig_len, cleaner digest access

Removed dig_len as this magic number is dependent on dig. The digests
variable is converted from a string to a structure holding the digest
name and length because of its close dependency.

Introduce another struct+function to get rid of the magic number 0x40
(DIG_MD5).

Removed export_cipher bit as this is dependent on eff_bits < bits.
Verified with:
grep ,KEX_ packet-ssl-utils.c | awk -F, '{bits=$6!=$7;ex=$9;
if ((bits && !ex) || (!bits && ex))print $6, $7, $8, "###", $0}'.

Removed space before SIG_RSA for cipher 51 for consistency with others.

svn path=/trunk/; revision=52147
2013-09-19 20:26:50 +00:00
Evan Huus 606c422d5b Zero the key in ntlmssp, because we don't otherwise fill all of it. I suspect
the tvb_memcpy on the next line should be taking more data, but I don't know
enough about the protocol to be sure. This is the least disruptive way to fix
the last valgrind error from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8941

svn path=/trunk/; revision=52145
2013-09-19 17:39:43 +00:00
Evan Huus 27c4a47c29 Enum was used after all. Restore it and namespace it with GLUSTER_ to avoid the
collision.

svn path=/trunk/; revision=52144
2013-09-19 13:04:37 +00:00
Evan Huus 6c41404ecf From Mark Vitale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9141
Decode AFS RXAFSCB_GetCapabilities RPC requests with their replies.

svn path=/trunk/; revision=52143
2013-09-19 13:00:57 +00:00
Evan Huus 49648069eb Remove unused enum that started conflicting with /usr/include/dirent.h on my
system.

svn path=/trunk/; revision=52142
2013-09-19 12:50:25 +00:00
Chris Maynard 63c297c455 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9138 (Malformed NORM packet) having to do with Wireshark assuming that all remaining bytes in the packet are part of the "cc_node_list", rather than stopping dissection according to the hdr_len field in the NORM Common Message Header.
Ref: http://tools.ietf.org/html/rfc3940#section-4.2.3.4

#BACKPORT(1.10, 1.8)

svn path=/trunk/; revision=52139
2013-09-18 14:49:03 +00:00
Pascal Quantin 0fb41d119d From Jason Wzhy via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9157 :
BSSGP: Fix dissection of Trace Type IE in SGSN-INVOKE-TRACE message

svn path=/trunk/; revision=52131
2013-09-17 21:56:35 +00:00
Pascal Quantin 2b44f1449c Fix off by 1 error when dissecting Data Radio Bearer identity number
svn path=/trunk/; revision=52128
2013-09-17 20:06:48 +00:00
Bill Meier 882ca2e76d Remove some unneeded #includes...
svn path=/trunk/; revision=52126
2013-09-17 19:23:11 +00:00
Jörg Mayer ac6214533e Regenerate all files where the .cnf files had whitespace changes.
svn path=/trunk/; revision=52125
2013-09-17 18:55:18 +00:00
Bill Meier 7316284293 Reference 'BACnetVendorIdentifiers' value_string using
an extended value string.

svn path=/trunk/; revision=52124
2013-09-17 18:55:17 +00:00
Bill Meier b7bb743641 Update 'BACnetVendorIdentifiers' value strings from
BACnet vendor ID list dated September 16, 2013.
http://www.bacnet.org/VendorID/BACnet%20Vendor%20IDs.htm


svn path=/trunk/; revision=52119
2013-09-17 16:44:26 +00:00
Jörg Mayer 80d8b029b0 Add svn id tag
svn path=/trunk/; revision=52116
2013-09-17 05:51:37 +00:00
Evan Huus 98761803e9 From Mark Vitale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9142
Fix decoding of AFS Volume Name.

svn path=/trunk/; revision=52114
2013-09-16 23:24:32 +00:00
Evan Huus 64d9c005f9 From Mark Vitale via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9140
Add reassembly support for AFS.

From me: minor tweaks to conform to other reassemblable protocols; indentation
fixes; modelines

svn path=/trunk/; revision=52113
2013-09-16 23:15:18 +00:00
Jörg Mayer 0017e999f4 Forgot to check in regenerated dissector for dap.
svn path=/trunk/; revision=52111
2013-09-16 21:38:42 +00:00
Pascal Quantin 7d6899b96b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9155 :
Ensure that codec_str string is always initialized 

svn path=/trunk/; revision=52107
2013-09-16 21:26:03 +00:00
Gerald Combs 6079691af4 Convert each of the address.h macros to inline functions.
Document each function. Note that we now call tvb_get_ptr() before
modifying the address in tvb_set_address() and tvb_set_address_hf(). The
caller doesn't have to worry about doing that any more. Add
add_address_to_hash64().

svn path=/trunk/; revision=52106
2013-09-16 21:15:49 +00:00
Jeff Morriss cc7a3cf06c Remove a bunch more set-but-no-longer-used variables.
svn path=/trunk/; revision=52100
2013-09-16 14:08:43 +00:00
Jeff Morriss bf093ef1f6 Remove set-but-no-longer-used variable.
svn path=/trunk/; revision=52099
2013-09-16 14:05:31 +00:00
Michael Mann 346f803d42 Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was all manual inspection and most cases were either:
1. Case sensitivity differences between hf_ field name and formatted string.
2. Unnecessary whitespace between hf_ field name and colon in formatted string

There are cases where the hf_ field name doesn't quite match the proto_tree_add_uint_format, but it's close enough that one of them should be "right", I'm just not sure which is, I just know the string in proto_tree_add_uint_format is the one displayed.

svn path=/trunk/; revision=52098
2013-09-16 10:39:06 +00:00
Alexis La Goutte 9bde18734f From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144
Update TLS Ciphers

The attached trivial patch corrects the digest (SHA) length for TLS_DHE_DSS_EXPORT1024_WITH_DES_CBC_SHA

svn path=/trunk/; revision=52096
2013-09-16 07:54:28 +00:00
Evan Huus adb39445ee Apparently some platforms don't like $ in their macro names. Fix it.
svn path=/trunk/; revision=52090
2013-09-15 22:36:47 +00:00
Evan Huus 464bbb1275 Tweak mq macro and checkAPI to avoid false positives - "garbage"
(like a #define) at the beginning of a line before a value_string no longer
matches so a #define that includes the beginning of a value_string doesn't
confuse the script.

svn path=/trunk/; revision=52089
2013-09-15 22:34:36 +00:00
Pascal Quantin da8240ef60 emem -> wmem (except uat or init routines)
svn path=/trunk/; revision=52087
2013-09-15 21:36:37 +00:00
Evan Huus da27bad13b Comment out hf_ var whose use is also commented out at least for now.
svn path=/trunk/; revision=52086
2013-09-15 21:01:45 +00:00
Evan Huus 5bd199d8f5 From RobiOneKenobi via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9072
Substantial enhancements to MQ protocol: all Structure, MSG_REQUEST/ASYNC_RESP,
MQ Multi Segment are decoded until version 7.1/7.5

svn path=/trunk/; revision=52085
2013-09-15 20:56:56 +00:00
Evan Huus 432a064b0e Simplification I noticed while reviewing the wmem conversion: there's no need to
strdup the string built in a strbuf if the scope is the same. Remove the
thoroughly unnecessary temporary variable as well.

svn path=/trunk/; revision=52082
2013-09-15 20:18:56 +00:00
Pascal Quantin 1359f55d9f From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9145 :
openSAFETY: SSDO Abort codes are handled incorrectly 

svn path=/trunk/; revision=52080
2013-09-15 19:44:19 +00:00
Martin Kaiser 0e57edb890 emem -> wmem for radius
svn path=/trunk/; revision=52077
2013-09-15 18:43:04 +00:00
Martin Kaiser b1272cbca1 emem -> wmem
svn path=/trunk/; revision=52076
2013-09-15 18:27:07 +00:00
Martin Kaiser 04ec29b391 emem -> wmem
svn path=/trunk/; revision=52075
2013-09-15 18:20:25 +00:00
Pascal Quantin 8c7cb82470 No need to use the pinfo pool
svn path=/trunk/; revision=52074
2013-09-15 18:18:08 +00:00
Evan Huus 97659c67f3 From Michal Labedzki via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9119

Implement the majority of the remaining items from the PN532 spec.

svn path=/trunk/; revision=52073
2013-09-15 18:13:42 +00:00
Martin Kaiser f83c03db62 emem -> wmem
svn path=/trunk/; revision=52072
2013-09-15 18:13:02 +00:00
Pascal Quantin 20a40260d7 A few more dissectors converted to wmem
svn path=/trunk/; revision=52071
2013-09-15 18:03:32 +00:00
Martin Kaiser a54e67abce TABs -> spaces
add editor modelines

svn path=/trunk/; revision=52070
2013-09-15 18:01:01 +00:00
Jörg Mayer 61aced2d64 emem -> wmem
svn path=/trunk/; revision=52069
2013-09-15 17:50:35 +00:00
Martin Kaiser ed321d62c3 emem -> wmem
svn path=/trunk/; revision=52067
2013-09-15 17:12:54 +00:00
Martin Kaiser 62c3c0e1f0 emem -> wmem
svn path=/trunk/; revision=52066
2013-09-15 16:53:11 +00:00
Anders Broman 4269f3065b Fix a typo
svn path=/trunk/; revision=52065
2013-09-15 16:49:06 +00:00
Anders Broman 516f145eaa Use "cheaper" length check.
svn path=/trunk/; revision=52064
2013-09-15 16:47:31 +00:00
Pascal Quantin 7850883904 emem -> wmem
svn path=/trunk/; revision=52063
2013-09-15 15:11:11 +00:00
Jörg Mayer 65ff43fada Finish asn1 emem -> wmem conversion.
Left are snmp and those functions that don't have wmem equivalents.

svn path=/trunk/; revision=52060
2013-09-15 14:37:46 +00:00
Pascal Quantin 9486a3d974 More wmem conversion (leaving uat related functions aside)
svn path=/trunk/; revision=52055
2013-09-15 13:46:13 +00:00
Jörg Mayer 888650324b emem -> wmem
svn path=/trunk/; revision=52054
2013-09-15 13:24:14 +00:00
Pascal Quantin 868b345eea Convert a few more dissectors to wmem API
svn path=/trunk/; revision=52053
2013-09-15 10:29:49 +00:00
Pascal Quantin 07c29e74e9 Convert a few more dissectors to wmem API
svn path=/trunk/; revision=52052
2013-09-15 09:12:01 +00:00
Alexis La Goutte eda53fd1b7 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9153 [PATCH trivial] Fix Application Data record parsing for TLS 1.1/1.2 and DTLS 1.0/1.2
Using memcpy on overlapping memory has undefined behaviour (read: on GCC 4.8.1 this destroys the plaintext and invalidates the MAC).

This patch fixes parsing Application Data records for TLS 1.1 and 1.2 (while I am at it, also for DTLS 1.0/1.2) by using memmove instead of memcpy.

svn path=/trunk/; revision=52051
2013-09-15 06:59:32 +00:00
Alexis La Goutte 89244b1ad0 From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers
Fix decryption of TLS_RSA_WITH_IDEA_CBC_SHA (0x0007)

Caught when iterating through all SSLv3 cipher suites.
TLS_RSA_EXPORT_WITH_RC2_CBC_40_MD5 (0x0006) was another one that
could not be decrypted

svn path=/trunk/; revision=52050
2013-09-15 06:59:19 +00:00
Alexis La Goutte 219d17145f From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers
Add more TLS cipher suites (SEED, AES-GCM, ECC)

- cipher suites from `RFC 5246 - TLS 1.2`
- cipher suites 150-155 are taken from: RFC 4162 - SEED for TLS
- cipher suites 156-167 are taken from: RFC 5288 - AES-GCM Cipher suites
- cipher suites 49153-49177 are taken from: RFC 4492 - ECC for TLS
- cipher suites 49195-49202 are taken from RFC 5289 - ECC with SHA256/384 and AES GCM

svn path=/trunk/; revision=52049
2013-09-15 06:59:07 +00:00
Alexis La Goutte 9ac2566d0a From Peter Wu via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9144 [PATCH] Update TLS Ciphers
Add support for Camellia ciphers

svn path=/trunk/; revision=52048
2013-09-15 06:58:54 +00:00
Evan Huus be2ebb1934 Remove unused variables, fix typos.
svn path=/trunk/; revision=52046
2013-09-15 02:26:20 +00:00
Michael Mann b38ee917b1 Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly.
The script didn't catch as many as I would have liked, but it's a start.

The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum.

svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
Martin Kaiser a17cf67635 emem -> wmem
svn path=/trunk/; revision=52044
2013-09-14 18:30:43 +00:00
Martin Kaiser c522d836a7 use generic editor modelines
svn path=/trunk/; revision=52043
2013-09-14 18:20:07 +00:00
Martin Kaiser 1fccb6a9e1 emem -> wmem
svn path=/trunk/; revision=52042
2013-09-14 18:16:43 +00:00
Martin Kaiser 17e350d4b0 TABs -> spaces
add editor modelines

svn path=/trunk/; revision=52041
2013-09-14 18:08:28 +00:00
Martin Kaiser f1592c5846 emem -> wmem
svn path=/trunk/; revision=52040
2013-09-14 17:56:44 +00:00
Jörg Mayer ec2fc7f0e7 emem -> wmem
svn path=/trunk/; revision=52039
2013-09-14 14:42:35 +00:00
Jörg Mayer f737cea032 emem -> wmem
svn path=/trunk/; revision=52038
2013-09-14 14:33:04 +00:00
Evan Huus 7584f77567 Only access val_other if tlv_len is sufficiently long. Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9150

Also add modelines.

svn path=/trunk/; revision=52037
2013-09-14 13:30:02 +00:00
Evan Huus ef101edfa1 _lookup_extended takes a pointer to the key-pointer since it has to set the old
key pointer value. _insert just takes the key-pointer, not a pointer to it.
Passing a pointer-to-a-pointer causes the outer pointer to be dereferenced as a
struct (when it in fact points to a pointer to struct) and leads to incorrect
behaviour and uninitialized/out-of-bounds memory accesses.

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

svn path=/trunk/; revision=52036
2013-09-14 13:15:31 +00:00
Evan Huus 4535fd9b13 From Patrick Lundquist via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7038

Fix a bug in Moldudp64 where offset + MOLDUDP64_MSGLEN_LEN was basically
subtracted twice from remaining packet length.

svn path=/trunk/; revision=52034
2013-09-14 12:35:29 +00:00
Pascal Quantin 5635a1f8bb Revert to emem for uat
svn path=/trunk/; revision=52032
2013-09-14 11:56:45 +00:00
Pascal Quantin 074349264e Convert some dissectors to wmem (leaving uat-like memory with emem for now)
svn path=/trunk/; revision=52031
2013-09-14 10:53:29 +00:00
Pascal Quantin e078770856 From Roland Knall via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9047 :
EPL: Dissection for WriteMultipleParameter, Node Alias, SDO/ASND structuring

svn path=/trunk/; revision=52021
2013-09-13 19:27:53 +00:00
Jörg Mayer 0d1411f854 Add comment where the vendor ids come from
svn path=/trunk/; revision=52014
2013-09-13 17:40:32 +00:00
Pascal Quantin 7623232f25 Convert a few more dissectors to wmem
svn path=/trunk/; revision=52013
2013-09-13 17:25:54 +00:00
Evan Huus 4fb4b2f1a2 Fix a bug (caught by Pascal) where a tree was being explicitly cast to emem_tree
for some reason, and thus the compiler hadn't flagged a type mismatch when the
tree was converted to wmem.

svn path=/trunk/; revision=52010
2013-09-13 17:21:12 +00:00
Evan Huus d6d4c069d9 Replace some emem with wmem.
The windows-common dissector seems to make excessive use of strbufs - I
converted them and simplified a bit, but it could probably be simplified more.

svn path=/trunk/; revision=52008
2013-09-13 17:14:55 +00:00
Evan Huus cabf974059 Remove useless-use-of-emem, add modelines.
svn path=/trunk/; revision=52005
2013-09-13 16:48:07 +00:00
Anders Broman b3ce4ecc14 Try to make the heuristic a bit more efficient.
svn path=/trunk/; revision=52004
2013-09-13 16:33:28 +00:00
Jörg Mayer 35a56ca756 Dario Lombardo via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147

More emem -> wmem conversion: Addresses se_malloc() calls.

svn path=/trunk/; revision=52003
2013-09-13 14:14:23 +00:00
Jörg Mayer 23d3e3d665 Dario Lombardo <lomato@gmail.com> via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147

Migration from emem to wmem for trivial cases (ep_alloc only).


svn path=/trunk/; revision=52002
2013-09-13 10:13:19 +00:00
Jörg Mayer e3ef5ac9fb emem -> wmem
This was the last dissector in packet-[t-z]*.c that I consider
trivial enough to work on it. The remaining ones a left to people
who intend to think while doing the conversion ;-) 

svn path=/trunk/; revision=51995
2013-09-12 22:53:40 +00:00
Jörg Mayer 1810de72b6 In some cases add include emem.h
In other cases emem -> wmem

svn path=/trunk/; revision=51994
2013-09-12 22:44:08 +00:00
Jörg Mayer 2614ec5ea0 emem -> wmem
svn path=/trunk/; revision=51993
2013-09-12 22:26:43 +00:00
Pascal Quantin 6cedc2c336 Convert a few more dissectors to wmem
svn path=/trunk/; revision=51991
2013-09-12 22:03:31 +00:00
Gerald Combs 07c3d057b8 Add previous/next stream navigation to the TCP stream graph dialog.
Add get_tcp_stream_count() to the TCP dissector and modify
graph_segment_list_get() to allow matching based solely on a stream.

Use text instead of icons for the mouse click behavior buttons. Remove
their PNG resources since we aren't using them any more. Fix setting the
cursor in the graph widget.

svn path=/trunk/; revision=51989
2013-09-12 21:37:47 +00:00
Jörg Mayer 467f128306 emem -> wmem
"tshark -v" tested

svn path=/trunk/; revision=51988
2013-09-12 21:34:58 +00:00
Martin Kaiser fd50ee16e8 dissect OCSP nonce extension
some minor reformatting of the ASN.1 imports

svn path=/trunk/; revision=51987
2013-09-12 21:29:50 +00:00
Martin Kaiser c7f22db4d2 mark unused parameters
svn path=/trunk/; revision=51986
2013-09-12 21:17:21 +00:00
Anders Broman 71b93947de Try to make the STUN heuristic sligtly more efficient.
svn path=/trunk/; revision=51985
2013-09-12 20:53:51 +00:00
Jörg Mayer 884b61f987 Add missing includes
Remove not needed include
emem -> wmem

svn path=/trunk/; revision=51984
2013-09-12 20:38:07 +00:00
Pascal Quantin efe18f199c Convert a few dissectors from emem to wmem API
svn path=/trunk/; revision=51983
2013-09-12 20:37:30 +00:00
Chris Maynard ac7ecb10d2 More dissector table name related changes (a continuation of r51904).
svn path=/trunk/; revision=51982
2013-09-12 20:34:19 +00:00
Jörg Mayer 1965ab5d3e emem -> wmem ("tshark -v" tested)
svn path=/trunk/; revision=51979
2013-09-12 20:25:51 +00:00
Anders Broman 753afe5fa4 Fix UDP port range.
svn path=/trunk/; revision=51977
2013-09-12 18:17:41 +00:00
Evan Huus 1f3adeae8c Revert the TPNCP changes in r51972 until we can figure out a better way to fix
it.

svn path=/trunk/; revision=51976
2013-09-12 17:32:49 +00:00
Evan Huus e5bac80237 Use wmem_new to get the automatic casts to fix the buildbot.
svn path=/trunk/; revision=51973
2013-09-12 16:31:30 +00:00
Jörg Mayer d1ee499bc7 emem -> wmem
svn path=/trunk/; revision=51972
2013-09-12 16:15:54 +00:00
Jörg Mayer 95ae33c8a0 emem -> wmem
svn path=/trunk/; revision=51971
2013-09-12 15:29:55 +00:00
Jörg Mayer fe5238e384 Convert from emem to wmem.
Trivial whitespace fix in packet-tftp.c while at it.

svn path=/trunk/; revision=51970
2013-09-12 15:07:22 +00:00
Evan Huus 58a9f5cb1e More wmem.
svn path=/trunk/; revision=51968
2013-09-12 12:37:27 +00:00
Evan Huus 343772cbcf Convert a few more dissectors to wmem.
svn path=/trunk/; revision=51967
2013-09-12 12:25:17 +00:00
Guy Harris dc7d61195b Need to specify the particular FT_UINTn type.
svn path=/trunk/; revision=51964
2013-09-12 04:10:47 +00:00
Guy Harris 0c11b6f8da Give various files RCS IDs.
svn path=/trunk/; revision=51963
2013-09-12 03:41:22 +00:00
Guy Harris caf09bdf55 Fix the types of some multi-bit bitfields - they're not Booleans. Give
some of them real names (presumably they were copied-and-pasted without
editing).

Thanks and a tip of the Hatlo hat to checkAPI.pl for catching this.

svn path=/trunk/; revision=51962
2013-09-12 03:36:36 +00:00
Chris Maynard 5cd898cd80 Rename frame relay NLPID dissector table from "fr.ietf" to "fr.nlpid".
svn path=/trunk/; revision=51960
2013-09-11 21:55:00 +00:00
Chris Maynard 0b0cb31ac4 Test the return value of tvb_reported_length_remaining() as > 0 rather than != 0. While in these cases, I don't see any actual bugs due to other protections, I don't think it hurts to make this change and should help avoid others from copying/pasting this code elsewhere, where similar protections may not be in place.
svn path=/trunk/; revision=51959
2013-09-11 21:44:13 +00:00
Chris Maynard f2c276ec21 Change the name of the Cisco HDLC dissector table from chdlctype to chdlc.protocol and change the UI name to match. It is by far much more common to name the tables after the field than to pick another name.
svn path=/trunk/; revision=51958
2013-09-11 21:37:58 +00:00
Jeff Morriss 2a276b3498 Mark a couple of parameters as unused.
Fix up indentation in many places while getting rid of tabs.

svn path=/trunk/; revision=51957
2013-09-11 21:06:34 +00:00
Anders Broman d1c73ac71f - Introduce a dissector table for Vendor AVP:s
- Dissect some of Cable Labs AVP:s.

svn path=/trunk/; revision=51956
2013-09-11 20:26:42 +00:00
Chris Maynard bf59c708f8 Instead of prepending "LLC " to the UI table name, just modify the table name.
svn path=/trunk/; revision=51952
2013-09-11 18:06:29 +00:00
Gerald Combs 6986eb4866 Move a lot of includes from follow_stream_dialog.h to
follow_stream_dialog.cpp. Remove the ones that we don't use. Use
QMessageBox in place of simple_dialog.

Move IP6OPT_HOME_ADDRESS and related definitions to packet-ipv6.c. It
looks like we only use it there and it conflicts with WinPcap.

Mark some items unused.

svn path=/trunk/; revision=51951
2013-09-11 17:39:49 +00:00
Pascal Quantin 10193e1ef2 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9128 :
ZigBee ZCL epoch is January 1, 2000

svn path=/trunk/; revision=51939
2013-09-10 19:37:13 +00:00
Martin Kaiser eee252d372 proto_tree -> proto_item
svn path=/trunk/; revision=51936
2013-09-10 17:55:31 +00:00
Martin Kaiser 4b0a906f78 remove unnecessary if (tree)
no need for tvb_ensure_bytes_exist()
replace += 1;; with ++;

svn path=/trunk/; revision=51929
2013-09-10 15:01:52 +00:00
Anders Broman 9378661d4e From Selvamegala:
GTS starting slot in the Beacon frame is not parsed correctly. As per the Spec, in the 3byte gts descriptor value bit 0- 15  refers Device Short address bit 16-19 – Starting slot bit 20-23 – GTS length.

(I Dug out the onliner from the attached file)

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

svn path=/trunk/; revision=51919
2013-09-10 06:32:41 +00:00
Anders Broman 0bb9585cd6 Freom Dennis:
As I looked into the implementation in epan/dissectors/packet-ieee802a.c, there's a bug in the dissect_ieee802a(). After OUI and PID is parsed, it looks for the customized sub-dissector_table by 
oui_info = (oui_info_t *)g_hash_table_lookup(oui_info_table, GUINT_TO_POINTER(oui))
The problem is that the oui is defined as an array (guint8 oui[3]), whose value contains the 3-byte customized OUI. However, here GUINT_TO_POINTER(oui) converts the local array oui's address to the hash table key, instead of the value. That cause the search in the hash table to fail, because the ieee802_add_oui() use the OUI value as the key.

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

svn path=/trunk/; revision=51918
2013-09-10 06:06:55 +00:00
Anders Broman 60aaa2d842 Change the default preference on how to dissect dunneled data to GTP_TPDU_AS_TPDU.
svn path=/trunk/; revision=51917
2013-09-10 05:47:28 +00:00
Anders Broman b1e6fc8411 From: Michal Labedzki <michal.labedzki@tieto.com>
Subject: [PATCH] NFC: PN532: Implement half of PN532 specification

Implement TG_* and RF_* commands/responses.
Also decode "status" field in all commands.
Update USB CCID to decode "escaped" payload.

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

svn path=/trunk/; revision=51916
2013-09-10 05:43:17 +00:00
Chris Maynard d3f277c015 More dissector table UI name changes (a continuation of r51904).
svn path=/trunk/; revision=51907
2013-09-09 22:30:40 +00:00
Chris Maynard 0c41507bad Change some internal dissector table UI names so it's clear which protocol they pertain to and it's easier to find in the list.
svn path=/trunk/; revision=51904
2013-09-09 21:55:57 +00:00
Alexis La Goutte 2632e16985 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51885
2013-09-09 19:30:47 +00:00
Evan Huus 771668d630 Register a wmem callback to free the glib hash tables used in SMB2 conversation
structs. Fixes the most egregious of the memory leaks (around 300KB) from
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9120

svn path=/trunk/; revision=51873
2013-09-09 17:51:30 +00:00
Martin Kaiser 955c89812d coverity 996921: add missing break
svn path=/trunk/; revision=51867
2013-09-09 13:07:08 +00:00
Martin Kaiser 9c023c0265 we don't need brackets around SET_ADDRESS() any more
svn path=/trunk/; revision=51866
2013-09-09 12:53:14 +00:00
Evan Huus e3eb3456ff In SMB2 dissector, make sure pinfo->private_data is pointing to an SMB struct
before calling an SMB helper function which expects it. Fixes the primary error
in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9120

svn path=/trunk/; revision=51865
2013-09-09 12:16:18 +00:00
Michael Mann 9e3f9b449f expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
Michael Mann 00dd0adc0d expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51851
2013-09-09 00:28:48 +00:00
Michael Mann a50c42821d expert_add_info_format_text -> expert_add_info_text
svn path=/trunk/; revision=51849
2013-09-08 23:47:06 +00:00
Pascal Quantin f54441c125 Add a chunk forgotten in r51846
svn path=/trunk/; revision=51847
2013-09-08 21:22:11 +00:00
Pascal Quantin a6ae13dee9 Slightly different fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9117 :
Check that tvb returned by dissect_per_bit_string is not null before trying to use it

svn path=/trunk/; revision=51846
2013-09-08 21:10:36 +00:00
Evan Huus 2210020704 Restore some format arguments that were accidentally dropped.
svn path=/trunk/; revision=51838
2013-09-08 14:55:36 +00:00
Michael Mann da96b71c95 Add filterable expert info to generated X11 dissector. I didn't regenerate the dissector files, but did manually update the source (tools/process-x11-xcb.pl) so any future regeneration won't lose the changes.
svn path=/trunk/; revision=51834
2013-09-08 13:54:07 +00:00
Michael Mann 306a110ed6 Add filterable expert info to NCP dissector.
svn path=/trunk/; revision=51833
2013-09-08 13:35:57 +00:00
Michael Mann cc26962f96 Batch of filterable expert info
svn path=/trunk/; revision=51831
2013-09-08 00:47:15 +00:00
Evan Huus 57c28aeffd Fix the FSF address in the license header for the new ASN.1 dissectors.
svn path=/trunk/; revision=51830
2013-09-07 22:12:24 +00:00
Michael Mann 17fbd9028a Batch of filterable expert info
svn path=/trunk/; revision=51823
2013-09-07 16:07:02 +00:00
Evan Huus e746a01ce8 Display GTPv2 Area Code fields (which show up in some DIAMETER AVPs) as
BASE_HEX_DEC instead of just BASE_DEC.

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

svn path=/trunk/; revision=51822
2013-09-07 13:56:25 +00:00
Evan Huus e69ec10794 Callers of tvb_per_bit_string expect that the returned value_tvb is non-NULL.
Ensure that is the case even in certain peculiar error conditions, by filling it
with a 0-length subset TVB. Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9117

Also add modelines.

svn path=/trunk/; revision=51821
2013-09-07 13:48:13 +00:00
Evan Huus 2e299ec910 Add modelines, use consistent indentation in address.h
Use the "do { } while (0)" trick to make the macros behave like regular function
calls syntatically.

Fix one dissector that wasn't using semicolons after the macro calls.

svn path=/trunk/; revision=51819
2013-09-07 12:51:29 +00:00
Martin Kaiser 071f89e3b3 coverity 1047692: check return value of inet_pton()
svn path=/trunk/; revision=51814
2013-09-07 10:02:46 +00:00
Pascal Quantin f974c74fd8 From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9105 :
Add additional PN532 opcodes, and update USB CCID dissector to skip status word in PN532 responses

svn path=/trunk/; revision=51812
2013-09-07 08:03:32 +00:00
Gerald Combs 52c9e57474 Deduplicate some type and field names.
svn path=/trunk/; revision=51800
2013-09-06 17:39:03 +00:00
Evan Huus 1c46818354 Convert to wmem, and as per Michael's suggestion in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9107, use zeroed memory for
ntlmssp_info structs.

svn path=/trunk/; revision=51799
2013-09-06 15:59:45 +00:00
Evan Huus 0e885e8089 Set length and contents to 0/NULL if the blob is empty. Fixes
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9107

svn path=/trunk/; revision=51798
2013-09-06 15:29:18 +00:00
Anders Broman 96d29a5d50 Get rid of a duplicated filter name.
svn path=/trunk/; revision=51792
2013-09-05 20:55:59 +00:00
Martin Kaiser 2d1b7d1e32 add casts to make my compiler (gcc 4.6.3) happy
svn path=/trunk/; revision=51790
2013-09-05 20:18:13 +00:00
Chris Maynard f6eb619d87 Display "TEID/GRE Key" field consistently as hexadecimal since 3GPP TS 36.444 says this field is of type, "octet string".
Ref: http://ask.wireshark.org/questions/24221/decode-gtpv2-teid-as-decimal-or-hex

#BACKPORT(1.10,1.8)

svn path=/trunk/; revision=51789
2013-09-05 18:51:46 +00:00
Michael Mann b3f4084c4e Make "content blob" dynamically sized so it doesn't take up 20k of memory per conversation.
Add filterable expert info while we're at it.

svn path=/trunk/; revision=51787
2013-09-05 16:29:08 +00:00
Evan Huus 808d594087 Add an expert info if we see content-length header and chunked encoding
together.

The other part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9101

Also fix modelines.

svn path=/trunk/; revision=51786
2013-09-05 16:05:32 +00:00
Evan Huus 8552f0df64 The length field is retrieved from the packet in bytes, not bits, so stop
adjusting it by 8 everywhere.

Seems to fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9087 though
someone more familiar with the protocol will have to verify it's actually
correct now.

svn path=/trunk/; revision=51784
2013-09-05 13:15:04 +00:00
Martin Mathieson e67292ff14 Move where timing reference for DRX timers will be set
svn path=/trunk/; revision=51783
2013-09-05 13:11:54 +00:00
Evan Huus 3b6f55c579 Convert atn-* dissectors to wmem. No emem in new code please!
svn path=/trunk/; revision=51780
2013-09-05 12:13:00 +00:00
Jörg Mayer 854363611c Generated file differs in whitespace output
svn path=/trunk/; revision=51774
2013-09-05 07:36:16 +00:00
Anders Broman 7e2efe9e6b From Christoph Viethen:
Typo in the name of a PPPoE tag name.

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

svn path=/trunk/; revision=51769
2013-09-05 05:39:15 +00:00
Anders Broman dd12400161 From Chris Bontje:
Changes include:
- Detect previously-unknown object types.  No dissection is attempted of response messages, but at least the types are documented and labelled.  As Graham notes, if some examples are provided we can attempt a little more here.
- Change up info_column object label handling to add some of the new objects.  Also added in a few that would be present in 'write' messages.
- Add expert info field for abnormal IIN bits.  This will help me in my job of detecting unknown objects and unsupported function codes and will easily flag to the user that 'something is up' due to the color changes.
- Only detect Application Layer if we are on the Final Transport Layer frame.

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

svn path=/trunk/; revision=51768
2013-09-05 05:34:40 +00:00
Anders Broman 436a6d2e99 From Mathias Guettler:
New dissector for Air/Ground Datalink ICAO doc 9705 Ed2: ULCS, CM, CPDLC.

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

svn path=/trunk/; revision=51767
2013-09-05 05:26:34 +00:00
Anders Broman 80cd0dca1d From Mathias Guettler:
New dissector for Air/Ground Datalink ICAO doc 9705 Ed2: ULCS, CM, CPDLC.

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

svn path=/trunk/; revision=51766
2013-09-05 05:26:04 +00:00
Anders Broman edbade8458 3GPP-MS-TimeZone value is not decoded in RADIUS and DIAMETER messages.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9099

svn path=/trunk/; revision=51765
2013-09-05 05:03:42 +00:00
Anders Broman b422c4892d From Dirk:
fix NTLMSSP Target Info Attribute dissection

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

svn path=/trunk/; revision=51764
2013-09-05 04:57:33 +00:00
Michael Mann 239971eca9 Fix some expert filter field names (one of which was illegal)
svn path=/trunk/; revision=51763
2013-09-05 02:52:08 +00:00
Michael Mann dd4b03512f Remove commented out expert_add_info_format
svn path=/trunk/; revision=51762
2013-09-05 01:42:11 +00:00
Michael Mann 0c49b4d872 Add filterable expert info to dissect_802_3() and clean up the shrapnel.
svn path=/trunk/; revision=51761
2013-09-05 01:39:35 +00:00
Michael Mann e65df7f453 Batch of filterable expert info.
Some of the FT_NONE hf_ variables were removed in favor of proto_tree_add_expert. It may also be possible to remove some of the booleans surrounding the expert info.

New expert display filters may need to be double-checked to make sure they make sense.

svn path=/trunk/; revision=51760
2013-09-05 01:05:16 +00:00
Martin Kaiser 1abd5a5965 dissect some more items of the smart card descriptor
svn path=/trunk/; revision=51758
2013-09-04 22:00:41 +00:00
Michael Tüxen 90ac3f129f Improve the display of AUTH related parameters.
Only use IANA registered values for HMAC ids.

svn path=/trunk/; revision=51755
2013-09-04 21:07:09 +00:00
Evan Huus 48089ba4ca Use epan-scoped memory for building more of the diameter table stuff.
svn path=/trunk/; revision=51754
2013-09-04 21:06:56 +00:00
Anders Broman f5b85d81d0 From Katrina Zhang:
Fix QoS dissection.

svn path=/trunk/; revision=51752
2013-09-04 18:11:21 +00:00
Anders Broman a53b483969 From Katrina Zhang:
Change to tfs_enabled_disabled.

svn path=/trunk/; revision=51750
2013-09-04 18:10:00 +00:00
Anders Broman 10f7f95d09 From Katrina Zhang:
637 UAR-Flags dissection.

svn path=/trunk/; revision=51749
2013-09-04 18:08:08 +00:00
Martin Mathieson 86656b31d2 Another small step towards modelling and reporting upon DRX state in
MAC.

svn path=/trunk/; revision=51748
2013-09-04 16:56:37 +00:00
Evan Huus d11c7d5480 Always initialize the hash when dissecting nfsv3 file handle. Fixes the recent
valgrind fuzz failure.

svn path=/trunk/; revision=51746
2013-09-04 11:46:01 +00:00
Anders Broman 55f7519fc2 From Tyson Key:
Update the InListPassiveTarget Response handler to dissect the ISO 14443-A ATQA, and UID values from InnoVision/Broadcom Topaz cards/tags.

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

svn path=/trunk/; revision=51745
2013-09-04 04:47:38 +00:00
Pascal Quantin a59b5388a9 From Andreas Urke via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9091 :
Add support for CFM R-APS/G.8032 version 2

From me: convert a few value_string to true_false_string

svn path=/trunk/; revision=51744
2013-09-03 22:05:22 +00:00
Pascal Quantin 69dfcffbc0 Remove obsolete code
svn path=/trunk/; revision=51743
2013-09-03 21:25:16 +00:00
Chris Maynard 6fc009baac Similar to the IPv4 dissector's hf_ip_dst_host, hf_ip_src_host and hf_ip_host fields, add to the Ethernet dissector:
hf_eth_dst_resolved
hf_eth_src_resolved
hf_eth_addr_resolved

and add to the IEEE802.11 dissector:

hf_ieee80211_addr_da_resolved
hf_ieee80211_addr_sa_resolved
hf_ieee80211_addr_ra_resolved
hf_ieee80211_addr_ta_resolved
hf_ieee80211_addr_bssid_resolved
hf_ieee80211_addr_resolved

Change motivated by:
http://ask.wireshark.org/questions/24314/possible-to-use-the-mac-info-in-the-wireshark-manuf-file-as-part-of-display-filter

svn path=/trunk/; revision=51742
2013-09-03 21:20:59 +00:00
Pascal Quantin a65045ec3f Code cleanup:
- remove some useless trees
- prettify the dissection of a few IEs
- use ELEM_MAND_VV_SHORT macro where applicable

svn path=/trunk/; revision=51741
2013-09-03 21:10:05 +00:00
Anders Broman 79352919a6 Fix "malformed packet" and tidy up a bit.
svn path=/trunk/; revision=51740
2013-09-03 19:04:13 +00:00
Anders Broman 4a226911da Protect agains infinite loop.
svn path=/trunk/; revision=51738
2013-09-03 18:47:44 +00:00
Alexis La Goutte dc1477b79b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51737
2013-09-03 18:44:42 +00:00
Alexis La Goutte 5098965030 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51736
2013-09-03 18:44:16 +00:00
Alexis La Goutte 6ac93da7f9 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51735
2013-09-03 18:43:50 +00:00
Alexis La Goutte b4a4a768dc Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51734
2013-09-03 18:43:29 +00:00
Alexis La Goutte 154d793f1e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51733
2013-09-03 18:43:11 +00:00
Alexis La Goutte 6934553230 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51732
2013-09-03 18:42:49 +00:00
Alexis La Goutte 7ecb6b1d7d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51731
2013-09-03 18:42:01 +00:00
Pascal Quantin 9de7a12476 Fix "Tones off" value typo introduced in r51613
svn path=/trunk/; revision=51729
2013-09-03 18:29:34 +00:00
Michael Mann 20227036fc Add MACSEC dissector
From Allan W. Nielsen, bug 9094 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9094)

svn path=/trunk/; revision=51727
2013-09-03 17:35:00 +00:00
Evan Huus feb39701c5 Decompress gzipped Kafka messages.
svn path=/trunk/; revision=51726
2013-09-03 16:43:08 +00:00
Jörg Mayer ee8719e2e1 Fix typo: =+ ---> +=
svn path=/trunk/; revision=51721
2013-09-03 13:49:48 +00:00
Alexis La Goutte 3c08741cae Enhance DNS Dissector Remove bad_rr goto !
Code is fuzzed (9 Pass with more of 400 DNS files)

svn path=/trunk/; revision=51717
2013-09-03 06:36:43 +00:00
Alexis La Goutte 6f4225a6f4 Enhance NSEC3,NSEC3PARAM TLSA type visibility
svn path=/trunk/; revision=51716
2013-09-03 06:36:33 +00:00
Alexis La Goutte 29d07267df Add dissection of EUI Family (draft-jabley-dnsext-eui48-eui64-rrtypes) DNS Rcode (EUI48, EUI64)
svn path=/trunk/; revision=51715
2013-09-03 06:36:23 +00:00
Alexis La Goutte 3f3a394932 Add Dissection of ILNP (RFC6742) DNS Rcode (NID, L32, L64, LP)
svn path=/trunk/; revision=51714
2013-09-03 06:36:12 +00:00
Alexis La Goutte 3658cbf175 Update DNS Rcode to last IANA Parameters (2013-07-24) * Add ILNP (RFC6742) Rcode (NID, L32, L64, LP) * Add EUI Family (draft-jabley-dnsext-eui48-eui64-rrtypes) Rcode (EUI48, EUI64) * Add URI Rcode (256) * Add TA (DNSSEC Trust Authorities) Rcode (32768)
svn path=/trunk/; revision=51713
2013-09-03 06:36:01 +00:00
Alexis La Goutte cbb1820533 Enhance DNS reorder case of big switch dns_type
svn path=/trunk/; revision=51712
2013-09-03 06:35:51 +00:00
Alexis La Goutte 02f17d0564 Enhance DNS dissector Remove ugly dns_type_description function and use value_string(_ext)
svn path=/trunk/; revision=51711
2013-09-03 06:35:41 +00:00
Alexis La Goutte bfeb1475c0 Enhance DNS dissector visibility (Rename some hf and display field)
svn path=/trunk/; revision=51710
2013-09-03 06:35:30 +00:00
Alexis La Goutte 53e87bd2b0 Enhance DNS dissector visibility (Add comments)
svn path=/trunk/; revision=51709
2013-09-03 06:35:13 +00:00
Alexis La Goutte 800359d771 Enhance default DNS type... (and expert info)
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51708
2013-09-03 06:35:01 +00:00
Alexis La Goutte 7f64348cc5 Enhance NULL type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51707
2013-09-03 06:34:52 +00:00
Alexis La Goutte de8247f4ae Enhance M.. familly type (MD, MF, MB, MG, MR, MINFO)
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51706
2013-09-03 06:34:41 +00:00
Alexis La Goutte 4a51170e8d Enhance NSAP and NSAP PTR type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51705
2013-09-03 06:34:31 +00:00
Alexis La Goutte 340ff87d38 Enhance PX type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51704
2013-09-03 06:34:21 +00:00
Alexis La Goutte a6f7037765 Enhance X25 and ISDN type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51703
2013-09-03 06:34:10 +00:00
Alexis La Goutte b7e78c778a Enhance AFSDB and RT type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51702
2013-09-03 06:34:00 +00:00
Alexis La Goutte 8e237acf74 Enhance RP type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51701
2013-09-03 06:33:48 +00:00
Alexis La Goutte 7668baf5da Enhance GPOS type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51700
2013-09-03 06:33:38 +00:00
Alexis La Goutte 7b012cf03e Enhance APL (and DHCID) type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51699
2013-09-03 06:33:28 +00:00
Alexis La Goutte d37a4ea6a1 Enhance HIP type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51698
2013-09-03 06:33:18 +00:00
Alexis La Goutte 7de1545fda Enhance SSHFP type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51697
2013-09-03 06:33:07 +00:00
Alexis La Goutte f38fb1a906 Enhance NAPTR type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51696
2013-09-03 06:32:57 +00:00
Alexis La Goutte 2b63d4fa5e Enhance TSIG and TKIP DNS type
Update rrcode list
Convert proto_tree_add_text calls to proto_tree_add_item
Use expert info when no found dissector for TSIG algo

Enhance TKEY (BETA)

svn path=/trunk/; revision=51695
2013-09-03 06:32:47 +00:00
Alexis La Goutte b36e366aab Enhance SRV DNS type
svn path=/trunk/; revision=51694
2013-09-03 06:32:36 +00:00
Alexis La Goutte e748993bac Enhance WINS and WINS-R DNS type
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51693
2013-09-03 06:32:26 +00:00
Alexis La Goutte dfec5ef599 Make test.sh from buildbot Happy
svn path=/trunk/; revision=51692
2013-09-03 06:31:53 +00:00
Alexis La Goutte 0550cb5121 Make Ubuntu buildbot happy
packet-kerberos.c: In function 'proto_register_kerberos':
packet-kerberos.c:5406:29: error: unused variable 'ei' [-Werror=unused-variable]

svn path=/trunk/; revision=51691
2013-09-03 06:09:21 +00:00
Michael Mann 8f7c877dd4 forgotten cleanup
svn path=/trunk/; revision=51690
2013-09-03 02:35:48 +00:00
Michael Mann a72fc72061 Batch of filterable expert info.
svn path=/trunk/; revision=51689
2013-09-03 02:26:50 +00:00
Michael Mann 5405b34469 Batch of filterable expert info.
svn path=/trunk/; revision=51688
2013-09-02 23:32:31 +00:00
Alexis La Goutte 5e7d5b950c Fix indent (Mix of tab and space...) => use tab
svn path=/trunk/; revision=51686
2013-09-02 23:16:29 +00:00
Alexis La Goutte 1a76dd70cc Fix warning found by fix-encoding-args tools
svn path=/trunk/; revision=51685
2013-09-02 23:16:19 +00:00
Alexis La Goutte 1d1a4825a6 Fix warning found by fix-encoding-args tools
svn path=/trunk/; revision=51684
2013-09-02 23:16:10 +00:00
Alexis La Goutte 7ac4759b0c Fix warning found by fix-encoding-args tools
svn path=/trunk/; revision=51683
2013-09-02 23:15:59 +00:00
Alexis La Goutte 1a4e261ce2 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51677
2013-09-02 23:14:57 +00:00
Alexis La Goutte b59244dd27 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51676
2013-09-02 23:14:46 +00:00
Alexis La Goutte 1c28ae3b55 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51675
2013-09-02 23:14:35 +00:00
Alexis La Goutte a8b720b4c8 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51674
2013-09-02 23:14:25 +00:00
Alexis La Goutte b7d50acffc Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51673
2013-09-02 23:14:15 +00:00
Alexis La Goutte c35cc805f4 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51672
2013-09-02 23:13:58 +00:00
Alexis La Goutte b897a6198d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51671
2013-09-02 23:13:47 +00:00
Alexis La Goutte f16b33e78e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51670
2013-09-02 23:13:36 +00:00
Alexis La Goutte f54d68773a Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51669
2013-09-02 23:13:22 +00:00
Alexis La Goutte 9c43ccd371 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51668
2013-09-02 23:13:12 +00:00
Alexis La Goutte 4e02b8dc0e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51667
2013-09-02 23:13:02 +00:00
Alexis La Goutte 890d656bca Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51666
2013-09-02 23:12:52 +00:00
Alexis La Goutte aaa8f4a0f3 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51665
2013-09-02 23:12:42 +00:00
Alexis La Goutte 9bf5e05205 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51664
2013-09-02 23:12:31 +00:00
Alexis La Goutte 6a23fa0860 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51663
2013-09-02 23:12:21 +00:00
Alexis La Goutte a1d2587f41 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51662
2013-09-02 23:12:11 +00:00
Alexis La Goutte b631b0c8e1 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51661
2013-09-02 23:12:00 +00:00
Alexis La Goutte ca31e9d76a Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51660
2013-09-02 23:11:50 +00:00
Alexis La Goutte f015ca3180 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51659
2013-09-02 23:11:41 +00:00
Alexis La Goutte a635df5ca0 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51658
2013-09-02 23:11:30 +00:00
Alexis La Goutte e4e084c5a1 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51657
2013-09-02 23:11:20 +00:00
Alexis La Goutte fd7658c073 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51656
2013-09-02 23:11:10 +00:00
Alexis La Goutte b717a5460b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51655
2013-09-02 23:11:00 +00:00
Alexis La Goutte 010c63358c Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51654
2013-09-02 23:10:51 +00:00
Alexis La Goutte b920999031 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51653
2013-09-02 23:10:41 +00:00
Alexis La Goutte 01af8f057a Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51652
2013-09-02 23:10:31 +00:00
Alexis La Goutte e070841f5f Fix compilation with Linux packet-openflow.c: In function 'dissect_openflow_pkt_out': packet-openflow.c:663:13: error: variable 'actions_len' set but not used [-Werror=unused-but-set-variable]
And make fix-encoding-args happy

svn path=/trunk/; revision=51651
2013-09-02 23:04:16 +00:00
Anders Broman 2cddd61a48 Fix
packet-openflow.c:318: warning: return type defaults to 'int'
packet-openflow.c: In function 'dissect_openflow_ofp_match_v_1_0':
packet-openflow.c:350: warning: control reaches end of non-void function

svn path=/trunk/; revision=51650
2013-09-02 21:45:09 +00:00
Anders Broman a768180b30 Dissect more of openflow.
svn path=/trunk/; revision=51649
2013-09-02 20:02:49 +00:00
Evan Huus acfbd6d680 Dissect all the fields in kafka produce request/response pairs. All of the
helpers should be in place for the other message types now.

svn path=/trunk/; revision=51648
2013-09-02 17:46:47 +00:00
Martin Kaiser c5488abfe7 dissect len and type for audio class descriptors
svn path=/trunk/; revision=51646
2013-09-02 15:39:16 +00:00
Martin Kaiser 6585c8e9c0 register a dissector for ccid class specific descriptors
start dissecting the smart card descriptor
--This line, and those below, will be ignored-e

M    epan/dissectors/packet-usb-ccid.c

svn path=/trunk/; revision=51645
2013-09-02 15:34:37 +00:00
Martin Kaiser 8506a52d5b descriptor type value string for the video class
svn path=/trunk/; revision=51644
2013-09-02 14:35:07 +00:00
Martin Kaiser 8ac76c0f19 descriptor type value string for HID
svn path=/trunk/; revision=51643
2013-09-02 14:33:16 +00:00
Martin Kaiser 97985b6d54 dissect_usb_descriptor_header() takes an additional value_string
parameter to intrepret the descriptor type depending on the class
    
per default, the list of standard descriptor types is used

svn path=/trunk/; revision=51642
2013-09-02 14:31:22 +00:00
Martin Kaiser 2643a24b0e remove class specific descriptor types from the global list
rename the value string to std_descriptor_type_vals_ext in order to
clarify that this is for the standard descriptors only

svn path=/trunk/; revision=51641
2013-09-02 14:27:48 +00:00
Martin Kaiser 68e48eec7e register a dissector for audio class specific descriptors
recognize audio control interface and endpoint descriptors

svn path=/trunk/; revision=51638
2013-09-02 13:02:26 +00:00
Martin Kaiser c41e8e11f2 display usb descriptor type as hex value
this is what all the class specs do

svn path=/trunk/; revision=51637
2013-09-02 12:56:45 +00:00
Martin Kaiser bda2a2ad05 clean up dissect_ssl3_hnd_cert_req()
- proper indentation
- remove unnecessary subtree checks
- no need for tvb_ensure_bytes_exist()

svn path=/trunk/; revision=51636
2013-09-02 10:57:16 +00:00
Martin Kaiser 1a92451350 use dissect_ssl_hash_alg_list() for TLS1.2 certificate request
svn path=/trunk/; revision=51635
2013-09-02 10:55:21 +00:00
Martin Kaiser e249c25f11 From Michael Reschly
dissect TLS/signature_algorithms extension

from me
separate function for dissecting the algorithm list
remove some unnecessary checks and variables

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

svn path=/trunk/; revision=51634
2013-09-02 08:16:44 +00:00
Anders Broman aca2dd29da dissect OFPT_PACKET_IN.
svn path=/trunk/; revision=51633
2013-09-01 19:59:48 +00:00
Michael Mann 1f4f0d535a Remove expert_add_undecoded_item in favor of proto_tree_add_expert.
svn path=/trunk/; revision=51632
2013-09-01 16:41:29 +00:00
Evan Huus 6c9fd6e751 Fix two expert calls on the wrong proto_item.
svn path=/trunk/; revision=51628
2013-09-01 13:43:26 +00:00
Michael Mann e597acdc48 Batch of filterable expert info.
svn path=/trunk/; revision=51625
2013-09-01 13:05:27 +00:00
Evan Huus 7dbc052d78 More dissectors to wmem. There are no more dissectors using se_tree now, just a
few other places.

svn path=/trunk/; revision=51622
2013-09-01 01:00:11 +00:00
Evan Huus c0763b00bd More wmem.
svn path=/trunk/; revision=51619
2013-08-31 16:17:31 +00:00
Evan Huus 44c91cb02a More wmem.
svn path=/trunk/; revision=51617
2013-08-31 15:58:15 +00:00
Evan Huus 83a7fedb55 A few more dissectors to wmem.
svn path=/trunk/; revision=51616
2013-08-31 15:47:04 +00:00
Pascal Quantin 446bf4045d According to X.S0059 specification, when using FemtoInterfaceMsg Body the Information Elements for the Complete Layer 3 Information message shall not be included
svn path=/trunk/; revision=51614
2013-08-31 15:21:39 +00:00
Pascal Quantin 8711038106 Fix (for real) https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9068 :
Add dissection of Signal and Call Waiting Indicator IEs when present in MS Information Records IE

svn path=/trunk/; revision=51613
2013-08-31 14:44:50 +00:00
Evan Huus 58804a6f15 Convert another 10 dissectors to wmem.
svn path=/trunk/; revision=51612
2013-08-31 14:32:01 +00:00
Pascal Quantin dba0ceff0e From Jon Carmicheal via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9068 :
BSMAP: add dissection of Signal IE when present in MS Information Records IE

svn path=/trunk/; revision=51611
2013-08-31 10:06:33 +00:00
Pascal Quantin dffff25801 From Andreas Urke via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9088 :
STP: fix dissection of MSTI Root Identifiers for all MSTIs

svn path=/trunk/; revision=51610
2013-08-31 09:42:11 +00:00
Evan Huus a8f4327da7 Convert m3ua to wmem and use the pinfo pool for a variable that might be used
for an address. Fixes the recent valgrind fuzz failure.

svn path=/trunk/; revision=51608
2013-08-31 02:50:32 +00:00
Jakub Zawadzki 17cbb2c36e bitcoin, gif: pass header_field_info to proto_tree_*.
svn path=/trunk/; revision=51606
2013-08-30 21:31:42 +00:00
Martin Kaiser 8445c81d50 (try to) fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9079
don't enter the for loop if there are no components to dissect

svn path=/trunk/; revision=51603
2013-08-30 18:13:54 +00:00
Pascal Quantin 777613f964 Remove useless tree
svn path=/trunk/; revision=51602
2013-08-30 17:55:07 +00:00
Pascal Quantin c82839c0a2 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9085 :
GSM A-I/F DTAP - Detach Request - Detach type is not displayed

svn path=/trunk/; revision=51599
2013-08-30 17:23:36 +00:00
Pascal Quantin 84bf0acc00 Convert a few dissectors from EMEM to WMEM API
svn path=/trunk/; revision=51597
2013-08-30 14:49:55 +00:00
Pascal Quantin ac5619426a Deactivate debug code
svn path=/trunk/; revision=51596
2013-08-30 12:31:14 +00:00
Alexis La Goutte b7d30a72a5 HTTP2 Upgrade heuristic for HTTP (Work with HTTP-draft-XX/2.0 and HTTP/2.0)
svn path=/trunk/; revision=51592
2013-08-30 11:14:18 +00:00
Alexis La Goutte c42a4f7706 From me and Stephen Ludin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9042 Add HTTP2 Dissector Based on draft-ietf-httpbis-http2-06
TODO :
* Support HTTP Header Compression (draft-ietf-httpbis-header-compression)
* Enhance display of Data
* Reassembling of continuation frame (and other frame)
* Add same tap and ping/pong time response

svn path=/trunk/; revision=51591
2013-08-30 11:14:09 +00:00
Pascal Quantin d89a3bab77 fragment_length has already been retrieved from TVB
svn path=/trunk/; revision=51590
2013-08-30 09:36:10 +00:00
Pascal Quantin 3eb4d24c23 From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9081 :
DTLS: fix detection of encrypted handshake messages in case of fragment

svn path=/trunk/; revision=51589
2013-08-30 09:18:21 +00:00
Martin Mathieson abd0838266 Revert r51586. It works just fine for drb_mapping_t.
The real problem seems to be that I forgot to commit the generated
packet-lte-rrc.c.

svn path=/trunk/; revision=51588
2013-08-30 04:33:36 +00:00
Martin Mathieson 201f3a3cca Submit forgotten generated file.
svn path=/trunk/; revision=51587
2013-08-30 04:31:02 +00:00
Martin Mathieson fa2c2e6558 Try to fix build problem for some compilers that don't like
typedef struct foo {
 ...
} foo;


svn path=/trunk/; revision=51586
2013-08-30 04:26:22 +00:00
Martin Mathieson a09ee6af03 The first step towards tracking and showing DRX info in MAC:
- send release from RRC
- show current DRX config from each frame, including a link back to the
  RRC config frame
- show simple DRX state for each frame (currently only offset into long
  cycle and whether within long cycle 'on' period)

TODO:
- simulate timers in response to new UL/DL transmissions or DL CRC
  errors
- maintain whether in long or short cycle
- show state of all timers

svn path=/trunk/; revision=51585
2013-08-30 04:08:57 +00:00
Evan Huus d9eb37b849 Add a preference for whether to use names found in DNS packets for address
resolution.

svn path=/trunk/; revision=51584
2013-08-30 01:29:46 +00:00
Pascal Quantin aa99a6c17b From Hauke Mehrtens via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9081 :
DTLS: improve detection of encrypted handshake messages

svn path=/trunk/; revision=51578
2013-08-29 20:23:43 +00:00
Anders Broman 894ca4e904 From Johan Wåhl:
Dissect 3GPP AVP 637 UAR-Flags.

svn path=/trunk/; revision=51575
2013-08-29 17:09:14 +00:00
Michael Mann 951e0101a3 From Hauke Mehrtens:
Break out Signature Hash Algorithm into hash and signature values

From me:
Cleanup all "saved" trees throughout the dissector as well as removing a few unnecessary NULL tree checks.
Removed most of the tvb_ensure_bytes_exist checks because the line that follows will through an exception anyway if there isn't enough bytes in the tvb.




svn path=/trunk/; revision=51574
2013-08-29 14:25:38 +00:00
Bill Meier 3bd36d84d2 Minor reformatting; Also: remove some boilerplate comments.
svn path=/trunk/; revision=51573
2013-08-29 02:20:49 +00:00
Bill Meier 92fe2aa40d Minor cleanup:
- proto_reg_handoff_...() & related;
- Remove unneeded #includes

svn path=/trunk/; revision=51572
2013-08-29 02:17:00 +00:00
Jörg Mayer ee9c47b6eb Slightly improve the decoding of unknown Aironet IEs
svn path=/trunk/; revision=51570
2013-08-28 22:57:52 +00:00
Anders Broman 821b3f24e3 Fix a copy-paste error.
svn path=/trunk/; revision=51569
2013-08-28 19:53:44 +00:00
Anders Broman 87d4d484c7 packet-aruba-erm.c:136: warning: 'range_add_callback' defined but not used
svn path=/trunk/; revision=51568
2013-08-28 19:25:48 +00:00
Anders Broman f6b9c18eed Use dissector_delete_uint_range/dissector_add_uint_range
svn path=/trunk/; revision=51567
2013-08-28 19:10:33 +00:00
Pascal Quantin 519a7778aa Fix copy/paste error introduced in r51541 and spotted by Joerg
svn path=/trunk/; revision=51564
2013-08-28 17:31:12 +00:00
Jörg Mayer b9a4e7a56c As reported by Ben Smith (thex1le@gmail.com) on #wireshark:
Aironet IE 20 is ClientMFP

svn path=/trunk/; revision=51561
2013-08-28 14:09:32 +00:00
Jörg Mayer 57b9b11e40 Comment out a line that seems to do nothing.
** CID 1068812: Unused pointer value (UNUSED_VALUE)

svn path=/trunk/; revision=51560
2013-08-28 10:47:23 +00:00
Alexis La Goutte 574183b9ec Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51552
2013-08-27 21:13:09 +00:00
Alexis La Goutte af7e3d0835 Fix indent (use 4 spaces) And add modelines info
svn path=/trunk/; revision=51551
2013-08-27 21:13:00 +00:00
Alexis La Goutte 37e43e58eb Enhance TLS ALPN dissection (Add length of ALPN)
svn path=/trunk/; revision=51549
2013-08-27 21:12:42 +00:00
Pascal Quantin 22c5585547 Add a DRX subtree to GTP dissector now that the subtree (useless for NAS and EPS NAS dissectors) was removed from de_gmm_drx_param in r51537
svn path=/trunk/; revision=51541
2013-08-27 19:38:35 +00:00
Anders Broman 7e3922cf43 Use dissector_delete_uint_range/dissector_add_uint_range
svn path=/trunk/; revision=51540
2013-08-27 19:21:20 +00:00
Pascal Quantin 77f1ed0f93 Make SPLIT PG CYCLE CODE filterable
svn path=/trunk/; revision=51537
2013-08-27 17:01:58 +00:00
Pascal Quantin 7dfc77adcd From Jiri Engelthaler via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849 :
IEC104: fix dissection of VTI Value and Normalised value

svn path=/trunk/; revision=51536
2013-08-27 14:56:00 +00:00
Pascal Quantin 165caf0869 From Hadar Shoham via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9076 :
MGCP: add support for option mp and fxr/fx

svn path=/trunk/; revision=51535
2013-08-27 12:28:21 +00:00
Martin Kaiser 6d97cc86bd revert the last commit, the comment was correct already
svn path=/trunk/; revision=51533
2013-08-27 11:10:36 +00:00
Martin Kaiser 285ab0a5f9 correct a comment: resource -> item
svn path=/trunk/; revision=51532
2013-08-27 11:04:12 +00:00
Martin Kaiser 155ac2eebd set item len correctly
svn path=/trunk/; revision=51531
2013-08-27 11:02:01 +00:00
Martin Kaiser 8911436697 better function name, make it clear what we want to do
svn path=/trunk/; revision=51530
2013-08-27 10:44:16 +00:00
Martin Kaiser 3f4cf67741 dissect the components of the HID descriptor
svn path=/trunk/; revision=51529
2013-08-27 08:32:01 +00:00
Martin Kaiser 75522d1697 register a dissector for HID class specific descriptors
start dissecting the HID descriptor

svn path=/trunk/; revision=51528
2013-08-27 07:40:50 +00:00
Anders Broman 0e81643540 From Michal Labedzki:
Full dissection of EIR/AD and little improve filtering, cd 

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

svn path=/trunk/; revision=51527
2013-08-27 05:08:34 +00:00
Anders Broman 8ddf822285 From Chun-Yeow:
Decode the Mesh Configuration Capabilities Info in Details.
With a change to use tfs_yes_no.

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

svn path=/trunk/; revision=51526
2013-08-27 04:57:27 +00:00
Anders Broman 84a319fffc From Dmitry Dyachenko:
Add Vendor Ids

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

svn path=/trunk/; revision=51525
2013-08-27 04:44:05 +00:00
Martin Kaiser a913e57d01 TABs -> spaces
add modelines

svn path=/trunk/; revision=51524
2013-08-26 21:11:35 +00:00
Anders Broman 2a0b65b827 Make the UDP port preference a range.
svn path=/trunk/; revision=51521
2013-08-26 05:14:53 +00:00