Commit Graph

52432 Commits

Author SHA1 Message Date
Pascal Quantin cfe11b1097 Add ENC_ASCII_7BITS encoding
Change-Id: I01ec87ff4181afb5b2de487fd5f5200f8d62f17d
Reviewed-on: https://code.wireshark.org/review/1088
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-13 20:02:52 +00:00
Gerald Combs 63ed4745a2 Replace QTableWidgets with QLabels + HTML tables.
This lets the user select and copy the folder and plugin data as text.
Add clickable local filesystem URLs while we're at it.

(I suspect that you shouldn't use QTableWidgets unless you're creating a
spreadsheet.)

Change-Id: I45650bd4f4b6215824a4ed70ec80698d0805baba
Reviewed-on: https://code.wireshark.org/review/1064
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-13 18:32:55 +00:00
Gerald Combs cf85d91547 [Automatic manuf, services and enterprise-numbers update for 2014-04-13]
Change-Id: I0af1de7915bf152ae59e48b4fb2e80c302aa4b39
Reviewed-on: https://code.wireshark.org/review/1085
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-13 16:06:51 +00:00
Guy Harris f55269e406 Use ftype_name() to get the name of an FT_ value.
That way we don't have to update the hf_types[] value_string if a new
type is added.

Change-Id: If4fd0a8ff2d6b54d0b70140be407dae9c4ab6b3b
Reviewed-on: https://code.wireshark.org/review/1083
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-12 22:39:46 +00:00
Guy Harris cb16dff992 Get rid of more tvb_get_nstringz* calls.
Add an FT_STRINGZPAD type, for null-padded strings (typically
fixed-length fields, where the string can be up to the length of the
field, and is null-padded if it's shorter than that), and use it.  Use
IS_FT_STRING() in more cases, so that less code needs to know what types
are string types.

Add a tvb_get_stringzpad() routine, which gets null-padded strings.
Currently, it does the same thing that tvb_get_string_enc() does, but
that might change if we don't store string values as null-terminated
strings.

Change-Id: I46f56e130de8f419a19b56ded914e24cc7518a66
Reviewed-on: https://code.wireshark.org/review/1082
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-12 22:27:22 +00:00
Pascal Quantin ef8a0a2ce1 Update E.212 list to Operational Bulletin No. 1047 (1.III.2014)
Change-Id: I6eddb03a0ef541f94fc166a03417a91bb219e235
Reviewed-on: https://code.wireshark.org/review/1081
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-12 17:24:11 +00:00
Pascal Quantin d7d1cdb1c1 Add MQTT to release notes
Change-Id: I553698c522b4a1eba370591a4ab788a139f8f221
Reviewed-on: https://code.wireshark.org/review/1080
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-12 14:18:12 +00:00
Martin Kaiser c00de8797c no need for if(tree)
Change-Id: Ic74a8f080628dc200fe1f5a4d34ff5f9bb60e232
Reviewed-on: https://code.wireshark.org/review/1079
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-12 12:12:59 +00:00
Martin Kaiser 37f85507dd TABs -> spaces
add editor modelines

Change-Id: Ieee4ea5c5043c519c465a4b0570357f2c22e311c
Reviewed-on: https://code.wireshark.org/review/1078
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-12 12:12:40 +00:00
Alexis La Goutte 6fd55a2e5b Fix packet-vp8.c:168:6: warning: redundant redeclaration of 'proto_reg_handoff_vp8' [-Wredundant-decls]
packet-vp8.c:30:6: note: previous declaration of 'proto_reg_handoff_vp8' was here

Change-Id: Ibbae1eeffaa672224e5ea77bda8e207d077b7262
Reviewed-on: https://code.wireshark.org/review/1071
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-12 11:58:59 +00:00
Guy Harris ae127f23fa Add Mac Roman and DOS CP437.
Change-Id: Ib96f2cf4ea71cd0cc2c703d58b9d254bf4c1248a
Reviewed-on: https://code.wireshark.org/review/1077
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-12 08:54:06 +00:00
David Ameiss 538429cc75 Fixes for numerous fuzz crashes - bug 9962.
Change-Id: I34fb09b62e79bfadd362c0ade81bec80dd0f14e0
Reviewed-on: https://code.wireshark.org/review/1058
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-12 01:53:27 +00:00
Shu Shen 0c2978d69d Adding message type to COL_INFO for multipart messages
Change-Id: I0ae84101c71f31e2d6ab91c7f7b74da81865b8f3
Signed-off-by: Shu Shen <shu.shen@gmail.com>
Reviewed-on: https://code.wireshark.org/review/1075
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-12 01:45:19 +00:00
Evan Huus 5ad84a9ed1 Fix non-standard format specifiers
C90 permits plain %f for doubles. Thanks to Alexis for pointing this out.

Change-Id: I3f927b0a50e5764c2297c7f9d680c6363ba9fd0e
Reviewed-on: https://code.wireshark.org/review/1073
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-12 00:25:38 +00:00
Stig Bjørlykke 2afa065d62 Fix compilation if not HAVE_LIBGNUTLS and not HAVE_LIBGCRYPT
This was introduced in the previous compilation fix.

Change-Id: I4ec652a2708d90f35f3f00ec2c3261acb3e68397
Reviewed-on: https://code.wireshark.org/review/1074
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-04-11 20:31:21 +00:00
Stig Bjørlykke b642a280cb Fix compilation if HAVE_LIBGNUTLS but not HAVE_LIBGCRYPT.
Also fixed a comment for a #endif for the same defines.

Change-Id: Icbbf619dbaeb1d4d154a5f1a8273f252d35c6981
Reviewed-on: https://code.wireshark.org/review/1070
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-11 14:07:39 +00:00
Niels de Vos 48c05a4f8e GlusterFS: correctly dissect flags passed with OPEN, CREATE, etc.
RPC/XDR is in big-endian, just like dissect_rpc_uint64() and friends.

Change-Id: I0843e280bd2ffc2c4bd9a5273a7343a17d81ad6a
Reported-by: Xavier Hernandez <xhernandez@datalab.es>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://code.wireshark.org/review/1066
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-11 13:08:33 +00:00
Stig Bjørlykke 3f81af22e0 Improved TLS/DTLS Heartbeat Message handling.
Added an expert info for invalid payload length (heartbleed).

Change-Id: I9e09d1ae2b997091bbce2483c098dba7e6631859
Reviewed-on: https://code.wireshark.org/review/1067
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-11 12:29:54 +00:00
Stig Bjørlykke 9ce003a620 Added P1 extension 34.
Change-Id: Iccaaf39d4de21e1a12a26c40a184321a67b41f3e
Reviewed-on: https://code.wireshark.org/review/1068
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-04-11 11:21:58 +00:00
Gerald Combs 7ac3ed366c Fix unused variable warnings found by clang.
Change-Id: I31ff6d9bfcedfc1e3cab4e191d8dbf8de347abb1
Reviewed-on: https://code.wireshark.org/review/1065
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-11 01:32:13 +00:00
Alexis La Goutte 725c2b3354 Fix called C++ object pointer is null found by Clang Analyzer
Change-Id: I7d142ed60af8bb776ea732bf9ef94ad92bc23d70
Reviewed-on: https://code.wireshark.org/review/1061
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-10 23:41:06 +00:00
Martin Kaiser 36a2ba2ce6 display LCNs as decimal number
this makes them easier to compare with your TVs channel list

Change-Id: Ie78d1a7df8aa83455ff723fa523b84a067231e5f
Reviewed-on: https://code.wireshark.org/review/1063
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-10 21:04:03 +00:00
Martin Kaiser b6cbf2374e use the CI+ value string for CI+ descriptor tags
Change-Id: I48f3304f74263672a65a74f523f14ebb7950d2d6
Reviewed-on: https://code.wireshark.org/review/1062
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-10 21:03:46 +00:00
Bill Meier b84ce5ca43 Comment out a section re SVN usage; svn ==> git in a few cases; Fix some typos.
Change-Id: I0bd7a7d4bdcc566af6b8f672a25fb937176fde21
Reviewed-on: https://code.wireshark.org/review/1060
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-10 18:00:07 +00:00
Michael Mann ed1e229cb7 Fix infinite loop. Bug 9970
Change-Id: I4f928187b9ba3e522f63f6b6987587e3638d8ba7
Reviewed-on: https://code.wireshark.org/review/1057
Reviewed-by: Francesco Fondelli <francesco.fondelli@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-10 17:34:36 +00:00
Bill Meier f5b26da049 Remove unneeded #include.
Change-Id: I3675f664f1e67c3881e5911427725fade8d1d0f0
Reviewed-on: https://code.wireshark.org/review/1059
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-10 17:10:27 +00:00
AndersBroman 28931af2e5 Update to the latest packet format.
Change-Id: I745a05c9a9e7a5addc00befc2b4ff019aca2a4cc
Reviewed-on: https://code.wireshark.org/review/1056
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-10 10:35:35 +00:00
AndersBroman 9ed6b19f78 Add a hint in the protocol tree.
Change-Id: Id565b153e322599430218eb6f7a542e2dd763458
Reviewed-on: https://code.wireshark.org/review/1055
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-10 08:06:42 +00:00
AndersBroman 98df3ce91f Have the checkum preference only affect IPv4
Change-Id: I6416ab40ac4e1e652bc453fb8e6d3eaa6ec5fe65
Reviewed-on: https://code.wireshark.org/review/1054
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-10 07:50:35 +00:00
Guy Harris af6618b9e2 More zero-length checks.
Fixes bug 9965.

(Also fixes a typo in an expert info string.)

Change-Id: I0b4f9bc4619e0d2ba291795973070598e2e142fe
Reviewed-on: https://code.wireshark.org/review/1051
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-10 01:42:21 +00:00
Guy Harris 209b08225f Check for zero-length options.
Otherwise, we get an infinite loop when processing options.  This might
be the cause of bug 9967.

Change-Id: If115c8cc8fc87b0c4252ab3cd07bfa34952786c6
Reviewed-on: https://code.wireshark.org/review/1050
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-10 01:30:28 +00:00
Guy Harris ea7660a301 Fix two ett_ variables that weren't getting registered.
Change-Id: I0b37bf3d89a108978a6c917fc4d3a33cba456493
Reviewed-on: https://code.wireshark.org/review/1048
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-10 01:06:50 +00:00
Guy Harris 7cbc790832 Avoid bug 9962 - don't use variables that haven't been set.
See the comment for details.

Change-Id: I0b1800dd884736e00201f09166c0d2bd6795b6c3
Reviewed-on: https://code.wireshark.org/review/1047
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-10 00:49:01 +00:00
Guy Harris 7fb9e9beb0 Fix white space.
Change-Id: Ia36d439d1210f93be25a31d2a7288474688e0d9c
Reviewed-on: https://code.wireshark.org/review/1046
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09 22:59:35 +00:00
Evan Huus b3350ed946 Update kafka OffsetFetchResponse dissection
Per https://github.com/Shopify/sarama/pull/77 the spec is out of date, there is
no longer a clientID field in certain messages.

Change-Id: Ieeb7b8f1dd32b326b3d9507e3d5897574a1b09fd
Reviewed-on: https://code.wireshark.org/review/1043
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-09 22:42:14 +00:00
Michael Mann 800cd7b95e Improve dissection of RFC 6607. Bug 9960
Change-Id: Ibab13b0ab7b3f0ac1d9c2e305cb428bb17689313
Reviewed-on: https://code.wireshark.org/review/1039
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-09 22:38:01 +00:00
Michael Mann 4990a8e4ee Added support for MQTT protocol. Bug 9930
Change-Id: I04fc3a6225c56af9905f4f9bbbca5bc10f214843
Reviewed-on: https://code.wireshark.org/review/873
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-09 22:35:08 +00:00
Guy Harris a07dd033d8 Clean up white space.
Change-Id: If274c6239859127485d306b92a59e4d473c26d39
Reviewed-on: https://code.wireshark.org/review/1045
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09 21:37:58 +00:00
Guy Harris 4e8d739609 Use tvb_strncaseeql() to check for XML.
This avoids using tvb_get_nstringz0(), and simplifies the check.

Change-Id: Ib33cf22bf79d4fac8896c25a8b879eeb6e506831
Reviewed-on: https://code.wireshark.org/review/1044
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09 21:32:42 +00:00
Martin Kaiser baa9d10407 iTXt chunk name
Change-Id: I0310368319fe70782bd2c3b48e100292cd93d8c4
Reviewed-on: https://code.wireshark.org/review/1042
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-09 18:19:30 +00:00
AndersBroman a653014e69 There seems to be some ambigiousy on how to calculate V3 checksums for
IPv4. Introduce a preference to use the same metod as for VRRP V2.
http://ask.wireshark.org/questions/15291/does-wireshark-uses-a-pseudo-header-for-vrrpv3-ipv4-checksum-calculation

Change-Id: I14bf279b0c85405c1963784737add9321d5cb7c4
Reviewed-on: https://code.wireshark.org/review/1040
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-09 14:00:12 +00:00
Pascal Quantin dae96ca72b Switch back Windows 32 bits build to GTK2
GTK3 does not work great on Windows:
- the GUI is quite ugly
- features like background color in filter box does not work
- x64 builds are still using GTK2
- no one is putting efforts on this to fix those issues

As we are transitioning to Qt, I do not expect any improvement soon.
Let's switch back to a more user friendly GUI.

Change-Id: I04c0856b8ac8ce808c1942f7f26b14dd57388d1a
Reviewed-on: https://code.wireshark.org/review/1026
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-09 12:53:01 +00:00
Guy Harris 1c162ffc7e Clean up the dissection of ServiceContexts.
Make the top-level item for a ServiceContext an item for the
ServiceContext as a while, and put the VSCID under it like other items,
rather than making the VSCID the top-level item.

Don't dissect the VSCID using the value_string field for the Object
Management Group's SCIDs; use that value_string field for the SCID if
the VSCID is 0 (meaning "Object Management Group"), and have no
value_string field for the VSCID otherwise (the interpretation of the
SCID depends on the value of the VSCID).

Dissect the encapsulation information even for unknown ServiceContexts.

If the ServiceContext's length is bigger than what it's supposed to be,
throw an exception if it's also bigger than the data available in the
packet; this squelches a run-time warning in that case.

Change-Id: I11cc62c2e32f4623dba2a551119b3146a7037e6d
Reviewed-on: https://code.wireshark.org/review/1038
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09 09:45:13 +00:00
Martin Kaiser 9c14703d7b remove usb_trans_info parameter
trans_info is part of the conversation info

Change-Id: I3eafe893324d7d6d23c5475f6f7aa34b7520a6b8
Reviewed-on: https://code.wireshark.org/review/1018
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-09 08:56:28 +00:00
Martin Kaiser 3e228c0f15 setup dissectors don't need bus_id and device_address parameters
these values are already part of usb_conv_info

Change-Id: I79f0c67c91f0f93ba2d52ef08875833eee5e9efd
Reviewed-on: https://code.wireshark.org/review/1017
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-09 08:56:16 +00:00
Guy Harris 7d83a8755a Don't use tvb_get_nstringz0(), use tvb_get_string_enc().
Change-Id: I8e654fa857fca6713198e3d20f2a14a0a444e935
Reviewed-on: https://code.wireshark.org/review/1037
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09 08:05:07 +00:00
Michał Orynicz 412c6cabcf Make makefile verbosity configurable from CMake
This change makes CMAKE_VERBOSE_MAKEFILE option
of CMake used to determine verbosity of generated
makefile, instead of hardcoding it in CMakeLists.txt
script and forcing user to read the script and use
workarounds like "make VERBOSE=1"

Change-Id: I0f3b90ccf962ff88fbfa21ad2f3920b1644d6b6e
Reviewed-on: https://code.wireshark.org/review/1002
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-09 08:00:31 +00:00
Michał Orynicz 3057e309df Change how WERROR and WERR_UNKNOWN is turned off
Use setting WERROR and WERR_UNKNOWN explicitly to 
FALSE instead using unset command. This ensures that
no if(WERROR) or if(WERR_UNKNOWN) clause will trigger
unless these variables are set to another value.

Change-Id: I752d7691c9c101b07c6ee85db83d96d9190bccd7
Reviewed-on: https://code.wireshark.org/review/1001
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-09 07:54:10 +00:00
Evan Huus 8d9c45d965 Update some Kafka API constants per lastest spec
Change-Id: Icef981f50e81e5059916e3bde5fa8a1e1fcd92ae
Reviewed-on: https://code.wireshark.org/review/1033
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-09 07:53:35 +00:00
Guy Harris 130b94fa61 Sadly, packet-dcerpc-mapi.c is not yet free of warnings.
Change-Id: Ic208c89a915fc34d0f42ce788a60aa15029d105b
Reviewed-on: https://code.wireshark.org/review/1036
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-09 02:02:26 +00:00