metze/wireshark/wip.git
4 years agoFix The left operand of '!=' is a garbage value issue found by Clang Analyzer
Alexis La Goutte [Sun, 21 Dec 2014 19:15:47 +0000 (20:15 +0100)]
Fix The left operand of '!=' is a garbage value issue found by Clang Analyzer

Change-Id: Ia555fc8eca2a7288c159983578cbc88dc0bebbc2
Reviewed-on: https://code.wireshark.org/review/5952
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoFix AARP AppleTalk address parsing
Doug Brown [Mon, 22 Dec 2014 03:30:46 +0000 (19:30 -0800)]
Fix AARP AppleTalk address parsing

AppleTalk addresses are 3 bytes long and stored in AARP packets as 4 bytes.
The high byte should be 0, followed by 2-byte network number, followed by
1-byte node number.

The previous code was assuming that the high two bytes were the network number,
followed by the 1-byte node number, followed by 0.

Change-Id: I467ec6edac353796db0b96fbac65658d5c5491d3
Reviewed-on: https://code.wireshark.org/review/5968
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoSquelch a compiler warning.
Guy Harris [Mon, 22 Dec 2014 06:42:28 +0000 (22:42 -0800)]
Squelch a compiler warning.

("Can't happen", but that requires more dataflow analysis than some
compilers do.)

Change-Id: I5c6acbff64ea88f9b43d5580522bc144465dc9ac
Reviewed-on: https://code.wireshark.org/review/5972
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoplugins: Cleanup #includes
Bill Meier [Mon, 22 Dec 2014 04:54:35 +0000 (23:54 -0500)]
plugins: Cleanup #includes

Change-Id: Ic839f2995532d68308f8b5908c185acc7acaaa9c
Mostly: remove '#include <glib/glib.h>' and certain
         other #includes already included in packet.h
Reviewed-on: https://code.wireshark.org/review/5971
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agostats_tree: g_sprintf()-->g_snprintf(); cleanup #includes.
Bill Meier [Mon, 22 Dec 2014 04:52:47 +0000 (23:52 -0500)]
stats_tree: g_sprintf()-->g_snprintf(); cleanup #includes.

Change-Id: I862fed818cd1f14584b082f87b1d4d305cf78687
Reviewed-on: https://code.wireshark.org/review/5970
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agoprint.c: clean up #includes
Bill Meier [Mon, 22 Dec 2014 04:50:49 +0000 (23:50 -0500)]
print.c: clean up #includes

Change-Id: I0ecf618cc79060d35b5480f3d8e7ebf8575761c4
Reviewed-on: https://code.wireshark.org/review/5969
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agoUse the messageLength field to indicate the message length.
Guy Harris [Mon, 22 Dec 2014 03:33:10 +0000 (19:33 -0800)]
Use the messageLength field to indicate the message length.

Check it for sanity (and report errors), and use it to set the length of
the PTP packet tvbuff and the PTP top-level protocol item.

Bug: 10611
Change-Id: I9af6aad5f07d405ebb14885dc986a73e430d7bdb
Reviewed-on: https://code.wireshark.org/review/5967
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoBGP : Update BGP-LS Attribute + Display NEXT_HOP
Ebben Aries [Mon, 22 Dec 2014 02:27:58 +0000 (19:27 -0700)]
BGP : Update BGP-LS Attribute + Display NEXT_HOP

From IANA page: http://www.iana.org/assignments/bgp-parameters/bgp-parameters.xhtml

Change-Id: Ibc85dccee94aa69306c88b48d680e48fede08f2e
Reviewed-on: https://code.wireshark.org/review/5965
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoRemoving ptp.v2.an.fcs as this erroneously refers to the Ethernet FCS which is proper...
sfd [Mon, 22 Dec 2014 01:29:41 +0000 (14:29 +1300)]
Removing ptp.v2.an.fcs as this erroneously refers to the Ethernet FCS which is properly handled by the Ethernet dissector.

Bug: 10611
Change-Id: I735085edf5c0d2a66c30c940c4b780a2ce8db6d4
Reviewed-on: https://code.wireshark.org/review/5964
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoQt: Fix status bar signal.
Gerald Combs [Mon, 22 Dec 2014 00:41:49 +0000 (16:41 -0800)]
Qt: Fix status bar signal.

Change-Id: Ie935269f6cbe9495b95bcc24b45198fbd284fb35
Reviewed-on: https://code.wireshark.org/review/5963
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoWrong array.
Guy Harris [Mon, 22 Dec 2014 00:15:42 +0000 (16:15 -0800)]
Wrong array.

Change-Id: I69ceca8be624b13f910997dee3bc6852b61b0162
Reviewed-on: https://code.wireshark.org/review/5962
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoImprove the message for "this field has an integral type" assertions.
Guy Harris [Mon, 22 Dec 2014 00:09:15 +0000 (16:09 -0800)]
Improve the message for "this field has an integral type" assertions.

(Along the lines of provious changes.)

Change-Id: I22d76f22400d4a93242392ff4688acc753eb0039
Reviewed-on: https://code.wireshark.org/review/5961
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoRegister the ORFEntry IP address as an IPv4 address.
Guy Harris [Sun, 21 Dec 2014 23:35:14 +0000 (15:35 -0800)]
Register the ORFEntry IP address as an IPv4 address.

We're adding it with proto_tree_add_ipv4(), so that it's displayed as,
and can be tested as, an IPv4 address.  That means that the field for it
must be of type FT_IPv4, *even though it's calculated from an 8-bit
prefix value* - you can't make it an FT_UINT8.

Change-Id: I7d668fb2a707cdda4ad228afcbdcaf47ee6cba1b
Reviewed-on: https://code.wireshark.org/review/5960
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoImprove the message for "this field doesn't have the right type" assertions.
Guy Harris [Sun, 21 Dec 2014 23:17:13 +0000 (15:17 -0800)]
Improve the message for "this field doesn't have the right type" assertions.

