Commit Graph

56149 Commits

Author SHA1 Message Date
Bill Meier 17582d345d asn1/Makefile.nmake: packet-c1222.c not autogenerated using Windows nmake
Change-Id: I21628bdd1a08348629350a373f1c20e02c3618f7
Reviewed-on: https://code.wireshark.org/review/6007
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-23 05:38:22 +00:00
Guy Harris 1b37f4c5ef Cmake: check for popcount, and build it from wsutil/popcount.c if missing.
Change-Id: Id646a9f0b1fc6acafa99a78725e3f0ec8a48c170
Reviewed-on: https://code.wireshark.org/review/6006
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-23 05:04:17 +00:00
Stephen Fisher 4009231b2c Try to fix Windows build for popcount() unresolved external symbol
Change-Id: Ie154caa1967ce4016dd52eefcf757e2e58d7ac68
Reviewed-on: https://code.wireshark.org/review/6005
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 00:45:08 +00:00
Stephen Fisher ae6df38436 packet-dtls.c still needs conversation.h
Change-Id: I1e6a55c41cbab74790880da2b3691cd7d82bc276
Reviewed-on: https://code.wireshark.org/review/6004
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 00:23:31 +00:00
Stephen Fisher 3d62d2c396 Move popcount() to an optionally built part of wsutil for systems that
provide their own popcount().

Change-Id: Ic26f3b50cf0bd2b4af0d42e9c27488ebbac1ab33
Reviewed-on: https://code.wireshark.org/review/5998
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23 00:22:23 +00:00
Guy Harris 59b4ab53fc Include <math.h> or <stdlib.h> as necessary to declare functions.
Various floating-point math functions require <math.h>, and abs()
requires <stdlib.h>.

Change-Id: I6831cfdb17eac3ce129b6800f0fe82fbcfef2d28
Reviewed-on: https://code.wireshark.org/review/6002
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 21:52:08 +00:00
Guy Harris d541774a61 Include <math.h> or <stdlib.h> as necessary to declare functions.
Various floating-point math functions require <math.h>, and abs()
requires <stdlib.h>.

Change-Id: Iadba9e0d7168bba6e67d9221e757a85960507742
Reviewed-on: https://code.wireshark.org/review/5999
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 21:24:15 +00:00
Martin Mathieson 596669f921 First batch of unincludes. Last attempt...
Change-Id: I3681462aeb98ca62ed3ec5eb226b2553317391a9
Reviewed-on: https://code.wireshark.org/review/5997
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-12-22 21:03:13 +00:00
Stephen Fisher b0181288e2 Cast a parameter in the kerberos dissector so it compiles without
warnings on NetBSD.

Change-Id: Id1ab5020fa53656065b0b2438071342eae4f7adb
Reviewed-on: https://code.wireshark.org/review/5987
Petri-Dish: Stephen Fisher <sfisher@sdf.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-22 19:43:30 +00:00
Gerald Combs 5cdad9fe42 Qt: Add methods to CaptureFile and WiresharkApplication.
Add isValid, fileTitle, and retapPackets methods to CaptureFile. Add
application name and title separator convenience methods to
WiresharkApplication.

Convert traffic tables, conversations, and endpoints to use CaptureFile
directly and to let the user know when the capture file is closed. Set
the file dialog titles while we're here.

Change-Id: I990392786d3833e1e0b3638aa2d34a5ada39fa13
Reviewed-on: https://code.wireshark.org/review/5957
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-22 18:12:31 +00:00
Alexis La Goutte 30c3d394ad Revert "Move packet-kerberos.c to the dirty dissectors because it generates warnings (at least on NetBSD), presumably due to our use of -Wc++-compat:"
This reverts commit d4ff430b4d.

Change-Id: Icb0907e649555237b4a86f9f651ec4df8d79d99b
Reviewed-on: https://code.wireshark.org/review/5975
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-22 17:11:28 +00:00
Sergey Avseyev 352bd87486 packet-couchbase.c: remove field which does not exists
Change-Id: Ia4a2a6127edbb6a92becf22cd6ee689e5e2a7966
Reviewed-on: https://code.wireshark.org/review/5981
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-22 16:17:25 +00:00
Alexis La Goutte 5248c0df21 Fix unknown command tag name [-Wdocumentation-unknown-command]
Change-Id: I6c2564a86e13d9321001856ba1f51681a9f20976
Reviewed-on: https://code.wireshark.org/review/5979
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:24:28 +00:00
Alexis La Goutte ed2df3beaf fix warning: parameter 'list' not found in the function declaration [-Wdocumentation]
Change-Id: Id6d02f5c1383dd8f231707f519ec1b28fb007079
Reviewed-on: https://code.wireshark.org/review/5978
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:23:52 +00:00
Alexis La Goutte f8720a6e44 ANSI MAP: Remove from Dirty ASN1 list
Change-Id: I192c447919ee9c3f430f058c2e5285501af962bf
Reviewed-on: https://code.wireshark.org/review/5977
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:23:25 +00:00
Alexis La Goutte 414701dfcb ANSI_MAP: Fix unused function (by add to .OMIT list)
Change-Id: I4e2278d563659db6acc6c02b9e66d58c67939e30
warning: unused function 'dissect_ansi_map_InvokeData' [-Wunused-function]
warning: unused function 'dissect_ansi_map_ReturnData' [-Wunused-function]
Reviewed-on: https://code.wireshark.org/review/5976
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:23:17 +00:00
Alexis La Goutte 3cb816ccb7 PTP: Fix ptp_tree may be used uninitialized in this function [-Werror=maybe-uninitialized]
Change-Id: I0b82782deb568256dafd4c1bf163fd3e74f95545
Reviewed-on: https://code.wireshark.org/review/5974
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22 15:22:36 +00:00
Martin Kaiser 67cbafaa46 remove unnecessary integer overflow checks
... and don't call THROW() from a dissector

