aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2013-07-21Replace relative timestamp with reference frame number. Saves 16B per frame.Jakub Zawadzki42-138/+222
svn path=/trunk/; revision=50772
2013-07-21There are many types that eventually turn into "signed byte"; for callsGuy Harris1-1/+1
to g_strlcpy(), use the one of them that it's documented as using. svn path=/trunk/; revision=50771
2013-07-21- Whitespace changesJörg Mayer1-11/+11
- Add a missing continuation \ svn path=/trunk/; revision=50770
2013-07-21Add wmem queue 'implementation' by wrapping wmem_list and wmem_stack.Evan Huus7-11/+124
Also a bit of misc. refactoring of the stack while I was there, and doc tweaks. svn path=/trunk/; revision=50769
2013-07-21Remove unused variable, fix comparison to use double-equals.Evan Huus1-2/+2
svn path=/trunk/; revision=50768
2013-07-21Fix: epan.c:155: warning: assignment discards qualifiers from pointer target ↵Jakub Zawadzki1-1/+1
type svn path=/trunk/; revision=50767
2013-07-21Interpretation of 3gpp_feature_list depends on Application Id.Anders Broman1-13/+20
svn path=/trunk/; revision=50766
2013-07-21Add helper function to epan_session which can be used to get absolute ↵Jakub Zawadzki18-60/+172
timestamp of given frame. Remove ->prev_cap, for testing purpose also replace ->prev_dis with number of previously displayed frame number. This patch reduce size of frame_data by 8B (amd64) This is what (I think) was suggested by Guy in comment 13 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5821#c13) svn path=/trunk/; revision=50765
2013-07-21Commit missing file.Jakub Zawadzki1-0/+31
svn path=/trunk/; revision=50764
2013-07-21try to fix: epan.c:141: error: invalid application of 'sizeof' to incomplete ↵Jakub Zawadzki1-1/+1
type 'epan_t' svn path=/trunk/; revision=50763
2013-07-21Add ability to convert proto_tree_add_text to "expert" API. It's a little ↵Michael Mann1-98/+327
hacky because the first pass doesn't know that a proto_tree_add_text call will be converted into an expert API call, so there is some "field reappropriation" (but not enough to have a different field layout) in the .proto_tree_input file. svn path=/trunk/; revision=50762
2013-07-21Some work on multi file dissectionJakub Zawadzki19-65/+85
- make init_dissection/cleanup_dissection private for libwireshark - implement epan_new(), epan_free() - pass epan_t to epan_dissect* svn path=/trunk/; revision=50761
2013-07-21Try to generate an error when calling clang with an unknown compilerJörg Mayer1-6/+13
option. This behaviour changed in clang, see https://bugzilla.mozilla.org/show_bug.cgi?id=731316 svn path=/trunk/; revision=50760
2013-07-21Add option for echld builds (forgot that in a previous commit)Jörg Mayer1-0/+1
svn path=/trunk/; revision=50759
2013-07-21Add test binaries to .gitignoreJakub Zawadzki1-0/+2
svn path=/trunk/; revision=50758
2013-07-21FixJörg Mayer1-1/+1
/home/jmayer/work/wireshark/svn/trunk/epan/address_to_str.c:595:20: error: passing 'const guint8 *' (aka 'const unsigned char *') to parameter of type 'const gchar *' (aka 'const char *') converts between pointers to integer types with different sign [-Werror,-Wpointer-sign] g_strlcpy(buf, (const guint8 *)addr->data, buf_len); ^~~~~~~~~~~~~~~~~~~~~~~~~~ /usr/include/glib-2.0/glib/gstrfuncs.h:110:20: note: passing argument to parameter 'src' here const gchar *src, ^ svn path=/trunk/; revision=50756
2013-07-21Remove trailing whitespaceJörg Mayer1-14/+14
svn path=/trunk/; revision=50754
2013-07-21[Automatic manuf, services and enterprise-numbers update for 2013-07-21]Gerald Combs1-0/+50
svn path=/trunk/; revision=50753
2013-07-21More fixes for building echld with cmake (not yet finished)Jörg Mayer1-11/+24
svn path=/trunk/; revision=50752
2013-07-21Enable echld builds with cmake when building with ENABLE_ECHLD=ONJörg Mayer1-0/+4
svn path=/trunk/; revision=50751
2013-07-21Include config.h, not ../config.h, just like everywhere else.Jörg Mayer2-2/+2
svn path=/trunk/; revision=50750
2013-07-21Don't check for "APPLE" if what you really mean is "clang"Jörg Mayer1-1/+2
svn path=/trunk/; revision=50749
2013-07-21Turn modifier field into a value_string.Michael Mann1-58/+29
svn path=/trunk/; revision=50748
2013-07-21Don't report a syntax error if a preference name without a "." isGuy Harris1-13/+3
specified, report it as "no such preference" instead. That should be less confusing; see http://stackoverflow.com/questions/17757659/how-to-apply-and-override-preferences-with-tshark for an example of confusion. #BACKPORT 1.10, 1.8 svn path=/trunk/; revision=50745
2013-07-20Replace wmem slist (singly-linked) with wmem list (doubly-linked).Evan Huus11-249/+288
The overhead is not large, and it makes append much faster (O(1) vs O(n)). It also will make a queue easy to add, which I need for a dissector I'm writing... svn path=/trunk/; revision=50744
2013-07-20make proto_tree_add_text calls filterable through hfs and expert info.Michael Mann1-76/+64
svn path=/trunk/; revision=50743
2013-07-20GeoIP 1.5.1.Gerald Combs4-4/+5
svn path=/trunk/; revision=50742
2013-07-19Fix problems when expanding whole tree '*' / all subtree nodes <Shift>-RightJakub Zawadzki1-3/+1
Remove gtk_tree_view_collapse_row from check_expand_trees() svn path=/trunk/; revision=50741
2013-07-19Fix gtk warnings when clicking on some byte on byte pane.Jakub Zawadzki1-2/+2
When we don't have path don't check for subtrees. (Originally report by Jeff on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908#c17) XXX, we could create a path pointing on begin of tree - but do we want to do it? svn path=/trunk/; revision=50740
2013-07-19From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8942 :Pascal Quantin1-11/+7
Fix segmentation fault when reading pref file svn path=/trunk/; revision=50737
2013-07-18Fix the fuzz failure reported in ↵Jeff Morriss1-8/+10
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8941 : Storing 2 different structures on the fd proto_data (with the same key) isn't safe: use different keys to keep them separate. I do wonder if both are really necessary... This fix can be back-ported to trunk-1.10 but not trunk-1.8 (which lacks the key identifier for proto_data's). svn path=/trunk/; revision=50734
2013-07-18Cleanup hf_ variables so they can be identified as such. "Array" of hf items ↵Michael Mann1-369/+302
not necessary and prevents "check" scripts from fully working. Made ett array local to proto_register_pcep. All this for preparing to use convert_proto_tree_add_text (which I thought should be its own patch/revision) svn path=/trunk/; revision=50733
2013-07-18From Marko Hrastovec via ↵Jeff Morriss1-14/+42
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8926 : A better fix for this bug (as compared to r50532): this version takes into account the scaling factors. svn path=/trunk/; revision=50732
2013-07-18Add fencing for COL_INFO (which was the intent of the dissector until I ↵Michael Mann1-1/+2
accidentally removed it in rev 50730.) svn path=/trunk/; revision=50731
2013-07-18Make filterable items from proto_tree_add_text.Michael Mann1-55/+56
svn path=/trunk/; revision=50730
2013-07-18Fix memleak, base64_to_tvb() strdup passed string by its own.Jakub Zawadzki1-1/+1
svn path=/trunk/; revision=50729
2013-07-18Catch exceptions from AVP subdissectors in case the AVPs following the oneJeff Morriss1-19/+43
that threw the exception are OK--this allows us to view as much of the message as possible even when Wireshark doesn't like whatever was in a particular AVP. Instead of using the 'volatile' keyword to avoid variable-clobbering warnings, put the exception-catching code in its own function with no local variables. svn path=/trunk/; revision=50728
2013-07-18Fix copy/paste errorPascal Quantin1-1/+0
svn path=/trunk/; revision=50727
2013-07-18From Anders: add Verizon Wireless dictionaryPascal Quantin4-2/+15
svn path=/trunk/; revision=50726
2013-07-18Temporarily disable offending code triggering a segmentation fault on Linux ↵Pascal Quantin1-0/+2
(see bug 8942) svn path=/trunk/; revision=50725
2013-07-18Fix errors :Alexis La Goutte1-9/+9
prefs_dlg.c:1395:69: error: unused parameter ‘parent_w’ [-Werror=unused-parameter] prefs_dlg.c:1414:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror] prefs_dlg.c:1415:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror] prefs_dlg.c:1417:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror] prefs_dlg.c:1418:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror] prefs_dlg.c:1419:19: error: initialization discards ‘const’ qualifier from pointer target type [-Werror] prefs_dlg.c:1427:7: error: format not a string literal and no format arguments [-Werror=format-security] prefs_dlg.c:1432:7: error: format not a string literal and no format arguments [-Werror=format-security] svn path=/trunk/; revision=50724
2013-07-18Fix various errors found by checkAPI.pl and fix-encoding-args.pl scriptsPascal Quantin1-21/+21
svn path=/trunk/; revision=50723
2013-07-18Try to fix error: ignoring return value of 'fwrite', declared with attribute ↵Pascal Quantin1-3/+6
warn_unused_result svn path=/trunk/; revision=50722
2013-07-18Fix error: 'format' may be used uninitialized in this functionPascal Quantin1-1/+1
svn path=/trunk/; revision=50721
2013-07-18Try to fix 'old-style function definition' warningPascal Quantin1-1/+1
svn path=/trunk/; revision=50720
2013-07-18From Rupesh Patro:Anders Broman1-5/+328
Add dissection of MPLS Upstream Label Assignment for LDP [RFC 6389]. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8020 svn path=/trunk/; revision=50719
2013-07-18From Cal Turney:Anders Broman1-18/+26
Fix: If the FH length is not 32 or 40, the packet is decoded as "Unknown", a warning is displayed in Expert, and the rest of the packet is decoded. In addition, changed "Celerra" to "Celerra|VNX". https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8945 svn path=/trunk/; revision=50718
2013-07-18From Javier Godoy:Anders Broman1-32/+58
* Remove dissect_osd_list_collection and dissect LIST COLLECTION by calling dissect_osd_list. * Handle the few differences depending on the value of svcaction in extra data. * dissect_osd_collection_object_id now returns proto_item* instead of void. The following field was added: * hf_scsi_osd_list_collection_flags_coltn The following true_false_string array was added * list_coltn_tfs https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8944 svn path=/trunk/; revision=50717
2013-07-18From Cal Turney:Anders Broman5-36/+154
Unrecognized preferences and color filters created in proprietary or older versions are discarded when saved. If the user attempts to save the preferences or colorfilters file, a popup is displayed that warns that unrecognized prefs or color filters have been detected and will be discarded if the save operation is allowed to proceed. In the case of Preferences, the popup message includes the version at which the file was last saved. A "Continue without Saving" button is provided so that the user can save the profile under a different name. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8942 svn path=/trunk/; revision=50716
2013-07-18Fix:Anders Broman1-3/+0
packet-l2tp.c: In function 'dissect_l2tp_cisco_avps': packet-l2tp.c:1296: warning: unused variable 'pw_type' packet-l2tp.c: In function 'process_control_avps': packet-l2tp.c:1789: warning: unused variable 'pw_type' svn path=/trunk/; revision=50715