Commit Graph

47672 Commits

Author SHA1 Message Date
Guy Harris 39518faa36 Squelch uninitialized variable warning.
svn path=/trunk/; revision=50782
2013-07-22 05:51:51 +00:00
Michael Mann cf4e08bdf2 fix "compiler errors"
Add better support for IP field detection.

svn path=/trunk/; revision=50781
2013-07-22 01:56:35 +00:00
Michael Mann c131f9a074 Make items more filterable
Apply consistent whitespace.
Remove unnecessary string.h

svn path=/trunk/; revision=50780
2013-07-22 00:39:30 +00:00
Evan Huus 60e25a2080 Commit real kafka dissector this time.
svn path=/trunk/; revision=50779
2013-07-22 00:12:42 +00:00
Evan Huus 76abdbc1cc Remove kafka dissector, accidentally committed symlink instead of real file.
svn path=/trunk/; revision=50778
2013-07-22 00:11:57 +00:00
Evan Huus fb6c9c3387 Skeleton dissector for Apache Kafka's new protocol:
https://cwiki.apache.org/confluence/display/KAFKA/A+Guide+To+The+Kafka+Protocol

All the core request/response matching necessary to actually decode is done, and
helpers exist for the common Kafka data types. Now it just remains to fill in
the rest of the fields.

svn path=/trunk/; revision=50777
2013-07-22 00:08:25 +00:00
Evan Huus d43eaa76cc Update rtp_player for rel_ts move.
svn path=/trunk/; revision=50776
2013-07-21 23:31:46 +00:00
Evan Huus ad42fced15 Fix file.c:112:1: error: ‘static’ is not at beginning of declaration
[-Werror=old-style-declaration]

svn path=/trunk/; revision=50775
2013-07-21 23:30:10 +00:00
Jakub Zawadzki 1a1360c2e1 Update plugins/ with recent change.
svn path=/trunk/; revision=50774
2013-07-21 23:26:07 +00:00
Jakub Zawadzki e7d733b31b Fix error when compiled with --enable-packet-editor
svn path=/trunk/; revision=50773
2013-07-21 23:14:57 +00:00
Jakub Zawadzki c702e92121 Replace relative timestamp with reference frame number. Saves 16B per frame.
svn path=/trunk/; revision=50772
2013-07-21 23:07:33 +00:00
Guy Harris 74b6c59499 There are many types that eventually turn into "signed byte"; for calls
to g_strlcpy(), use the one of them that it's documented as using.

svn path=/trunk/; revision=50771
2013-07-21 22:01:22 +00:00
Jörg Mayer 0177ef4970 - Whitespace changes
- Add a missing continuation \

svn path=/trunk/; revision=50770
2013-07-21 21:17:35 +00:00
Evan Huus 037fc022da Add wmem queue 'implementation' by wrapping wmem_list and wmem_stack.
Also a bit of misc. refactoring of the stack while I was there, and doc tweaks.

svn path=/trunk/; revision=50769
2013-07-21 21:13:30 +00:00
Evan Huus 9e1b53539a Remove unused variable, fix comparison to use double-equals.
svn path=/trunk/; revision=50768
2013-07-21 21:10:13 +00:00
Jakub Zawadzki 5df324921d Fix: epan.c:155: warning: assignment discards qualifiers from pointer target type
svn path=/trunk/; revision=50767
2013-07-21 21:04:25 +00:00
Anders Broman df9bbb93a3 Interpretation of 3gpp_feature_list depends on Application Id.
svn path=/trunk/; revision=50766
2013-07-21 20:58:37 +00:00
Jakub Zawadzki 5d52e16734 Add helper function to epan_session which can be used to get absolute 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-21 20:48:30 +00:00
Jakub Zawadzki a66a717d46 Commit missing file.
svn path=/trunk/; revision=50764
2013-07-21 19:21:51 +00:00
Jakub Zawadzki 265dbadb68 try to fix: epan.c:141: error: invalid application of 'sizeof' to incomplete type 'epan_t'
svn path=/trunk/; revision=50763
2013-07-21 19:08:11 +00:00
Michael Mann 2e5561d9c5 Add ability to convert proto_tree_add_text to "expert" API. It's a little 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-21 19:03:36 +00:00
Jakub Zawadzki 28e9dcc4a9 Some work on multi file dissection
- 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-21 18:38:03 +00:00
Jörg Mayer 9e7b6f1a69 Try to generate an error when calling clang with an unknown compiler
option. This behaviour changed in clang, see
https://bugzilla.mozilla.org/show_bug.cgi?id=731316

