summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-06-07Updates as requestedAnish Bhatt2-0/+8
Change-Id: I447b2c1f713710820ce81dda40992b5311285d09 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2015 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-07When installing the launch daemon, get rid of the old startup item.Guy Harris1-0/+2
Only one is necessary; get rid of the startup item. Change-Id: I0bd2dabb3fc286ccd0e6634bc112e20602624c86 Reviewed-on: https://code.wireshark.org/review/2016 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06Misc lldp cleanup.Anish Bhatt1-32/+39
I'm cheating a bit here, hf_media_loc_long & hf_media_loc_lat need a 5byte bitmask, but the bitmask field in hf is restricted to guint32 Change-Id: I7e044fc680bb947973e437fc66057488a8deee67 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/2012 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Moved dissection of setup field to own functionSean O. Stalley1-34/+55
Dissection of all setup field types (standard & nonstandard) are handled in a seperate function. Before, nonstandard dissection was handled in dissect_usb_common. This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: I15d7e3691afc29cd569aa5d3770d2aa569630b12 Reviewed-on: https://code.wireshark.org/review/1992 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Get rid of some stuff left over from the days of drag-install.Guy Harris2-28/+1
We're not using the Utilities directory; don't create it and don't fill it in. Change-Id: I7ba66b415a2e5a6aff77d4bdb57b2ca176bcd789 Reviewed-on: https://code.wireshark.org/review/2009 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06Switch to a launch daemon for ChmodBPF.Guy Harris10-130/+94
"Ah finally blew that varmint to Kingdom Come!" Change-Id: I4ef5f8692924772189af4158eddbc125c1c7d521 Reviewed-on: https://code.wireshark.org/review/2004 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-06Comment out an empty section.Gerald Combs1-1/+1
Change-Id: I2c98e5c70e5443eb927dbdc5525c67b463b837bf Reviewed-on: https://code.wireshark.org/review/2003 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-06-06Q.2931: sort extended value string 'q2931_message_type_vals' in increasing orderPascal Quantin1-12/+12
Change-Id: I003d55b338c79b9841dd16d0947e4734f118f7c6 Reviewed-on: https://code.wireshark.org/review/2002 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06Add TFTP export for Qt tooAlexis La Goutte5-14/+22
Change-Id: I056829d48aa49eb106c76c8f572c0f8b6e1a4245 Reviewed-on: https://code.wireshark.org/review/1916 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin10-22/+48
Change-Id: I7650a3ec31120ac5e7954f4c1ca985ad55d189b4 Reviewed-on: https://code.wireshark.org/review/1978 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06Fixed Fencing for Multiple MAUSB Packets in 1 TCP Packet.Sean O. Stalley1-2/+6
Packet info for all MAUSB packets in a single TCP packet is now displayed in the info column. Before, only info on the last packet was displayed. See conversation for change Ib20e5e30474d93270dd24e203ab96f64f5cc77ad. Patch 3 had fencing, I messed up and left it out of patches 4-6. This patch adds it back in. Change-Id: I37f0e028a8f9b5a8500700f03ac36f8bf1c4f63c Reviewed-on: https://code.wireshark.org/review/1958 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-06Added tap queue helper function to USB dissectorSean O. Stalley1-16/+19
Added a helper function which handles all the USB-Specific tap data. This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: If0f0b5542203ddaed28009d8a8a1bb8660fa5d70 Reviewed-on: https://code.wireshark.org/review/1990 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-1/+1
packet-q931.c:2532:25: warning: Access to field 'message_type' results in a dereference of a null pointer (loaded from variable 'q931_pi') Change-Id: I7533ff60c541e31efe4522e710f86175c1c0ccf4 Reviewed-on: https://code.wireshark.org/review/1997 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: Iada015df96b8c1b5070699589bb4b4f759217ecd Reviewed-on: https://code.wireshark.org/review/1996 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I2e7e32f618f709739948b2b5ebd1db0e775bfaed Reviewed-on: https://code.wireshark.org/review/1995 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-06(trivial) changed when transfer info is setSean O. Stalley1-2/+1
usb_conv_info->usb_trans_info is set to the same thing regardless of the branch taken, to pull it out of the condition. Change-Id: Ieabf0a6e796b942d7bafedbeba18d9e0fa113e17 Reviewed-on: https://code.wireshark.org/review/1991 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-06WiMAX: fix incorrect type for include_cor2_changes variablePascal Quantin1-1/+1
Issue found while playing with MSVC /GL option Change-Id: I1f734eb4054349c706b529d8080036b00e66397a Reviewed-on: https://code.wireshark.org/review/1998 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-06LLDP-MED CleanupAnish Bhatt1-116/+258
Co-ordinate based LCI is untested, as the sample capture does not have this, could not find one anywhere. Change-Id: Id0b52c234d6a36ee430ab9a7265bcd84f151c80c Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/1929 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-06IPMI trace dissector (without PCAP-dependent part).U-beauty\bdn16-923/+4587
Added KCS and TMode protocol dissectors. Request/response logic has been revised. Saved request data logic has been revised. Added Get Message command response dissector. Added missing PICMG command dissectors. Added new PICMG command dissectors. Added new PPS OEM command entries. Added VITA 46.11 command dissectors. From: Bill Meier: - refs to value_strings/range_strings in hf[] entries, by convention, should use VALS/RVALS macros; - refs to true_false_strings should use TFS(&...) macro. also: true_false_string definitions should not be defined as arrays. - remove some unneeded #includes (packet-ipmi.c). - Do some re-indentation. - Add editor-modelines as needed. bug: 10004 Change-Id: Ib269b35784c0b70892d1e0111bcfb483ea64092c Reviewed-on: https://code.wireshark.org/review/1185 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05Windows packaging and release note updates.Gerald Combs4-146/+45
For now, use "Wireshark" and "Wireshark 2 Preview" instead of "Wireshark (GTK+)" and "Wireshark (Qt)" respectively to match the 1.12 installer. Shorten the descriptions of the command line tools. Warn against (but don't prohibit) installing on XP. Change-Id: Ica37ffa5b04eb48cadf41842b6fb9b1431c69803 Reviewed-on: https://code.wireshark.org/review/1988 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 25bb29a1d65896959bc3f73bcf20b400fe0d32dd) Reviewed-on: https://code.wireshark.org/review/1989
2014-06-05Add a missing header file, and add new file to cmake buildMartin Mathieson2-0/+2
Change-Id: I3be8bef8c7542e7bcb11f3696783ca68c3920082 Reviewed-on: https://code.wireshark.org/review/1987 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-06-05Add Object (file) export for files transferred over TFTP.Martin Mathieson8-4/+326
Updated following review comments. Change-Id: I56e70d8f8e332d2aea604ceec16c980ad890fa58 Reviewed-on: https://code.wireshark.org/review/1885 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-06-05When have more than one SDU in the same RLC PDU, make sure output from all ↵Martin Mathieson1-0/+8
of them stays in the INFO column Change-Id: I7b2555101f3a1a596a4108a13240d21786054671 Reviewed-on: https://code.wireshark.org/review/1985 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-06-05Add a handle to dissect sip userinfo.AndersBroman1-11/+21
Change-Id: Ia8c15b710d79f12e8f62a49b17f057b746f31f0c Reviewed-on: https://code.wireshark.org/review/1980 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05sip: avoid calling tvb_format_text() when tree is not visible.Jakub Zawadzki1-83/+112
sip dissector when filtering spends ~5% of Ir in tvb_format_text(), avoid calling. Change-Id: I1de8e970b300354c0536aead65178401f140f509 Reviewed-on: https://code.wireshark.org/review/1974 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05Make socpe a local variable, can be used if we change the g_slist to aAndersBroman1-4/+7
wmem_list. Change-Id: I176a2acc5ae334916978f543c959287bf0d8541e Reviewed-on: https://code.wireshark.org/review/1979 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05STUN: Add error code from MS-ICE2BWMAlexis La Goutte1-0/+3
Interactive Connectivity Establishment (ICE) 2.0 Bandwidth Management Extensions http://msdn.microsoft.com/en-us/library/ff595756.aspx Change-Id: I218229225ea5c64cfe2d5f269625deafe7eb8292 Reviewed-on: https://code.wireshark.org/review/1972 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05STUN: Add support of MS-TURN (Used by Lync)Alexis La Goutte1-1/+91
MS-TURN: Traversal Using Relay NAT (TURN) Extensions http://msdn.microsoft.com/en-us/library/cc431507.aspx Change-Id: I2a6f28f5f7db4da45543816caecce1da7cf03c35 Reviewed-on: https://code.wireshark.org/review/1971 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-05Moved dissection of standard setup responses to own functionSean O. Stalley1-26/+38
Standard USB setup responses are now handled by a seperate function. Before, dissection was handled in the dissect_usb_common(). This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: Ibfbcd915d8cef881a6ae0f0312e5a8070984f465 Reviewed-on: https://code.wireshark.org/review/1968 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-05Moved dissection of standard setup requests to own functionSean O. Stalley1-22/+37
Standard USB setup requests are now handled by a seperate function. Before, dissection was handled in the dissect_usb_common(). This is part of an effort to make dissect_usb_common() more modular so that code can be shared between the USB & the MAUSB dissector. Change-Id: I51944c688cc0715887abd4c8e5a7e3639c06821b Reviewed-on: https://code.wireshark.org/review/1967 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-05Added generic setup dissector for USB control transfersSean O. Stalley1-27/+25
Added helper function to remove inline duplicate code. Change-Id: I898f1157bfa5f77613be2e82b29bfb21660124eb Reviewed-on: https://code.wireshark.org/review/1962 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-05simplify PCR calculationMartin Kaiser1-28/+8
Change-Id: I892088e158519e331cba89be3c8d7c71f38a8925 Reviewed-on: https://code.wireshark.org/review/1964 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04Fix typo that would have hit once conversion of the users guide toJoerg Mayer1-1/+1
asciidoc would have started Change-Id: Ie4f79bbf65a56a83995c70eb864d2476885c9170 Reviewed-on: https://code.wireshark.org/review/1966 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-04Do not rebuild developers-guide.xml on each run. Do this only whenJoerg Mayer1-3/+7
required. Change-Id: I525c09e78c385593a7132ad3bfbca1114ea0de8b Reviewed-on: https://code.wireshark.org/review/1965 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-04Fix message about detection of asciidoc package (would always reportJoerg Mayer2-20/+24
not found before). Change-Id: Iaac974e5db3e605e0b9f7256d2724ae777eaebc3 Reviewed-on: https://code.wireshark.org/review/1963 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-06-04tshark.c: 'tshark -F pcap -w ...' should create a pcap (not pcapng) file; ↵Bill Meier1-0/+1
fixes Bug #9991. Change-Id: I182357fc57d6e57033319afc762549d805c2c10c Reviewed-on: https://code.wireshark.org/review/1954 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-04tshark.c: Change "Live captures can only be saved in libpcap format" to ↵Bill Meier1-1/+1
"[...] in pcap or pcapng format" Change-Id: I18dd0d15e261ecbc1ec086b4870a994afc7665ee Reviewed-on: https://code.wireshark.org/review/1953 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-04(Trivial) Fix a typo.Bill Meier1-1/+1
Change-Id: I111d3af8d9f1a96ebbe3f4b19ab1597a93348058 Reviewed-on: https://code.wireshark.org/review/1952 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-04The subtype_seek_read() functions populate *phdr, not wth->phdr.Michael Tüxen1-3/+3
So don't use the values. This problem show up on pcapng files resulting from captures of multiple interfaces. Change-Id: I30b0598602b0b69233107d35be4360475d8648d8 Reviewed-on: https://code.wireshark.org/review/1950 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-04Use -O2 option when compiling with MSVCPascal Quantin1-3/+6
Change-Id: Ia2c14b782b1a73ecab41c25ed21e4fcf356f5ee3 Reviewed-on: https://code.wireshark.org/review/1948 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04Clang complained about non initialized variable.ruengeler1-1/+1
Change-Id: Idc4c1a8db4d5f1b6f2b01428ea283c4a975723f2 Reviewed-on: https://code.wireshark.org/review/1947 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04Fix packet-q931.c:604:25: error: 'ti' may be used uninitialized in this ↵AndersBroman1-2/+1
function [-Werror=uninitialized] Change-Id: I936a56aec7ff448d403f84a370b3cd3e9b73a718 Reviewed-on: https://code.wireshark.org/review/1945 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04Try to please the OSX build botAndersBroman1-6/+6
Change-Id: I4c7d5c6b91df2baae74f6970d0e333346be47238 Reviewed-on: https://code.wireshark.org/review/1944 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04EPL: Reassemble the splitted payloadRoland Knall1-23/+316
The data that is sent when downloading or uploading from a server is sent in segments to the client.To clearly display all the segments belonging together the splitted payload needs to be reassembled. The behaviour is described in the powerlink specification 301 v1.2.0 chapter 6.3.2.4.1.1 Download Protocol and chapter 6.3.2.4.2 Upload Protocol. The payload of the download/upload is now reassembled. Signed-off-by: Lukas Emersberger <lukas.emersberger@gmail.com> Change-Id: I17c30f15e75da47bcaba8f1fda1e412849ec268c Reviewed-on: https://code.wireshark.org/review/1120 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04This fix now allows SASL/GSS-API with integrity only to be properly dissectedRichard Sharpe3-13/+70
in that we now properly indicate the checksum and provide the wrapped token to the LDAP dissector to dissect. There is still a problem in that the wrong parts of the SASL packet can be indicated when users click on some parts. I am committing it for review and because it is much better than the current code. Bug:9398 Change-Id: I552fc249db26835b79abfc8793438a95f221663a Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/1905 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-04Use the -Ox compiler option. AndersBroman1-1/+9
Change-Id: I5d216d132485f6d2f8c63fa5a10b22e884e26b02 Reviewed-on: https://code.wireshark.org/review/1937 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-04packet-q2931.c: proto_tree_add_text -> something filterable.Michael Mann1-316/+272
Parts of this dissector have TLV design, but the identifier is "hidden" by the field. I left that behavior in and used more proto_tree_add_uint than proto_tree_add_item because of it. But at least the fields themselves are more filterable. Change-Id: I94f38d0063e32f6f3f682b380e0ce7bd051121c6 Reviewed-on: https://code.wireshark.org/review/1934 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04packet-ansi_801.c: proto_tree_add_text -> somthing filterableMichael Mann1-821/+370
Change-Id: I780c270f58ad0e8f8fabd121ad0cb5fdcfd593a2 Reviewed-on: https://code.wireshark.org/review/1933 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04packet-q931.c: proto_tree_add_text -> something filterable.Michael Mann5-420/+377
Change-Id: I576f8d7fcf01a4c1dc6e486f7dd0a5b46edce502 Reviewed-on: https://code.wireshark.org/review/1935 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-04MAUSB dissector uses USB addressesSean O. Stalley3-2/+55
The MAUSB dissector now prints the USB address for MAUSB data packets in the Source & Destination columns. Before, the IP address was printed. All MAUSB data packets are now part of USB Conversations. Like the USB dissector, all data to & from one endpoint are part of the same conversation. Issues that need to be resolved: - In the case where multiple MAUSB packets exist in one TCP packet, only one USB address can be printed. - The USB conversations do not appear in the conversations window. They should appear under the USB conversations tab. Change-Id: I042daf7889cf70b3bbc450f9ccd974a0f93f4798 Reviewed-on: https://code.wireshark.org/review/1943 Reviewed-by: Evan Huus <eapache@gmail.com>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-13 12:55:20 +0000