aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-07-26Update .mailmapAlexis La Goutte2-1/+5
Change-Id: Id725f28977282b289a2de26cac2fb92713babe6a Reviewed-on: https://code.wireshark.org/review/16692 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-26packet-smb2: fix data type of share_typeHiroshi Ioka2-3/+3
According to spec, https://msdn.microsoft.com/en-us/library/cc246499.aspx share_type uses 1 byte. But, current implementation allocates 2 bytes for it. Change-Id: Ibf55c49168a417c16bde57aad368a1265040afae Reviewed-on: https://code.wireshark.org/review/16695 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-26BGP: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-3/+0
Change-Id: Iaec85cbe8fbced461a56f55f8813506054356369 Reviewed-on: https://code.wireshark.org/review/16688 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: Anders Broman <a.broman58@gmail.com>
2016-07-26s1ap: fix indent (use 2 spaces) and modelines infoAlexis La Goutte5-1106/+1161
Change-Id: I450f252d22b21438e55285b2af950f6a1c9f6d10 Reviewed-on: https://code.wireshark.org/review/16693 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-26DNP dissector. Typo in commentsbartolootrit1-10/+10
Change-Id: Ie77c7bba0e97cca87b443552c8efe9aaed45734d Reviewed-on: https://code.wireshark.org/review/16545 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-26ERSPAN: add link to protocol spec and refactoring.William Tu1-85/+54
Add link to ERSPAN protocol spec, remove obsolete comments, and remove unnecessary 'if(tree)' check. Change-Id: I1b4950777c84d62301c322afdfc876949db0d4ed Signed-off-by: William Tu <u9012063@gmail.com> Reviewed-on: https://code.wireshark.org/review/16675 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>
2016-07-26Fix decoding of MS Info Change Reporting ActionMarius Paliga1-4/+4
Bug: 12642 Change-Id: I69b339ff4785a2fe3fb0e2111264616815339c1b Reviewed-on: https://code.wireshark.org/review/16644 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-26Fix some of the checkAPIs.pl warnings for g_warning.Michael Mann15-90/+106
1. Create ws_g_warning for legitimate uses of g_warning 2. Use proto_tree_add_debug_text 3. Comment some out Change-Id: Ida044bf40286b955fdd529c4f9907c8e09b3d7c5 Reviewed-on: https://code.wireshark.org/review/16678 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>
2016-07-26GVSP: enforce heuristic (get some false positive with STUN)Alexis La Goutte1-0/+10
Change-Id: Ic1da51a71ee4fa60267751d7bb3f46225ad2f084 Reviewed-on: https://code.wireshark.org/review/16573 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-26MP-BGP dissector: Fix EVPN route type 5 decodingMatt Texier1-71/+104
Route type 5 do have optional fields that was not properly decoded (MPLS labels) Bug: 12631 Change-Id: I12d61ef170d4e0f6e6d2c7bf25f149db84c186d7 Reviewed-on: https://code.wireshark.org/review/16576 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>
2016-07-26packet-smb2: add a dissector for STATUS_STOPPED_ON_SYMLINKHiroshi Ioka2-13/+127
Bug: 12628 Change-Id: I666416d1a6facdbf8f4fa6230d6b061cad23dc7a Reviewed-on: https://code.wireshark.org/review/16524 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-26SMB2: Always display reserved fieldAlexis La Goutte1-2/+29
Change-Id: I2f4878d7b730d626d75ac5ed57a00acc8ec34990 Reviewed-on: https://code.wireshark.org/review/16658 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>
2016-07-26WBXML: limit the recursion levelPascal Quantin1-1/+7
Bug: 12663 Change-Id: Ibbab2f20f4eda9f42ea0ea5e88dcf553cce1b55c Reviewed-on: https://code.wireshark.org/review/16670 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-07-26WAP: check that tvb_get_guintvar does not overflowPascal Quantin5-117/+139
Bug: 12661 Change-Id: I2ef857d6be6595fd89f3dbb8d41c1c70d550ad93 Reviewed-on: https://code.wireshark.org/review/16665 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-26proto.c: add bounds check to proto_tree_add_text(_valist)_internalPascal Quantin1-0/+16
Bug: 12659 Change-Id: I44cb3ce8e647ae2816d5ffa95435068c435a1e5c Reviewed-on: https://code.wireshark.org/review/16648 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-26Use a variable consistently.Gerald Combs1-1/+1
We test against "field" in ServiceResponseTimeDialog::filterExpression. Make sure we use it within the test as well. Bug: 12627 Change-Id: If11ab9fcdb8394f4366569185808ec1ddfc34dfe Reviewed-on: https://code.wireshark.org/review/16672 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-26IPv6: Add fragment header size #defineJoão Valverde2-4/+6
Change-Id: I536324da9ec761279cc3d3d5df681a4217d5b5fc Reviewed-on: https://code.wireshark.org/review/16676 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-25editcap: fix typosDario Lombardo1-2/+2
Change-Id: Ic5eb5daca1ab7463723ee2b299482929f3e8be56 Reviewed-on: https://code.wireshark.org/review/16666 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-25vxlan(.h): fix no newline at end of file [-Wnewline-eof]Alexis La Goutte1-1/+1
Change-Id: Ib53a0234eb8b6a24470e1e6beabe26515b6ef421 Reviewed-on: https://code.wireshark.org/review/16664 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>
2016-07-25SMB2: (Re)indent hf_register_info hf (use tab)Alexis La Goutte1-767/+1175
Change-Id: I872baa7bf44cc6c675366206e749c50001cee067 Reviewed-on: https://code.wireshark.org/review/16659 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-07-25vsock: Fix Dead Store (Dead assignement/Dead increment) Warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I266b0542597eec755b7998d9d5abbae8e804b192 Reviewed-on: https://code.wireshark.org/review/16651 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-25LDSS: check if a conversation already exists before recreating itPascal Quantin1-11/+14
Bug: 12662 Change-Id: I81d91d54544e5865336dc08ffda9fe109fc643ed Reviewed-on: https://code.wireshark.org/review/16660 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-07-25SHIM6: rename p variable by offsetAlexis La Goutte1-143/+126
Change-Id: I3f7e3291e119eb51c85381d1141bd79b2d61ec18 Reviewed-on: https://code.wireshark.org/review/16649 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-25[S1AP] Add dissection of the content of UERadioCapabilityForPaging.AndersBroman6-2998/+3253
Change-Id: I7f6686a9324fdd364653404ed4b3315d6ca36716 Reviewed-on: https://code.wireshark.org/review/16650 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-25[GTPv2] Dissect TWAN Identifier and other minor updates.AndersBroman1-8/+202
Bug:12638 Change-Id: I13446727a46b4df4fe3e667723aa43d83efe1159 Reviewed-on: https://code.wireshark.org/review/16585 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-25IPv6: Use wmem_packet_scope for ws_ip address allocationJoão Valverde1-2/+2
Change-Id: I7e386fe0f8cb3a19a91a16c1152ce500367c13fd Reviewed-on: https://code.wireshark.org/review/16654 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-25IPv6: Use pinfo->pool scope for ipv6_pinfoJoão Valverde1-1/+1
Change-Id: I415103eaba23b1a616667cf7c72af3b391a9e5ab Reviewed-on: https://code.wireshark.org/review/16653 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-25IPv6: Say "unknown" for unknown ip protocol column infoJoão Valverde1-1/+1
Change-Id: I99424f9382dd602d3f29251cdbf7d32666409d90 Reviewed-on: https://code.wireshark.org/review/16652 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-25IPv6: Use ipv6_pinfo_t instead of ws_ip to keep some stateJoão Valverde6-52/+20
To perform IPv6 defragmentation we need to compute the IPv6 fragment header payload length by subtracting the length of intermediate extension headers from the IPv6 payload length. Add a new frag_plen field to ipv6_pinfo_t to do that instead of (ab)using struct ws_ip. Note: The RFC 2460 rules for fragment header order are stricter than the code suggests but that shouldn't be a problem here. Change-Id: I76f3cb3a1a29d96b080d3d53c0f493f9d0b2786c Reviewed-on: https://code.wireshark.org/review/16637 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-07-25RLC: fix a variable overflow in rlc_decode_li functionPascal Quantin1-3/+4
Bug: 12660 Change-Id: I20a423eb9aa72383ac28d176bc60751ed36be9bd Reviewed-on: https://code.wireshark.org/review/16639 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>
2016-07-25RLC: fix a stack overflow in rlc_decode_li functionPascal Quantin1-1/+1
The test to check whether the array was full or not was off by 1 Bug: 12664 Change-Id: If2057b71d92c7f03e05b0f4676abc62d5a03ae73 Reviewed-on: https://code.wireshark.org/review/16640 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-25Add vSocket dissectorGerard Garcia4-1/+327
Header definition: https://github.com/GerardGarcia/linux/blob/vsockmon/include/uapi/linux/vsockmon.h Bug: 12623 Change-Id: I9af4b5069f69b847779a8b25abb3939e672dc9c3 Reviewed-on: https://code.wireshark.org/review/16308 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>
2016-07-25Fix checkAPI.pl warnings about printfMichael Mann23-194/+234
Many of the complaints from checkAPI.pl for use of printf are when its embedded in an #ifdef and checkAPI isn't smart enough to figure that out. The other (non-ifdef) use is dumping internal structures (which is a type of debug functionality) Add a "ws_debug_printf" macro for printf to pacify the warnings. Change-Id: I63610e1adbbaf2feffb4ec9d4f817247d833f7fd Reviewed-on: https://code.wireshark.org/review/16623 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>
2016-07-24Pacify GTK checkAPIs.pl warnings.Michael Mann15-43/+61
Add "Wireshark" macros to old-gtk-compat.h for GTK APIs that have been deprecated. The macros are setup by version number to limit their proliferation (not that I suspect much development will really be done there since GTK is deprecated). Just want to make buildbots happy for the time being. Change-Id: I095f850065166a0bc2e2456fb2e886ab64fdd97d Reviewed-on: https://code.wireshark.org/review/16635 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-24zvt: use a hash table for the bitmapsMartin Kaiser1-68/+81
table entries contain the length (if known and constant) and a function to dissect the payload this should clean up the code for bitmap dissection and make it easier to add new entries Change-Id: Id0ef5ff9e53c82171789c8a3352e56d3997d82b9 Reviewed-on: https://code.wireshark.org/review/16632 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-07-24Use 'nxt' argument in ipv6_dissect_next()João Valverde1-1/+1
Change-Id: I7190aa5301ba54be4c179dc7815c4be82987c949 Reviewed-on: https://code.wireshark.org/review/16636 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-24zvt: rename dissect_zvt_bitmap_apdu() to dissect_zvt_bitmap_seq()Martin Kaiser1-6/+7
the sequence of bitmaps can either be the complete APDU payload or a part of it Change-Id: I3e3d176f29a5c2a0ad2c7fb61102c46255f436da Reviewed-on: https://code.wireshark.org/review/16631 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-07-24zvt: rename bitmap to bmpMartin Kaiser1-4/+4
It looks like the specs call the first byte BMP and the whole record (BMP + content) is called the bitmap. Change-Id: I60ce75b131b3cddc59f614b8ca156ceacc890cf8 Reviewed-on: https://code.wireshark.org/review/16630 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-07-24Add Ericsson A-bis P-GSL dissectorHarald Welte5-1/+418
Ericsson uses a vendor-specific packetized PCU-CCU interface on their packetized A-bis, which can be encapsulated in their own variant of HDLC on top of L2TP. The new P-GSL dissector is called from packet-ehdlc.c, which in turn integrates with packet-l2tp.c. Change-Id: Ifca190577b1c9691209221d79e3ef034dc3ca650 Reviewed-on: https://code.wireshark.org/review/16510 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-07-24Replace strlen with NULL checks to pacify checkAPIs.plMichael Mann2-4/+4
Change-Id: I5db39cbd531c228da73447bf8899599f82e1889d Reviewed-on: https://code.wireshark.org/review/16624 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-07-24Fix shadow variable warnings.Michael Mann2-11/+11
Change-Id: I1e6bd722b3f04f171b462fc680ca080bb7ec03c7 Reviewed-on: https://code.wireshark.org/review/16625 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-07-24[Automatic update for 2016-07-24]Gerald Combs12-282/+580
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9a88b1d2ac3fd54cd2b7bfbb652ba504db81df65 Reviewed-on: https://code.wireshark.org/review/16626 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-24Add basic dissector for Ericsson Packet A-bis TFP ProtocolHarald Welte5-1/+226
This dissector currently onl dissects the TFP header, treating the payload (TRAU) as opaque data. Still, it is an improvement to see the header information like timeslot, sequence number, delay and frame type. The new TFP dissector is called from packet-ehdlc.c, which in turn is used inside Ericsson-specific L2TP. Change-Id: I8835c07e259ec9a324ec92aac39abbef2c902af3 Reviewed-on: https://code.wireshark.org/review/16509 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-07-24L2TP: Add some more Ericsson-specific AVPsHarald Welte1-0/+8
Change-Id: I3d0eb7f9b5641c388493c7188c128bfb14dfbf60 Reviewed-on: https://code.wireshark.org/review/16622 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-07-24Fix indentation (no tabs).Guy Harris1-1/+1
Change-Id: Ic45c0aa526e90bd51c0c501cdd349255ce0b43f5 Reviewed-on: https://code.wireshark.org/review/16621 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-24More null "IP information" pointer checks.Guy Harris1-27/+35
Bug: 12645 Change-Id: I356b6570f9a33fd495523a5e1fa6ada56047dc45 Reviewed-on: https://code.wireshark.org/review/16620 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-24Don't even *mention* the TTL/hop limit if we don't have it.Guy Harris2-4/+13
That's cleaner than reporting it as 0. Change-Id: I862130c98131ba83f9689201d852e2f1aab34770 Reviewed-on: https://code.wireshark.org/review/16619 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-24More null "IP information" pointer checks.Guy Harris4-7/+13
Bug: 12645 Change-Id: Iac662bec3c23b0b3d228766ad7a094f615770072 Reviewed-on: https://code.wireshark.org/review/16618 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-24Pass the next protocol value to ip_try_dissect() as an argument.Guy Harris3-5/+6
That way, we don't rely on the ws_ip pointer being non-null. Based on changes from Ib73410fd8575ad6c836311bbda87a0580e5640ac. Change-Id: If8c437572c725481ac4148c8095a1a479b4fb0f8 Reviewed-on: https://code.wireshark.org/review/16617 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-24Pass the next header value to ipv6_dissect_next() as an argument.Guy Harris5-14/+14
That way, we don't rely on the ws_ip pointer being non-null. Based on changes from Ib73410fd8575ad6c836311bbda87a0580e5640ac. Bug: 12645 Change-Id: I8c74ba57637b6a125593c4711d7c21b9693c2c85 Reviewed-on: https://code.wireshark.org/review/16616 Reviewed-by: Guy Harris <guy@alum.mit.edu>