AgeCommit message (Collapse)AuthorFilesLines
2016-07-13osmux: Add stats_tree statistics for Osmuxdaniel/osmuxDaniel Willmann1-0/+68
Change-Id: I9510b973e6a7c2a2d46b7631fc46109d9520bee2
2016-07-13osmux: Add osmuxh info for osmux tapDaniel Willmann1-10/+30
Change-Id: Ic562ab92efe0a44d41f6426315d563ffd187e031
2016-07-13osmux: Queue packet to the tap systemDaniel Willmann1-1/+7
Change-Id: I434bac2793e485561168b5402a7848b2a1db1d0d
2016-07-13Add OSMux dissectorDaniel Willmann3-0/+238
Change-Id: I8fb21e54adec8d8bd7ac5ebd2154100a73ab71c9
2016-07-12packet-rsl: Track rtp pt and codec for rslDaniel Willmann1-1/+39
Change-Id: I8f07c2807c7fd6d43c3307e01bf7fb1750accebd
2016-07-12Add AMR codec supportDaniel Willmann6-1/+175
Change-Id: I5ec963b910f8f271aa2e5d680ea33e2170a6f367
2016-07-12ceph: distingush between client and server by checking for a second ↵Jeff Layton1-22/+54
entity_addr_t The current ceph dissector assumes that the server will always send its initial connection negotiation first, but that's not necessarily the case, especially with the kernel client which sends its banner as soon as the socket is created. So, we need a better mechanism to determine which end is client and which is the server. The server sends its own address and then the address of the client, but the client only sends its own address. We can determine whether the initial negotiation message is from the client or server by looking at the data after the first entity addr and seeing whether it also looks like an entity addr. This patch takes that approach. It just grabs the address family from the second address and sees whether it's IPv4 or IPv6. If it's not one of those, then it assumes that it's not an entity_addr_t at all and is therefore a request from the client. We could go farther and try to verify the port and address as well, but that's probably overkill. The address family is at the same offset as the host_type field in the client's Connect request, but it's big endian and the host_type is little endian. As long as we don't end up with host_types that are 0x200 or 0xA00, this scheme should be OK. Change-Id: I161d02da86d978272eff95497c6df66766b02ebc Signed-off-by: Jeff Layton <jlayton@redhat.com> Reviewed-on: https://code.wireshark.org/review/16043 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-12Generic Protocol Extension support for VxLANsjha32-31/+174
Bug: 12323 Change-Id: I53bfedf50ad09cda52320b0e6eb81e92ed73efc8 Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-on: https://code.wireshark.org/review/16250
2016-07-11Geneve: Update list of option classes.Jesse Gross1-2/+7
Newer versions of the Geneve protocol draft have defined additional option classes. This updates the list so we can show the class name instead of unknown. Change-Id: I19f2024704abe2bc0692c73be783858d74323c0e Reviewed-on: https://code.wireshark.org/review/16382 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-11osx-app: small improvement in packaging script.Dario Lombardo1-10/+7
Change-Id: I484ab1b001f7fd578e734b4e006137f590a750a9 Reviewed-on: https://code.wireshark.org/review/16379 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-11Fix up *some* of the coding style inconsistenciesJoerg Mayer1-605/+713
- return type of a function definition is always on a seperate line - reformat single line expert items into multiline format - no space between functionname and ( - reformat some hf_ elements that looked different from most others - space after , where appropriate - Fix the following warnings and errors from checkhf.pl Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi Unused href entry: epan/dissectors/packet-ieee80211.c: hf_ieee80211_ff_rcsi_aid Error: hf_ieee80211_ff_dsss_ofdm: FT_BOOLEAN with non-null 'convert' field missing TFS in epan/dissectors/packet-ieee80211.c Error: non-null hf_ieee80211_ff_dsss_ofdm 'convert' field missing 'VALS|VALS64|RVALS|TFS|CF_FUNC|FRAMENUM_TYPE|&' in epan/dissectors/packet-ieee80211.c ? Error: hf_ieee80211_operat_mode_field_channel_width is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c Error: hf_ieee80211_operat_mode_field_rxnss is passing the address of a pointer to VALS in epan/dissectors/packet-ieee80211.c Change-Id: Ide51d1871755199721e65c0f62b3f6a62ef1159e Reviewed-on: https://code.wireshark.org/review/16381 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2016-07-11IPv6: refactor dissect_routing6() into type-specific dissectorsJoão Valverde1-277/+335
Change-Id: I153c39bb76dc30cecede9dbf5fe4abf234fcd719 Reviewed-on: https://code.wireshark.org/review/16347 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-11hdcp2: don't throw an exception during heuristic checkMartin Kaiser1-0/+4
Change-Id: I24895950464e1845c468f9fa9b6e5aa3ab8c75de Reviewed-on: https://code.wireshark.org/review/16378 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-11iso7816: check for minimum atr lenMartin Kaiser1-1/+5
and reject the packet if it is shorter make sure that we don't throw an exception when we read the first byte and haven't yet decided if the packet contains an iso7816 atr Change-Id: I7b4c93cc7c55489467b46241f07a1bb5ddfd927a Reviewed-on: https://code.wireshark.org/review/16377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-10BGP: Add support of Vendor Capability 131 (Multisession Cisco)Alexis La Goutte1-0/+18
Issue reported by Garri Djavadyan Change-Id: I6dd4bd20d82a3f2cb8aa45f740f72d33e33053da Ping-Bug:12604 Reviewed-on: https://code.wireshark.org/review/16374 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-10BGP: Add (Cisco) for "Vendor" Cisco capabilityAlexis La Goutte1-2/+2
* Route Refresh Cisco capability (128) * ORF Cisco capability (130) Issue reported by Garri Djavadyan Bug: 12605 Change-Id: Icb19cd6a75315e5af4772dd7833a5b762bdd7ff4 Reviewed-on: https://code.wireshark.org/review/16373 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-10NAS-EPS: Add preference to bypass a heuristic decode of a ciphered NAS.Binh Trinh1-2/+11
Change-Id: Ifedb82bbcb29ab978ffb9ce2f485ac9ff0712fc2 Reviewed-on: https://code.wireshark.org/review/16363 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-10Remove a compiler warning some platforms give.Guy Harris1-5/+5
Some UN*Xes declare an index() function, that being the name strchr() originally had in V7 UNIX. This causes warnings from compilers if you have a variable named "index", so rename the variable. Change-Id: Ibb046005d1ef911ce0739ce70a0a55c13310cdf0 Reviewed-on: https://code.wireshark.org/review/16372 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-10pvfs2: clean up dissect_pvfs_distribution()Martin Kaiser1-22/+18
remove unnecessary variable initializers remove an unnecessary if (tree) check Change-Id: I4c5326c11efe4fe38fb606a45ca7674484e9421c Reviewed-on: https://code.wireshark.org/review/16371 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-07-10mp2t: use tvb_new_subset_remaining() instead of tvb_new_proxy()Martin Kaiser1-3/+1
the latter is internal to the tvb code and not meant to be called from a dissector Change-Id: Iee5af3d59329aeef8156f0bbbd5c765cac4e314d Reviewed-on: https://code.wireshark.org/review/16364 Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-10[Automatic update for 2016-07-10]Gerald Combs12-1209/+1451
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I9d1c7b06a449a3b0dc02dd99f33c4e7634e2d1c0 Reviewed-on: https://code.wireshark.org/review/16368 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-07-10DOCSIS: Added dissector for Downstream Profile Descriptor (DPD)Bruno Verstuyft3-0/+393
Change-Id: I97e6e07be45a5c4de6c8c467e0c782b35036bd98 Reviewed-on: https://code.wireshark.org/review/16202 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Adrian Simionov <daniel.simionov@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-10Cleanup and extend the regex for matching expert info entries.Jeff Morriss1-19/+17
Match each entity in the structure explicitly rather than skipping a bunch at the end. This makes it possible to easily (and clearly) specify where we allow white space. Don't capture the event group and severity: we don't use them anyway. Don't put single character matches in []: that makes it hard to read (for me anyway). There's no need for both the "m"(ultiline) and "s"(ingle line) options. Nor the "o"optimize (make buggy) option. These same changes should/will be applied to the hf regex later. Change-Id: I3bf307dcd6432eb1a0c2b9aceea201f8403e08c0 Reviewed-on: https://code.wireshark.org/review/16313 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-10Remember query after closing Follow StreamDavid Morsberger2-4/+31
Update main filter after follow stream dialog is closed - Use: previous_filter if new 'Back' button (passed in follow() method) filter_out_filter_ if 'Filter Out This Stream' button (built by appending !current_stream to previous_filter) leave filter alone if window closed using Close button or window close. (current stream) Change-Id: Ic02edeaffdc65ff0f33cac4cb9afb8cde28963c7 Reviewed-on: https://code.wireshark.org/review/16277 Reviewed-by: Jim Young <jim.young.ws@gmail.com> Petri-Dish: Jim Young <jim.young.ws@gmail.com> Tested-by: Jim Young <jim.young.ws@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-10Makefile: Install wireshark.pc tooMichal Privoznik1-0/+3
In my previous patches (8454f2a20e2 and ea16a84ef51) I've tried to make the pkg-config file more robust. But what I had completely forgot about is that the file was never installed by our Makefile rather than we relied on distribution maintainers to be smart and make the package install the file instead. I've realized this as soon as I've tried to update wireshark in my system. Change-Id: Idb60157a51ea1dd0afd6cfac695bfa5760485241 Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-on: https://code.wireshark.org/review/16279 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2016-07-10randpkt_core: Use g_random_* for randpkt_parse_type().João Valverde1-1/+1
randpkt_parse_type() can (and most likely will) be called before randpkt_example_init(), therefore g_rand_int_range is called with a NULL GRand argument. This produces non-random output. Change-Id: Id420edc15a5f9dec427c5f1a1dd9a1f18a225319 Reviewed-on: https://code.wireshark.org/review/16367 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-10iso14443: the uid size is a generated itemMartin Kaiser1-1/+3
Change-Id: I77952e0099ed8103c8316becafc700866b4c46d8 Reviewed-on: https://code.wireshark.org/review/16366 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-07-10iso14443: expert info for invalid uid sizeMartin Kaiser1-5/+16
Change-Id: I3181375c3a2c8a905e1fd8bb722ac27902735ff0 Reviewed-on: https://code.wireshark.org/review/16365 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2016-07-10Qt: add assert (CID 1311486).Dario Lombardo1-1/+2
Change-Id: I62290f1f1c7856ee431705a64fae2022b850234a Reviewed-on: https://code.wireshark.org/review/16361 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-09randpkt_core: change rand() to g_rand_int (CID 1355360).Dario Lombardo4-72/+20
Change-Id: I48560cbb6007eb16aa545a3e8e6a0e8e3b206930 Reviewed-on: https://code.wireshark.org/review/16326 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-09IPv6: Remove obsolete commentJoão Valverde1-3/+0
WS_INET6_ADDRSTRLEN should be used instead of INET6_ADDRSTRLEN. Change-Id: Id937ca72361f4f1b3cad2c18b1067c3fddc527a9 Reviewed-on: https://code.wireshark.org/review/16359 Reviewed-by: João Valverde <j@v6e.pt>
2016-07-09packet-wsp.c: Fix infinite loop in add_headersMichael Mann1-0/+15
Bug: 12594 Change-Id: Id86d1e5f2db12871bc1b345721e79e57192f01e1 Reviewed-on: https://code.wireshark.org/review/16355 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-09Fix detection of NSIS/WiX install path when running a win64 CMakePascal Quantin2-4/+7
On x86 system: System32\cmd.exe ProgramFiles=C:\Program Files On x64 system: System32\cmd.exe ProgramFiles=C:\Program Files ProgramFiles(x86)=C:\Program Files (x86) ProgramW6432=C:\Program Files Syswow64\cmd.exe ProgramFiles=C:\Program Files (x86) ProgramFiles(x86)=C:\Program Files (x86) ProgramW6432=C:\Program Files Change-Id: I32d52219366b299f1e8099dc6d7737970dc398dd Reviewed-on: https://code.wireshark.org/review/16346 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-09Check for pcapng files when reading from a pipe.Guy Harris1-22/+29
That way, people don't get confused by an "Unrecognized libpcap format" error - it's *not* libpcap format! Also, improve *that* message to say "...or not libpcap data", and put a period at the end of the error messages. Change-Id: I175f9399fe99ce424f1d83596b7330e1fa5c0625 Reviewed-on: https://code.wireshark.org/review/16349 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-07-08Fix value_string_ext_free() constnessJoão Valverde2-3/+3
Don't declare destructor as taking a const argument. Change-Id: I9badfe400718bef41a0e0a00d4b3d1b0bb2879d1 Reviewed-on: https://code.wireshark.org/review/16342 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-08IPv6: Remove a memcpy()João Valverde1-16/+14
Replace CamelCase and remove unnecessary casts too. Change-Id: Iacf56912448c0e0dc0fe21477d6b71ba9caba69a Reviewed-on: https://code.wireshark.org/review/16344 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: João Valverde <j@v6e.pt>
2016-07-08fixed some juniper vn dissector bugsAmitoj Setia1-8/+8
Change-Id: I67ea5df962266c1476d1d1b6234e831018138422 Reviewed-on: https://code.wireshark.org/review/16341 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-08GSM RLC/MAC: register dissectors for EC-GSM-IoT control messagesPascal Quantin1-0/+22
Change-Id: I8fe84cc98b8967c529c07ff17014648610ad8660 Reviewed-on: https://code.wireshark.org/review/16340 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-08MAC LTE: upgrade dissector to v13.2.0Pascal Quantin2-24/+159
Change-Id: Ic859d69583ca3c342d4775511b68fc276f3290a4 Reviewed-on: https://code.wireshark.org/review/16339 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-08When generating the LUA reference in AsciiDoc then say so.Jaap Keuter1-4/+4
Generating LUA documentation source for the developer guide says that it's generating XML, which it did before the switch to AsciiDoc. Fix this statement. Change-Id: Ib8625af84c74b5f6dc31c1e9e5ded80d9d7940ff Reviewed-on: https://code.wireshark.org/review/16320 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-08couchbase: Fix Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-1/+0
Clang Change-Id: Ie1e3b071388b3527bba1088af69d76dcb8d6981a Reviewed-on: https://code.wireshark.org/review/16333 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: Michael Mann <mmann78@netscape.net>
2016-07-08APRS: more cleanup.Jeff Morriss1-245/+75
There's no need to create global structures with pointers to the (global) hf's to pass into the dissection functions. Just reference the global variables directly. Remove other global variables passed as arguments while we're at it. Remove boilerplate comments. Change-Id: I7ce6b356172aa25983f4cc6a007a0158cb7f26c9 Reviewed-on: https://code.wireshark.org/review/16331 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-08APRS: clean up some header fields.Jeff Morriss1-22/+22
Try to make the names self-explanatory (without relying on blurbs). Change-Id: Icfb4797282987b42ac68709b431d8b7248a0a633 Reviewed-on: https://code.wireshark.org/review/16330 Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-07-08Qt: Update scrollbars when change byte view formatStig Bjørlykke1-0/+1
Update scrollbars when changing display format between hex and bits view because the height of the phane will change. Change-Id: I81556c8dbdfb0a34f6c97e76834646a40aed62bb Reviewed-on: https://code.wireshark.org/review/16336 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-07-08ZigBee GreenPower: Fix GP Pairing command dissection.dsrsupport1-1/+1
Fix length of Sink GroupID in GP Pairing command. Change-Id: I5905812456faa0181ee1cc13824a12ce2583d4e0 Reviewed-on: https://code.wireshark.org/review/16335 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-07-08p1: Add BuiltInEncodedInformationTypes.telexStig Bjørlykke2-1/+7
This is for completeness. Change-Id: Id89f649aa836dd011f0967cdbdc905916b4d2182 Reviewed-on: https://code.wireshark.org/review/16334 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2016-07-08nbifom: fix no previous prototype for 'proto_register_nbifom' ↵Alexis La Goutte1-0/+2
[-Wmissing-prototypes] Change-Id: I4456cfd6600986b2e0c1cecf7d3054f3e829a210 Reviewed-on: https://code.wireshark.org/review/16332 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-07-08Qt: add initializers (CID 1261463).Dario Lombardo1-0/+5
Change-Id: I5c2d5c73e188586a91dde342d6347d25495e0263 Reviewed-on: https://code.wireshark.org/review/16325 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-08Qt: add initializer (CID 1269610).Dario Lombardo1-1/+1
Change-Id: I483e5d3f239f4708f9fc6b11c98869bb1381fb44 Reviewed-on: https://code.wireshark.org/review/16324 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2016-07-08Qt: add initializers (CID 1317257).Dario Lombardo1-2/+12
Change-Id: I61a63c187990b119b62e99871832913a0e3f75e4 Reviewed-on: https://code.wireshark.org/review/16323 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>