Give the field name in the message.

Change-Id: I046c74b451b473c9c87c2980122b025390f82cc8
Reviewed-on: https://code.wireshark.org/review/5959
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoMove another helper macro.
Guy Harris [Sun, 21 Dec 2014 22:09:28 +0000 (14:09 -0800)]
Move another helper macro.

Change-Id: Id3801373526af57146a87abe9698b192074a0fa0
Reviewed-on: https://code.wireshark.org/review/5958
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDefine helper macros before they're used.
Guy Harris [Sun, 21 Dec 2014 21:44:46 +0000 (13:44 -0800)]
Define helper macros before they're used.

The code works if they're defined afterwards, but defining them earlier
makes it a bit clearer that they're helper macros used as components of
the macros we're exporting.

Change-Id: I326894eea67d2db43fedf4567699cd9eaaa0e004
Reviewed-on: https://code.wireshark.org/review/5956
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoUse the "netbios" heuristic dissector list elsewhere.
Guy Harris [Sun, 21 Dec 2014 21:05:46 +0000 (13:05 -0800)]
Use the "netbios" heuristic dissector list elsewhere.

Use find_heur_dissector_list() to find the "netbios" heuristic dissector
list, rather than using code from packet-netbios.c.

Change-Id: Ieeab58d7c6eb32491b026b242c687bd18c4d5cdb
Reviewed-on: https://code.wireshark.org/review/5955
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDo not use packet scoped memory in GUI
Pascal Quantin [Sun, 21 Dec 2014 19:56:33 +0000 (20:56 +0100)]
Do not use packet scoped memory in GUI

It will trigger an assertion

Change-Id: I2436c11b45e1505a94256a06ed3ad0c5480e034b
Reviewed-on: https://code.wireshark.org/review/5953
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoQt: rename SummaryDialog class to CaptureFilePropertiesDialog
Pascal Quantin [Sat, 20 Dec 2014 22:18:05 +0000 (23:18 +0100)]
Qt: rename SummaryDialog class to CaptureFilePropertiesDialog

Change-Id: I79aa63621853ff15b8c568e1c7949fb8fa0caca2
Reviewed-on: https://code.wireshark.org/review/5929
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>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoQt: Better accordion frame layout.
Gerald Combs [Sun, 21 Dec 2014 18:13:00 +0000 (10:13 -0800)]
Qt: Better accordion frame layout.

Calling invalidate + activate on the parent layout has better results
than calling adjustSize on the parent widget.

Change-Id: I844bee49b868d988b0fc93a72687407adf232ef9
Reviewed-on: https://code.wireshark.org/review/5951
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoDo not use packet scope memory outside packet dissectors
Pascal Quantin [Sun, 21 Dec 2014 18:25:39 +0000 (19:25 +0100)]
Do not use packet scope memory outside packet dissectors

Otherwise it will trigger an assert
Fixes a regression introduced in gf002332

Change-Id: I0cffa2c952b7eff085a1834ebabfec03342095bd
Reviewed-on: https://code.wireshark.org/review/5950
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agono need for if(tree)
Martin Kaiser [Sun, 21 Dec 2014 17:26:19 +0000 (18:26 +0100)]
no need for if(tree)

Change-Id: Ie06738d99851b35e53effb50b2c109ce50e9c6df
Reviewed-on: https://code.wireshark.org/review/5949
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
4 years ago[Automatic manuf, services and enterprise-numbers update for 2014-12-21]
Gerald Combs [Sun, 21 Dec 2014 16:04:50 +0000 (08:04 -0800)]
[Automatic manuf, services and enterprise-numbers update for 2014-12-21]

Change-Id: I08b7be1ab911e8f578173a45dc2055a81e8cbffb
Reviewed-on: https://code.wireshark.org/review/5945
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoReplace ether_to_str with either address_to_str or tvb_ether_to_str.
Michael Mann [Sat, 20 Dec 2014 02:42:14 +0000 (21:42 -0500)]
Replace ether_to_str with either address_to_str or tvb_ether_to_str.

Change-Id: I8cce9fddbfe950e27e96ea8a5a6d2e0921ff4260
Reviewed-on: https://code.wireshark.org/review/5933
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoReplace ax25_to_str and get_ax25_name with address_to_str.
Michael Mann [Fri, 19 Dec 2014 23:13:17 +0000 (18:13 -0500)]
Replace ax25_to_str and get_ax25_name with address_to_str.

Change-Id: I74ddb6fc629ef32b217dede7a3ba652cbbf5ab12
Reviewed-on: https://code.wireshark.org/review/5932
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoAllow "cba" filter prefix for hf_ fields (missed a Profinet file the first time)
Michael Mann [Sun, 21 Dec 2014 12:27:01 +0000 (07:27 -0500)]
Allow "cba" filter prefix for hf_ fields (missed a Profinet file the first time)

Change-Id: I3ff65a8f6307a9ee08e173c0b2658d96985e0c45
Reviewed-on: https://code.wireshark.org/review/5943
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoQt: keep "Copy to clipboard" button active when closing the capture_file_properties_d...
Pascal Quantin [Sun, 21 Dec 2014 09:28:03 +0000 (10:28 +0100)]
Qt: keep "Copy to clipboard" button active when closing the capture_file_properties_dialog

As the Capture File Properties window content is kept once the capture is closed, allow to copy it

Change-Id: I11466e102fcf75a31aaa22225861ad8bf27f89a8
Reviewed-on: https://code.wireshark.org/review/5942
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
4 years agoFix Python 3 compatibility in LocatePythonModule
Peter Wu [Fri, 19 Dec 2014 20:26:23 +0000 (21:26 +0100)]
Fix Python 3 compatibility in LocatePythonModule

Regression introduced with cb345eb4bd0149b4a71d6069f957600a83cc3417.

