aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2014-10-07ANSI683: Fix mobile country code baseEvan Huus1-1/+1
Fixes error: Field 'Mobile country code (MCC_T)' (ansi_683.mcc_t) is an integral value (FT_UINT16) but is being displayed as BASE_NONE Change-Id: I2d87075b0c982bcaf0e855653d49eb891e83b70d Reviewed-on: https://code.wireshark.org/review/4536 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07GSM (bssmap): Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-2/+0
by Clang Change-Id: I9fadd0edc26e5525cfdd15fc62062f19fef16d10 Reviewed-on: https://code.wireshark.org/review/4526 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07Overhaul the filterability of packet-ansi_683.cMichael Mann5-2307/+1068
It's (ab)use of proto_tree_add_text was "hidden" behind a single FT_NONE hf item, that effectively had the same behavior of proto_tree_add_text, but wouldn't show up in checkAPIs.pl. Replaced the (over 200+) proto_tree_add_none_format calls with proto_tree_add_text and then ran convert_proto_tree_add_text.pl on the dissector. That started the cleanup, and I did more while in the neighborhood. Change-Id: I89e09cf23e8998bcc9197f9a4043e1fc2850fc8c Reviewed-on: https://code.wireshark.org/review/4521 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-07[iSCSI] Fix incorrect heuristic.Anish Bhatt1-3/+5
The only valid check for Expected Data Transfer Length is : R and W MUST NOT both be 0 when the Expected Data Transfer Length and/or Bidirectional Read Expected Data Transfer Length are not 0 Bug #10469 Change-Id: I5503a5ad524c4e237b143696fc8eda895bcb9172 Reviewed-on: https://code.wireshark.org/review/4514 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-07asn2wrs: Added support for #.SYNTAX_NEWStig Bjørlykke1-4/+12
This allows syntaxes to be registered as "new" dissectors. Change-Id: Ibb76688d9d3cbf47222610956aa627fa374bcbce Reviewed-on: https://code.wireshark.org/review/4524 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07ASN1: Added support for using #.REGISTER_NEWStig Bjørlykke5-50/+92
This will register BER PDU-dissectors as "new". Return number of bytes dissected from dissector_try_* functions. Return number of bytes dissected in DissectorTable:try() This will make it possible to get dissected length when using dissector_try_*() and dissected ASN.1 length in Lua when using DissectorTable:try() (as we already have for Dissector:call). Change-Id: Iee17a68dc214fa0fb50b25fc927026ad7c1cbce4 Reviewed-on: https://code.wireshark.org/review/4531 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07Add proper decoding for type field in OBEX headersMichał Orynicz1-1/+12
Change type field type from byte sequence to string. Change-Id: I3e2ac6fbb5ce7187ba1183d63236e9a2bcd824ee Reviewed-on: https://code.wireshark.org/review/4417 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-07Make the code a bit more like the pre-new-APIs code.Guy Harris8-108/+50
Change-Id: I40282d8825936d24480c9b77e2e7d9374b1de6b5 Reviewed-on: https://code.wireshark.org/review/4534 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-071.99.0 → 1.99.1.Gerald Combs5-9/+9
Change-Id: I8580be0bfe88e33df333f0397f51762f4af819f6 Reviewed-on: https://code.wireshark.org/review/4532 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07Revert "ASN1: Added support for using #.REGISTER_NEW"Gerald Combs5-92/+50
This temporarily reverts commit acc09c2aa248d892ee6b894b43c79cb060131b11. Change-Id: I7a55c8c2da3f65e914b90648ee92c84efd57f1a0 Reviewed-on: https://code.wireshark.org/review/4525 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07ASN1: Added support for using #.REGISTER_NEWStig Bjørlykke5-50/+92
This will register BER PDU-dissectors as "new". Return number of bytes dissected from dissector_try_* functions. Return number of bytes dissected in DissectorTable:try() This will make it possible to get dissected length when using dissector_try_*() and dissected ASN.1 length in Lua when using DissectorTable:try() (as we already have for Dissector:call). Change-Id: I8802a812bd484c1e8794c618b87e676003aea94a Reviewed-on: https://code.wireshark.org/review/4493 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-10-07Build 1.99.0.Gerald Combs4-77/+27320
Change-Id: Idc813297e5e27680b13a6b81adcf18ae4ef4d4e4 Reviewed-on: https://code.wireshark.org/review/4523 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-07Dissect an SVHDX Open Device Context that appears as an Extra Create ParameterRichard Sharpe1-3/+153
in a CREATE request. This helps understand HyperV over SMB 3.x stuff. Bug: 10527 Change-Id: I1e206ed38e12fed419b1ac4a0793b91f9308f364 Signed-off-by: Richard Sharpe <rsharpe@samba.org> Reviewed-on: https://code.wireshark.org/review/4477 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-07Make the code a bit more like the pre-API change code.Guy Harris1-6/+3
Change-Id: I9a8bd2c7ce97993c1b72caf63254d024950f8b94 Reviewed-on: https://code.wireshark.org/review/4520 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07- Handle strings that have an opening but no closing quoteMartin Kaiser1-6/+11
fixes the endless loop reported in Bug: 10521 - Fix a typo. Change-Id: I17b4a15e780d1d6122841a308348518063f82a59 Reviewed-on: https://code.wireshark.org/review/4467 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-07Clean up white space.Guy Harris4-13/+13
Change-Id: I73f2406483c13c7917faed46db6fc1f5e2bc8fcd Reviewed-on: https://code.wireshark.org/review/4517 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07Fix a comment, clean up some whitespace.Guy Harris1-2/+2
Change-Id: I5d3d518eee2d61dd896b44c2a61d66057f3c2f7f Reviewed-on: https://code.wireshark.org/review/4516 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07[bacnet] update vendor listAnish Bhatt1-0/+80
Change-Id: I6b7bd3b3a110b8d393cd849c12890fff17446e54 Reviewed-on: https://code.wireshark.org/review/4515 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-10-07Whitespace cleanups.Guy Harris18-448/+448
Change-Id: I92f983b2e04defab30eb31c14c484b9f0f582413 Reviewed-on: https://code.wireshark.org/review/4513 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-07PIDL (DCERPC): fix Assigned value is garbage or undefined found by Clang ↵Alexis La Goutte7-9/+9
Analyzer packet-dcerpc-dnsserver.c:1002:12: warning: Assigned value is garbage or undefined packet-dcerpc-frstrans.c:1137:12: warning: Assigned value is garbage or undefined packet-dcerpc-lsa.c:6345:12: warning: Assigned value is garbage or undefined packet-dcerpc-nspi.c:7805:12: warning: Assigned value is garbage or undefined packet-dcerpc-dfs.c:3245:11: warning: Function call argument is an uninitialized value packet-dcerpc-dfs.c:3245:9: warning: 'level' may be used uninitialized in this function [-Wmaybe-uninitialized] Change-Id: Ife6a2f565ae215535d0e3d72ef50800114240e3f Reviewed-on: https://code.wireshark.org/review/4478 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07idl2wrs (DCERPC DRSUAPI): Fix Dead Store (Dead assignement/Dead increment) ↵Alexis La Goutte2-4/+12
warning found by Clang Add a check if the struct is not empty budb and butc are also regenerate but no change Change-Id: I0d8cfc827f5451f1cdbd924628a263af9d483a7b Reviewed-on: https://code.wireshark.org/review/4473 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-07Add some higher-level file-read APIs and use them.Guy Harris40-1337/+787
Add wtap_read_bytes(), which takes a FILE_T, a pointer, a byte count, an error number pointer, and an error string pointer as arguments, and that treats a short read of any sort, including a read that returns 0 bytes, as a WTAP_ERR_SHORT_READ error, and that returns the error number and string through its last two arguments. Add wtap_read_bytes_or_eof(), which is similar, but that treats a read that returns 0 bytes as an EOF, supplying an error number of 0 as an EOF indication. Use those in file readers; that simplifies the code and makes it less likely that somebody will fail to supply the error number and error string on a file read error. Change-Id: Ia5dba2a6f81151e87b614461349d611cffc16210 Reviewed-on: https://code.wireshark.org/review/4512 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-06Revert "Qt: Try to fix a Visual C++ encoding warning."Gerald Combs4-13/+14
Revert gafa8c02 since it didn't work on Windows. Use a pragma to squelch Visual C++ instead. Qt's rich text renderer doesn't handle "&apos;". Replace it with "&#x27;". Remove a QDebug include. Change-Id: I0e6308efda74a4bc0e67ce841a50a0a9b68f4a8b Reviewed-on: https://code.wireshark.org/review/4511 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06Qt: Rename the "check for updates" slot.Gerald Combs3-3/+3
The "Check for Updates..." action doesn't exist when QMetaObject::connectSlotsByName is called. Rename on_actionHelpCheckForUpdates_triggered to checkForUpdates so that we don't get the warning QMetaObject::connectSlotsByName: No matching signal for on_actionHelpCheckForUpdates_triggered() at startup. Change-Id: Icbd7eb98731023c323212e6ec3d3c98f1321e245 Reviewed-on: https://code.wireshark.org/review/4510 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06after an lupdate, I should also do an lrelease to keep the .ts file andMartin Kaiser1-0/+0
the .qm file in sync Change-Id: I588f5ff7386bac13c8ce0bba82fee4807c490682 Reviewed-on: https://code.wireshark.org/review/4509 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-06lupdate for JapaneseMartin Kaiser1-448/+634
Change-Id: Ifa7af35cfc18f85cd547aa7621c5ca7305a9242d Reviewed-on: https://code.wireshark.org/review/4508 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-06From 竹下 恵 (Megumi Takeshita)Martin Kaiser2-824/+861
another update of the Japanese translation the translation is fairly complete now, only some recently added items are missing Change-Id: Iacd4ee2da7a83681b6119c5d02a40156b441065b Reviewed-on: https://code.wireshark.org/review/4507 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-06Qt: QVector::length was added in Qt 5.2.Gerald Combs1-2/+2
Use ::count instead. Change-Id: Ic890ed8061b7e92eea65c3102de5219e5ac97a93 Reviewed-on: https://code.wireshark.org/review/4505 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06UI (simple_dialog): fix warning: redundant redeclaration of .. ↵Alexis La Goutte1-18/+0
[-Wredundant-decls] simple_dialog.h:78:13: warning: redundant redeclaration of ‘simple_message_box’ [-Wredundant-decls] simple_dialog.h:85:13: warning: redundant redeclaration of ‘vsimple_error_message_box’ [-Wredundant-decls] simple_dialog.h:90:13: warning: redundant redeclaration of ‘simple_error_message_box’ [-Wredundant-decls] Change-Id: I8f6363fc8ec46ba24895e5236368544f64354e42 Reviewed-on: https://code.wireshark.org/review/4460 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>
2014-10-06Qt: Packet list column sorting.Gerald Combs9-24/+144
Sorting behavior should be identical to GTK+. Pass the correct position to beginInsertRows. Add a list of to-do items to packet_list.cpp. Change-Id: Ie6ab4b9f2d780a2af430d0f90529edca5485dada Reviewed-on: https://code.wireshark.org/review/4481 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06Convert "4 space tabs" to spaces; Adjust editor modelines.Bill Meier11-4591/+4592
Change-Id: I8d61d959c79e6aa9875c58680c54a331d18079cc Reviewed-on: https://code.wireshark.org/review/4504 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06Adjust indentation to match editor modelines; Do other minor whitespace changes.Bill Meier36-4407/+4413
Change-Id: Ic020b2c92db5d14a2be9dc4d35aef4514b8b0353 Reviewed-on: https://code.wireshark.org/review/4502 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06packet-rpcap.c: Don't use mixed space/tab indentation;Bill Meier1-124/+124
Change-Id: I21409a02fabc28951d9c15be7a160295f5fb35ca Reviewed-on: https://code.wireshark.org/review/4501 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06Adjust editor modelines to match actual format of the file; Adjust some ↵Bill Meier2-76/+74
whiotespace. Change-Id: If930f2c266b61c9348063eab0189af2582b0a331 Reviewed-on: https://code.wireshark.org/review/4500 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06Convert (what appear to be) "4 space tabs"; Adjust editor-modelines; Do some ↵Bill Meier3-3497/+3505
minor reformatting. Change-Id: Ie078c826ed38a0d682f61fb3e95450b47a9d2c31 Reviewed-on: https://code.wireshark.org/review/4499 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06packet-g723.c: Remove some boilerplate comments.Bill Meier1-17/+1
Change-Id: Ib322b33c304674835170e1ae2006aabf0f44fd9d Reviewed-on: https://code.wireshark.org/review/4498 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06packet-hclnfsd.c: Reformat hf[] entries; Adjust some whitespace.Bill Meier1-98/+122
Change-Id: I84368080d12cb5001dd7847add0ec96608080604 Reviewed-on: https://code.wireshark.org/review/4497 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06packet-q931.c: Reformat hf[] entries; Convert apparent "4-space tabs" to ↵Bill Meier1-2721/+3057
spaces. Adjust editor modelines. Change-Id: Iaeb321f0facfc6b3176677779e6cdf5c92226dec Reviewed-on: https://code.wireshark.org/review/4496 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06Dissect 3GPP AVP Presence-Reporting-Area-Elements-List.AndersBroman1-19/+46
Change-Id: Ic7b99d41a275fb6f50758ea87763844f24be537c Reviewed-on: https://code.wireshark.org/review/4495 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>
2014-10-06tcp: default no-subdissector-on-error to TRUEEvan Huus1-1/+1
Dissectors that need this set break badly when it isn't. Dissectors which don't need this set will still generally be understandable without it, since e.g. retransmissions will link to the original packet at the TCP layer, and presumably the subdissector payload is exactly the same in that case. Change-Id: I2871c2a90c601637bdfb8cffaa34a7407995c603 Ping-Bug: 10525 Ping-Bug: 10289 Reviewed-on: https://code.wireshark.org/review/4487 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-06Expand dissection of 8.108 Presence Reporting Area Action.AndersBroman1-10/+100
Change-Id: I2ad57d8cdb6758f01146b37ac924e2d8f2141546 Reviewed-on: https://code.wireshark.org/review/4491 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>
2014-10-06Modify multicheck to accept parent parameter.Tomasz Moń4-39/+156
This makes it possible for multicheck to become a tree-like structure. Example: arg {number=4}{call=--devices}{display=Devices}{tooltip=Device selector}{type=multicheck} value {arg=4}{value=dev1}{display=Parent Device}{enabled=t}{default=t} value {arg=4}{value=dev2}{display=Child Device}{parent=dev1}{enabled=t} value {arg=4}{value=dev3}{display=Another Parent Device}{enabled=t} value {arg=4}{value=dev4}{display=Non-clickable Child Device}{parent=dev3} value {arg=4}{value=dev5}{display=Non-clickable Child of Child}{parent=dev4} Change-Id: I59dd7208ca0ec90cccfc49ae049559cdc6c69a4b Reviewed-on: https://code.wireshark.org/review/4192 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Roland Knall <rknall@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-10-06Adjust some whitespace to match editor modelines.Bill Meier8-38/+38
Change-Id: I9fda7de49255857cc1cf270d6202c85573d91674 Reviewed-on: https://code.wireshark.org/review/4490 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06Adjust some whitespace to match editor modelines.Bill Meier20-1168/+1167
Change-Id: Ia22cac3ebd7a454c156f98d967e6fd61f708a2b3 Reviewed-on: https://code.wireshark.org/review/4489 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06plugins: Add editor modelines; Adjust whitespace as needed.Bill Meier70-3745/+4623
Change-Id: I36124f6021d46a228721bdc976f6b9fef1c8c088 Reviewed-on: https://code.wireshark.org/review/4488 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05mpeg-pes: don't modify source and destination address columsMartin Kaiser2-32/+6
the mpeg-pes dissector replaced source or destination address with decoding timestamp, presentation timestamp or pack data rate these values don't belong into address columns and erase the IP addresses when mpeg-pes is transmitted over IP the timestamps etc can be displayed in a user-defined column if required this patch is part of Bug: 10505 Change-Id: I1bf561648f848eb18818862edd138724abfc8e88 Reviewed-on: https://code.wireshark.org/review/4472 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-05docsis: Add editor modelines; Adjust whitespace; Remove boilerplate comments.Bill Meier44-7941/+7702
Change-Id: I78f9815616f4fc3c14204339c5826f0ca7d0680e Reviewed-on: https://code.wireshark.org/review/4485 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05Add editor modelines; Adjust whitespace as needed.Bill Meier56-1557/+2284
Change-Id: I6e70c933ae61a97377235d67b2f6a1b3d67dc155 Reviewed-on: https://code.wireshark.org/review/4484 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05Reformat hfi entries; Add editor modelines; Adjust whitespace.Bill Meier2-323/+349
Change-Id: Iead53f92cc847d04c32f4a307d45f9748c49a69c Reviewed-on: https://code.wireshark.org/review/4483 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05packet-igap.c: Reformat hf[] entries; Add editor modelines.Bill Meier1-131/+170
Change-Id: I0ac4f2eb7f2b93aab864c6f43dee057774048165 Reviewed-on: https://code.wireshark.org/review/4482 Reviewed-by: Bill Meier <wmeier@newsguy.com>