summaryrefslogtreecommitdiff
path: root/epan/dissectors
AgeCommit message (Collapse)AuthorFilesLines
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-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-06Upgrade Windows builds to GnuTLS 3.1.22 and Gcrypt 1.6.0Pascal Quantin1-1/+1
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-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\bdn13-923/+4581
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-05Add a missing header file, and add new file to cmake buildMartin Mathieson1-0/+1
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 Mathieson2-3/+173
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-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-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 Sharpe2-8/+38
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-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 Mann3-420/+373
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>
2014-06-04Added usb_set_addr helper functionSean O. Stalley1-21/+31
Added a helper function used to set the address fields for an urb. The code functions the same as before, but is now more modular. This change makes it easier for other dissectors to reuse the usb addressing code (ex: MAUSB). Change-Id: Idef3156a0fc9a9eda77ec7b2bbf3797b7a59e264 Reviewed-on: https://code.wireshark.org/review/1942 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-06-03MBIM: do not access to hash map when it is not initialized yetPascal Quantin1-1/+1
Change-Id: I560941115316ead5a85b9e0b55be693217fddff2 Reviewed-on: https://code.wireshark.org/review/1940 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-03USB: Try to make Mac os 10.5 buildbot HappyAlexis La Goutte1-2/+1
Fix warning: cast to pointer from integer of different size Change-Id: Ieed19204cb3be469c1b12f6ff87168b217a2a33d Reviewed-on: https://code.wireshark.org/review/1938 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-03make the PCR value filterableMartin Kaiser1-4/+3
this fixes bug #10158 Change-Id: Ic67b074c464c52ac523e835b9815a5c3a3fa14d9 Reviewed-on: https://code.wireshark.org/review/1925 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-03packet-bencode: proto_tree_add_text -> somthing filterableMichael Mann4-52/+61
Also, cleanup dissector being called only with tree and a few tvb_new_subset calls. Change-Id: I1dab1b42ef1a27fc85b05d126f51f1582d7e5c58 Reviewed-on: https://code.wireshark.org/review/1932 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-03LLDP : Fix bug in mdi_power_source hf.Anish Bhatt1-8/+10
While it compiles fine, hits an assert in add_string : failed assertion "hfinfo->type == FT_STRING || hfinfo->type == FT_STRINGZ || hfinfo->type == FT_STRINGZPAD" Fix takes care of this issue, but seems like we're losing the bitmask info here, is there a better way to do this ? Change-Id: I7156d734f4b058113730d5dfbf6498e801c36770 Signed-off-by: Anish Bhatt <anish@chelsio.com> Reviewed-on: https://code.wireshark.org/review/1915 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-03Make decode_udp_ports() function available for pluginsPascal Quantin1-1/+1
Change-Id: Ic5e087c333d46b4bf0946c80aaad5768534155b5 Reviewed-on: https://code.wireshark.org/review/1928 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-03Make TCP functions available for pluginsPascal Quantin1-3/+3
Change-Id: Ibce3f3351bfc89c069a02380c776680a1c78e12c Reviewed-on: https://code.wireshark.org/review/1926 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-03packet-ipmi...: Various cleanups:Bill Meier10-220/+353
- refs to value_strings in hf[] entries, by convention, should use VALS macro; - add editor-modelines as needed; Fix some indentation. Change-Id: Iaa0196bab6de066ed68a2755b69b07fadd33e498 Reviewed-on: https://code.wireshark.org/review/1927 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-06-02Update TLS extensionsMarc Bevand2-2/+6
Add better reference to IANA list of all extensions. Add newer "channel_id" extension (0x7550) as used by current Chrome versions. Change-Id: Ia5b2515c557fbaf42d320ede918120f83b2e02dd Reviewed-on: https://code.wireshark.org/review/1924 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-06-02generate the usb tree outside of the if statementMartin Kaiser1-9/+6
Change-Id: I959729a8834054cf333ec2c47f9d93756eb94066 Reviewed-on: https://code.wireshark.org/review/1922 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-02use is_request from the conversationMartin Kaiser1-10/+8
Change-Id: I16e6fd4f2d9fb37539cfcb17c0ade1033aea2d6f Reviewed-on: https://code.wireshark.org/review/1921 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-02get the USB conversation struct as quickly as possibleMartin Kaiser1-32/+47
at first, read only the info required to fetch the conversation struct Change-Id: I3becbb59bf6a55f07805ca9f3c24f015484fcd13 Reviewed-on: https://code.wireshark.org/review/1920 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-02EIGRP Sequence TLV Dissector PatchPeter Palúch1-34/+47
In the EIGRP packet dissector, the dissector routine for the Sequence TLV dissected the TLV only up to the first address in the list. However, the Sequence TLV contains a variably sized list of addresses. This patch modifies the routine so that it processes the entire TLV, not just the first address in the contained list. Also, in the dissect_eigrp(), replaced calls to tvb_new_subset() with the reported length set to -1 with the call to tvb_new_subset_length(). TLVs always carry information about their length. And this time, correct truly ALL calls in the switch{} section. Sample packet capture is available in BugZilla. Bug: 10156 Change-Id: Idaaf182c05bcf799f770f23a2ce2b1e05a3d569a Reviewed-on: https://code.wireshark.org/review/1911 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-02HTTP2 : Max value for type is now 0x0B (BLOCKED type), update the heuristicAlexis La Goutte1-2/+2
Change-Id: I8de7b63ca90803f8fc6333bbe43aeb94459e6363 Reviewed-on: https://code.wireshark.org/review/1918 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-02use bus_id from the conversation structMartin Kaiser1-4/+5
Change-Id: I796138bab6d4b75ade047f0706e68f301e4559df Reviewed-on: https://code.wireshark.org/review/1919 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-06-01Just have one value_string table for OUIs.Guy Harris3-10/+10
While we're at it, get rid of duplicate #defines for some OUIs, sort the OUI #defines, and fix some routine names. Change-Id: I8f4e5408b44896c3629a0014299b060ebc15bab6 Reviewed-on: https://code.wireshark.org/review/1906 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-05-31Move the definitions of OUI value_strings to epan/oui.c.Guy Harris1-55/+0
Change-Id: Iad921bebad03dd482b58a38ed25ae3f4a99c5cf2 Reviewed-on: https://code.wireshark.org/review/1904 Reviewed-by: Guy Harris <guy@alum.mit.edu>