Change-Id: I625432ac4572d2449cb6981a158e46c560a81f1a
Reviewed-on: https://code.wireshark.org/review/5883
Reviewed-by: Maarten Bezemer <maarten.bezemer@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
4 years agoAdd comments, change structure member name.
Guy Harris [Sun, 21 Dec 2014 07:32:23 +0000 (23:32 -0800)]
Add comments, change structure member name.

"GSList *" implies a list; call the pointer in a struct
heur_dissector_list "dissectors", to indicate what it's a list *of*.

Change-Id: Idf5011e08d35d28934cd52f818b945db1cc7f37b
Reviewed-on: https://code.wireshark.org/review/5941
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoClean up some error messages.
Guy Harris [Sun, 21 Dec 2014 07:25:55 +0000 (23:25 -0800)]
Clean up some error messages.

Correct one message, change another one from a g_assert() to a g_error()
with descriptive text.

Change-Id: I667beb08ac1677205a9323ab623ed0a9766bac79
Reviewed-on: https://code.wireshark.org/review/5940
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agopacket-PROTOABBREV.c: Update re #includeusage
Bill Meier [Sun, 21 Dec 2014 06:55:48 +0000 (01:55 -0500)]
packet-PROTOABBREV.c: Update re #includeusage

- packet.h should be first Wireshark #include
  after config.h and "system" includes.
- '#include <glib.h>' not needed.

Change-Id: Ibec076818f3f509aabb4d240e939ef719f3798d6
Reviewed-on: https://code.wireshark.org/review/5939
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agoCleanup use of #includes in a few recently committed dissectors.
Bill Meier [Sun, 21 Dec 2014 06:41:34 +0000 (01:41 -0500)]
Cleanup use of #includes in a few recently committed dissectors.

Change-Id: Ie66d4c3f0c5d0037cac65ff39e4dedcedff462f1
Reviewed-on: https://code.wireshark.org/review/5938
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agoCleanup use of #includes in non-generated epan/dissector/*.c
Bill Meier [Sat, 20 Dec 2014 21:23:59 +0000 (16:23 -0500)]
Cleanup use of #includes in non-generated epan/dissector/*.c

