Commit Graph

53508 Commits

Author SHA1 Message Date
Joerg Mayer c62d6e5753 Undo Graham's change to move find-package down.
Fix detection of Homebrew on APPLE

Change-Id: I96506bb57d4772c5c90b1117c37e8350cda376ee
Reviewed-on: https://code.wireshark.org/review/2257
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 18:43:45 +00:00
Joerg Mayer 66532894b0 Detecting gmodule2 on Homebrew almost worked... it behaves more like
non-apple platforms

Change-Id: I1acf8d05c918121fe1a76c8fbd3ac119f624ee8b
Reviewed-on: https://code.wireshark.org/review/2256
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-16 18:32:26 +00:00
Evan Huus de00c49bd8 Convert a bunch of time_to_str functions to wmem
Change-Id: I24fe3cc4a3589dadc4528a77fe7ff13d06b1a983
Reviewed-on: https://code.wireshark.org/review/2245
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 17:26:25 +00:00
Alexis La Goutte b71b68cd63 Fix indent (Use 4spaces like end of the file and modelines info
Change-Id: I80e0193240032e62c685c5b976df921ea1e6a581
Reviewed-on: https://code.wireshark.org/review/2251
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2014-06-16 17:08:57 +00:00
Alex Badea faac494d98 isakmp: support decryption for SHA-2 hash algorithms
Simply map ISAKMP hash IDs for sha256, sha384 and sha512 to gcrypt MDs.
Fixes bug 10181.

Change-Id: I9c8265bf3c5c8f8d2fd6d251cc0f267964e3be8e
Signed-off-by: Alex Badea <abadea@ixiacom.com>
Reviewed-on: https://code.wireshark.org/review/2250
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-16 16:24:14 +00:00
Niels de Vos 9ac8052fb1 glusterfs: correctly decode GFIDs that are passed in a dict
When a dict structure is passed by GlusterFS, the values are not encoded
normally. We now assume that the GFID in the dict is in network-order,
but this will be incorrect for Big Endian systems. The majority of
Gluster deployments are on Little Endian, and the GFID is displayed
correctly for this case. I am sorry for the few users on Big Endian
Gluster environments, they will see some GFIDs in Wireshark that don't
exist on the Gluster volume.

With this change, it is also made possible to filter on the GFID that is
contained inside of the dict.

Change-Id: I62a265eca34df23a507403397012cf652d43ca54
Reported-by: Vikhyat Umrao <vumrao@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://code.wireshark.org/review/1856
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 15:48:44 +00:00
Hannes Mezger 2f369b216f Cleanup subtree types in opcua plugin
- make ett_opcua_transport static, is only used locally
- format code grouping extern ett variables
- add subtree variables for encodingmasks of simple types

Change-Id: Ia044ca6ca0ff19e940a03d21610db67fe3679b01
Reviewed-on: https://code.wireshark.org/review/2157
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16 15:47:17 +00:00
Hannes Mezger 0bb0b62ec8 Display status code info bits if set
Checks if a StatusCode has any of the additional info bits set and displays them accordingly.

Change-Id: Ic584233083174d3fd30c6ec6684f308e0e5ae22e
Reviewed-on: https://code.wireshark.org/review/2127
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 15:47:01 +00:00
Hannes Mezger a9b18eff0f Display text representation of status codes
Adds a table containing all known StatusCodes and displays them if found.
The list of StatusCodes is in a separate file for easy generating of the list if necessary.

Change-Id: Iab74b22b7fc4fb53d8f072c4e3a4cea4ae18196c
Reviewed-on: https://code.wireshark.org/review/2126
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 15:44:35 +00:00
Evan Huus 39d7c9df0a Remove emem in SNMP UAT, use glib instead
Change-Id: Ieea8c09d6a82285b0ba20f669c35394fbf195f50
Reviewed-on: https://code.wireshark.org/review/2241
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 15:38:31 +00:00
Evan Huus c76b70fa12 Remove last remaining call to se_strdup
get_filter_from_packet_list_row_and_column now returns glib memory

Change-Id: I24361670322ff4a936c157a842b07f32c474089e
Reviewed-on: https://code.wireshark.org/review/2240
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 15:36:44 +00:00
Evan Huus 83f9cc6603 Remove last caller of se_strdup_printf
Also remove that function as it is now unused.

Fix what appeared to be a memory leak in the manual address resolution dialog
while in the neighbourhood.

Change-Id: I75128ab0f95e5a7673f92bfeea45191f00581c25
Reviewed-on: https://code.wireshark.org/review/2244
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 15:25:53 +00:00
Evan Huus e46c1af0f0 Remove emem from ssl utils, use glib instead.
No exceptions can be thrown when loading a key from a file, so it's safe.

Change-Id: I14ee8569bb516fcb45b72f07f76d28ef4b32065c
Reviewed-on: https://code.wireshark.org/review/2243
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 15:20:35 +00:00
Evan Huus 39a14ab75f Remove now-unused functions.
Change-Id: Iecf230d493b31ecab25b33c67323987459b23bd7
Reviewed-on: https://code.wireshark.org/review/2242
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 15:19:48 +00:00
Alexis La Goutte dd596dbcfd STUN: Add support of MS-TURNBWM
Traversal using Relay NAT (TURN) Bandwidth Management Extensions
http://msdn.microsoft.com/en-us/library/ff595670.aspx

Change-Id: I58c7b758ae96226a45095243939b2ad2b4a91d4d
Reviewed-on: https://code.wireshark.org/review/1973
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16 14:27:50 +00:00
Stig Bjørlykke 066a9f3d2d Support out-of-source docbook build
Change-Id: I273a6317c459664a247d3f5623ef54b0a70a9ab8
Reviewed-on: https://code.wireshark.org/review/2232
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-16 14:19:13 +00:00
Yan Burman 0a29589c01 Fix SDP dissector crash during fuzz testing
Change-Id: Ic133dd9440feb61964d197fa0aaacd86241f229d
Signed-off-by: Yan Burman <yanb@mellanox.com>
Reviewed-on: https://code.wireshark.org/review/2248
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 13:22:31 +00:00
Yan Burman 2274b281ef iSCSI: Register iscsi dissector, so it can be used by iSER
Change-Id: I78e487c14859b82d7e1d79f99a92c759c73fbda2
Signed-off-by: Yan Burman <yanb@mellanox.com>
Reviewed-on: https://code.wireshark.org/review/2246
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 13:20:56 +00:00
Stig Bjørlykke 92fbff2483 Register BER dissector as new.
This makes it possible to dissect part of a package as ASN.1.

Change-Id: I53dd6bc916fa0d2c932d77fef437c2094fdd29ed
Reviewed-on: https://code.wireshark.org/review/2238
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 06:50:00 +00:00
Stig Bjørlykke 1f47e2729f Use tfs_f1_3_override_state to avoid unused variable error
Change-Id: I211f1bd2dcf61f27034e1e42e00ab3c1dc0c4c89
Reviewed-on: https://code.wireshark.org/review/2236
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 06:49:28 +00:00
Alexis La Goutte ac5479b4b8 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I781c7eec381d3296d15e666385f549e44f62e3f1
Reviewed-on: https://code.wireshark.org/review/2226
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 06:48:33 +00:00
Alexis La Goutte 53c0d7856e Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I17b5f3af2c4822805705fae9fdbb0375ba04acdd
Reviewed-on: https://code.wireshark.org/review/2225
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-16 06:48:10 +00:00
Dario Lombardo 2919633c65 New dissector for Character Generator Protocol (chargen).
Change-Id: I01e0508adc79dda11b3eaee51fa01110b8c83e39
Bug: 10178
Reviewed-on: https://code.wireshark.org/review/2220
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-15 18:41:21 +00:00
Stig Bjørlykke 235617399c Fix documentation for DissectorTable_get_dissector
Change-Id: Ic8db06249c6326505b7f5c4518c3af2c6961066a
Reviewed-on: https://code.wireshark.org/review/2234
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-06-15 17:56:25 +00:00
Stig Bjørlykke b3054c2c5f Added some type values
Change-Id: I99a2203968dfb9fb0bb7e2052c2bf5aa0994f9ca
Reviewed-on: https://code.wireshark.org/review/2233
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-06-15 17:44:39 +00:00
Stig Bjørlykke fae6b0b573 Add missing --git-dir=$srcdir/.git for ls-remote
Change-Id: I848b80cd8126d93cbf3ce02a333345f4ea6b4e92
Reviewed-on: https://code.wireshark.org/review/2231
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-06-15 17:41:10 +00:00
Balint Reczey 14903d65c3 Depend on docbook-xml and drop obsoleted 0005-...patch
Change-Id: I4c849a1e8205b65ba05959213967bac5f378c96c
Reviewed-on: https://code.wireshark.org/review/2137
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-06-15 16:33:08 +00:00
Gerald Combs 3081fe05b1 [Automatic manuf, services and enterprise-numbers update for 2014-06-15]
Change-Id: Idb28b18adc99e7ba5cd1a3995986774d75ddb3aa
Reviewed-on: https://code.wireshark.org/review/2227
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-15 15:04:40 +00:00
Alexis La Goutte 310d5ab1ca OSPF: Remove unused code (will be never reused)
Change-Id: I7cd22fd1524b6eeaf5a1384d6a43acc5411370f9
Reviewed-on: https://code.wireshark.org/review/2224
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-15 14:35:40 +00:00
Joerg Mayer 237fa1cac2 Fix warnings turning errors (also fixes buildbot)
These fixes are superficial. Michael: Please review and either remove
the unneeded stuff or put in the correct use.

Change-Id: I15e0f8c746af5bd76f57965ddcbf06d9e4ac80ca
Reviewed-on: https://code.wireshark.org/review/2223
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-15 13:59:07 +00:00
Michael Mann 9e4cb64a85 packet-ospf.c : proto_tree_add_text -> something filterable
Change-Id: I9769e1d93ff99c4081dd028d79c0cead75e0e36c
Reviewed-on: https://code.wireshark.org/review/2221
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-15 12:29:03 +00:00
Michael Mann dc4d3706a8 packet-ipmi-se.c : proto_tree_add_text -> something filterable.
Also did some minor cleanup noticed while doing the filter conversion

Change-Id: Iea61b395c0eeb6fbcaac4c09964da2cb3cdccda5
Reviewed-on: https://code.wireshark.org/review/2184
Reviewed-by: Dmitry Bazhenov <dima_b@pigeonpoint.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-15 12:18:54 +00:00
Michael Mann e9dea8542b acknowledge BASE_RANGE_STRING
Change-Id: I3e899f79a3d58b8a2e72b88253a7e9ec51a314b5
Reviewed-on: https://code.wireshark.org/review/2222
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-15 03:18:14 +00:00
Joerg Mayer 4c261cf6a0 Policy CMP020 was being set twice. Remove my original clumsy implementation.
Set CMP0015 to NEW

Change-Id: Idea76f365f27e59eb6f56c7edec6d96224668c0d
Reviewed-on: https://code.wireshark.org/review/2219
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 14:34:22 +00:00
Dario Lombardo d4c6b2a4bb Added monlist support
Change-Id: Ia96bfb71449624ff75c694080fef30d57300b30d
Bug: 10174
Reviewed-on: https://code.wireshark.org/review/2131
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:27:08 +00:00
Martin Kaiser a1a5f6513d limit the scope of setup_tvb
Change-Id: Id3fc3f017c02c2df3b0578c28f187b106c3ad2ed
Reviewed-on: https://code.wireshark.org/review/2218
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:08:33 +00:00
Martin Kaiser 548d8aaf6c limit the scope of new_offset
Change-Id: Ib7f57696e40df770f5ae21ca066b27d28c13b57b
Reviewed-on: https://code.wireshark.org/review/2217
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:08:07 +00:00
Martin Kaiser 04b3118524 let the subfct fill win32_data_len
Change-Id: I39012cf467b27eb0be4c63bbc648a72f831d9068
Reviewed-on: https://code.wireshark.org/review/2216
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:07:44 +00:00
Martin Kaiser 7d5821f441 mark both transfer header and payload bytes for usbpcap iso packets
Change-Id: I2aadbde82b59ac0135230e5e370a9a3f81951365
Reviewed-on: https://code.wireshark.org/review/2215
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:07:16 +00:00
Martin Kaiser 4cb848800c more descriptive names for tree variables
Change-Id: I3eaa39784be9c00de834325dbfe9be4c545dcec7
Reviewed-on: https://code.wireshark.org/review/2214
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:06:43 +00:00
Martin Kaiser 29a25d25f7 rename tree_ti to urb_tree_ti
Change-Id: I2cda4c90de1be774d80cc2cd044ce2609a350c3e
Reviewed-on: https://code.wireshark.org/review/2213
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:06:17 +00:00
Martin Kaiser f1523a66fb remove unnecessary tree variable
Change-Id: Ie3eb6f91a99e82c9068074aa20e99ca5b2525882
Reviewed-on: https://code.wireshark.org/review/2212
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:05:49 +00:00
Martin Kaiser 2c9b7c54a3 simplify the detection of iso data start offset
Change-Id: Idcae64accda9d812fdeb21b71bed35601cfbcd89
Reviewed-on: https://code.wireshark.org/review/2211
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:05:23 +00:00
Martin Kaiser 09784a977c rename dissect_win32_usb_pseudo_header() to
dissect_usbpcap_buffer_packet_header()

only process the generic part of the usbpcap pseudo header in this
function, the transfer-specific parts are handled in
dissect_usb_common()

Change-Id: I1e97db9905ef1d14f04b53624e82feed7270912f
Reviewed-on: https://code.wireshark.org/review/2210
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:04:54 +00:00
Martin Kaiser 464c26399d dissect the usbpcap_buffer_control_header in dissect_usb_common()
Change-Id: I605908619b5d87c846810016c15cccfce9da858e
Reviewed-on: https://code.wireshark.org/review/2209
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-14 14:04:31 +00:00
Irene Ruengeler e14357032f Define INET6 for all platforms.
Show the addresses as a tooltip in capture interfaces.

Change-Id: I911784e09ed9479229a7d6f8a7f1476e2e1e6224
Reviewed-on: https://code.wireshark.org/review/2155
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-14 13:27:10 +00:00
Joerg Mayer 30480da87a Match for contents of WIRESHARK_SIMD_FLAGS only if non-empty
Change-Id: I99e15b237c74783b455461ce58ba32f1f8202990
Reviewed-on: https://code.wireshark.org/review/2208
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 08:49:51 +00:00
Joerg Mayer b70bb4654a Make it harder to miss that this is also about Win builds
Change-Id: Id4fd7a4672ed32dfcb57a4435a6b3e5cf2e5ca3d
Reviewed-on: https://code.wireshark.org/review/2207
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 07:38:23 +00:00
Joerg Mayer 935280317a Backport autofoo simd optimization
Change-Id: I5d58154bf8266eabedf550b54f18845612f514c6
Reviewed-on: https://code.wireshark.org/review/2206
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 06:44:15 +00:00
Joerg Mayer a4a7d2cfec Small whitespace fixes
Change-Id: I44c6c193ec2a7d88cda56ba34c2f17c03f7e121d
Reviewed-on: https://code.wireshark.org/review/2205
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-14 06:43:22 +00:00