Commit Graph

55839 Commits

Author SHA1 Message Date
Alexis La Goutte 15f6f56073 Revert "Allow "(g)make tags" to work again"
This reverts commit 6b8fe87ef4.

Change-Id: Ie4f681186c1555e6ab966e7db687035f7fc5e60f
Reviewed-on: https://code.wireshark.org/review/5472
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-24 18:36:06 +00:00
Stephen Fisher 6b8fe87ef4 Allow "(g)make tags" to work again
Change-Id: Idcff82aceedbf42652741564e06ca53984078361
Reviewed-on: https://code.wireshark.org/review/5413
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-11-24 18:01:19 +00:00
Alexis La Goutte 2baac34eb1 CPHA : tvb_length -> tvb_reported_length
Change-Id: I49a7ffb1fcff71d49593ab009036f21c3ae6a2d0
Reviewed-on: https://code.wireshark.org/review/5471
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-24 17:35:09 +00:00
Alexis La Goutte 1f5dbb05b5 CPHA: Update versions lists
Use also value_string ext

Request from Hugo van der Kooij

Bug:10723
Change-Id: I0603687215b7e82a987a4a6cde00eb996b04a77c
Reviewed-on: https://code.wireshark.org/review/5466
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-24 17:34:24 +00:00
Stephen Fisher 10803f2119 Second attempt at putting a description in the preferences page
Change-Id: I6d196486e824c82d29f1c233ef3230ad8619715d
Reviewed-on: https://code.wireshark.org/review/5434
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-11-24 17:28:22 +00:00
Michael Mann 953e6b1dd0 Pass data to JSON through dissector data, not pinfo->private_data.
Change-Id: I21dc2777822f0836f486432343cc1238886ad29d
Reviewed-on: https://code.wireshark.org/review/5460
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-24 16:51:35 +00:00
Bill Meier 0c716f794b openflow; Fix a (no-effect) typo in openflow_version_values[]
Change-Id: I7a51face9c675ac3c03f2306ec40293b4835e02e
Reviewed-on: https://code.wireshark.org/review/5468
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-24 16:41:46 +00:00
AndersBroman 73096642fd [SIP/DIAMETER] Reinstate the lost dfilter_store_sip_from_addr() and use it
for 3GPP AVP 601 Public-Identity.

Change-Id: I5ef6608e7821779b00f79486860ee5f578828dfc
Reviewed-on: https://code.wireshark.org/review/5467
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-24 16:35:11 +00:00
Pascal Quantin 78849d0e6b SMTP: escape ASCII strings printed to COL_INFO
This is already done automatically for the hf entries thanks to hfinfo_format_text() function

Bug: 10536
Change-Id: I9ee56b795234a94f0e59c82a96e3e6cedf71c4e6
Reviewed-on: https://code.wireshark.org/review/5459
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-24 16:11:24 +00:00
Michael Mann daed8070dd Pass FrameID as data to the heuristic table, rather than use pinfo->private_data.
Change-Id: Idd5818cbb2b1f8628bb29c2c71dfc6d41df89b5d
Reviewed-on: https://code.wireshark.org/review/5448
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-24 14:35:42 +00:00
Dave Tapuska 6dbb97da10 SSL: Implement Extended Master Secret
Store all handshake mesages in a buffer so that we can hash them
correctly when generating the master secret.

This change does not work correctly for DTLS retransmitted packets; that
are in the handshake as they will be hashed twice; which is bad. Looking
for ideas to implement this.

Bug: 10686
Change-Id: Ied01d4cc37b4270f325070a8d1630d3123577a0d
Reviewed-on: https://code.wireshark.org/review/5168
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-24 09:22:12 +00:00
Guy Harris eb93f3bdfb Don't do unsafe pointer casting
Don't cast a pointer-to-int into a pointer-to-pointer and pass the
resulting pointer to g_hash_table_lookup_extended() - pointers and ints
are *not* guaranteed to be the same size.  Instead, just have a variable
of type gpointer, pass a pointer to *that*, and then run that result
through GPOINTER_TO_UINT().

This fixes a reproducible crash.

Change-Id: I42954f222ab59866cb909b80d9dbb1d2668d2aff
Reviewed-on: https://code.wireshark.org/review/5457
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-24 01:04:20 +00:00
Peter Wu ec650d45a9 elf: separate ett for program and sections entries
This makes it easier to focus on a single section entry, collapsing all
other entries.