Specifically:
- Set packet.h to be the first wireshark #include after
   config.h and "system" #includes.
   packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
   packet.h. E.g., glib.h.
   (Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
   before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.

Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agoQt: Don't clear the capture file properties.
Gerald Combs [Sun, 21 Dec 2014 04:33:45 +0000 (20:33 -0800)]
Qt: Don't clear the capture file properties.

Don't clear the contents of the capture file properties dialog when the
capture closes. Retaining the contents lets users compare the properties
for multiple files.

Change-Id: I6bf684e7bd996f22032ec3d0adcddc343bb17992
Reviewed-on: https://code.wireshark.org/review/5937
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoQt: Fix accordion frame height calculation.
Gerald Combs [Sun, 21 Dec 2014 04:06:43 +0000 (20:06 -0800)]
Qt: Fix accordion frame height calculation.

Change-Id: I32d2ea2ff34544e285b52e4e35e035306c33d3aa
Reviewed-on: https://code.wireshark.org/review/5935
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoHave a heur_dissector_list_t be an opaque handle.
Guy Harris [Sun, 21 Dec 2014 04:13:28 +0000 (20:13 -0800)]
Have a heur_dissector_list_t be an opaque handle.

This allows dissector lists to be looked up by name, so they can be
shared by multiple dissectors.

(This means that there's no "udplite" heuristic dissector list, but
there shouldn't be one - protocols can run atop UDP or UDPLite equally
well, and they share a port namespace and uint dissector table, so they
should share a heuristic dissector table as well.)

Change-Id: Ifb2d2c294938c06d348a159adea7a57db8d770a7
Reviewed-on: https://code.wireshark.org/review/5936
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoQt: fix a crash when closing a file while capture file properties window is open
Pascal Quantin [Sat, 20 Dec 2014 21:27:54 +0000 (22:27 +0100)]
Qt: fix a crash when closing a file while capture file properties window is open

refresh_button_ and copy_comment_button_ are not used neither initialized, get rid of them
Also clear text areas and disable buttons

Change-Id: I418d712313041dcf4f15aceee01497f01ae74918
Reviewed-on: https://code.wireshark.org/review/5927
Reviewed-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: Gerald Combs <gerald@wireshark.org>
4 years agoQt: disable Capture File Properties toolbar icon by default
Pascal Quantin [Sat, 20 Dec 2014 22:30:12 +0000 (23:30 +0100)]
Qt: disable Capture File Properties toolbar icon by default

Otherwise it can be opened by clikcing on the icon just after launching Wireshark
Also update tooltip to match the exact dialog name

Change-Id: I5ce5e0c24f3dfb44c2303c78114102c5c03ccc88
Reviewed-on: https://code.wireshark.org/review/5930
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoRemove profinet_type from packet_info structure.
Michael Mann [Fri, 19 Dec 2014 03:12:55 +0000 (22:12 -0500)]
Remove profinet_type from packet_info structure.

Profinet I/O and DCOM CBA had completely separate uses for the profinet_type member, so it's okay to separate them with different proto ids tracking the proto_data.

Change-Id: I7b9c01b8d4f74d51fe9f9ef2f957479dff0a7157
Reviewed-on: https://code.wireshark.org/review/5852
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoMIPv6: simplify fixed point degrees conversion
Luke Mewburn [Sat, 20 Dec 2014 14:05:07 +0000 (01:05 +1100)]
MIPv6: simplify fixed point degrees conversion

* Simplify the conversion of degrees from 24 bit fixed point to a float.
  Avoids strict-aliasing warning by gcc 4.4.
* Add reference to RFC 6757.
* Correct spelling of 'convert' in degrees_convert_fixed_to_float().

Change-Id: Icb680d009fdd960e8668fa3020060799d6a74c2f
Reviewed-on: https://code.wireshark.org/review/5913
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoUse "" rather than <> for includes; that might fix ABI check failures.
Guy Harris [Sat, 20 Dec 2014 23:00:57 +0000 (15:00 -0800)]
Use "" rather than <> for includes; that might fix ABI check failures.

Change-Id: I80e291031e4e8e347422e4a1e636d2ce40efc5c2
Reviewed-on: https://code.wireshark.org/review/5931
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoQt: Use an accordion frame in the welcome screen.
Gerald Combs [Sat, 20 Dec 2014 22:11:31 +0000 (14:11 -0800)]
Qt: Use an accordion frame in the welcome screen.

Place the recent files list in an accordion frame so that showing and
hiding is more visually smooth.

Change-Id: Ifdc534a33aa9f93949c9f919cfe0765fbfcde750
Reviewed-on: https://code.wireshark.org/review/5924
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoRemove debugging code.
Gerald Combs [Sat, 20 Dec 2014 22:08:04 +0000 (14:08 -0800)]
Remove debugging code.

Change-Id: If3a64a6914ae8ce2521c85766df6f733a13ca7e1
Reviewed-on: https://code.wireshark.org/review/5926
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoFix filter test for multifield custom column
Stig Bjørlykke [Sat, 20 Dec 2014 19:09:00 +0000 (20:09 +0100)]
Fix filter test for multifield custom column

This adds support for "field||field" without spaces.

Change-Id: Ia738d6642d12a188d1629bbdd9701cc8f8bb7a68
Reviewed-on: https://code.wireshark.org/review/5922
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
4 years agoQt: Revert back to an all-in-one main window.
Gerald Combs [Sat, 20 Dec 2014 00:27:57 +0000 (16:27 -0800)]
Qt: Revert back to an all-in-one main window.

Switch back to having everything on the main window similar to GTK+.
It's more cluttered but this way but you don't have to navigate the task
selector to get to the recent files and help links.

Retain the "Capture", "Open", and "Learn" imperative text. Move "Open"
to the top as suggested by Michal.

Change-Id: Iaf7d93f9caf686b5cbeb640e5e5f95ecb46f7f2d
Reviewed-on: https://code.wireshark.org/review/5896
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years ago802.11: VHT NDP announcement frame is no correctly decode when there is FCS
Alexis La Goutte [Fri, 19 Dec 2014 10:42:19 +0000 (11:42 +0100)]
802.11: VHT NDP announcement frame is no correctly decode when there is FCS

The FCS at the end of the frame is decoded as additional STA info fields which does not seem correct.

Issue reported by Sudheer
Bug:10786
Change-Id: Idffaa41cd7c79ad4c9937e7f32aa2444c1b9033f
Reviewed-on: https://code.wireshark.org/review/5849
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>
4 years agoFCoIB / Infiniband SDP: prevent a crash when 'enable manual settings' is set without...
Pascal Quantin [Sat, 20 Dec 2014 17:39:51 +0000 (18:39 +0100)]
FCoIB / Infiniband SDP: prevent a crash when 'enable manual settings' is set without filling address field

Bug: 10796
Change-Id: Ifdb7804ec5e1146b08f00e54647d802a69d52113
Reviewed-on: https://code.wireshark.org/review/5914
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>
4 years agono need for if (tree)
Martin Kaiser [Sat, 20 Dec 2014 17:40:45 +0000 (18:40 +0100)]
no need for if (tree)

Change-Id: I0749f8e10d6f8d97b85da6bb52b0ab336ba06c38
Reviewed-on: https://code.wireshark.org/review/5919
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
4 years agohide the hf_msmms_data item, not the NULL item
Martin Kaiser [Sat, 20 Dec 2014 17:41:16 +0000 (18:41 +0100)]
hide the hf_msmms_data item, not the NULL item

Change-Id: If92c9bc281f44de8f3b1de71005240755748403a
Reviewed-on: https://code.wireshark.org/review/5918
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
4 years agoFix filter valid/invalid test for multifield custom type
Michal Labedzki [Fri, 19 Dec 2014 08:21:20 +0000 (09:21 +0100)]
Fix filter valid/invalid test for multifield custom type

Check for "or" or "||" (also ignore whitespaces)
and check both arguments of this operator to be
fieldname (character check), then check whole filter is valid
for dfilter compiler.

Change-Id: I412b5dc1fca16fcd2b640aa74af81167300fd11e
Reviewed-on: https://code.wireshark.org/review/5848
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
4 years agoFix handling of 3-component OS version numbers.
Guy Harris [Sat, 20 Dec 2014 17:47:01 +0000 (09:47 -0800)]
Fix handling of 3-component OS version numbers.

Get rid of doubled square brackets (what were those for?), and match
dots in the version number with "\.", so we only match dots.

This fixes the handling of version numbers such as 10.10.1.

(A 2-component version number doesn't match, but that's OK - the sed
command doesn't use -n, so that just means it's unchanged by the
command.)

Change-Id: I3046133de732c80410592272d1f7b961a64d9289
Reviewed-on: https://code.wireshark.org/review/5915
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoQt: Add a CaptureFile class.
Gerald Combs [Tue, 9 Sep 2014 20:42:58 +0000 (16:42 -0400)]
Qt: Add a CaptureFile class.

Wrap the capture_file struct in a QObject which translates cf_cb_* and
capture_cb_* events into signals. Move the global cfile to
capture_file.cpp.

Don't use a void pointer for the capture file struct.

Change-Id: Ic5d5efb4bb1db64aa0247245890e5669b1da723a
Reviewed-on: https://code.wireshark.org/review/5885
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoConsolidate RTP stream structs.
Gerald Combs [Tue, 16 Dec 2014 22:36:04 +0000 (14:36 -0800)]
Consolidate RTP stream structs.

Consolidate the three different RTP stream structs in ui/rtp_stream.h,
ui/gtk/rtp_player.c, and ui/voip_calls.c into one. Make the member names
a bit more consistent. Document what each GList contains. Use nstime_t
for timestamps since that's what we get from the frame data. Use g_new0
to initialize our structs.

Change-Id: I2b3f8f2051394a6a98a5c7bc49c117f07161d031
Reviewed-on: https://code.wireshark.org/review/5843
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
4 years agoFix typo.
Guy Harris [Sat, 20 Dec 2014 08:57:20 +0000 (00:57 -0800)]
Fix typo.

One position off on the keyboard and everything falls apart.

Change-Id: I00909ca3344642d3eeaae0d8563403b56cc62f79
Reviewed-on: https://code.wireshark.org/review/5912
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoWhen checking for floorl(), include math.h.
Guy Harris [Sat, 20 Dec 2014 08:23:05 +0000 (00:23 -0800)]
When checking for floorl(), include math.h.

It's not being found with MSVC, but is apparently present; perhaps
math.h does something magic, e.g. defining it as a macro, so try using
check_symbol_exists with "math.h".

Change-Id: Idaecac641fb0b87d399807d8bf1fcb74e7251a4e
Reviewed-on: https://code.wireshark.org/review/5911
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoAdd a check for floorl().
Guy Harris [Sat, 20 Dec 2014 05:18:27 +0000 (21:18 -0800)]
Add a check for floorl().

Also, we don't use NEED_STRPTIME_H, we use HAVE_STRPTIME.

Change-Id: I330e8ce408c05b74c50f3369691283e35e68505c
Reviewed-on: https://code.wireshark.org/review/5910
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoDon't bother with __builtin_floorl().
Guy Harris [Sat, 20 Dec 2014 05:09:18 +0000 (21:09 -0800)]
Don't bother with __builtin_floorl().

At least as I read the GCC documentation, if GCC supports a builtin
floorl() at all, it will always treat floorl() and
__builtin_floorl() the same (it's reserved in C90 and defined in C99, so
nobody should ever write C code assuming floorl() won't be treated in
that afshion).

In addition, the GCC 3.3.6 manual says nothing about __builtin_floorl(),
so it probably won't help to use it.  If it appears to help, there's
probably something else going on.

Also, GCC appears not to like "#ifdef (__GNUC__)", as the parentheses
mean it's testing an expression, not a macro name.

Change-Id: Ib88b52c366d7f3b1637bb408fb18d04b67c27e4b
Reviewed-on: https://code.wireshark.org/review/5909
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoUse AC_SEARCH_LIBS() for math functions.
Guy Harris [Sat, 20 Dec 2014 04:45:18 +0000 (20:45 -0800)]
Use AC_SEARCH_LIBS() for math functions.

Use it to check whether we need -lm for various math functions -
including floorl().  Let it handle adding -lm, rather than having that
in the various _LDADD macros.

Change-Id: Ic5d24ec35e060306351f4981c92e26879e597d81
Reviewed-on: https://code.wireshark.org/review/5908
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoInclude <math.h> to declare floor().
Guy Harris [Sat, 20 Dec 2014 04:22:08 +0000 (20:22 -0800)]
Include <math.h> to declare floor().

Change-Id: I39de31c3e38b83aaec76396048e6960f609bc63e
Reviewed-on: https://code.wireshark.org/review/5907
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoRemove trailing white space.
Guy Harris [Sat, 20 Dec 2014 04:11:12 +0000 (20:11 -0800)]
Remove trailing white space.

Change-Id: I0777945a5234cf380e2f3bc2461cc638c316f499
Reviewed-on: https://code.wireshark.org/review/5906
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoRename wsutil/floor.[ch] to wsutil/floorl.[ch].
Guy Harris [Sat, 20 Dec 2014 03:44:03 +0000 (19:44 -0800)]
Rename wsutil/floor.[ch] to wsutil/floorl.[ch].

That better indicates what they do - they don't supply floor(), as
that's a standard math.h feature dating back before C89, they supply
floorl().

Change-Id: Ib1278c51cdfc57680c28c51de87eafb2cb50c8eb
Reviewed-on: https://code.wireshark.org/review/5905
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoWe assume all versions of MSVC have floorl().
Guy Harris [Sat, 20 Dec 2014 03:36:21 +0000 (19:36 -0800)]
We assume all versions of MSVC have floorl().

If not, we'll have to play some games in config.nmake.

Change-Id: I1dbc5d4ef41ede0e596dbe40b4e139e0f6c39dba
Reviewed-on: https://code.wireshark.org/review/5904
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoIf we don't have GCC, fall back on using floor().
Guy Harris [Sat, 20 Dec 2014 02:59:55 +0000 (18:59 -0800)]
If we don't have GCC, fall back on using floor().

Add the closing brace for the function body while we're at it.

Change-Id: I73170fdc0885972dce531b553ff8601cceea182e
Reviewed-on: https://code.wireshark.org/review/5902
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoHandle floorl() the same way we handle other not-on-all-platforms functions.
Guy Harris [Sat, 20 Dec 2014 02:53:31 +0000 (18:53 -0800)]
Handle floorl() the same way we handle other not-on-all-platforms functions.

Use AC_CHECK_FUNC() for it, define FLOORL_LO to floorl.lo if we *don't*
have it, add FLOORL_LO to the list of items conditionally built in
libwsutil, and include "wsutil/floor.h" only if HAVE_FLOORL is *not*
defined, as that means it's *not* supplied by the platform and thus
*not* declared in <math.h>.

Also, use the standard export stuff in wsutil/floor.h.

Change-Id: Ic24aa69f65f2d15450d8b84b0c2b0c58f38edebe
Reviewed-on: https://code.wireshark.org/review/5901
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoChange more variables from si_code to mtp3_si_code to avoid conflicts
Stephen Fisher [Sat, 20 Dec 2014 02:28:59 +0000 (19:28 -0700)]
Change more variables from si_code to mtp3_si_code to avoid conflicts
with a #define in a NetBSD header file.

Change-Id: I2136db207cb4707571920b373708fcb63505131c
Reviewed-on: https://code.wireshark.org/review/5900
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoInclude floor.c and floor.h in the source tarball.
Guy Harris [Sat, 20 Dec 2014 02:00:50 +0000 (18:00 -0800)]
Include floor.c and floor.h in the source tarball.

Change-Id: Iabc0403643a05eaa7dbd525a94bc720d100d54d5
Reviewed-on: https://code.wireshark.org/review/5899
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoUse ENCTYPE_NULL in the krb5_crypto_init() call.
Guy Harris [Sat, 20 Dec 2014 01:56:17 +0000 (17:56 -0800)]
Use ENCTYPE_NULL in the krb5_crypto_init() call.

That appears to be a name supplied both by MIT and Heimdal Kerberos.
Using it makes it a bit clearer what the code is doing, and might avoid
type clash warnings if it's the right type (e.g., if it's a member of an
enum, as it is in Heimdal, and the corresponding argument to
krb5_crypto_init() is of the same type, the types will match).

