Commit Graph

47173 Commits

Author SHA1 Message Date
Michael Mann e5af2f55ee Separate IP option header fields for each dissector that uses dissect_ip_tcp_options(). Bug 8823 (
svn path=/trunk/; revision=50230
2013-06-29 19:59:08 +00:00
Evan Huus 04f8906be3 From Fabio Tarabelloni via

Zigbee dissectors for the power profile cluster and the appliance control

svn path=/trunk/; revision=50229
2013-06-29 15:57:44 +00:00
Michael Mann 7c72e1c5ce Improvements for the KDSP dissector. Bug 8864 (
From Yuri Schaeffer

It addresses the following issues:

- Payload was included for all CAPPACKET messages. Even when not flagged by bitmap (bug).
- Frame Checksum (FCS) was not read from bitmap all following data is off by 4. (bug)
- Headers indicated in bitmap could use own subtree
- Payload is malformed because it is assumed the span 'the rest of the packet'. In reality more commands can follow. (bug)

svn path=/trunk/; revision=50228
2013-06-29 02:54:58 +00:00
Luis Ontanon a3c320fd75 One further iteration, get things right, put placeholders for things to do.
svn path=/trunk/; revision=50227
2013-06-29 01:16:48 +00:00
Evan Huus 487ff8806d Callers to dissect_ndr_* functions expect pdata to be initialized on return from
the function, so make sure it is even in error conditions and other anomaly
cases. Fixes the valgrind errors with the capture from

svn path=/trunk/; revision=50226
2013-06-28 23:54:53 +00:00
Guy Harris 67f849fcbc Rename octet_to_hex() to low_nibble_of_octet_to_hex() to indicate what
it actually does (it takes the low-order nibble of an octet and returns
a single character).

Cast away some warnings.

svn path=/trunk/; revision=50225
2013-06-28 22:52:24 +00:00
Guy Harris 882db1c5fb Squelch a warning.
Rename the "is_int" argument to fill_label_number() to make it clearer
what it indicates, i.e. whether the number is signed or unsigned.

svn path=/trunk/; revision=50224
2013-06-28 22:47:50 +00:00
Jakub Zawadzki 832745df70 Use octet_to_hex() in another place.
svn path=/trunk/; revision=50223
2013-06-28 22:29:08 +00:00
Guy Harris 70075fa70f Rename AC_WIRESHARK_GCC_CFLAGS_CHECK to
AC_WIRESHARK_COMPILER_FLAGS_CHECK, because it doesn't just affect CFLAGS
and it doesn't just affect the flags for GCC.

svn path=/trunk/; revision=50222
2013-06-28 22:00:52 +00:00
Guy Harris eea87ac6e7 Change formatting in the hopes of making the code a bit easier to figure
out, and update a comment.

svn path=/trunk/; revision=50221
2013-06-28 21:51:31 +00:00
Jakub Zawadzki d0c862bfa6 Merge fill_label_[u]int to fill_label_number, hfinfo_[u]int_value_format to hfinfo_number_value_format
svn path=/trunk/; revision=50220
2013-06-28 21:46:41 +00:00
Guy Harris 623cca3634 When checking whether a given option should be added to the compiler
flags, if the option should be added to the flags for both C and C++,
test both the C and C++ compilers and, if the answers are different,
print a warning; the user might have (intentionally or unintentionally)
selected mismatched compilers, e.g. clang and g++ on OS X.

svn path=/trunk/; revision=50219
2013-06-28 21:38:51 +00:00
Luis Ontanon cf647de6a1 MS: new child
MS: ping child
MS: set/get child parameter

svn path=/trunk/; revision=50218
2013-06-28 21:10:52 +00:00
Jakub Zawadzki 8ccfc17cf2 Merge _hfinfo_int_value_format and _hfinfo_uint_value_format to one function hfinfo_number_vals_format
In hfinfo_number_vals_format check how hf should be formatted.

svn path=/trunk/; revision=50217
2013-06-28 19:54:04 +00:00
Jakub Zawadzki eecbadecf4 #micro-optimization, remove g_snprintf()'s from _hfinfo_[u]int_value_format with some new fresh replacements.
svn path=/trunk/; revision=50216
2013-06-28 19:34:48 +00:00
Guy Harris c0fa736323 Do the "is $CXX actually a C++ compiler" test as early as possible, so
that it doesn't fail due to the C++ compiler not supporting -W options
that the C compiler does.

(We should fix that, too, by having separate checks for whether the C
and C++ compilers support particular options.)

svn path=/trunk/; revision=50215
2013-06-28 19:34:35 +00:00
Pascal Quantin b5187b496b Use newly assigned DLT for PDU export functionality
svn path=/trunk/; revision=50212
2013-06-28 13:05:12 +00:00
Jeff Morriss 8d29106ffb From Dirk via :
The attached patch fixes the integer type of the WCCP identity mask value.
This is a bitmask which should be printed as hex, it doesn't make sense to
print it as an IPv4 address. See section 5.7.7 and
the attached capture file as an example.

The current draft
doesn't mention "mask" in the names of the field any more, but the description
still describes them as mask values.

svn path=/trunk/; revision=50211
2013-06-28 13:04:01 +00:00
Jeff Morriss 0d75d64949 From Lorand Jakab via :
The I and R flags in Map-Notify LISP control packets are shown at an incorrect
position.  The attached patch fixes the bug.

svn path=/trunk/; revision=50210
2013-06-28 12:52:19 +00:00
Michael Mann c1ddd6046d replace object_identifier_id with actx->external.direct_reference
svn path=/trunk/; revision=50209
2013-06-28 12:52:13 +00:00
Michael Mann 9009944d51 Remove all global variables in P1 dissector. Bug 8515 (
Added a "subtree context" structure to asn1_ctx_t. This should allow other ASN.1 dissector global variables to be replaced when only used for transferring data between fields in a subtree.

svn path=/trunk/; revision=50208
2013-06-28 12:43:29 +00:00
Jeff Morriss c29fb44886 From Niels de Vos via :
Recent versions of GlusterFS have extended the RPC protocol with new
procedures. The RPC-program-version has not been updated (yet?).

The attached adds support dissecting the FREMOVEXATTR, FALLOCATE and
DISCARD procedures.

svn path=/trunk/; revision=50207
2013-06-28 12:42:41 +00:00
Jeff Morriss 8c826964bf Standard C++ header files don't have .h in their name: #include <iostream>
rather than #include <iostream.h>.

Also reference cout as std::cout in the test program.

svn path=/trunk/; revision=50206
2013-06-28 12:18:03 +00:00
Guy Harris 9a09ef907a AC_LANG_PROGRAM's second argument is put inside "int main(){"/"}" by the
macro, and mustn't include that itself.

svn path=/trunk/; revision=50205
2013-06-28 09:59:19 +00:00
Guy Harris fd5281c763 AC_PROG_CXX doesn't actually check whether what it finds is a real live
C++ compiler (it might not be one on, for example, OS X, due to "cc"
being a C compiler, "CC" referring to "cc" due to the case-insensitivity
of the default OS X file system, and "CC" being one of the names checked
for in AC_PROG_CXX), so if we really need a C++ compiler, test it with a
program that a C compiler won't compile.

svn path=/trunk/; revision=50204
2013-06-28 08:36:35 +00:00
Michael Mann 277aed869e Make colors used by colorize_filter_te_as_* as preferences. Bug 5413 (
svn path=/trunk/; revision=50203
2013-06-28 03:03:36 +00:00
Evan Huus 10918860b6 From Fabio Tarabelloni via

More zigbee dissection, adding the following clusters:
- appliance identification
- meter identification
- appliance statistics
- appliance events and alert

svn path=/trunk/; revision=50202
2013-06-28 01:47:18 +00:00
Guy Harris ca9122bfec Suppress "Of *COURSE* you're developing a Mac-only application - you're
on a Mac, right?  So of *COURSE* you want to use our shiny new frameworks
rather than those ugly old open-source multi-platform libraries, right?"

svn path=/trunk/; revision=50200
2013-06-27 23:11:05 +00:00
Jakub Zawadzki 4504ed0bcc use hf_try_val_to_str() in two more places.
svn path=/trunk/; revision=50199
2013-06-27 22:26:34 +00:00
Luis Ontanon 24a5467228 Propagate the main_window_update change of few commits ago into the qt client

svn path=/trunk/; revision=50198
2013-06-27 19:24:39 +00:00
Jakub Zawadzki ac3f0d7483 cleanup [u]int fill proto with value_string function
Create generic int/uint fill functions from hfinfo_[u]int_value_format.

XXX: to be honest I don't get it why if dev picked up BASE_DEC_HEX and has value string we're truncating it to BASE_DEC...

svn path=/trunk/; revision=50197
2013-06-27 19:17:22 +00:00
Guy Harris b7a3865c91 Actually, that's not a clang bug; my test case had a typo. It's still a
case where clang is complaining about code that's OK, it's just not OK
in a way that lets clang determine that it is.

svn path=/trunk/; revision=50196
2013-06-27 19:14:41 +00:00
Luis Ontanon 99013aefa8 MS: list interfaces!
svn path=/trunk/; revision=50195
2013-06-27 19:00:01 +00:00
Jeff Morriss 16fc2c5998 Remove a no-longer-used variable.
svn path=/trunk/; revision=50194
2013-06-27 18:44:11 +00:00
Jakub Zawadzki c36a384b25 cleanup int/uint fill proto functions.
- hfinfo_uint_value_format(), hfinfo_int_value_format() formats value instead of returning proper format
- remove hfinfo_int_format(), hfinfo_uint_format

svn path=/trunk/; revision=50193
2013-06-27 18:40:08 +00:00
Luis Ontanon 7f5d688bda Windows changes for main_window_update ....
svn path=/trunk/; revision=50192
2013-06-27 17:45:07 +00:00
Luis Ontanon c780d97411 forgot from the las commit...
svn path=/trunk/; revision=50191
2013-06-27 17:27:41 +00:00
Jakub Zawadzki 3f5665a6b1 Add functions hf_try_val_to_str[_const]
svn path=/trunk/; revision=50190
2013-06-27 17:26:23 +00:00
Jakub Zawadzki 1895c1c5a0 cleanup, use packet_list_iter_nth_child() in another place.
svn path=/trunk/; revision=50189
2013-06-27 17:12:23 +00:00
Luis Ontanon 0bdc0efc46 get main_window_update out of the way... pass an update_cb to the capture_sync stuff
... as per the XXX comment removed from tshark.c this was a mess to keep the linker
happy... I couldn't!

I did this without even understanding whether calling main_window_update was realy
necessary in most cases. I guess nothing or more specific update cbs would be best.

svn path=/trunk/; revision=50188
2013-06-27 17:10:50 +00:00
Guy Harris b450609a55 For now, don't turn on -Wcast-align by default. There are at least some
bugs it points out that probably mean the code won't work on machines
that require alignment (e.g., SPARC machines), but we'll turn it on once
we fix them.  (clang is fussier than GCC about this.)

svn path=/trunk/; revision=50187
2013-06-27 10:35:06 +00:00
Guy Harris f3f156073b Don't assume the system include files are under /usr/include; trick the
compiler into saying where they are, and use that.

Patch a bug in PortAudio pa_stable_v19_20111121 that clang found.

svn path=/trunk/; revision=50186
2013-06-27 10:30:33 +00:00
Pascal Quantin 9334a49cb1 Fix :
Do not assume that we must have at least 1 character present before \r\n

svn path=/trunk/; revision=50185
2013-06-27 10:17:39 +00:00
Evan Huus 31bd48bce3 *sigh*
From the comment above wmem_tree_insert32_array():
 * If you use ...32_array() calls you MUST make sure that every single node
 * you add to a specific tree always has a key of exactly the same number of
 * keylen words or things will most likely crash. Or at least that every single
 * item that sits behind the same top level node always have exactly the same
 * number of words.

So clearly generating thousands of keys with random lengths while testing is
going to cause problems. Generate a set of random lengths, then use those
lengths consistently (but still generating random keys of those lengths).

Should hopefully fix the intermittent build-bot failures.

(unfortunately this does not manifest nicely, and I cannot see an easy way to
assert it so that we catch other people trying to use different-length key

svn path=/trunk/; revision=50184
2013-06-27 03:44:48 +00:00
Luis Ontanon e48b0084e1 MS: Pong from the dispatcher!
svn path=/trunk/; revision=50183
2013-06-27 03:41:48 +00:00
Evan Huus ffe6d9c4d6 Misc little cleanups to wmem tree (comments, whitespace, assertions)
svn path=/trunk/; revision=50182
2013-06-27 03:01:53 +00:00
Evan Huus 32f4010527 Remove debugging lines from wmem_test, I think I've figured out the problem.
svn path=/trunk/; revision=50181
2013-06-27 03:00:33 +00:00
Michael Mann 11cc4642a3 From Audric Schiltknecht, bug 8521 (
According to ETSI TS 102 771 (GSE implementation guidelines), "mandatory extension headers" - when GSE's protocol type field is (strictly) less than 256 (0x100) - are of 'pre-defined length (and format) that must be known by all GSE receivers'.

svn path=/trunk/; revision=50180
2013-06-27 02:34:57 +00:00
Michael Mann 9672f3d6a4 Bugfix implementation of RFC 4379. Reported through bug 8835 (
svn path=/trunk/; revision=50179
2013-06-27 01:15:24 +00:00
Guy Harris 04cc1e2fb5 Don't assume that compilers not named "clang" will, by default, report
an error, or not issue warnings, by default if you give them an unknown
-f flag.  Instead, test that flag with all compilers, and use -Werror to
force it to error out.

As with C/C++ flags, so with C++-only flags.

svn path=/trunk/; revision=50178
2013-06-27 00:45:39 +00:00