summaryrefslogtreecommitdiff
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2014-03-04Remove assertions from block allocator.Evan Huus1-30/+0
It has been extremely well-tested at this point, and is a very hot code path so the performance gain is measurable (~1-2% on most captures I tried). Change-Id: I2f5e03d2f348f56e740bf0dfbc83a4fd9cc8c5a9 Reviewed-on: https://code.wireshark.org/review/499 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04When dissecting GSM MAPv1/v2 messages, display opcode 44 or 46 as forwardSMPascal Quantin1-52/+56
Fixes bug 9829 Change-Id: Ib56bc7dc79ca27667fb89691817f6e568006d3a8 Reviewed-on: https://code.wireshark.org/review/494 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04cmake: Add missing exported_pdu dissectorMichal Labedzki1-0/+1
Change-Id: I9a6a91b11555e2b271b3d359f26bf97796d6742f Reviewed-on: https://code.wireshark.org/review/495 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04replace label_mark_truncated_start() with a macros that callsMartin Kaiser1-14/+9
label_mark_truncated() Change-Id: I7ede5f9776d26ebce2ccf427cf6ff5dec56814cd Reviewed-on: https://code.wireshark.org/review/465 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03Show ymsg.content as bytes; it's not a simple string.Guy Harris1-3/+3
The content of a YMSG message is a sequence of lines, each one of which contains a text string (in some ASCII-based encoding) for a key, a 0xc080 separator, and a text string (in some ASCII-based encoding) for a value. That's not a string in any ASCII-based encoding I know of - 0xc0 0x80 is not, for example, a valid UTF-8 sequence (it's a too-long sequence for NUL). This should fix bug 9832: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9832 by avoiding the general "GTK+ on Windows crashes when asked to copy something that's not valid UTF-8" problem. Fix some field descriptions while we're at it. Change-Id: I4084dabc89b0186ecd1a7329452ca2f1cb48f1c0 Reviewed-on: https://code.wireshark.org/review/488 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-03truncate UTF-8 strings only at the boundary between two charactersMartin Kaiser1-3/+14
Change-Id: Ib3ffc1593e877f4f7c708712b82209cf969cecff Reviewed-on: https://code.wireshark.org/review/464 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-03Create/use extended value_strings; add editor modelines as needed.Bill Meier5-255/+336
Change-Id: I36ebee937ddd1c5ccbfa36f284a4794bc63631dc Reviewed-on: https://code.wireshark.org/review/482 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03Move value_string defs from .h file; create/use extended value_string; Other ↵Bill Meier3-303/+324
minor changes. - Multiple value string arrays were defined in packet-fcels.h (which was included in two differnt .c files). Only one of the arrays was actually used in two different .c files. All the value_string arrays (and most of the #defines) moved to packet-fcels.c. - Other: Use -1 instead of tvb_length() for the length param of several proto_tree_add...() calls. Add editor modelines. Change-Id: Idc642caf1c8d62b658147a234d5560b8f2fd0630 Reviewed-on: https://code.wireshark.org/review/479 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03Create/use an extended value-string; Move value-string array from .h file; ↵Bill Meier2-268/+283
Do other misc. - Value string arrrays should never be defined in a .h file (especially one included in multiple .c files). So: a. The value_string array (and associated #defines) was moved from the .h file to packet-rtp_events.c b. A public extended value_string was created in packet-rtp_events.c and declared as external in packet-rtp_events.h - Other: Remove a few unneeded initializers; Add editor modelines. Change-Id: Ib580c3e50ab5ce79484c9c6af57f62ca604b57d1 Reviewed-on: https://code.wireshark.org/review/468 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03Create/use several extended value-strings; Do several other small changes.Bill Meier1-26/+40
- Move setting COL_PROTO & clearing COL_INFO to before a tvb fetch which could cause an exception; - Remove some unneeded initializers; - Fix up some long-lines and whitespace; - Use a consistent indentation; - Add editor modelines. Change-Id: I8a8015a65d5dc581ed02cbd134231481b9f96263 Reviewed-on: https://code.wireshark.org/review/467 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03Create/use an extended value_string; Do other misc minor changes.Bill Meier1-235/+249
- Localize some vars; - Use a consisten 4-space indentation & whitespace style; - Add editor modelines; Change-Id: I0d6270eea3fae804788a56557d3c7e171afa8aaa Reviewed-on: https://code.wireshark.org/review/466 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03SSL: dynamically allocate session ticket storage area to avoid buffer overflowPascal Quantin3-2/+5
Fixes bug 9825 Change-Id: I20ae65331ec11b2f6774054df4c026fd5fa76d3a Reviewed-on: https://code.wireshark.org/review/447 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-03show if the current service is scrambled or freeMartin Kaiser1-2/+13
Change-Id: I9e50920fbc09fdf0650be3a63fee8153ce0fd3df Reviewed-on: https://code.wireshark.org/review/462 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03add cleartext values for retention limitMartin Kaiser1-4/+19
Change-Id: I8ecfdb1c366310d224660e89c99136a0a9f4a067 Reviewed-on: https://code.wireshark.org/review/461 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03move URI dissection to a separate functionMartin Kaiser1-29/+49
Change-Id: Ia1db91ef9344e46a3f32204bbf9cdbcc514980ce Reviewed-on: https://code.wireshark.org/review/460 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03use tvb_memdup() instead of tvb_get_ptr()Martin Kaiser1-1/+1
Change-Id: I1e9ff715c3e315c9e36abb69fb5f441b71477501 Reviewed-on: https://code.wireshark.org/review/459 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03remove unnecessary if (tree) checkMartin Kaiser1-12/+10
Change-Id: I1542d715594b1b90e2442edb6f220ddc4dd99675 Reviewed-on: https://code.wireshark.org/review/458 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03skip empty service provider name and empty service nameMartin Kaiser1-11/+15
Change-Id: I355600320865a9c7c17093d37fc693b02f0a7f0c Reviewed-on: https://code.wireshark.org/review/457 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03service provider name is a DVB-SI stringMartin Kaiser1-2/+12
Change-Id: Idea44f0e4678f738336215f4a250b9e9d9a60fbc Reviewed-on: https://code.wireshark.org/review/456 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03service name is a DVB-SI stringMartin Kaiser1-3/+15
Change-Id: I81ef4cd363acf6cff99fd0f75b135962c4c22f53 Reviewed-on: https://code.wireshark.org/review/455 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-02Don't pass an invalid length to proto_item_set_lenEvan Huus1-1/+2
Fixes bug #9818. Change-Id: I4fb4cf2b5b31ed6efc55a48df67f2ec4949d47c3 Reviewed-on: https://code.wireshark.org/review/442 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-02Improve SCTP association lookup.Evan Huus1-5/+5
It's still O(n) in the worst case since the comparison function doesn't appear to be suitable for use in a tree or hash-table, but at least we no longer spend O(n) by default just finding the end of the list so we can iterate backwards. Discovered while investigating bug #9823, but probably not the cause of that bug. Change-Id: Ib6c3691cff8e7fa49703df7c75635ef797c8fbe8 Reviewed-on: https://code.wireshark.org/review/443 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-02Remove unneeded line of code.Bill Meier1-2/+0
Change-Id: Ic2769d5c125d8db7d32b6ad3ab0e4363f513f599 Reviewed-on: https://code.wireshark.org/review/451 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02Clear INFO column at the beginning of the dissector.Bill Meier1-6/+6
Change-Id: Iea901674e1d9c4745b891ac4330bd781d5eb76ec Reviewed-on: https://code.wireshark.org/review/450 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02tvb_length() --> tvb_reported_length() in several cases + other misc changes.Bill Meier1-256/+265
Misc changes: - sort entries in an enum by value; - add some XXX notes as to possible missing entries in a value-string array; - remove an unneeded initializer; - 0 --> FALSE for several boolean values; - whitespace. Change-Id: I6c8f1c1f37edad120d979fcd2d7278e7981ca5a7 Reviewed-on: https://code.wireshark.org/review/449 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02Clear INFO col; Create/use extended value-string; Do other minor changesBill Meier1-1214/+1222
- val_to_str() -> val_to_str_const() in a few cases; - localize some vars; - remove some unneeded initializers; - convert "4 space tabs" indentation to "4 spaces"; revise editor modelines to match; - do some whitespace changes. Change-Id: Ic91df02022971c973b27c71e6127395ed3ef06d3 Reviewed-on: https://code.wireshark.org/review/448 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02[Automatic manuf, services and enterprise-numbers update for 2014-03-02]Gerald Combs1-1/+149
Change-Id: Ie382028102569030ac00084125a26d49a05432b9 Reviewed-on: https://code.wireshark.org/review/444 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-02Fix packet-h223.c:842:18: error: will never be executed ↵Alexis La Goutte1-4/+4
[-Werror,-Wunreachable-code] Change-Id: I8255a3841add78eaa167ef631effe58d9fb12736 Reviewed-on: https://code.wireshark.org/review/323 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-01Create/use two extended value-strings & do other minor changes.Bill Meier1-187/+138
- Use VALUE_STRING_ENUM/VALUE_STRING_ARRAY macros to create one of the value string arrays instead of using the usual separate #defines & array definition; - Remove a few unneeded initializers; - prefs_register_protocol() need not be called under 'if (gp_zbee_prefs == NULL)' - Do some minor whitespace changes; - Add editor modelines. Change-Id: I33669b25fa18ecc452b83a0d88a6c0b33aae904a Reviewed-on: https://code.wireshark.org/review/441 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-01Add the PPID for 3GPP Pua. Move the (unregistered) M2TP PPID into that ↵Jeff Morriss2-8/+9
dissector. Also put a note in sctpppids.h saying that only IANA-registered PPIDs should go in that file. Inspired by the rejection of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4332 Change-Id: I763aad7d1b69e9d36c798061473438ce3cb66ca1 Reviewed-on: https://code.wireshark.org/review/434 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Anders Broman <a.broman58@gmail.com>
2014-03-01Fix some scan-build warnings.Gerald Combs1-1/+1
Fix a modeline while we're at it. Change-Id: Ief6d5edbe33456170059cfab4f436f0844de32a1 Reviewed-on: https://code.wireshark.org/review/440 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-03-01GlusterFS: add support for ZEROFILL fopNiels de Vos2-6/+30
Implementation details in http://review.gluster.org/5327 BUG: 9812 Change-Id: Ib1650fb7ca8221def4e9c6a323008847dc7b5f62 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: https://code.wireshark.org/review/429 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-01Disable IPv4 checksum verfification to match TCP and UDP.Gerald Combs1-1/+1
Offloading seems to be very common nowadays and having this option enabled by default generates a lot of false positives. Suggested by Laura Chappell. Change-Id: I285f218efb3c9f164d8ad7a6d6de8270e442ffff Reviewed-on: https://code.wireshark.org/review/426 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-28Fix bug which (somewhat) randomly caused UAT pref to not display on a proto ↵Bill Meier1-0/+1
pref page. Introduced in ga2b2dd4b (SVN #53880) Change-Id: I3dd24ab5e1b45367b03b8096a5892f346782217f Reviewed-on: https://code.wireshark.org/review/433 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-28packet-homeplug-av: use HOMEPLUG_AV_MMVER_1_1 consistentlyFlorian Fainelli1-7/+7
The HomePlug AV dissector was not consistently using the HOMEPLUG_AV_MMVER_1_1 constant and was sometimes using it and sometimes using mmver == 1 directly. Make sure we use that constant throughout the code to help clarifiying which version tests are applying to. Change-Id: I602413163e4e44dedfbf3e2364448a951fa70f54 Signed-off-by: Florian Fainelli <florian@openwrt.org> Reviewed-on: https://code.wireshark.org/review/428 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-28packet-homeplug-av: fix missing reserved byte for station dumpFlorian Fainelli1-1/+1
dissect_homeplug_av_nw_info_sta() was processing stations information correctly, except that after the first station dump, all dumps would be off-by-one byte because we were not reserving a missing byte at the end of the station dump. Fixes #9798. Change-Id: Iff3afd5ff536ae718fa446de3c59cd5e9851ff20 Signed-off-by: Florian Fainelli <florian@openwrt.org> Reviewed-on: https://code.wireshark.org/review/427 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-27Fix build with recent lua changes.Evan Huus2-13/+13
Use FT_NONE instead of 0 to initialize an enum. Drop use of lround/llround since they are not available on Windows. Change-Id: I3961c1921304bafc090c763f0d6de8532f0b3510 Reviewed-on: https://code.wireshark.org/review/425 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-27Fix prefs.c: Argument with 'nonnull' attribute passed null (redux)Hadriel Kaplan1-10/+15
Change-Id: I795df36039278283008132d647aaf51e76dbe218 Reviewed-on: https://code.wireshark.org/review/424 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-27Fix coverity warnings for all wslua files. (redux)Hadriel Kaplan14-171/+383
This fixes/addresses all the coverity warnings shown by the buildbots. (I hope) Change-Id: Ic2722df97c577d274e3cf3f0cbdca1902edde047 Reviewed-on: https://code.wireshark.org/review/423 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-02-27Ensure ieee802154_packet struct is initialized.Evan Huus1-1/+1
A malformed capture could cause the zbee-nwk-gp and 6lowpan heuristics to be called with an incompletely-initialized structure, leading to valgrind errors. Change-Id: Iaea6daecdca6856466b58071f095930e68c6e159 Closes-Bug: #9735 Reviewed-on: https://code.wireshark.org/review/418 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-27Sherman, set the Wayback Machine for 1997.Guy Harris1-1/+1
The URLs for the CRC-10 code are dead; use Wayback Machine URLs. Change-Id: I3924e9cabb3b49b0e1abb31fbffa9b89f95cd0ce Reviewed-on: https://code.wireshark.org/review/419 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26Document tvb_memdup() in more detail.Guy Harris1-4/+15
Change-Id: Iec94342b7d033fb6e8597bbffea563128182316b Reviewed-on: https://code.wireshark.org/review/417 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26Regularize the formatting of some comments.Guy Harris1-5/+4
Change-Id: I1009c75d5a4f074767dbc3600e7a6edfd0031460 Reviewed-on: https://code.wireshark.org/review/416 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26Fix a copy-and-pasteo.Guy Harris1-2/+2
Change-Id: Ied8830e2e7a689197870a4d839fd08b36546c75f Reviewed-on: https://code.wireshark.org/review/414 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26Some g_free() -> wmem_free() changes missed in earlier checkins.Guy Harris1-2/+2
Change-Id: I5858e0ee8fc8584b35145c943e19e8e5f7dba77c Reviewed-on: https://code.wireshark.org/review/413 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26More tvbuff API deprecation, comment expansion, and documentation updates.Guy Harris2-43/+80
Do with tvb_get_stringz() what was done with tvb_get_string(). Redo the comments for the string get routines to try to give more detail in a fashion that's a bit less hard to read. Warn, in comments, of the problems with using tvb_get_string()/tvb_get_stringz() (i.e., if your strings are non-ASCII, all bytes with the 8th bit set are going be replaced by the Unicode REPLACEMENT CHARACTER, and displayed as such). Warn, in a comment, of the problems with tvb_get_const_stringz() (i.e., it gives you raw bytes, rather than guaranteed-to-be-valid UTF-8). Update documentation and release notes appropriately. Change-Id: Ibd3efb92a203861f507ce71bc8d04d19d9d38a93 Reviewed-on: https://code.wireshark.org/review/327 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-02-26Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate ↵Bill Meier64-309/+309
dissectors. Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4 Reviewed-on: https://code.wireshark.org/review/412 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-26Create/use an extended value_string.Bill Meier1-4/+5
Change-Id: I1cd20d68ebb50d11ecfa00bf76e9be7c47a45860 Reviewed-on: https://code.wireshark.org/review/410 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-26(Minor) Use col_add_str() iso col_set_str().Bill Meier2-5/+6
Change-Id: I3d430e7e6a6bbdcb518f0110bd81ab32f88c17f0 Reviewed-on: https://code.wireshark.org/review/409 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-26Create/use some extended value-strings. Do some whitespace changes.Bill Meier1-179/+182
Change-Id: Iee5cb12d3b6669c7e45e18352ebcd151db721ad3 Reviewed-on: https://code.wireshark.org/review/408 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>