Change-Id: I3de72065eb279e9449496a7224508e5be85c3757
Reviewed-on: https://code.wireshark.org/review/5456
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-23 23:49:28 +00:00
Guy Harris 4d55e1f455 Presumably the intent is to dump *non*-dummy entries.
I.e., presumably the intent is to dump *resolved* hosts, rather than
*unresolved* hosts where there's no known host name and the name field
is a string form of the address (the premise being that looking the
address up in the hash table repeatedly, and using the already-generated
string, will be faster than generating the string repeatedly).

Change-Id: Iad1beb1d5f9cd9ed92bad5386111cb659614ee4d
Reviewed-on: https://code.wireshark.org/review/5455
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-23 20:53:11 +00:00
Guy Harris da5487ff49 Newlines at the ends of lines, please.
Change-Id: I7b484e3ddac7cb1330c966819514a9468ea69066
Reviewed-on: https://code.wireshark.org/review/5454
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-23 20:51:05 +00:00
Gerald Combs b2030ca582 [Automatic manuf, services and enterprise-numbers update for 2014-11-23]
Change-Id: I6f8a66b742571dcde011125df9295daedc5652a7
Reviewed-on: https://code.wireshark.org/review/5450
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-23 16:04:47 +00:00
Michael Mann e50095c600 Remove use of pinfo->private_data (which doesn't appear to be used anyway) and pass it as dissector data.
Some other minor cleanup while in the neighborhood.

Change-Id: I1b0c0567488fa350c14d21c5f5e4cb9746177af1
Reviewed-on: https://code.wireshark.org/review/5447
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-23 05:13:52 +00:00
Guy Harris e908804776 Update symbol list.
Change-Id: Ib1cb41f212bbccd4e20d3621110cbb98c01a7196
Reviewed-on: https://code.wireshark.org/review/5444
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22 20:20:39 +00:00
Michael Mann 08cf40eb4a Use dissector data to "return" XML data to XMPP dissector.
Change-Id: I9abdc8c3deed35131af1537733d624d5cfced182
Reviewed-on: https://code.wireshark.org/review/5443
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-22 19:04:19 +00:00
Michael Mann 534b5967c0 Cleanup packet-sccp.c in preparation of trying to remove sccp_info member of packet_info.
Convert a handful of global variables into function parameters that get passed through the dissector, so we shouldn't be dependent on pinfo->sccp_info anymore. Removal of pinfo->sccp_info will be done in a separate patch (when the dissectors that use it can be updated).

packet-sua.c may need similar treatment.

Change-Id: If0001638d666afc07e04b02aa32ef31d6223a5de
Reviewed-on: https://code.wireshark.org/review/5343
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-22 13:52:08 +00:00
Jeff Morriss e2b597a898 Fix problem where the profile bar moves further left every time Wireshark is
run.

For the saved/restored geometry to be consistently correct we need to always
show the expert info and capture file comment icons.  Disable them if no
capture file is open.

Bug: 10518
Change-Id: I6e254f66a17f8f54f28cfbafb4e0f92e02cff70c
Reviewed-on: https://code.wireshark.org/review/5404
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-22 13:49:57 +00:00
Jesse Gross c61a037541 Add version check in Geneve dissector.
We should warn when decoding Geneve packets with an unknown
version number.

Change-Id: Id40b756c3bb0320b69fbd8ee98830a2b05834a48
Reviewed-on: https://code.wireshark.org/review/5420
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-22 13:48:50 +00:00
Graham Bloice 01f9706b28 Add the required c flags for some test executables
Change-Id: I93b0c346fff162899e5f97dd2366e01cf99ec38e
Reviewed-on: https://code.wireshark.org/review/5435
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-11-22 11:20:49 +00:00
Guy Harris 741db4c751 Get rid of another global in the print code.
Pass the "output only these protocols" hash table as an argument,
instead.

Change-Id: Id8540943037e7b9bbfe377120c3f60dbe54fe0f1
Reviewed-on: https://code.wireshark.org/review/5440
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22 09:07:46 +00:00
Guy Harris c68e77b844 Pass a capture_file * to write_psml_preamble() in tfshark as well.
Change-Id: I2b2ae78d4b75bb27a44d185b48e3d85794effdb7
Reviewed-on: https://code.wireshark.org/review/5439
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22 08:28:54 +00:00
Guy Harris b19b12a85d Get rid of write_headers global variable.
Have write_psml_preamble() and write_csv_preamble() take a capture_file *
as an argument, so they can print the column titles themselves, rather
than having to defer it to the routine that prints packet data.

Change-Id: Ifd1b7a13062be8ad46846315976922a752778153
Reviewed-on: https://code.wireshark.org/review/5438
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22 08:07:24 +00:00
Guy Harris 6e1214c4df Fix comments.
Change-Id: I3b7340939b8204102bfc7e2e7d83f4d978cf7bad
Reviewed-on: https://code.wireshark.org/review/5437
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22 03:32:58 +00:00
Guy Harris 7d7fc47a2a Split the low-level print stream code into a separate file.
Put the low-level print stream code from epan/print.c into
epan/print_stream.c, leaving the higher-level stuff in print.c

Change-Id: Iae961f168ec655a29f434257b1af0937fca9f025
Reviewed-on: https://code.wireshark.org/review/5436
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-22 03:24:17 +00:00
Bill Meier 08475ff673 README.heuristic: rework example code.
Specifically: show the use of tcp_dissect_pdus()
   for a TCP heuristic dissector

Change-Id: I02f184b2c8ef6ed128ef3d0bc59eed759aae54bb
Reviewed-on: https://code.wireshark.org/review/5399
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-21 22:13:06 +00:00
Alexis La Goutte fecea9745e VoIP Call (GTK): Fix Dereference of null pointer found by Clang analyzer
Change-Id: I80029b6238c78dcab83a6a70eca0af5b66e1488d
Reviewed-on: https://code.wireshark.org/review/5401
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21 21:57:47 +00:00
Irene Ruengeler c07e9fe450 Add minimize and maximize buttons to the SCTP analysis windows.
As suggested by Jeff Morriss.

Change-Id: Ibe2d30c31d51ab92377d64068527b424a92e8a64
Reviewed-on: https://code.wireshark.org/review/5361
Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21 21:52:22 +00:00
Michael Mann d7e277aa08 CANopen bugfixes
1. Fixed endianess in CANopen dissector.
According to CiA 301, 7.1.1. (p. 26):
"For numerical data types the encoding is little endian style."

2. Fixed NMT type string in CANopen dissector
NMT function code should not display 'EMERGENCY'

3. Fixed time stamp decoding

* Offset increment was too low for data type size
* Decoding of time_stamp_days must equal time_stamp_msec and thus be letohs instead of ntohs. CANopen data is little-endian encoded.

4. Fix: Use correct description string for NMT error control state bits
canopen.nmt_guard.state was faulty named "Node-ID". This was changed to "State".

5. Fix nmt_guard_state value_string array
CiA 301 desribes only 4 valid values. All other were deleted.
0x00 was renamed from 'Initalisation' to 'Boot-up' following CiA301.

6. Shortened EMERGENCY to EMCY

The term EMCY is the standard abbreviation used in CiA standard for Emergency service.

7. Fix: Allow SYNC and NMT error frames without any payload
NMT node guard remote requests do note have a payload,
SYNC frames only have an optional payload (counter)

If item length is set to -1, decode will cause a 'Malformed Packet' error.

8.  Rename MT_NMT_GUARD to MT_NMT_ERR_CTRL which better reflects its scope

Change-Id: I676f9b5f2e4efd8e7c9528fe289e7510c4d43235
Reviewed-on: https://code.wireshark.org/review/5425
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21 21:51:10 +00:00
AndersBroman f2fc562eda Replace tvb_length()
Change-Id: I0b5ad4d588f0b658abaf3892d08d6520ecd2f645
Reviewed-on: https://code.wireshark.org/review/5431
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-21 15:05:33 +00:00
Jeff Morriss 96fb34706b Remove some leftover debug printfs.
Change-Id: I9f4c7f71ae403059a2a236ba095b21753f7938fa
Reviewed-on: https://code.wireshark.org/review/5417
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-21 13:09:53 +00:00
Michał Orynicz 1cde318117 Fix for very big pid and tid numbers in logcat_text
There can be no space after pid colon if tid is big enough
in logcat long format.

Change-Id: I8e03e78c88e4bef1a5fdb3a04b77f58fa7d055bc
Reviewed-on: https://code.wireshark.org/review/5411
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-21 07:50:40 +00:00
Michał Orynicz 1d8673c0df Move text logcat regex strings to shared header
To avoid further duplication of work and bugfixing,
move regex strings to wiretap/logcat_text.h and include
this file in epan/dissectors/packet-logcat-text.c

Change-Id: I82773cda0e3240844139b104c68738ec82788014
Reviewed-on: https://code.wireshark.org/review/5410
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-21 07:45:58 +00:00
Jeff Morriss 1b9dd7547c Fix the build: dissect_a21_ie_common() can't be static any more.
Change-Id: I93db6bc35aef9c36a294e530730cd295ad6851ef
Reviewed-on: https://code.wireshark.org/review/5419
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-11-21 01:31:07 +00:00
Guy Harris 1df0d9cbfa Include "ws_symbol_export.h" to make sure WS_DLL_PUBLIC is defined.
Wrap the declaration for C++ while we're at it.

Change-Id: Ifcc1b47bab139f5fb8da8c3dd4f20b1ebb99739e
Reviewed-on: https://code.wireshark.org/review/5418
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-21 00:58:07 +00:00
Alexis La Goutte 97323982a4 A21: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
Change-Id: Ib2f3816892f1682c175b0dee3c80725caebf3d4d
Reviewed-on: https://code.wireshark.org/review/5415
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20 21:29:36 +00:00
Alexis La Goutte 5e932ada7b EPL: fix warning: no previous prototype for function ... [-Wmissing-prototypes]
Change-Id: I40de0c8c2bd40f18a33947367fdeec5a22a3093a
Reviewed-on: https://code.wireshark.org/review/5414
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20 21:28:53 +00:00
Michael Mann e77261f659 Eliminate proto_tree_add_text from some dissectors.
Change-Id: Ib160211198ca02f7eacf29d04568628c11f208a5
Reviewed-on: https://code.wireshark.org/review/5407
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-20 16:09:09 +00:00
AndersBroman 9611e751ae Replace tvb_length...() calls.
Change-Id: Idda7cd56a12b36d18774a1fe324c69eb8f5e4330
Reviewed-on: https://code.wireshark.org/review/5412
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20 15:12:57 +00:00
Bill Meier 9145acb68a uat: tighten up dec/hex uat field validity checking
Specifically:
- Use the proper code for testing strtol() result;
- Also: Values greater than 32-bits treated as an error
   (on LP64 architectures);

Change-Id: I56e8e734fbb9a22dbd9ed4112e24327ffd7ee3c0
Reviewed-on: https://code.wireshark.org/review/5394
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Petri-Dish: Bill Meier <wmeier@newsguy.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-20 13:47:13 +00:00
Michael Mann ead585fda7 Give better hints as to where the "expert info" fields go.
Change-Id: I9b1cee43ef9280504745b136b87507c2b6bb5369
Reviewed-on: https://code.wireshark.org/review/5406
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-20 12:29:10 +00:00
Pascal Quantin f7f19f0291 IrDA: always initialize buffer before accessing it
Bug: 10716
Change-Id: I8e54f750b70076758d5fd0d7f35f9c782f5d0bf9
Reviewed-on: https://code.wireshark.org/review/5398
Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-20 12:28:29 +00:00
Balint Reczey bcc4c7fad6 Fix global plugin folder when it is set as an absolute path
This fixes regression in creating Debian packages caused by
80b36cdbde

Change-Id: I46702ad4c9a11ce317da7ef664c84e1f22d3f709
Reviewed-on: https://code.wireshark.org/review/5316
Reviewed-by: Evan Huus <eapache@gmail.com>
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-11-20 11:26:11 +00:00
Michał Orynicz 6fbcc18742 Fix text logcat for changes in android L
In L, in line "-- beginning of /<buffer>" the "/" was removed.
This commit accomodates text logcat to that change.

Change-Id: I4cbfadf5a8169589f2848ce1a5793cea593ba459
Reviewed-on: https://code.wireshark.org/review/5405
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-20 11:06:46 +00:00
Alexis La Goutte 087518b326 MIP6: Access network identifier option is not full decoded
* Add subtype Geo Location (2) and Operator Identifier (3)
* Use also offset to calculate the length
* Remove proto_tree_add_text

Issue reported by Ravindranath K M

Bug:10712
Change-Id: I9ad81ece856df134f3a706ad774d34e638cb5c94
Reviewed-on: https://code.wireshark.org/review/5397
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-20 10:52:45 +00:00
Guy Harris d23247e7a9 White space tweaking to match what's in Samba git.
(Samba git also needs some white space tweaking; this only changes the
cases where we're not obviously "better".)

Change-Id: Iafb9cf8fea67b898b12850a7793806e3fccb39ac
Reviewed-on: https://code.wireshark.org/review/5403
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-20 00:55:06 +00:00
Alexis La Goutte 4fdabdcfe7 SBC: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I6ac8e0eed88e78521f7d5623b9afdb6a42900ede
Reviewed-on: https://code.wireshark.org/review/5402
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-19 22:28:28 +00:00