aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2015-04-07[SGSAP] Add dissection of TMSI based NRI container andAndersBroman2-5/+60
Selected CS domain operator. Change-Id: I7c9c089588848a44e1454803b767ac79c07d197f Reviewed-on: https://code.wireshark.org/review/7964 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-07Add OCFS2 dissector.Sunil Mushran3-0/+1677
Bug: 5553 Change-Id: If297036b6d7a7afe163d97b05bc4a319d6cf2e97 Reviewed-on: https://code.wireshark.org/review/7949 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-07DMP: Handle encoded 7bit string as binary.Stig Bjørlykke1-1/+1
This bug was introduced when rewriting tvb_get_string() to handle encoding (and thus handling ASCII string different). Change-Id: Ia37a9d075fb58c8d6c26af811e96f7ca1e82af3d Reviewed-on: https://code.wireshark.org/review/7962 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-04-07Add proper "Decode As" mechanism for AAL2 instead of preference.Michael Mann6-72/+48
Also create dissector table for AAL5 subdissectors. This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed. Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00 Reviewed-on: https://code.wireshark.org/review/7894 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-06zigbee: enhance zigbee illuminance cluster dissectionJulien STAUB3-6/+8
value displayed wasn't in lux Change-Id: Id0c48c9a7968639e47d81e128c22c6cdcb3df929 Reviewed-on: https://code.wireshark.org/review/7945 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-06PKCS1: fix a typo for OID 1.3.132.0.35Robert P1-2/+2
Bug: 11106 Change-Id: Ied414b8e0bae8f34445f4d36bc6dfcc96b4a7456 Reviewed-on: https://code.wireshark.org/review/7941 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-05fibre channel: remove some unnecessary if(tree) checksMartin Kaiser1-31/+20
Change-Id: Id55fcaa49d5ae46af2c26c7c641f6440335ca225 Reviewed-on: https://code.wireshark.org/review/7925 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-04-05[Automatic update for 2015-04-05]Gerald Combs3-25/+274
Update manuf, services enterprise-numbers, translations, and other items. Change-Id: If98edeab7a413c33e54fbd579e975da26993a380 Reviewed-on: https://code.wireshark.org/review/7922 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-05NAS EPS: remove proto_tree_add_text callsPascal Quantin1-70/+73
Change-Id: Ib66a37c31df5da5c93dc7087528bb92d0ffec67e Reviewed-on: https://code.wireshark.org/review/7920 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-04-04change several (mutually exclusive) if statements into one big if-elseMartin Kaiser1-8/+4
Change-Id: Ib3614431c3ff8f6e53fa0993e296ffea70926d03 Reviewed-on: https://code.wireshark.org/review/7911 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-04-04Coverity 1158848, 1158849 (logically dead code)Martin Kaiser1-13/+12
the option parameter of output_fields_set_option() is always a 0-terminated string therefore, option_value can't possibly be NULL, remove the NULL checks if someone runs 'tshark ... -E header=', option_value is an empty string, bail out in this case, don't parse *option_value and *(option_value++) in the switch statements Change-Id: I734b04aff653e8dbe990f546220595546e7503b0 Reviewed-on: https://code.wireshark.org/review/7904 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-04-04GSM: fix no previous prototype for 'de_sm_re_attempt_ind' [-Wmissing-prototypes]Alexis La Goutte1-1/+1
Change-Id: Iaf4c01f659f9c0eed8615e77d0eab81724b44385 Reviewed-on: https://code.wireshark.org/review/7908 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-04GSM: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+0
Change-Id: If10a9902c231b87995562fd0c687a25dcab3e250 Reviewed-on: https://code.wireshark.org/review/7910 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-04Some CANopen frame types can have zero size, so use tvb_reported_length ↵Michael Mann1-3/+2
instead of -1. Bug: 11083 Change-Id: Ib17649fbbc4f79705e3ad18903b5c8847cb09054 Reviewed-on: https://code.wireshark.org/review/7881 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-04we may see an empty option string in output_fields_set_option()Martin Kaiser1-1/+1
Change-Id: I45a4cbef7cb38a851c207fbe26ff412ffc502240 Reviewed-on: https://code.wireshark.org/review/7903 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-04-04Add proper "Decode As" mechanism for I2C messages instead of preference.Michael Mann5-107/+59
Change-Id: Ifcf1193f97df6911ca9a0cf5613c9450b8fce1e4 Reviewed-on: https://code.wireshark.org/review/7897 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-04-04Add proper "Decode As" mechanism for EtherNet/IP I/O instead of preference.Michael Mann3-28/+43
Change-Id: I9d7c0f296176679b61d7ee0c4358ce409dfc4f4f Reviewed-on: https://code.wireshark.org/review/7895 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-03NAS EPS: upgrade dissector to v12.8.0Pascal Quantin1-8/+47
Change-Id: I8b7f7380c32c38fa5483a2966b56a6c2ee687c1c Reviewed-on: https://code.wireshark.org/review/7892 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-03[S1AP] Display the decimal value for TAC.AndersBroman1-64/+76
Change-Id: I12127b5f7e53e2d47a42ad54d4e952f6a184d7b6 Reviewed-on: https://code.wireshark.org/review/7883 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-03802.11: don't not showing all 11k subelement fieldsAlexis La Goutte1-1/+132
Add Request Channel Load and Noise Histogram Bug:11101 Change-Id: I276eb4711169555a2df6a72c78d0ad743398b954 Reviewed-on: https://code.wireshark.org/review/7877 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-03802.11: don't not showing all 11k subelement fieldsAlexis La Goutte1-0/+30
Add expert info when there is some undecoded Measure Request/Report type (and subtype) Change-Id: Iece7487680d3211f28365d6596db31f408edb96b Ping-Bug:11101 Reviewed-on: https://code.wireshark.org/review/7876 Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-03Fix IMF DissectorGraham Bloice1-6/+10
The IMF dissector doesn't properly handle the extra CRLF between the headers and the body, leaving it as part of the last header, and then fails to obtain the body contents due to incorrectly specifying the length of the remaining data. Change-Id: I8a1dfebd90e4cd5249f2244e9374a8e9ed3a25da Reviewed-on: https://code.wireshark.org/review/7884 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-033GPP NAS: upgrade dissector to v12.9.0Pascal Quantin3-5/+74
Change-Id: I6bffe7b5b95d72031df5aecac66129d2ceff517e Reviewed-on: https://code.wireshark.org/review/7889 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-033GPP NAS: display Short Element Identifier as it was done prior to ge74cb41Pascal Quantin1-1/+1
Change-Id: Ie001b420eb1fd29c8f5c941e69f4e2929250d887 Reviewed-on: https://code.wireshark.org/review/7885 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-03Fix:Joerg Mayer1-0/+2
packet-bitcoin.c:1735:6: error: 'hfi_msg_getheaders_version' undeclared (first use in this function) &hfi_msg_getheaders_version, caused by previous commit. Weird that the compiler on my system didn't catch that. Change-Id: I73cb06553bdf3a37f7c3d61d85f425d7c92d5b99 Reviewed-on: https://code.wireshark.org/review/7888 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-04-02Fix:Joerg Mayer1-0/+2
git/epan/dissectors/packet-bitcoin.c:270:26: error: ‘hfi_msg_getheaders_version’ defined but not used [-Werror=unused-variable] Change-Id: Ifcbc8be775e5f435497f5391755356caee48a7d9 Reviewed-on: https://code.wireshark.org/review/7887 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-04-02Fixup our anonsvn URLs.Gerald Combs2-2/+2
Change-Id: Id18d392bf7ff948fc78b684d8222c5c3725d302a Reviewed-on: https://code.wireshark.org/review/7886 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-02802.11: EAPOL 4-way handshake information wrongAlexis La Goutte1-3/+8
the EAPOL Key Exchange descriptions show key packets 2 and 4 as "Key (Message 4 of 4)" Reason of issue : In the IEEE 802.11 specification the value for the counter is defined as following: Message #2 - counter = n Message #4 - counter = n+1 So the only way to distinguish between message #2 and message #4 using the counter value would be for Wireshark to "look ahead" and compare the counter values (e.g., if counter1 < counter2, then message 2, else message 4). Fix : However, there is a much easier way to distinguish between message #2 and message #4. Instead of using the counter field, Wireshark could parse the "WPA Key Nonce" field (display filter = wlan_rsna_eapol.keydes.nonce). According to the IEEE specification, sections 11.6.6.3 and 11.6.6.5 define the value for the WPA Key Nonce as following: Message #2, Key Nonce = SNonce (Supplicant Nonce) Message #4, Key Nonce = 0 So, the logic would be: 1. Use the Wireshark parser to determine the WPA Key Nonce value. The Key nonce field is 32 octets. 2. If !(keynonce), then message #2 Else message #4 (Only check the first 4 octets of nonce if equal to zero) Issue reported by Murray Pickard Reason of issue (and proposed fix) by Amato Carbonara Bug: 10557 Change-Id: I66086ac27a4d7d3ac0356be295d23001e2af71c8 Reviewed-on: https://code.wireshark.org/review/7868 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>
2015-04-01AFP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-8/+1
Change-Id: Ib1c2bb355c7757b1aca4b59953ca6ab94aa30593 Reviewed-on: https://code.wireshark.org/review/7873 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>
2015-04-01USB Audio : fix fix Found soft-deprecated APIs (tvb_length)Alexis La Goutte1-3/+3
Change-Id: I727f0b0853920967b88a95e1708b535e8b1e4d9e Reviewed-on: https://code.wireshark.org/review/7875 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-012G/3G NAS: follow-up of ge74cb41Pascal Quantin1-150/+144
Change-Id: Id095bfb4a39b205517a8545e8a1c66927b4f4515 Reviewed-on: https://code.wireshark.org/review/7872 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-04-01LTE RRC: fix a typo introduced in g9aa624dPascal Quantin1-2/+2
Change-Id: Ia1bb68c64ca4cb820790dc84abee9cc222a1d0e4 Reviewed-on: https://code.wireshark.org/review/7874 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-01Bluetooth: fix Uninitialized scalar variable (CID 1268203)Alexis La Goutte1-1/+1
Change-Id: Ic9e47a32dc935e3e121cd49d4b378021c122aecd Reviewed-on: https://code.wireshark.org/review/7866 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: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-01Remove proto_tree_add_text from GSM dissectors.Michael Mann3-594/+591
Change-Id: I72a7c1a44bda7755d8b1376dd5e57c46f137ff31 Reviewed-on: https://code.wireshark.org/review/7870 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>
2015-04-01Fix bug #10858. There were several cases where uint32 fields were mistakenRichard Sharpe1-20/+37
for two uint16 fields and three fields were merged into one as an unknown. There was also an unnecessary unknown field on the end that caused a malformed packet exception to occur. Tested with a capture of a rename. Bug: 10858 Change-Id: Ibcf22270d2c34605bb47e3a9804b53746597572d Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/7837 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-01afp: 64-bit values require 64-bit value stringsEvan Huus1-2/+2
Bug: 11099 Change-Id: Id3b465f1835552d25b9877242d4c69a3c03281a6 Reviewed-on: https://code.wireshark.org/review/7871 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-03-31LTE RRC: upgrade dissector to v12.5.0Pascal Quantin2-12604/+15399
Change-Id: I9e3dfb17b4b7f96be999ccea88fec754a936d312 Reviewed-on: https://code.wireshark.org/review/7869 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-31USB Audio: fix Logically dead code (CID: 1247681)Alexis La Goutte1-6/+4
Change-Id: I8a32b1aff45376246ea092459594fcae2f423755 Reviewed-on: https://code.wireshark.org/review/7867 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> 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>
2015-03-31Correctly handle the CREATE_APP_INSTANCE_ID Create Tag as well as another thatRichard Sharpe1-16/+28
is based around a GUID. Also add some more FileFs Info strings and one more FSCTL code. Change-Id: Ib9e5d5a4ee64cd9b94eb9a54ec7a04a82e4ad00f Signed-off-by: Richard Sharpe <realrichardsharpe@gmail.com> Reviewed-on: https://code.wireshark.org/review/7817 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-03-31GSM_A: dissector table for User-To-User signallingMikhail Koreshkov1-1/+11
Add User-To-User (UUS) dissector table to be able further data processing. Change-Id: I44cc32441072c643d19af53849cf5b53909b4889 Reviewed-on: https://code.wireshark.org/review/7857 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>
2015-03-30WSP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-21/+21
Change-Id: I1e046988ed0e21e4824a3021e43fb429ed5211b4 Reviewed-on: https://code.wireshark.org/review/7854 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>
2015-03-30Remove proto_tree_add_text from packet-afp.cMichael Mann1-515/+454
Also do a bunch of proto_tree_add_bitmask conversions and other small cleanup. Change-Id: I0b42098e1db1457f80b839edbc260c0a72e177d6 Reviewed-on: https://code.wireshark.org/review/7853 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>
2015-03-30BTHFP: fix missing Break in switch (CID: 1287325)Alexis La Goutte1-0/+1
Change-Id: I26156e928b5fc07cff8a7c83cfed2f1cccff1994 Reviewed-on: https://code.wireshark.org/review/7851 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-03-30LPP: upgrade dissector to v12.4.0Pascal Quantin2-30/+30
Change-Id: Ie09ab1002ccc3f275828615755b3130bfbb14fdc Reviewed-on: https://code.wireshark.org/review/7852 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-30ANSI IS-637 A: add dissection of Multiple Encoding User Data and Service ↵Pascal Quantin2-63/+352
Category Program Data Bug: 11086 Change-Id: I36096d35038bc71191040514a38dcdf9e1373f31 Reviewed-on: https://code.wireshark.org/review/7840 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-03-30Eliminate proto_tree_add_text from packet-nfs.cMichael Mann1-814/+516
Various other cleanup while in the neighborhood. Change-Id: I9d8322fd8fb867ad5569db9f781a33825ca34d1b Reviewed-on: https://code.wireshark.org/review/7834 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>
2015-03-29RRC: add a missing mask forgotten in gf3d1e3cVincent Helfre1-1/+1
Change-Id: Ib62e15d17ea576f2180ac92d217869768225905d Reviewed-on: https://code.wireshark.org/review/7850 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-29DVB-CI Card Information Structure (CIS): start dissecting the device tuplesMartin Kaiser1-0/+57
Change-Id: I20a098eb1fdcfd34eb03b685d6936a6cf5868c0d Reviewed-on: https://code.wireshark.org/review/7848 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-03-29smart card dev class descriptor: use a bit field for the supported protocolsMartin Kaiser1-3/+19
Change-Id: Icf1d71f0aa90ed418264cd4f349e2a514f1ae2f9 Reviewed-on: https://code.wireshark.org/review/7847 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-03-29dissect two more features in the smart card device class descriptorMartin Kaiser1-0/+12
Change-Id: Ia442cbf7a30c1f1054a3fa8e814d595867e2c034 Reviewed-on: https://code.wireshark.org/review/7846 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>