aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-08-28Add 3GPP2 Tx AVPs. Move all the 3GPP2 stuff into its own XML file.Jeff Morriss4-245/+382
Change-Id: I7197f84472139c99bafa5b68f724abaab0453faa Reviewed-on: https://code.wireshark.org/review/3908 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-28handle standard and non-standard setup requests in the same functionMartin Kaiser1-40/+22
Change-Id: I5204a2fc1082e8a6b8082ad58fb252d4ba6c8bcb Reviewed-on: https://code.wireshark.org/review/3901 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28simplify dissect_nonstandard_usb_setup_request()Martin Kaiser1-26/+19
create setup_tvb in the calling function Change-Id: Id34635afbd25817b09535fc52d1ba396b2597e5a Reviewed-on: https://code.wireshark.org/review/3900 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28correct detection of USB header typeMartin Kaiser1-1/+2
this fixes a regression for linux USB headers without 64 bytes extension Change-Id: Icb79d983dac6dca25d04657d3324286c73d31f29 Reviewed-on: https://code.wireshark.org/review/3906 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28- Use e212 routine for IMSI.AndersBroman1-17/+11
- Add top_tree to function calls to avoid a crash. - Set a21_prefs_initialized. Change-Id: I193ae87189dda9b3806f43c9be3916f1adf7bda2 Reviewed-on: https://code.wireshark.org/review/3902 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-28remove unnecessary try_dissect_linux_usb_pseudo_header_ext() callMartin Kaiser1-1/+0
Change-Id: Iafe173d4625d7e57ee3bd9c2fe9a6e6176624dcc Reviewed-on: https://code.wireshark.org/review/3899 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28merge dissect_linux_usb_pseudo_header_ext() andMartin Kaiser1-33/+14
try_dissect_linux_usb_pseudo_header_ext() Change-Id: Ica9e3089cc6bfde9b52158ef5e161dfcddeb716a Reviewed-on: https://code.wireshark.org/review/3898 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28remove two obsolete commentsMartin Kaiser1-2/+0
Change-Id: I339655b699d998bd4194363df64d98543dcae624 Reviewed-on: https://code.wireshark.org/review/3897 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28NULL check for usb_conv_infoMartin Kaiser1-3/+7
Change-Id: I6cb4347f73afcfe561d3dca846c846d481c1c3bd Reviewed-on: https://code.wireshark.org/review/3896 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28req_type is the same as typeMartin Kaiser1-26/+12
Change-Id: Icdc94d65043feb5927aa0194cbef796e634bf3a9 Reviewed-on: https://code.wireshark.org/review/3895 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28use proto_tree_add_subtree()Martin Kaiser1-3/+2
Change-Id: I0182397a7a208a2be8587fa4060a8497b54bb273 Reviewed-on: https://code.wireshark.org/review/3894 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-28Fix error: not a Doxygen trailing comment found by Clang (-Wdocumentation)Alexis La Goutte1-8/+8
Change-Id: Ieff4b888b39c8da82f00b00e0609d89d1203aef9 Reviewed-on: https://code.wireshark.org/review/3891 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-28OSI util: Add modelines infoAlexis La Goutte2-0/+25
Change-Id: I15e44f2f10b80b7c7ce78ce84b748ce8ec7a2eff Reviewed-on: https://code.wireshark.org/review/3890 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-28DNS: Update CDS and add CDNSKEY ↵Alexis La Goutte1-3/+8
(draft-ietf-dnsop-delegation-trust-maintainance-14) Use DS dissector for CDS (see section 3.1) and DNSKEY dissector for CDNSKEY (see section 3.2) Change-Id: I2ee11dc0eb2b5c74447b58604b1611ed249bc329 Reviewed-on: https://code.wireshark.org/review/3869 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-28DNS: Update EUI48 and EUI64 to final draft (RFC7043)Alexis La Goutte1-4/+4
Change-Id: I2b18ccb874a51e5e752462a34175df8d8a90ce41 Reviewed-on: https://code.wireshark.org/review/3868 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-28NTP: fix parsing of control assignments with empty valuePascal Quantin1-3/+6
Consider that ',' is a separator between assignments and make value presence optional Bug: 10417 Change-Id: I23f2b4029548a1263d65ee11c6356270e7a89bd7 Reviewed-on: https://code.wireshark.org/review/3884 Reviewed-by: Evan Huus <eapache@gmail.com> 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>
2014-08-28RPKI-RTR: enhance dissectorAlexis La Goutte1-14/+16
* fix no display all append COL_INFO... (reset by col_set_clear...) * fix dissection when type is unknown * fix warning about soft-deprecated (tvb_length..) * fix indent * fix some typo (IPV6 => IPv6...) Ping-Bug:8296 Change-Id: I246b04098200afd1528f632cc709f631422e745b Reviewed-on: https://code.wireshark.org/review/3888 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-28Bluetooth: btle: Clear info column before use itMichal Labedzki1-5/+5
This fix "btle" over "ubertooth" dissector, so messeges from both will not be merged. Change-Id: I587b81a405f37d16e8ab417d94edfc633bfc14fc Reviewed-on: https://code.wireshark.org/review/3877 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-27TCP/UDP/SCTP: fix Dereference of null pointer found by Clang AnalyzerAlexis La Goutte3-0/+13
The warning coming after change in g018b84de8 Change-Id: Ia96cdb2993a6283d8de2647c6723ec6b2b0977eb Reviewed-on: https://code.wireshark.org/review/3752 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-2711ac decode update for IE196 Channel Switch Wrapper.Luke Chou1-19/+25
Bug:10258 Change-Id: Ic8d3ee5323b95c9e827b47ad284be58e11bc97f4 Reviewed-on: https://code.wireshark.org/review/3593 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-27Increase the error buffer size for rpcap.Gerald Combs1-2/+6
If the rpcap port is unreachable pcap_findalldevs_ex can write more than PCAP_ERRBUF_SIZE bytes to errbuf. E.g. if we try to capture from Google's all-eights public DNS server we get: ---- Can't get list of interfaces: Is the server properly installed on 8.8.8.8? connect() failed: A connection attempt failed because the connected party did not properly respond after a period of time, or established connection failed because connected host has failed to respond. (code 1 ---- Set the buffer to PCAP_ERRBUF_SIZE*4 bytes. Hopefully that's large enough. Change-Id: I19f34cda16050c1ba8b9d7d6ed2d8e77b945a2af Ping-Bug: 3554 Ping-Bug: 6922 Ping-Bug: 7021 Reviewed-on: https://code.wireshark.org/review/3880 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-27At least some compilers don't allow warning pragmas inside functions.Guy Harris2-43/+11
So wrap the entire function in USES_APPLE_DEPRECATED_API/USES_APPLE_RST. Change-Id: I6ae3e8ecc40bc407e6f7156ccc5d9dd8c51d650d Reviewed-on: https://code.wireshark.org/review/3885 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-27Use the <wsutil/ws_diag_control.h> stuff to disable -Wdeprecated-declarations.Guy Harris1-39/+3
Change-Id: I4b1fcbf5b25f2515d45015c9e1c4a94d6cfbc79c Reviewed-on: https://code.wireshark.org/review/3883 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-27Be more selective about turning off deprecation warnings.Guy Harris2-12/+48
Only turn them off in the vicinity of those nasty cross-platform APIs. (This also checks in the generated Kerberos dissector, which we forgot to do in the last checkin.) Change-Id: I5dc9162ff64afe764e37866706590ed2ed965acb Reviewed-on: https://code.wireshark.org/review/3882 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-27Use FreeRADIUS's warning pragma controls to suppress Apple complaints.Guy Harris3-0/+103
Apple would really rather that you use their Shiny Happy Frameworks rather than those crufty old cross-platform APIs. We are a cross-platform program, and will use platform-specific APIs only if there's enough benefit to doing so - and, in this case, that means "using the platform-specific APIs on OS X and the other APIs on other platforms", so that's two code paths to maintain, so "enough benefit" has to outweigh the issues with that. Change-Id: I370ba469a6f5892143d72179d15c9fe22d664fdf Reviewed-on: https://code.wireshark.org/review/3881 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-08-27checkhf.pl: (Trivial) remove trailing whitespace.Bill Meier1-38/+38
Change-Id: I37ece54d936541b5d92e8c323ffeb429d9cc5f33 Reviewed-on: https://code.wireshark.org/review/3879 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-27packet-mausb.c: proto-reg-handoff() fixesBill Meier1-6/+8
- proto_reg_handoff...(): Fix handling of tcp port pref change; Rename 'gPORT_PREF' to 'mausb_tcp_port_pref'; Do 'dissector_add_uint("llc.mausb_pid",..)' only once; Change-Id: Ic4498560f61d0ce95f8109c3a1bb3c407221269b Reviewed-on: https://code.wireshark.org/review/3854 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-27E.164: update list to Operational Bulletin No. 1057 (1.VIII.2014)Pascal Quantin1-1/+6
Change-Id: If1767dcf9a533d10e0ac946a2f31d7f58ea7b01c Reviewed-on: https://code.wireshark.org/review/3875 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>
2014-08-27E.212: update list to Operational Bulletin No. 1058 (15.VIII.2014)Pascal Quantin1-297/+312
Change-Id: I79d12c4699df01f3435fae5342aa5ec295316959 Reviewed-on: https://code.wireshark.org/review/3874 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>
2014-08-26CAPWAP : Fix wrong offset for AC Name with PriorityAlexis La Goutte1-1/+1
Thanks to Massimo Velluci for sample Change-Id: Ibab2658c2c11c9940d3fdebb0bdc42752d57e1ae Reviewed-on: https://code.wireshark.org/review/3871 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-26Exclude MA USB TransferAck's from USB conversationSean O. Stalley1-1/+6
the usb_trans_info struct only understands Requests & Responses. TransferAcks are currently treated as responses, which throws off the Request/Response pairing & dissection. This patch fixes tracking in the case when a TransferAck & TransferReq are in the same TCP packet. It does not fix the case where there are multiple TransferReq's or TransferResp's in 1 TCP packet. Eventually I want to revamp usb_trans_info structure to support: -multiple requests/responses per transaction (IE: retries) -TransferAck tracking -handling of multiple requests/responses in 1 TCP packet Change-Id: I09be6fecf55a40b4ea2a4f27bd753f3991ccabbd Reviewed-on: https://code.wireshark.org/review/3866 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-26Skinny:Diederik de Groot3-20/+14
Do not try to create a wmem_strbuf whose size is bigger than the max size allowed -> using wmem_strbuf_new instead of wmem_strbuf_sized_new (Evan Huus) While we are at it, fix errors spotted by the pre-commit tools/SkinnyProtocolOptimized -> Did not get any, can you specify which errors ? (Pascal Quantin) FT_IPv6: 'ENC_BIG_ENDIAN | ENC_NA' -> 'ENC_NA' only (2) (Pascal Quantin) Revert back to wmem_strbuf_sized_new instead of wmem_strbuf_new (Pascal Quantin) Use wmem_strbuf_sized_new maxlength = 0 (Pascal Quantin) Bug: 10409 Bug: 10410 Change-Id: Iebfcb53bc0a6289e02d10c38ecb717aa5c89389e Reviewed-on: https://code.wireshark.org/review/3862 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-26Add custom_layer_chm.xsl to UNKNOWN (fix checklicence)Alexis La Goutte1-0/+3
Change-Id: I4c336f21f721443e83eca7b9bf8d7a6138b367f4 Reviewed-on: https://code.wireshark.org/review/3827 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-26Extcap: prevent a GLib assert when interface_opts.extcap_args is NULLPascal Quantin1-1/+2
I was able to trigger it when trying to change the options of extcap_example.py interface Change-Id: I9ecff51d47b3ef6e178637b31d49af46a1928acd Reviewed-on: https://code.wireshark.org/review/3822 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-26Extcap: restore compatibility with GLib 2.16.0Pascal Quantin2-13/+16
While we are at it, fix what seem to be a memory leak in extcaps_init_initerfaces() Change-Id: I1bb9a1b44d16f986eedd192b15cce84c5881a917 Reviewed-on: https://code.wireshark.org/review/3820 Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-26USB: fix dissection of non standard USB setup requestsPascal Quantin1-50/+43
Otherwise captures like the one found in bug 8161 do not dissect properly anymore (sub dissector is called twice) While we are at it, reorganize functions order to void a forward declaration Change-Id: Id02ef835ba24981902a1702f976db099fa07b0fd Reviewed-on: https://code.wireshark.org/review/3858 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-26USB: get rid of the remaining proto_tree_add_text instancesPascal Quantin1-7/+20
Change-Id: I6acaa32745e32ec5728874549e420468499d9b24 Reviewed-on: https://code.wireshark.org/review/3860 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-26Skinny: do not try to create a wmem_strbuf whose size is bigger than the max ↵Pascal Quantin4-8/+8
size allowed While we are at it, fix errors spotted by the pre-commit tools/SkinnyProtocolOptimized Bug: 10409 Change-Id: Ic84632e0563f801239603534121e3487cf0d6d24 Reviewed-on: https://code.wireshark.org/review/3861 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-26Added Authentication-Method and afew other AVPs that appear in the ↵Josip Medved2-3/+17
SIP-Auth-Data-Item grouped AVP. Change-Id: Ie90ec71d8d574d38f32a5ff3de6ad5433b9e5e9f Reviewed-on: https://code.wireshark.org/review/3823 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-26Have dissect_usb_setup_request handle non-standard requestsSean O. Stalley3-29/+38
Moved code for parsing non-standard setup requests from dissect_usb_common() to dissect_usb_setup_request(). Also added header_info flag USB_HEADER_IS_MAUSB & updated mausb dissector. Change-Id: Ifa8abccbd57bf4dd3965f582872952383e6f737d Reviewed-on: https://code.wireshark.org/review/3851 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-26Non-standard USB control requests now handled in own functionSean O. Stalley1-29/+48
Change-Id: Icf56f3f5899d17908dac4783d2b3e30373186eba Reviewed-on: https://code.wireshark.org/review/3850 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-26further rearranged control URB request conditionalsSean O. Stalley1-13/+13
combined 2 sections for dissecting non-standard requests into 1 Change-Id: I181346a69e2f96ff47b82f82d3aa69846c45614f Reviewed-on: https://code.wireshark.org/review/3849 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-26added try_dissect_linux_usb_pseudo_header_ext helper functionSean O. Stalley1-25/+21
Change-Id: I05b0adaef2b979432e293bc26e2a122a0d3551fc Reviewed-on: https://code.wireshark.org/review/3848 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-26rearranged control URB request conditionalsSean O. Stalley1-33/+41
Rearranged conditionals for control URB request to limit variable scope. Now there are 2 major branches based on weather the URB has setup data. Change-Id: I67172c4e949bbda363ccf939d404957258b73840 Reviewed-on: https://code.wireshark.org/review/3847 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: Anders Broman <a.broman58@gmail.com>
2014-08-26The remaining build systems didn't know about the change of theJoerg Mayer1-1/+2
capture chapter from xml to asciidoc either. Change-Id: Ia48d4e0e4b445aedabd29a8483bcc19f12c13b20 Reviewed-on: https://code.wireshark.org/review/3857 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-26Whitespace fixJoerg Mayer1-1/+1
Change-Id: Ie42cc8df1066078d26966129fdd3e8b5643c722f Reviewed-on: https://code.wireshark.org/review/3856 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-26Added missing name to AUTHORS file.David Ameiss1-0/+3
Change-Id: I674c60a39e9e85e441fdb28c14a0845e34115b53 Reviewed-on: https://code.wireshark.org/review/3853 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-26Fix typoEvan Huus2-2/+2
Change-Id: I8e3b3115191ca7a9c5388e866e9add12b7689039 Reviewed-on: https://code.wireshark.org/review/3852 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-25Skinny Dissector:Diederik de Groot4-17/+74
Source Fix: Trailing Whitespace (Reported by Graham Bloice). Dissection Fix: ProtocolVer needed to be split up into two fields to display the protocol version correct during device registration Segfault Fix: Null Pointer Check required after returning from tvb_memdup, before calling strlen (Reported by Evan Huus) Fix: Whitespace (again) Bug: 10409 Change-Id: Ib253ea843363792f678f2e724359f83f12ebfadc Reviewed-on: https://code.wireshark.org/review/3844 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-25WSUG_chapter_capture is now an asciidoc file that gets convertedJoerg Mayer1-1/+2
into an xml file. Change-Id: I43ae59d14cbdcf460250cf62005aea4a2772d11f Reviewed-on: https://code.wireshark.org/review/3846 Reviewed-by: Jörg Mayer <jmayer@loplof.de>