Change-Id: I81b79223f789b8d1ec47180b7636ac1d83e03681
Reviewed-on: https://code.wireshark.org/review/5898
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoAnother missing change
Stephen Fisher [Sat, 20 Dec 2014 00:44:37 +0000 (17:44 -0700)]
Another missing change

Change-Id: Icaaaeda75f411ecc7cf3027440c8af2b85021be3
Reviewed-on: https://code.wireshark.org/review/5897
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoAnother missing change, to include floor.h
Stephen Fisher [Sat, 20 Dec 2014 00:27:30 +0000 (17:27 -0700)]
Another missing change, to include floor.h

Change-Id: Ice962bb9d62ab99f225228bf1e78850947eea625
Reviewed-on: https://code.wireshark.org/review/5895
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoDon't use g_slist_free_full().
Guy Harris [Sat, 20 Dec 2014 00:20:42 +0000 (16:20 -0800)]
Don't use g_slist_free_full().

It's only in GLib 2.28 or later, but we don't require 2.28.

Instead, have col_custom_field_ids_free() do what g_slist_free_full() does -
and more.

Change-Id: I15768cfd2d26c847470b02ea6c51830dabcaa7ee
Reviewed-on: https://code.wireshark.org/review/5894
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoAdd a missing line related to previous two commits
Stephen Fisher [Fri, 19 Dec 2014 23:19:25 +0000 (16:19 -0700)]
Add a missing line related to previous two commits

