aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-01-17[iseries] fix iseries_check_file_type()Martin Kaiser1-6/+15
check that we have a line that contains OBJECT PROTOCOL ETHERNET (at the moment, we fail if there's a line containing OBJECT PROTOCOL but not ETHERNET and succeed otherwise -> a file with some random lines will be identified as iseries) initialize our line buffer with 0s to make sure we don't access uninitialized data while parsing don't set wth->priv unless the file is really an iseries file free the iseries struct if the file is not our type Bug: 11985 Change-Id: I0ac7003c047f54ca025d02e59b56d1ff4e2a6be7 Reviewed-on: https://code.wireshark.org/review/13360 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-17[iseries] return WTAP_OPEN_ERROR if file_seek() failsMartin Kaiser1-1/+1
like it's done for the other file types Change-Id: I8caa360b9c527ea642ee6b5102759ad341ad0030 Reviewed-on: https://code.wireshark.org/review/13359 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-01-17[netlink] remove an unnecessary if (tree) checkMartin Kaiser1-6/+4
Change-Id: Id9d20bf98550cfb879c107063d0011840536538a Reviewed-on: https://code.wireshark.org/review/13361 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-01-17[Automatic update for 2016-01-17]Gerald Combs16-1955/+2019
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I4aacb3b957cbb04f1848504bfb6880fe010723a3 Reviewed-on: https://code.wireshark.org/review/13356 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-17[sll] call the netlink dissector if the arp_hdr type is netlinkMartin Kaiser2-6/+19
re-order things a bit so that don't display anything if we just relay our packet to the netlink dissector Bug: 12018 Change-Id: Ic115de82d682b7105a1e97fb8be2709ac4875232 Reviewed-on: https://code.wireshark.org/review/13335 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>
2016-01-17Correctly construct subset tvbuffs.Guy Harris1-23/+8
Use tvb_subset_remaining() or tvb_subset_length() - they calculate the correct captured length for you. This fixes, for example, the EoIB code, where you ended up with tvbuffs with captured length > reported length. Change-Id: Ie792b53a796d4b32242cb83020b54232a2a09698 Reviewed-on: https://code.wireshark.org/review/13355 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Dissect Ethernet-over-GFP frames with the "with the FCS" dissector.Guy Harris1-2/+8
Ethernet-over-GFP frames include the Ethernet FCS. Ping-Bug: 9933 Change-Id: I4eb3f0428b34d7ab62b505fe20f2ba31762594f3 Reviewed-on: https://code.wireshark.org/review/13354 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Call the "no FCS present" version of the Ethernet dissector.Guy Harris1-1/+19
I haven't found an official spec for EoIB, but slide 10 of http://downloads.openfabrics.org/Media/Sonoma2009/Sonoma_2009_Tues_converged-net-bridging.pdf shows the "Eth Payload" following the "Eth Header" and optional "Vlan tag", and doesn't show an FCS; "Payload" generally refers to the data transported by the protocol, which wouldn't include the FCS. In addition, the capture attached to bug 5061 includes no Ethernet FCS. So we assume the Ethernet frames carried by EoIB don't include the Ethernet FCS. Bug: 9933 Change-Id: I310e5727c42e05498d1f1df08266a48fd6674388 Reviewed-on: https://code.wireshark.org/review/13351 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Call the "no FCS present" version of the Ethernet dissector.Guy Harris1-3/+7
The I-D doesn't explicity indicate that the FCS isn't present in the tunneled Ethernet frames, but it is missing from the captures attached to bug 10282. Update the I-D number while we're at it. Bug: 9933 Change-Id: I6e78b20cb858e6c8c4d7380b17b88382db013d56 Reviewed-on: https://code.wireshark.org/review/13350 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Use the "no FCS" version of the Ethernet dissector.Guy Harris1-1/+10
RFC 6325, section 4.1.4 "Frame Check Sequence (FCS)", says "Thus, when a frame is encapsulated, the original FCS is not included but is discarded." meaning that the inner Ethernet frame does *not* include an FCS. Change-Id: Ie764ceb66dd43b951da015870e3e652ccfc651b5 Ping-Bug: 9933 Reviewed-on: https://code.wireshark.org/review/13347 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Use the "no FCS" version of the Ethernet dissector.Guy Harris1-6/+10
RFC 7348 Figures 1 and 2, in the Payload section, says "(Note that the original Ethernet Frame's FCS is not included)" meaning that the inner Ethernet frame does *not* include an FCS. Also, update the protocol references (the I-D is now RFC 7348) and add the I-D for the group policy stuff. Remove some extra blank lines while we're at it. Change-Id: Ib94a43b95b0761e97d1406a1cca3687ee640e12d Ping-Bug: 9933 Reviewed-on: https://code.wireshark.org/review/13343 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-17Don't look at pinfo->pseudo_header.Guy Harris4-153/+205
On the off chance that UMTS FP traffic is being carried over a pseudowire. :-) Change-Id: I8db0fbe96545c08f4748bf9ec046e2dc4f2c2cc6 Reviewed-on: https://code.wireshark.org/review/13342 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Add WTAP_ENCAP_NFC_LLCP to the list of types require a pseudo-header.Guy Harris2-17/+21
Discovered by changing wtap_encap_requires_phdr() to use a switch statement and comparing the case arms. Change-Id: I2a23b86ddfbc88c1b3251a0e97f7f00ee93f630e Reviewed-on: https://code.wireshark.org/review/13341 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Have the pcap_pktdata dissector dissect the payload.Guy Harris1-8/+5
That lets us handle pseudo-headers derived from packet data in one central place. Change-Id: Ie8e1d2d7dac176ea45be08cdc49bd808d9f8cc5b Reviewed-on: https://code.wireshark.org/review/13340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Get rid of unused stuff.Guy Harris1-5/+0
Change-Id: Iad17e64de609d95d1e13c94ae13d1a4834786dd6 Reviewed-on: https://code.wireshark.org/review/13339 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Get rid of a no-longer-needed #include.Guy Harris1-3/+0
Change-Id: I725891d40d27ed87963d717c2c69b1288dafd2da Reviewed-on: https://code.wireshark.org/review/13338 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Have the pcap_pktdata dissector dissect the payload.Guy Harris1-68/+16
That lets us handle pseudo-headers derived from packet data in one central place. Change-Id: I25cb7599a8d3c31e5cbcfda94b072557209f5342 Reviewed-on: https://code.wireshark.org/review/13337 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Don't call dissectors that require a pseudo-header if we can't generate one.Guy Harris1-68/+100
It's not safe to pass a null data pointer to a link-layer header type dissector that expects the data pointer to point to a pseudo-header. Also, remove one extra layer of protocol tree. Change-Id: I030d38fd7d2f99d471020227597e4d7d81506e3e Reviewed-on: https://code.wireshark.org/review/13336 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16doc: fix spelling-error-in-manpage found by lintianAlexis La Goutte3-4/+4
Change-Id: I848159f0c960e0e8ece09c7c96dda6deb0ec6046 Reviewed-on: https://code.wireshark.org/review/13329 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-16plugin_if: fix bug in var assignment.Dario Lombardo1-6/+6
This bug was introduced in d1cb746, when HAVE_PCAP is not defined. Change-Id: I67cd51e4eec45cf7e7c3bdbfea9b8e164bb92883 Reviewed-on: https://code.wireshark.org/review/13333 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-16[sll] add LINUX_SLL_P_NETLINKMartin Kaiser2-11/+10
remove some unnecessary if(tree) checks while at it Change-Id: I2ed7153a25a96f9fa08476176980655117aae26e Reviewed-on: https://code.wireshark.org/review/13334 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-01-16fix spelling-error-in-binary found by lintianAlexis La Goutte2-6/+6
Change-Id: I2bdb40d287b2c19d40679fb73a8bae5f1debdd98 Reviewed-on: https://code.wireshark.org/review/13330 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> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-01-16LAT: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-2/+0
Change-Id: I3e2fad7f0307e599802c37040b34c899efb0e603 Reviewed-on: https://code.wireshark.org/review/13328 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>
2016-01-16MPTCP: Update ADD_ADDR option to RFC6824bis-04Fabrizio Demaria1-0/+11
The new ADD_ADDR format contains a truncated HMAC value of 8 bytes. The specifications can be found in RFC6824bis-04. Change-Id: Ief5118aea06fcd6c502ff4e55f0a49bf3234fd09 Reviewed-on: https://code.wireshark.org/review/13304 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-01-16IEEE802.11: fix EAPOL key frame detectionAlexander Wetzel3-26/+11
Use eapol key data length to differentiate between #2 and #4. This should work around ieee802.11 client implementation errors. Windows is setting the Secure Bit on #2 when rekeying and Bug 11994 has a sample capture with the Nonce set in #4 and are so both violating the spec. Bug: 11994 Change-Id: Ia9e9c68d08dae042cfa7fd9517892db211b0a00f Reviewed-on: https://code.wireshark.org/review/13299 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-01-16extcap: Code cleanupStig Bjørlykke1-49/+26
Rewrote to avoid unneeded g_strdup/g_free constructs, made some arguments const, simplified some code and fixed some whitespace. Plugged a memory leak in extcap_free_info(). Change-Id: I0bfcd86e6464d8bc592329b05dc994191a430096 Reviewed-on: https://code.wireshark.org/review/13306 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-01-16Revert "Don't use the printf command; it's not guaranteed to be there."Guy Harris1-1/+1
This reverts commit 67c58497442fb52571e7507cab0115567eb6352d. It's not *guaranteed* to be there in *every* UN*X, but it's in at least the Single UNIX Specification V3, as well as in shells commonly used in non-UNIX UN*Xes :-), so it'll be there in the UN*Xes we'll be run on. Change-Id: I541f7607055a24d6933d10244f85eea60052a3d8 Reviewed-on: https://code.wireshark.org/review/13325 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Don't use the printf command; it's not guaranteed to be there.Guy Harris1-1/+1
Change-Id: I8cb7f1dcf9cbe360f38a2d9e05f1b876c80409e3 Reviewed-on: https://code.wireshark.org/review/13324 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16Don't export wtap_encap_dissector_table from packet-frame.c.Guy Harris4-10/+9
Dissectors that need it should fetch it with find_dissector_table("wtap_encap"). Change-Id: I4b12888f20182aa529274b934b81d36f7697e1a6 Reviewed-on: https://code.wireshark.org/review/13323 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-16ssl: fix app_data handle detectionPeter Wu1-2/+7
When desegmentation is disabled (as is done with the SSL Decryption (master secret)" test), the app_data dissection is ignored because the app_data dissector it not yet known. Fix this by continuing when the port-based dissector is known (as was done before). Also add avoid setting a "(null)" protocol in the tree when the app_handle is not set (because the encrypted data is not decrypted for example, or when the heuristics dissector fails to set a protocol). Fixes regression since v2.1.0rc0-1501-g50dc0e8 ("ssl: improve interaction with heuristics subdissectors"). Change-Id: I65c1d4705dec8f6fea8b7ac02151fab9dc6152d6 Reviewed-on: https://code.wireshark.org/review/13312 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-16Improve Error messages when failing to load pcapng filesMichael Mann1-20/+23
Include the pcapng block name in every error message to give user a better hint as to where the error is Bug: 8798 Change-Id: Idd80a8541ac37a42b9bd2e988fa8da1ce7bc91a0 Reviewed-on: https://code.wireshark.org/review/13310 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-16Fix indentation.Guy Harris1-7/+7
Change-Id: Ic4c5c0b86e90dc5f3e5e0a6023e21756fa8015d3 Reviewed-on: https://code.wireshark.org/review/13320 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-15Don't try to dissect if the link-layer header type requires a pseudo-header.Guy Harris1-15/+62
If a link-layer header type is one where Wiretap generates a pseudo-header from the bytes at the beginning of the packet data, we can't handle it, because we don't have code to process those bytes and generate a pseudo-header. Punt on it. Change-Id: I28c585e9d368216411cc841068ce3414f27f2d86 Reviewed-on: https://code.wireshark.org/review/13319 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-15autotools: Remove repeated configure output (sshdump)João Valverde1-17/+0
Change-Id: Ia0c7b9f1a6d311e6172f9848a7c809107b6fcd65 Reviewed-on: https://code.wireshark.org/review/13316 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-15sshdump: change message to error.Dario Lombardo1-1/+1
Change-Id: I6f3df909b2cb20a869dd1b812cdf6cdf8946e83c Reviewed-on: https://code.wireshark.org/review/13313 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Dario Lombardo <lomato@gmail.com>
2016-01-15Not passing a struct atm_phdr to an ATM dissector is a bug.Guy Harris1-12/+4
Check for it with DISSECTOR_ASSERT(). Change-Id: I71ba81107f7a4aff21b0f0dbecb5158dc4ff6238 Reviewed-on: https://code.wireshark.org/review/13318 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-15ATM: do not try to dissect if pseudo header is not presentPascal Quantin1-0/+16
Bug: 12013 Change-Id: If753fcdbb01d646fc4db43485549e8c6f668eced Reviewed-on: https://code.wireshark.org/review/13311 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-15Keep comments from stealing hierarchy statistics.Gerald Combs1-1/+14
If a packet has a comment, the Protocol Hierarchy Statistics dialog will add its stats to a top-level "Packet comments" node instead of the "Frame" node. Add a check for the pkt_comment protocol ID and skip over it if we find it. Affects Wireshark 2.0, 1.12, 1.10, and probably earlier versions. As an alternative we could always force "Frame" to be the first item in the tree. Change-Id: If7cd817071caf6219515f5d8121b3a1a2c0d79a6 Reviewed-on: https://code.wireshark.org/review/13297 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-01-15Always initialize need_colorize flagPascal Quantin1-0/+1
Change-Id: I1da2f3e5d5cd6111a6ac7abaee2a97a36e8fd3c1 Reviewed-on: https://code.wireshark.org/review/13309 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-01-15Add http.file_data string field to store decompressed HTTP data.David Morsberger1-1/+10
Change-Id: I6031ae6f9b31447665236098c87ffed97e4b8a2d Reviewed-on: https://code.wireshark.org/review/13275 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-15plugin_if: Add function to get capture file infoPaul Offord5-2/+172
This is an enhancement to allow a plugin to obtain capture file and other status information via a simple plugin_if call Added GTK port to this revision Bug: 11968 Change-Id: Ibcf4e8b43c6f3b48e971fa4020a07cc273234fb8 Reviewed-on: https://code.wireshark.org/review/13103 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-01-15androiddump: Return extcap version informationRoland Knall1-1/+7
Change-Id: I22cdf02286262ae55ea94b4387791d3d28769f31 Reviewed-on: https://code.wireshark.org/review/13286 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-01-15extcap: Add list of extcaps to about dialogRoland Knall7-55/+155
Adds the list of available extcaps to the plugin list in the About dialog of Wireshark (Qt only). To do this, and additional sentence is provided in the extcap arguments list, which allows for additional information to be passed (as of right now, just version and display is used) Additionally, cleans up the code when using g_free. Bug: 11683 Change-Id: I04a958e2b73c9a707ab1cb4f2fc8345833a854a9 Reviewed-on: https://code.wireshark.org/review/13224 Petri-Dish: Roland Knall <rknall@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Roland Knall <rknall@gmail.com>
2016-01-15uaudp: fix buffer overrun while reading prefPeter Wu1-39/+17
Drop the custom str_to_addr_ip, it overruns the buffer with at most 3 bytes when an empty string is passed. Remove sizeof(guint8) while at it, the C standard requires this to be 1. Avoid overwriting uaudp.system_ip to avoid an invalid free of the preference. Change-Id: I39cb0a35364f2ecd32b780fcb7c0253bd866f329 Reviewed-on: https://code.wireshark.org/review/13145 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-15ssl: avoid duplicate PDU dissectionsPeter Wu1-4/+30
When a single frame contains multiple SSL segments and the higher-level PDU requests desegmentation, then each segment will trigger a dissection, resulting in a new tree for each. This seems to happen because the SSL dissector tries to complete a reassembly whenever a segment is found in the last frame. When doing the second pass, the fully reassembled segment is known and as a result the payload dissector is called for all SSL segments in a single frame. Fix this by checking whether the end of the segment covers the whole reassembled data. Another workaround is added to avoid "[SSL segment of a reassembled PDU]" in the Info column when desegmentation finishes. Also fix the SSL version in the Protocol column when a segment is part of a reassembled PDU. Bug: 11079 Change-Id: I9ae0c8ae5c56ed0dd7b071dec8bcc87e838a068d Reviewed-on: https://code.wireshark.org/review/12307 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-15DICOM: fix addition of item subtreesPascal Quantin1-10/+20
Bug: 12011 Change-Id: Idcb0b547d49dcf4b87ddfc05aceb24d06c38ab32 Reviewed-on: https://code.wireshark.org/review/13295 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: Anders Broman <a.broman58@gmail.com>
2016-01-15LTE RRC: upgrade dissector to v13.0.0Pascal Quantin8-1798/+14189
Change-Id: Ie41471f79191097c491d58949c4e90b314cade04 Reviewed-on: https://code.wireshark.org/review/13300 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-01-15[editcap] Pacify OS X buildbot.Michael Mann1-3/+3
Change-Id: I3ec3c4723d29d84b25419982712707126351a01c Reviewed-on: https://code.wireshark.org/review/13301 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-01-14autotools: Remove old hack and bugfix CPPFLAGSJoão Valverde1-6/+0
This was intended to be set as: CPPFLAGS="$CPPFLAGS -DQT_GUI_LIB" but got misplaced/misfixed. It is unsetting all the previous CPPFLAGS in autoconf. No longer needed, remove. Change-Id: I0c87b5f68917ef4a9eb45735ed4255c8952908d9 Reviewed-on: https://code.wireshark.org/review/13293 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-01-14Adding Device Temperature Configuration Cluster for ZigbeeDarshan Nevgi2-0/+231
Change-Id: I574b0364a3007c02d45bbb8cfbfed786a78da0a5 Reviewed-on: https://code.wireshark.org/review/13289 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: Michael Mann <mmann78@netscape.net>