svn path=/trunk/; revision=50760
2013-07-21 18:12:20 +00:00
Jörg Mayer f506b45c32 Add option for echld builds (forgot that in a previous commit)
svn path=/trunk/; revision=50759
2013-07-21 18:10:30 +00:00
Jakub Zawadzki 6eafdc3610 Add test binaries to .gitignore
svn path=/trunk/; revision=50758
2013-07-21 17:36:35 +00:00
Jörg Mayer 270cf97b25 Fix
/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-21 14:28:08 +00:00
Jörg Mayer 61f57ac30e Remove trailing whitespace
svn path=/trunk/; revision=50754
2013-07-21 14:05:04 +00:00
Gerald Combs 3d6d5d1e6e [Automatic manuf, services and enterprise-numbers update for 2013-07-21]
svn path=/trunk/; revision=50753
2013-07-21 14:03:34 +00:00
Jörg Mayer 94aa66e642 More fixes for building echld with cmake (not yet finished)
svn path=/trunk/; revision=50752
2013-07-21 13:40:08 +00:00
Jörg Mayer df397b4f63 Enable echld builds with cmake when building with ENABLE_ECHLD=ON
svn path=/trunk/; revision=50751
2013-07-21 13:34:50 +00:00
Jörg Mayer 94bdbd2e1e Include config.h, not ../config.h, just like everywhere else.
svn path=/trunk/; revision=50750
2013-07-21 13:25:35 +00:00
Jörg Mayer f3f910a5cf Don't check for "APPLE" if what you really mean is "clang"
svn path=/trunk/; revision=50749
2013-07-21 12:53:51 +00:00
Michael Mann f1866064c3 Turn modifier field into a value_string.
svn path=/trunk/; revision=50748
2013-07-21 01:35:45 +00:00
Guy Harris 21609c54bb Don't report a syntax error if a preference name without a "." is
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-21 00:56:42 +00:00
Evan Huus 6635f5ef67 Replace wmem slist (singly-linked) with wmem list (doubly-linked).
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-20 20:33:38 +00:00
Michael Mann 19726260f1 make proto_tree_add_text calls filterable through hfs and expert info.
svn path=/trunk/; revision=50743
2013-07-20 02:33:34 +00:00
Gerald Combs a692824160 GeoIP 1.5.1.
svn path=/trunk/; revision=50742
2013-07-20 01:01:55 +00:00
Jakub Zawadzki a1a96706d5 Fix problems when expanding whole tree '*' / all subtree nodes <Shift>-Right
Remove gtk_tree_view_collapse_row from check_expand_trees()

svn path=/trunk/; revision=50741
2013-07-19 17:51:05 +00:00
Jakub Zawadzki acdfb0eca6 Fix gtk warnings when clicking on some byte on byte pane.
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-19 17:31:32 +00:00
Pascal Quantin 57aebcf776 From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8942 :
Fix segmentation fault when reading pref file

svn path=/trunk/; revision=50737
2013-07-19 08:04:58 +00:00
Jeff Morriss 23d9a348a1 Fix the fuzz failure reported in 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-18 23:34:48 +00:00
Michael Mann a0606ce0b2 Cleanup hf_ variables so they can be identified as such. "Array" of hf items 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-18 20:13:42 +00:00
Jeff Morriss 38c4986b4b From Marko Hrastovec via 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-18 20:11:55 +00:00
Michael Mann b5cf7e1601 Add fencing for COL_INFO (which was the intent of the dissector until I accidentally removed it in rev 50730.)
svn path=/trunk/; revision=50731
2013-07-18 18:19:03 +00:00
Michael Mann ce4c06a47b Make filterable items from proto_tree_add_text.
svn path=/trunk/; revision=50730
2013-07-18 18:10:59 +00:00
Jakub Zawadzki c850c0bfc8 Fix memleak, base64_to_tvb() strdup passed string by its own.
svn path=/trunk/; revision=50729
2013-07-18 17:31:34 +00:00
Jeff Morriss 7d76eb0ad3 Catch exceptions from AVP subdissectors in case the AVPs following the one
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-18 15:08:15 +00:00
Pascal Quantin 6dd1cb7f8e Fix copy/paste error
svn path=/trunk/; revision=50727
2013-07-18 09:32:36 +00:00
Pascal Quantin d64dbd371b From Anders: add Verizon Wireless dictionary
svn path=/trunk/; revision=50726
2013-07-18 09:27:10 +00:00
Pascal Quantin fdc867a4fc Temporarily disable offending code triggering a segmentation fault on Linux (see bug 8942)
svn path=/trunk/; revision=50725
2013-07-18 09:12:59 +00:00