If we have a guint32 a and interpret 2*a as gint, we'll always end up
with a negative value if 2*a overflows. Both tvb_get_string_enc() and
proto_tree_add_item() handle this case and throw an exception.

Change-Id: Ibb142328837b6a583057531c76d08631fc731848
Reviewed-on: https://code.wireshark.org/review/5948
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-22 08:17:40 +00:00
Alexis La Goutte 9b3f9b711a 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>
2014-12-22 07:38:57 +00:00
Doug Brown 37940ee5ad 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>
2014-12-22 06:57:42 +00:00
Guy Harris 7b721a1c0e 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>
2014-12-22 06:42:59 +00:00
Bill Meier 998a84774b 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>
2014-12-22 05:00:20 +00:00
Bill Meier 971d4e4ad1 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>
2014-12-22 04:59:47 +00:00
Bill Meier 94eeaf10f2 print.c: clean up #includes
Change-Id: I0ecf618cc79060d35b5480f3d8e7ebf8575761c4
Reviewed-on: https://code.wireshark.org/review/5969
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-22 04:59:19 +00:00
Guy Harris 4cb19d48f5 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>
2014-12-22 03:33:42 +00:00
Ebben Aries 859360a6c4 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>
2014-12-22 02:58:55 +00:00
sfd a5a25658ed 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>
2014-12-22 02:31:15 +00:00
Gerald Combs 8076f29fdb Qt: Fix status bar signal.
Change-Id: Ie935269f6cbe9495b95bcc24b45198fbd284fb35
Reviewed-on: https://code.wireshark.org/review/5963
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-22 00:42:15 +00:00
Guy Harris 8228bcfeec Wrong array.
Change-Id: I69ceca8be624b13f910997dee3bc6852b61b0162
Reviewed-on: https://code.wireshark.org/review/5962
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-22 00:16:06 +00:00
Guy Harris 147ca45683 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>
2014-12-22 00:09:36 +00:00
Guy Harris c30aa115fe 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>
2014-12-21 23:36:04 +00:00
Guy Harris 48419fc2b7 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>
2014-12-21 23:17:39 +00:00
Guy Harris 0be413e270 Move another helper macro.
Change-Id: Id3801373526af57146a87abe9698b192074a0fa0
Reviewed-on: https://code.wireshark.org/review/5958
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21 22:10:08 +00:00
Guy Harris 5d30a3cb41 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>
2014-12-21 21:45:09 +00:00
Guy Harris c96858b5fe 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>
2014-12-21 21:07:17 +00:00
Pascal Quantin 9407160e05 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>
2014-12-21 20:47:48 +00:00
Pascal Quantin ccf0573fcd 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>
2014-12-21 18:52:46 +00:00
Gerald Combs bcaf1f4ca6 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>
2014-12-21 18:47:42 +00:00
Pascal Quantin bd19532bfb 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>
2014-12-21 18:30:33 +00:00
Martin Kaiser 9fbede8567 no need for if(tree)
Change-Id: Ie06738d99851b35e53effb50b2c109ce50e9c6df
Reviewed-on: https://code.wireshark.org/review/5949
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-21 17:29:27 +00:00
Gerald Combs 9c036553ab [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>
2014-12-21 16:04:54 +00:00
Michael Mann f002332d88 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>
2014-12-21 15:13:30 +00:00
Michael Mann cdaa669829 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>
2014-12-21 15:12:58 +00:00
Michael Mann 6f8de873c7 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>
2014-12-21 12:57:58 +00:00
Pascal Quantin da220672b2 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>
2014-12-21 09:48:49 +00:00
Peter Wu fda12fb66d Fix Python 3 compatibility in LocatePythonModule
Regression introduced with cb345eb4bd.

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>
2014-12-21 08:54:24 +00:00
Guy Harris deb49cb662 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>
2014-12-21 07:32:51 +00:00
Guy Harris a138faf425 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>
2014-12-21 07:26:42 +00:00
Bill Meier 806ebca6a5 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>
2014-12-21 07:18:28 +00:00
Bill Meier ce211a4d61 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>
2014-12-21 06:48:22 +00:00