aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-06-23Remove more deprecated tvb_lengthEvan Huus24-189/+189
Change-Id: I36603453c2563406f82663683930088dedd5f39c Reviewed-on: https://code.wireshark.org/review/9041 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-22srt_table.h: fix parameter 'opt_arg/filter' not found in the function ↵Alexis La Goutte1-2/+2
declaration [-Wdocumentation] Change-Id: I6edda434d02a4926a2ec7a2580a7f684b6e96ee6 Reviewed-on: https://code.wireshark.org/review/9008 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-22SIP: add support for draft-ietf-insipid-session-idPascal Quantin1-4/+128
Bug: 11294 Change-Id: I54f7e19d129cddb1f11525f6ee9931270cc41f40 Reviewed-on: https://code.wireshark.org/review/9028 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-22Don't use the value of the Flags field if we didn't have it.Guy Harris1-10/+14
Change-Id: Idd7771bd39ee823981b31b827645abd2ae516f66 Reviewed-on: https://code.wireshark.org/review/9039 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-22Fix handling of XChannel radiotap field.Guy Harris1-6/+19
Fetch the flags before using them; thanks to Peter Wu for catching that one. Fetch and use the frequency and channel. Have cflags be the variable for the flags in Channel and xcflags be the variable for the flags in XChannel. Change-Id: If82f7adb448eef04b769186a90a8722d03a702a3 Reviewed-on: https://code.wireshark.org/review/9038 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-22gtk,qt: Fix minor buffer underrunPeter Wu2-2/+2
Avoid accessing the first byte before an empty dirname. No idea why this was not triggered before. Reproduced with an empty Wireshark profile and wireshark and wireshark-qt. Caught with ASAN. Change-Id: I44f8fdab03ad0f24e663df63a1c54567996a3dfc Reviewed-on: https://code.wireshark.org/review/9037 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-22packet: write explicit type for destroy_heuristic_dissector_listPeter Wu1-1/+1
It is an implementation detail that the data pointer contains a GSList*. Use the type that got inserted into function register_heur_dissector_list. Change-Id: I25b6414afa73818baa0c955a5c8aa7669f3058ee Reviewed-on: https://code.wireshark.org/review/9035 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-22IEEE 802.11: add an expert info when tag length value is bigger than ↵Pascal Quantin1-0/+4
remaining payload Bug: 11298 Change-Id: I18082a15fbeaa843099741511292eec19acf94b9 Reviewed-on: https://code.wireshark.org/review/9033 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-22Fix "Unescaped left brace in regex is deprecated"Peter Wu1-1/+1
This got reported with Perl 5.22: Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/^typedef enum { <-- HERE / at epan/wslua/make-init-lua.pl line 228. The perldelta manual page says this about it: "[..] a future version of Perl (tentatively v5.26) will consider this to be a syntax error." Change-Id: I7f23cc10dc3311a35d8c15faa4337e4d50d0bd61 Reviewed-on: https://code.wireshark.org/review/9034 Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-22Provide PHY type and band information in the 802.11 pseudo-header.Guy Harris12-265/+664
Provide that information so that the "802.11 radio information" protocol can indicate whether a packet was 802.11 legacy/11b/11a/11g/11n/11ac, and possibly whether it's 2.4 GHz or 5 GHz 11n. (Sometimes the center frequency might not be supplied, so the band information can be useful.) Also, provide some 11ac information, now that we can distinguish between 11n and 11ac. Don't calculate the data rate from the MCS index unless it's 11n; we don't yet have code to calculate it for 11ac. For radiotap, only provide guard interval information for 11n and 11ac, not for earlier standards. Handle the 11ac flag in the Peek remote protocol. For Peek tagged files, the "extension flags" are 11n/11ac flags, so we don't have to check for the "MCS used" bit in order to decide that the packet is 11n or 11ac or to decide whether to provide the "bandwidth" or "short GI" information. Change-Id: Ia8a1a9b11a35243ed84eb4e72c384cc77512b098 Reviewed-on: https://code.wireshark.org/review/9032 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-22ieee80211: fix memleakPeter Wu1-1/+5
parse_key_string reads from rec->string and rec->key (without modifying those parameters), then returns a newly allocated decryption_key_t struct which is not used except for reading the type field. Release memory after copying that single field! Change-Id: Iac19bea23dedb73cab9dd1ea09f98cc83556e96c Reviewed-on: https://code.wireshark.org/review/9025 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2015-06-22Remove more tvb_lengthEvan Huus6-21/+21
Change-Id: I940704e927001b2a051a59fd0738e7a02328472b Reviewed-on: https://code.wireshark.org/review/9031 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-22Use StockIcon to load toolbar icons.Gerald Combs1-1/+2
StockIcon loads each available icon size. Change-Id: Ia5604cc11ed8350e7f4f782312939cf30c94f548 Reviewed-on: https://code.wireshark.org/review/9030 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-22rtd_table.h: fix parameter 'srt/srt_array' not found in the function ↵Alexis La Goutte1-5/+5
declaration [-Wdocumentation] srt => rtd Change-Id: I297258ebb22723f280588692fdbb5d062d08ced9 Reviewed-on: https://code.wireshark.org/review/9024 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-22fix the interface list in the main welcome screenMartin Kaiser1-0/+5
when no interfaces are available at startup, the number of columns in the interface tree is set to 1 when new interfaces become available later, the column number is not reset to the default value and we end up with an interface list whose entries are not visible reset the number of columns each time the interface list is updated Change-Id: I267c5b47da6d5ae9e7769b1036622f79da4d97f2 Reviewed-on: https://code.wireshark.org/review/8996 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-22Remove a bunch of deprecated tvb_length callsEvan Huus49-229/+229
Change-Id: I9362e0fdc4519ba5f3d656152966e7030f478839 Reviewed-on: https://code.wireshark.org/review/9022 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-22checkAPIs.pl: proto_tree_add_bytes_item takes an encoding parameterPascal Quantin1-1/+1
Change-Id: Iebe0e2483d9fd1661bf87ea5efaeb4ae14f6e105 Reviewed-on: https://code.wireshark.org/review/9027 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-22NCP: fix comma at end of enumerator list [-Wpedantic]Alexis La Goutte1-1/+1
Change-Id: I47795fb9e1044f4319721c3bf1208c269a4b9c34 Reviewed-on: https://code.wireshark.org/review/9023 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-22ws80211_utils.h: fix empty paragraph passed to '@param' command ↵Alexis La Goutte1-1/+1
[-Wdocumentation] Change-Id: Iecd9f8820840959a2f226120cbc359977d20c757 Reviewed-on: https://code.wireshark.org/review/9009 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-22PKCS12: Remove from ASN1 DIRTY listAlexis La Goutte2-2/+2
Change-Id: I454c48d5342ebe5682217667e4cafd6164e58d41 Reviewed-on: https://code.wireshark.org/review/9004 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>
2015-06-22PKCS12: fix unused function 'dissect_AuthenticatedSafe_PDU' [-Wunused-function]Alexis La Goutte3-19/+19
Change-Id: Iaaaaffc8a271ac844b745d1b9265eb06df2efe9c Reviewed-on: https://code.wireshark.org/review/9003 Reviewed-by: Evan Huus <eapache@gmail.com>
2015-06-22Add a strlen cast.Gerald Combs1-1/+1
Change-Id: I480e2e7436f0334f0dfd99352bd49304765fcee3 Reviewed-on: https://code.wireshark.org/review/9021 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-22Refactor RTD stats.Michael Mann27-1955/+1463
Very similar to the refactoring of SRT stats, it provides more commonality of the stats for all GUI interfaces. Currently implemented for TShark and GTK. Affected dissectors: MEGACO, MGCP, Radius Change-Id: Icb73a7e603dc3502b39bf696227fcaae37d4ed21 Reviewed-on: https://code.wireshark.org/review/8998 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>
2015-06-22Fix make distcheck buildbotAlexis La Goutte1-5/+1
packet-dnp.c:2735:28: error: variable 'al_filename' set but not used [-Werror=unused-but-set-variable] packet-dnp.c:1843:32: error: variable 'al_filename_offs' set but not used [-Werror=unused-but-set-variable] Change-Id: Ia84b270aa8f56fb4104fb875339dc3d39c6105c6 Reviewed-on: https://code.wireshark.org/review/9020 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-22[pcep] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for certain multibyte fields.Bill Meier1-15/+15
Change-Id: Idc31728ce1b327ff86a58541ba01275107c7598b Reviewed-on: https://code.wireshark.org/review/9019 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-22[rfid-pn532] (benign) Use ENC_BIG_ENDIAN (not ENC_NA) for several 3-byte fields.Bill Meier1-8/+8
Change-Id: If70a45d59fdce105b429d00fbbc4a8b2784262a2 Reviewed-on: https://code.wireshark.org/review/9018 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-22service_response_time_table.h: fix parameter 'gui_data' not found in the ↵Alexis La Goutte1-1/+1
function declaration [-Wdocumentation] Change-Id: Ie214d654aa91b91da2a1435dce63a822e404669a Reviewed-on: https://code.wireshark.org/review/9010 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-22Fix typo caused assertionMichal Labedzki1-1/+1
Invalid character ')' in filter name 'gsm_abis_rsl.llsdu.sacch)' ** ERROR:wireshark/epan/wmem/wmem_core.c:50:wmem_alloc: assertion failed: (allocator->in_scope) Aborted Change-Id: Ie22035cf9a9d1d29354a64cd5b085f1c2e18b1d3 Reviewed-on: https://code.wireshark.org/review/9017 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-06-22GSM MAP: Fix decoding of IPv6 addressesVasil Velichckov3-14/+24
From 3GPP 23.003 The GSN Address is composed of the following elements: 1) The Address Type, which is a fixed length code (of 2 bits) identifying the type of address that is used in the Address field. 2) The Address Length, which is a fixed length code (of 6 bits) identifying the length of the Address field. 3) The Address, which is a variable length field which contains either an IPv4 address or an IPv6 address. Address Type 0 and Address Length 4 are used when Address is an IPv4 address. Address Type 1 and Address Length 16 are used when Address is an IPv6 address. The IP v4 address structure is defined in RFC 791 [14]. The IP v6 address structure is defined in RFC 2373 [15]. Currently the Wireshark decodes IPv6 addresses as IPv4 This commit reverts parts of commit 1cdef1d98aac306932dc599d427a3e1191d48a44 Change-Id: I4905d4cf559abcb42b9dfe3652667d2ff96dd444 Reviewed-on: https://code.wireshark.org/review/8984 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-22Eliminate proto_tree_add_text from some dissectors.Michael Mann5-99/+262
Change-Id: I979990e9385182870ce4809a7e6fa16e598cb2be Reviewed-on: https://code.wireshark.org/review/9016 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-22Convert "macro checks" to use expert info in line with dissectors with ↵Michael Mann1-75/+95
comparable checks. Change-Id: I30affba4941ba150c34541bfba67ff8da5b52a17 Reviewed-on: https://code.wireshark.org/review/9015 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-22[bmp] minor cleanupBill Meier1-38/+32
- Simplify some code; - Remove unneeded initializers; - Remove some unused code; Change-Id: I30b6a7751845670b732eae8ec143cd23e57fc54c Reviewed-on: https://code.wireshark.org/review/9014 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-06-21PKCS12: fix warning about unused parameter when don't build with LIBGCRYPTAlexis La Goutte2-2/+2
Change-Id: I7cc47f811d6c090aa2be54d3d92361966d011ccd Reviewed-on: https://code.wireshark.org/review/9002 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-06-21Remove deprecated tvb_length from a bunch of dissectorsEvan Huus22-52/+51
Change-Id: I5c777806cb1403062a9d85261149d722df57b239 Reviewed-on: https://code.wireshark.org/review/9005 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>
2015-06-21Fix memory leak printing eui64sEvan Huus2-4/+9
The scope that is passed in should only be used for the return value - other temporary buffers we must alloc/free ourselves, since if the scope is NULL they will not be managed automatically. Bug: 11293 Change-Id: I27be856f1c5cdf47f78e766192a29523664a543e Reviewed-on: https://code.wireshark.org/review/9007 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: Pascal Quantin <pascal.quantin@gmail.com>
2015-06-21ERM (Aruba): Fix Assigned value is garbage or undefined found by Clang AnalyzerAlexis La Goutte1-1/+1
Fix also trailing whitespace Change-Id: I9e9e09f6855f41609581ea1b7cd1bd16b15f85f4 Reviewed-on: https://code.wireshark.org/review/9006 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-21[Automatic update for 2015-06-21]Gerald Combs17-4346/+5992
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: I266509d729803494666458651ab3ae88cac50a21 Reviewed-on: https://code.wireshark.org/review/9012 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-21editcap: split usage output so won't wrap in cmd.exe windowMartin Mathieson1-1/+2
Change-Id: I8a8ed3721e525ceb685f8e105147a0cc012fc912 Reviewed-on: https://code.wireshark.org/review/9001 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-21Remove now unneeded tap-srt.hMichael Mann3-47/+3
Change-Id: Ic625f5a0f8e3c4d70dd04f5e3eb7100fb54027e5 Reviewed-on: https://code.wireshark.org/review/8997 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-21editcap: trivial changes while looking into the -L optionMartin Mathieson1-1/+5
Change-Id: I94dd83af160eebb9dc44c123b2b83674bc5866f6 Reviewed-on: https://code.wireshark.org/review/9000 Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-06-21srt_table: fix conversion shortens 64-bit value into a 32-bit valueAlexis La Goutte1-1/+1
Change-Id: I62d04fc2c02c393fd15bccbdfe194c557665dc0e Reviewed-on: https://code.wireshark.org/review/8999 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-06-21Further refactor SRT stats.Michael Mann54-5212/+2542
Create "common" SRT tap data collection intended for all GUIs. Refactor/merge functionality of existing dissectors that have SRT support (AFP, DCERPC, Diameter, FC, GTP, LDAP, NCP, RPC, SCIS, SMB, and SMB2) for both TShark and GTK. SMB and DCERPC "tap packet filtering" were different between TShark and GTK, so I went with GTK filter logic. CAMEL "tap packet filtering" was different between TShark and GTK, so GTK filtering logic was pushed to the dissector and the TShark tap was left alone. Change-Id: I7d6eaad0673fe628ef337f9165d7ed94f4a5e1cc Reviewed-on: https://code.wireshark.org/review/8894 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-20Call the "802.11 radio information" dissector for radio headers.Guy Harris19-335/+597
Have dissectors of various forms of radio information headers in the packets fill in a struct ieee_802_11_phdr with radio information as appropriate, and call the "802.11 radio information" dissector rather than the raw 802.11 dissector. This means that the radio information can be found in a protocol-independent and encapsulation-independent form when you're looking at the packet; that information can be presented in a form somewhat easier to read than the raw metadata header format. It also enables having a single "radio information" tap that allows statistics to handle all different sorts of radio information encapsulation. In addition, it lets us clean up some of the arguments passed to the common 802.11 dissector routine, by having it pull that information from the struct ieee_802_11_phdr. Ensure that the right structure gets passed to that routine, and that all the appropriate parts of that structure are filled in. Rename the 802.11 radio protocol to "wlan_radio", rather than just "radio", as it's 802.11-specific. Give all its fields "wlan_radio." names rather than "wlan." names. Change-Id: I78d79afece0ce0cf5fc17293c1e29596413b31c8 Reviewed-on: https://code.wireshark.org/review/8992 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-20(trivial) fix a spelling mistake in a commentMartin Kaiser1-1/+1
Change-Id: I3f9feab57032c8c701c4ea487c0f5acca428d5d9 Reviewed-on: https://code.wireshark.org/review/8995 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-20[mifare] make the payload of the write command filterableMartin Kaiser1-16/+5
use an FT_BYTES variable instead of passing it to the data dissector Change-Id: Ia52cba24dedec13c9842109d45b3a277ee627f42 Reviewed-on: https://code.wireshark.org/review/8994 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-20[mifare] minor cleanupMartin Kaiser1-34/+18
remove the if(tree) so that we fill the info column regardless of the tree clear the info column first, then append our data remove an unnecessary initializer Change-Id: I0e9e9582f360dd929e422f994c3d4a644c602642 Reviewed-on: https://code.wireshark.org/review/8993 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-06-20Use "Present"/"Absent" for presence bits.Guy Harris1-29/+29
That's clearer than "True"/"False". Change-Id: I300c040f347eff8477a87f639bea8402772314b9 Reviewed-on: https://code.wireshark.org/review/8991 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-20Support the "number of extension spatial streams" information.Guy Harris2-4/+44
Change-Id: If69088aac0848d6ec8d239e3a9acc140ad376d6f Reviewed-on: https://code.wireshark.org/review/8990 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-20ftypes: display BASE_HEX_DEC integers as hexadecimalPascal Quantin1-2/+2
Bug: 11292 Change-Id: I69a5591996bec77c2cb2bfcd04e9179784470edf Reviewed-on: https://code.wireshark.org/review/8987 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>
2015-06-20qt_ui_utils: fix parameter 'glib_string' not found in the function declarationAlexis La Goutte1-1/+1
Only a small typo glib_string => glib_gstring Change-Id: Ia3ad0a8086f6c1a47065754dee33eff1e0ad770f Reviewed-on: https://code.wireshark.org/review/8988 Reviewed-by: Anders Broman <a.broman58@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-03 10:02:43 +0000