aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-08-25The timezone for generating the NEWS file timestamp was changed to UTCJoerg Mayer1-1/+2
Change-Id: I77187bf4738a20bcebd899e2a01afd6077ae7e6c Reviewed-on: https://code.wireshark.org/review/3845 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-25As long as NEWS is still part of the git tree: At least don't differJoerg Mayer3-2/+3
because of different timezones. Change-Id: I93809447db29c2cc5f848edb438ee16372b57453 Reviewed-on: https://code.wireshark.org/review/3824 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-25WSUG: Convert the "Capturing" chapter to AsciiDoc.Gerald Combs5-1585/+973
Leave most of the content intact for now. Add a section on markup conventions to README.txt. Remove the .mediaobject border. Change-Id: I06cfd482a4c8ea63c90b9f59fcdf2afaf636a4a2 Reviewed-on: https://code.wireshark.org/review/3821 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-25Updates for docbook builds on WindowsGraham Bloice3-9/+28
In config.nmake search for multiple versions of fop in a couple of places, preferring fop 1.1 In Makefile.nmake remove any PYTHONPATH env var (as that's probably for Windows) and not the Cygwin python used in asciidoc In Readme.txt update some Cygwin package info Change-Id: I117ec6bbdabc34829b421fd514508383b925090f Reviewed-on: https://code.wireshark.org/review/3816 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-25reformat dissect_usb_setup_response()Martin Kaiser1-22/+15
make sure it can handle usb_conv_info==NULL Change-Id: I5f53b26fd6fe22471906b07b5dad8f4c07dffa55 Reviewed-on: https://code.wireshark.org/review/3843 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-25SKINNY: Fix some warningDiederik de Groot4-7/+25
Fix: cog [[[END]]] in packet-skinny.h.in Fix: error: expression which evaluates to zero treated as a null pointer constant of type 'const gchar *' (aka 'const char *') [-Werror,-Wnon-literal-null-conversion] (Reported by Alexis La Goutte and found by Clang 3.6) Change-Id: Ic354f349eef8a12a7e18e841b517ea4f72ba86f2 Reviewed-on: https://code.wireshark.org/review/3842 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-25More README.cmake updates.Gerald Combs1-11/+19
Change-Id: I1c7e51ee397171af0703878e509665c8119b37ba Reviewed-on: https://code.wireshark.org/review/3841 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-25Use Segoe UI to render the HTML Help text.Gerald Combs1-0/+14
Change-Id: I0ff717dda35a39f34c3140f920f8ac2fe74e24bc Reviewed-on: https://code.wireshark.org/review/3840 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-25checkhf.pl: (Trivial) fix two typosBill Meier1-2/+2
Change-Id: I2a63127dcf819d671a4c814dcbd82b2dca5022d3 Reviewed-on: https://code.wireshark.org/review/3838 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-25packet-a21.c: Minor changesBill Meier1-4/+4
- Comment out several "set but unused" lines of code; - initialize 'gcsna_handle' only once. Change-Id: I17a89ccff228b28d075d9db9289ad412892b2639 Reviewed-on: https://code.wireshark.org/review/3837 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-08-25BPG : issue with BGP AS path heuristic (AS_CONFED_SET)Matthieu Texier1-8/+17
Add also a expert info when unable determine ASN length (2 or 4 bytes) Bug: 10399 Change-Id: I24978e29e24f38c2e01e4b953a5a51496f0cf5a6 Reviewed-on: https://code.wireshark.org/review/3831 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-25Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I19df790d18e71d45df28dc6e8731cd2e1acb098b Reviewed-on: https://code.wireshark.org/review/3826 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-25Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I4a2ba6902acc0cbd224a8926eeb7bd0b62b4d29e Reviewed-on: https://code.wireshark.org/review/3825 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-25TRILL ISIS: Implement all RFC7176 section 2.2 SubTLVsMarian Durkovic1-14/+229
Bug:10391 Change-Id: Ibdf3e4964668a57362b6d25ef4ae106d368f0e69 Reviewed-on: https://code.wireshark.org/review/3668 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-25RPKI RTR: Wrong decoding of RPKI RTR End of Data PDUAlexis La Goutte1-1/+1
The decoding of the End of Data PDU ignores the Serial Number, i.e., the last 32 bit of this PDU. Instead of that the current dissector implementation starts to decode a new RTR PDU. Details of packet format see http://tools.ietf.org/html/rfc6810#section-5.8 Found by Matthias Wählisch Bug: 10411 Change-Id: I8451b5fbda18a034022b97ff442ddb2a2dabed7b Reviewed-on: https://code.wireshark.org/review/3832 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-08-25packet-a21.c: Fix a bug; Do some other misc cleanup.Bill Meier1-32/+49
- expert_...() and external dissectors shouldn't be called under 'if (tree)'; - Remove (what appear to be) some unneeded casts; - (Misc cleanup) Change-Id: I5ced313d3342125b918e179529b12d2f3bc4d87a Reviewed-on: https://code.wireshark.org/review/3830 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-25remove trans_info parameter from dissect_usb_endpoint_descriptor()Martin Kaiser3-17/+19
(remove it in the call from mausb as well) add NULL checks for usb_conv_info, usb_trans_info Change-Id: I95d52b85e3fa0d42b6a20047053259aaca8754fe Reviewed-on: https://code.wireshark.org/review/3784 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-25remove trans_info parameter from dissect_usb_unknown_descriptor()Martin Kaiser3-7/+3
remove now unused trans_info variable in mausb Change-Id: I99df8a1ed039134c9448546d0f1a738f203f9610 Reviewed-on: https://code.wireshark.org/review/3785 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-25an endpoint_descriptor may only be sent from a USB device to the hostMartin Kaiser1-17/+8
as part of a GET DESCRIPTOR Response therefore, pinfo->destport==NO_ENDPOINT is always true for valid USB packets and we can remove the else branch Change-Id: I2163e3000cafa27113ee0e6173fd69b7ef17b812 Reviewed-on: https://code.wireshark.org/review/3585 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-08-25Fix a typo RELEASE_OTHER_REASON 4 -> RELEASE_OTHER_REASON 3AndersBroman1-1/+1
RFC 3057 3.3.1.2 RELEASE_OTHER 0x3 Other reasons Change-Id: I5c2344600646cbfbef379aed5d3ffa9fc48da639 Reviewed-on: https://code.wireshark.org/review/3829 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-25TRILL ISIS: SubTLVs of Router Capability TLV are valid for MT-Capability TLV ↵Marian Ďurkovič1-264/+161
as well Change-Id: Idf466c021b1b188d9c6d55ba73a25257ba352412 Reviewed-on: https://code.wireshark.org/review/3803 Petri-Dish: Evan Huus <eapache@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-25Skinny: packet-skinnyDiederik de Groot4-8/+53
Add tools path to the python search path, fixing cog.py generation of package-skinny.c from packet-skinny.c.in Add GPLv2 License to parse_xml2skinny_dissector.py Change-Id: I91b76867b02d8cebc40bba35151db48bc2fcaeca Reviewed-on: https://code.wireshark.org/review/3819 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-24Remove obsolete comments regarding the shell version of make-dissector-regРоман Донченко14-70/+0
Change-Id: I93470e8c6e9afd6c1ebf735eb13141586964be0e Reviewed-on: https://code.wireshark.org/review/3818 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-24Fix Autotools AsciiDoc configuration + CSS updates.Gerald Combs2-3/+13
Fix --asciidoc-opts in Makefile.am. Add borders around menu and keycap markup. I like the latter but the former could probably use more work. Change-Id: If02e3d00875106d6b8f8bcf01cd52b1df4f9b6c8 Reviewed-on: https://code.wireshark.org/review/3817 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24Try to get HTML Help to render SVG.Gerald Combs3-4/+38
Add a custom stylesheet that inserts <meta http-equiv="X-UA-Compatible" content="IE=9" > at the top of our HTML Help output. This *should* convince the WebBrowser control to draw our new SVG images. Change-Id: Iae491128195d3738951f3d19e2f82dd3fc73d1d8 Reviewed-on: https://code.wireshark.org/review/3814 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-08-24Hack to fix RTP player progress line positionPeter Wu1-5/+52
PortAudio seems to return 0 as value for Pa_GetStreamTime() on a PulseAudio system using the ALSA host API. This is known for 3 years, but still has not been fixed. As this function basically gives us a monotonically increasing clock in seconds as double, just use the Glib library function for that. I don't know whether this adds much latency, but it is certainly better than breaking the progress line (and also the related auto-scroll). While at it, split the idx calculation and explain what each part does and add modelines. Remove invalid _U_ annotations. [1]: http://music.columbia.edu/pipermail/portaudio/2011-June/012452.html Bug: 10307 Change-Id: I67fff531e0577add4b9b76052e286fb3fd5d01ff Reviewed-on: https://code.wireshark.org/review/3260 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>