(I messed up my local git repo using git branches and stash/stash pops,
sorry for all of the extra commits for one change)

Change-Id: Ib031ae7d57ba9ea4b19fe13121643799e7563046
Reviewed-on: https://code.wireshark.org/review/5893
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoAdd missing files from last commit
Stephen Fisher [Fri, 19 Dec 2014 23:11:33 +0000 (16:11 -0700)]
Add missing files from last commit

Change-Id: I4a6dd1b60893d19b91f5bc0f85be9ee99cd3eb5e
Reviewed-on: https://code.wireshark.org/review/5892
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoRevert "Provide a floorl() function (which is currently only able to call GCC's __bui...
Stephen Fisher [Fri, 19 Dec 2014 23:03:14 +0000 (23:03 +0000)]
Revert "Provide a floorl() function (which is currently only able to call GCC's __builtin_floorl() function) for systems which don't provide one." because I left off the new wsutil/floor.[ch] files

This reverts commit e2586ec36d0d924b933d2127e809918b980cb413.

Change-Id: Ie38b7f32b2d21e3beba5173eec22ca12b7f5da91
Reviewed-on: https://code.wireshark.org/review/5891
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoProvide a floorl() function (which is currently only able to call GCC's
Stephen Fisher [Fri, 19 Dec 2014 22:54:04 +0000 (15:54 -0700)]
Provide a floorl() function (which is currently only able to call GCC's
__builtin_floorl() function) for systems which don't provide one.

Change-Id: Ie0140ff195f0eae525c7bd70c7c3e23039fde569
Reviewed-on: https://code.wireshark.org/review/5889
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoGet rid of some accidentally-checked-in debugging stuff.
Guy Harris [Fri, 19 Dec 2014 22:07:29 +0000 (14:07 -0800)]
Get rid of some accidentally-checked-in debugging stuff.

Change-Id: Iea54df783cdff2424d23ecfba8f219dae42d0c83
Reviewed-on: https://code.wireshark.org/review/5888
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoThrow some casts at compiler warnings.
Guy Harris [Fri, 19 Dec 2014 22:06:04 +0000 (14:06 -0800)]
Throw some casts at compiler warnings.

Change-Id: I609fcba0b015599f98edb1b3927edb5684bcf2b1
Reviewed-on: https://code.wireshark.org/review/5887
Reviewed-by: Guy Harris <guy@alum.mit.edu>
4 years agoMove packet-kerberos.c to the dirty dissectors because it generates
Stephen Fisher [Fri, 19 Dec 2014 21:51:26 +0000 (14:51 -0700)]
Move packet-kerberos.c to the dirty dissectors because it generates
warnings (at least on NetBSD), presumably due to our use of
-Wc++-compat:

../../asn1/kerberos/packet-kerberos-template.c: In function
'read_keytab_file':
../../asn1/kerberos/packet-kerberos-template.c:497:10: warning: request
for implicit conversion from 'gpointer' to 'struct enc_key_t *' not
permitted in C++
../../asn1/kerberos/packet-kerberos-template.c:518:21: warning: request
for implicit conversion from 'gpointer' to 'char *' not permitted in C++
../../asn1/kerberos/packet-kerberos-template.c: In function
'decrypt_krb5_data':
../../asn1/kerberos/packet-kerberos-template.c:570:3: warning: enum
conversion when passing argument 3 of 'krb5_crypto_init' is invalid in
C++/usr/include/krb5/krb5-protos.h:1208:1: note: expected 'krb5_enctype'
but argument is of type 'int'
../../asn1/kerberos/packet-kerberos-template.c:581:13: warning: request
for implicit conversion from 'gpointer' to 'guint8 *' not permitted in
C++
../../asn1/kerberos/packet-kerberos-template.c:596:13: warning: request
for implicit conversion from 'gpointer' to 'char *' not permitted in C++

Change-Id: I17c10fc1df2685ec2e2c1b00cd3b81f62e09c829
Reviewed-on: https://code.wireshark.org/review/5886
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoAdd parenthesis around some generated code so it compiles. This new
Stephen Fisher [Fri, 19 Dec 2014 20:26:22 +0000 (13:26 -0700)]
Add parenthesis around some generated code so it compiles.  This new
code only shows up when the X11 dissector is updated from the latest
xcbproto & mesa, which I will commit real soon now (RSN).

Change-Id: Ic750df3b4406f107fd850ade891ee093054c8d6d
Reviewed-on: https://code.wireshark.org/review/5882
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoTake out parenthesis around faq.txt rule so it works when automake
Stephen Fisher [Fri, 19 Dec 2014 18:31:07 +0000 (11:31 -0700)]
Take out parenthesis around faq.txt rule so it works when automake
chooses Korn shell instead of Bourne shell.  It still works with the
Bourne shell in my testing.

Change-Id: I00bfed22fb0d9bb183637ea5fb111904b8536949
Reviewed-on: https://code.wireshark.org/review/5880
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoReplace uses of proto_get_frame_protocols with proto_is_frame_protocol when only...
Michael Mann [Thu, 18 Dec 2014 21:31:43 +0000 (16:31 -0500)]
Replace uses of proto_get_frame_protocols with proto_is_frame_protocol when only one protocol is desired.

Also use proto_get_frame_protocols in main_menubar.c instead of doing it "manually".

Change-Id: Ie7a365c538700f2cebdd1e3d253f2fd9b189f5cf
Reviewed-on: https://code.wireshark.org/review/5851
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoSkip over the new 'switch' field in xproto/src/xinput.xml so we can
Stephen Fisher [Fri, 19 Dec 2014 17:01:55 +0000 (10:01 -0700)]
Skip over the new 'switch' field in xproto/src/xinput.xml so we can
re-generate the x11 dissector again without the script breaking.

Change-Id: I6d24cf098f370f4c1ff191052e2ea67b7875b33a
Reviewed-on: https://code.wireshark.org/review/5878
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoISIS: Fix warning: '@return' command used in a comment that is attached to a function...
Alexis La Goutte [Fri, 19 Dec 2014 10:57:19 +0000 (11:57 +0100)]
ISIS: Fix warning: '@return' command used in a comment that is attached to a function returning void [-Wdocumentation]

Change-Id: I7f20311125e369cc90df808772323e8e98f8c94e
Reviewed-on: https://code.wireshark.org/review/5850
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoBring pkg.m4 in from pkgconfig version 0.28 so we can use the
Stephen Fisher [Mon, 8 Dec 2014 17:06:56 +0000 (10:06 -0700)]
Bring pkg.m4 in from pkgconfig version 0.28 so we can use the
PKG_PROG_PKG_CONFIG macro to try searching for pkg-config even when
it isn't installed.  Without this (and without pkg-config installed)
the configure script is broken.  With it, it gives a message saying
pkg-config isn't found.

Change-Id: I4c5af4cedd8c1927c1e00dd6b42faef3f31b84d4
Reviewed-on: https://code.wireshark.org/review/5671
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoUse new color_dissector_filters.[ch] to refactor (color) conversation generation...
Michael Mann [Thu, 18 Dec 2014 02:55:52 +0000 (21:55 -0500)]
Use new color_dissector_filters.[ch] to refactor (color) conversation generation in GTK menus.

Change-Id: I5868a40b71a989a3a1522cb091064bb0aaec6daf
Reviewed-on: https://code.wireshark.org/review/5828
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: Anders Broman <a.broman58@gmail.com>
4 years agoBluetooth: Remove unused value strings.
Gerald Combs [Thu, 18 Dec 2014 21:56:47 +0000 (13:56 -0800)]
Bluetooth: Remove unused value strings.

Remove bluetooth_type_vals and bluetooth_direction_vals.

Change-Id: I2d39a59fc815f06d1a5cd5ab838e2bde37597469
Reviewed-on: https://code.wireshark.org/review/5842
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
4 years agoPut a colon after the error message and before the field the error
Stephen Fisher [Fri, 19 Dec 2014 04:16:16 +0000 (21:16 -0700)]
Put a colon after the error message and before the field the error
is referring to for clarity.

Change-Id: I7930e851647c847335b91435c7b0871c6db2defe
Reviewed-on: https://code.wireshark.org/review/5847
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoAdd a comment to each of these scripts to say that
Stephen Fisher [Fri, 19 Dec 2014 03:49:50 +0000 (20:49 -0700)]
Add a comment to each of these scripts to say that
epan/dissectors/README.X11 has instructions for running them.

Change-Id: Id3c1df1bf1f50b19372b9a0470822da9ca6504f7
Reviewed-on: https://code.wireshark.org/review/5846
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoFinish renaming si_code to mtp3_si_code.
Jeff Morriss [Fri, 19 Dec 2014 02:31:05 +0000 (21:31 -0500)]
Finish renaming si_code to mtp3_si_code.

I5e183b997768c87f275569343afa69ca542aba46 missed a spot.

Change-Id: I0970f7e50719e71efc824bbb07a6c2a69c66e991
Reviewed-on: https://code.wireshark.org/review/5845
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
4 years agoRemove main-menubar-ui.xml because it's not used.
Michael Mann [Thu, 18 Dec 2014 02:59:56 +0000 (21:59 -0500)]
Remove main-menubar-ui.xml because it's not used.

Noticed it because it had some really old menu information in it.  Much of which is now programmatically done.

Change-Id: I0a24227df48c00310bc3223f72ba71c00b2c9fc7
Reviewed-on: https://code.wireshark.org/review/5829
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
4 years agoRename si_code variable to mtp3_si_code to avoid conflicts with NetBSD's
Stephen Fisher [Fri, 19 Dec 2014 00:46:27 +0000 (17:46 -0700)]
Rename si_code variable to mtp3_si_code to avoid conflicts with NetBSD's
si_code #define in sys/siginfo.h

Change-Id: I5e183b997768c87f275569343afa69ca542aba46
Reviewed-on: https://code.wireshark.org/review/5844
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
4 years agoAllow "cba" filter prefix for hf_ fields. Seems like something with "pn" or (abbrevi...
Michael Mann [Thu, 18 Dec 2014 19:40:15 +0000 (14:40 -0500)]
Allow "cba" filter prefix for hf_ fields.  Seems like something with "pn" or (abbreviated) Profinet would make more sense (with dissectors to match), but trying to satisfy pre-commit check.

Change-Id: I1db5314fdc77ab7b909c955415f66f24da7d2a0a
Reviewed-on: https://code.wireshark.org/review/5838
Reviewed-by: Michael Mann <mmann78@netscape.net>
4 years agoproto.c: Add hint to 'DISSECTOR_ASSERT(hf->bitmask != 0)' to show field name.
Bill Meier [Thu, 18 Dec 2014 16:53:03 +0000 (11:53 -0500)]
proto.c: Add hint to 'DISSECTOR_ASSERT(hf->bitmask != 0)' to show field name.

Change-Id: Ie578a73742901c1837802da17c0aaf2e58d48c6f
Reviewed-on: https://code.wireshark.org/review/5835
Reviewed-by: Bill Meier <wmeier@newsguy.com>
4 years agoAdd new cmake.in files to the distribution
Maarten Bezemer [Thu, 18 Dec 2014 14:42:53 +0000 (15:42 +0100)]
Add new cmake.in files to the distribution

Change-Id: I685b9376342087182cc0dc8d9b8ed8e17a5ff8e7
Reviewed-on: https://code.wireshark.org/review/5833
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoAdd new cmake files to the distribution
AndersBroman [Thu, 18 Dec 2014 11:33:03 +0000 (12:33 +0100)]
Add new cmake files to the distribution

Change-Id: Iae5ffac472c6d013cf5dd37310278f203a04f8d3
Reviewed-on: https://code.wireshark.org/review/5831
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoAdd support for multifields in custom column
Michal Labedzki [Wed, 17 Dec 2014 10:38:49 +0000 (11:38 +0100)]
Add support for multifields in custom column

You can now add column with Custom type with more than one field
by using OR "||" splitter.

Bug: 9695

Change-Id: Ia82a91e7a35b867647d36cb9626e3870f46c0d85
Reviewed-on: https://code.wireshark.org/review/5804
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
4 years agoBluetooth: Add generic Bluetooth dissector
Michal Labedzki [Fri, 12 Dec 2014 10:24:44 +0000 (11:24 +0100)]
Bluetooth: Add generic Bluetooth dissector

Bluetooth dissector is used to add ability to filter all bluetooth
payload from capture files (there are many transport like:
hci_h4, hci_h1, hci_usb, hci_mon, btle). Also it is used to placeholder for
all data tree used to store additional informations like bd_addrs, names, etc.
Finally it is used to be one point for Bluetooth
Endpoints/Conversation filtering what is enabled now.

Also add Master/Slave Role and Connection Mode tracking.

Change-Id: I67048080fb8ee16fa0f4ec429c1257de81ddd737
Reviewed-on: https://code.wireshark.org/review/5771
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
4 years agoBluetooth: BTLE: Add src/dst addresses when they are known
Michal Labedzki [Fri, 12 Dec 2014 10:11:00 +0000 (11:11 +0100)]
Bluetooth: BTLE: Add src/dst addresses when they are known

Generally where it is not connection then on LinkLayer protocol level
addresses for Source and Destination device are known.

Change-Id: Id67703edc08df73d4c7a2f66ee8f4d6810a867c9
Reviewed-on: https://code.wireshark.org/review/5776
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>
4 years agoDisplayFilter: Check also another fields with the same name
Michal Labedzki [Tue, 9 Dec 2014 17:55:44 +0000 (18:55 +0100)]
DisplayFilter: Check also another fields with the same name

This adds possibility to have two fields with the same abbrev name
but different type, for example FT_ETHER and FT_STRING.
That allows to compare each one to find a valid field.

Change-Id: I8b2a1708ac9648b7a4289777c72a0f3b18f3d8f8
Reviewed-on: https://code.wireshark.org/review/5702
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>
4 years agoUse LocatePythonModule to locate asn2wrs.py
Maarten Bezemer [Wed, 17 Dec 2014 14:03:56 +0000 (15:03 +0100)]
Use LocatePythonModule to locate asn2wrs.py

This reuses existing functionality and thereby making FindAsn2Wrs.cmake obsolete, resulting in a reduction of the cmake module maintaince load

Change-Id: Ic6ae53e65236246c0cbe86f8c2f066a2d034e0b9
Reviewed-on: https://code.wireshark.org/review/5805
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
4 years agoUse LocatePythonModule to find make-dissector-reg.py in order to make UseMakeDissecto...
Maarten Bezemer [Sun, 16 Nov 2014 15:07:45 +0000 (16:07 +0100)]
Use LocatePythonModule to find make-dissector-reg.py in order to make UseMakeDissectorReg.cmake more generally (out-of-source) usable.
Add make-dissector-reg.py to the Debian packages.

Making it possible to generate out-of-source wireshark plugins.

Change-Id: I0bbe5b46205d39e229d31812341540b26a7336d6
Reviewed-on: https://code.wireshark.org/review/5802
Reviewed-by: Anders Broman <a.broman58@gmail.com>