Commit Graph

66 Commits

Author SHA1 Message Date
Michael Mann c70b1a548b Convert proto_tree_add_int_format calls to proto_tree_add_int_format_value where appropriate.
svn path=/trunk/; revision=52301
2013-09-30 16:10:40 +00:00
Michael Mann 47bca84efb Convert proto_tree_add_double_format calls to proto_tree_add_double_format_value where appropriate.
svn path=/trunk/; revision=52298
2013-09-30 15:42:18 +00:00
Michael Mann e6f1bd9056 Convert several proto_tree_add_bytes_format calls to proto_tree_add_bytes_format_value.
svn path=/trunk/; revision=52272
2013-09-29 18:19:29 +00:00
Pascal Quantin a0c53ffaa1 emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly

svn path=/trunk/; revision=52172
2013-09-22 15:50:55 +00:00
Michael Mann 346f803d42 Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was all manual inspection and most cases were either:
1. Case sensitivity differences between hf_ field name and formatted string.
2. Unnecessary whitespace between hf_ field name and colon in formatted string

There are cases where the hf_ field name doesn't quite match the proto_tree_add_uint_format, but it's close enough that one of them should be "right", I'm just not sure which is, I just know the string in proto_tree_add_uint_format is the one displayed.

svn path=/trunk/; revision=52098
2013-09-16 10:39:06 +00:00
Michael Mann b38ee917b1 Convert proto_tree_add_uint_format to proto_tree_add_uint_format_value if hf_ field name is the first part of the formatted string. This was done with a perl script on the dissectors directory (packet-*.c), followed by manual inspection of the output. The manual inspection yielded a few cases that really should have been proto_tree_add_uint or proto_tree_add_item, so I updated them accordingly.
The script didn't catch as many as I would have liked, but it's a start.

The most common (ab)use of proto_tree_add_uint_format was for appending strings to CRC/checksum values to note good or bad CRC/checksum.

svn path=/trunk/; revision=52045
2013-09-15 01:48:30 +00:00
Jörg Mayer 23d3e3d665 Dario Lombardo <lomato@gmail.com> via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147

Migration from emem to wmem for trivial cases (ep_alloc only).


svn path=/trunk/; revision=52002
2013-09-13 10:13:19 +00:00
Anders Broman 3eb06be97d From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48425
2013-03-19 19:28:57 +00:00
Guy Harris 544efd26a6 And another 64-bit-to-32-bit conversion on 32-bit platforms.
svn path=/trunk/; revision=46768
2012-12-26 10:49:05 +00:00
Jeff Morriss d97b4ec325 Fix problem where NTP times with the high-bit set to 0 (which RFC 2030
chapter 3 has redefined to mean years *after* 2036) were being represented as
times prior to 1968.

This has been broken since r35840 (apparently not many people see NTP
timestamps beyond 2036 :-)): apparently I over-optimized packet-ntp's code
while copying it into proto.c: that temporary variable is necessary for the
unsigned math to happen correctly before assigning the result to the (signed)
time_t.

Leave a comment in the code indicating why the temporary variable is needed.
Copy that comment to packet-ntp.c.

Fix the same problem in ntp_to_nstime(): it also did not use the temporary variable.

svn path=/trunk/; revision=45790
2012-10-25 22:26:52 +00:00
Anders Broman ae4115bcdb - Dissect more options.
- Correct a Timestamp bug.
- Try to pretify the options dissection.

svn path=/trunk/; revision=45783
2012-10-25 12:54:37 +00:00
Jeff Morriss 2552c750e5 We always HAVE_CONFIG_H so don't bother checking whether we have it or not.
svn path=/trunk/; revision=45017
2012-09-20 02:03:38 +00:00
Bill Meier 638d74d43f Use val_to_str_const() where appropriate;
Also (for a few files):
- create/use some extended value strings;
- remove unneeded #include files;
- remove unneeded variable initialization;
- re-order fcns slightly so prefs_reg_handoff...() at end, etc

svn path=/trunk/; revision=44438
2012-08-10 22:55:02 +00:00
Michael Mann 0d4eafb04d Update display filter names per Bug 2794. Part 1 of many.
svn path=/trunk/; revision=43907
2012-07-22 03:06:37 +00:00
Bill Meier bab856a504 General cleanup including as appropriate:
- Remove unneeded #include files (string.h, addr_resolv.h);
 - Remove unneeded 'if(!initialized){...}' in proto_reg_handoff();
 - Reformat hf[] entries;
 - Remove unneeded variable initializations;
 - "localize" some variables;
 - Whitespace/indentation/long lines/formatting
(in one case: re-order code slightly to not do col_set_str() & etc until
              after initial "frame acceptance testing" by dissector.

svn path=/trunk/; revision=42683
2012-05-17 20:13:22 +00:00
Chris Maynard 82fa509542 Fix display filter prefix from "ntpctrl." to "ntp.ctrl." Part of a patch submitted by Michael Mann in bug 2794, but for some reason the patch specified the filter prefix as "nap.ctrl.", which I don't think is right.
svn path=/trunk/; revision=42603
2012-05-12 20:26:42 +00:00
Jeff Morriss d2ddfe8ca6 Fix part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6703 :
r35887 added ntp_to_nstime() to packet-ntp since a couple of dissectors had
their own versions.  The version used was from packet-netflow; switch to the
version from packet-zep because that one's math works better: the fractional
time is actually shown.

svn path=/trunk/; revision=41045
2012-02-17 03:02:32 +00:00
Chris Maynard bdbe75190f Fix a typo.
svn path=/trunk/; revision=40018
2011-11-27 16:17:22 +00:00
Bill Meier 794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +00:00
Bill Meier 126aa85393 Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).



svn path=/trunk/; revision=39426
2011-10-15 18:46:26 +00:00
Martin Mathieson 23f8f9cf6a Show version and mode in protocol root. Now dissects details whether tree is NULL or not.
svn path=/trunk/; revision=38309
2011-08-02 10:35:22 +00:00
Stephen Fisher eec3e70821 Change descriptions of NTP Reference Identifier Codes for stratum 1
servers to match IANA assignment / RFC 5905.  A number of codes already
in Wireshark that aren't assigned were left intact.


svn path=/trunk/; revision=36136
2011-03-04 00:25:56 +00:00
Stephen Fisher 47b9a1235e Correct the usage of tvb_memeql() after r35558: it doesn't return true
if the values are the same; we have to check for "== 0" to see if they
are the same. 


svn path=/trunk/; revision=36135
2011-03-04 00:17:01 +00:00
Stephen Fisher ed9de27ba1 Change "Reference Clock ID" to "Reference ID" to match RFC5905 (also
mention this RFC in the comments).


svn path=/trunk/; revision=36134
2011-03-03 23:48:56 +00:00
Stephen Fisher 4c6e0d3604 Clarify / add explanations for the fields
svn path=/trunk/; revision=36133
2011-03-03 23:47:05 +00:00
Stephen Fisher 191f6622e1 Display the NTP version in COL_INFO so tshark output (without -V) looks
more like tcpdump.


svn path=/trunk/; revision=36097
2011-02-28 18:00:34 +00:00
Jeff Morriss 50e1634f4c Modify proto_tree_add_bytes_format() and proto_tree_add_bytes_format_value()
so that if the start_ptr is NULL the bytes are extracted from the given TVB
using the given offset and length.

Replace a bunch of:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), [...])

with:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, NULL, [...])

svn path=/trunk/; revision=35896
2011-02-10 16:31:00 +00:00
Jeff Morriss 13d8e41e0f A couple of dissectors have/need an NTP-to-nstime routine, so put it in
packet-ntp and export it to the other dissectors.

Move some macros (now) only used in packet-ntp.c into that file.

svn path=/trunk/; revision=35887
2011-02-09 03:24:12 +00:00
Jeff Morriss 92cd49b4c2 Rename ntp_fmt_ts() to tvb_ntp_fmt_ts() and make it take a pointer to a TVB and
an offset instead of (generally) a pointer into the TVB. Then use the standard
accessor functions to get data out of the TVB.


svn path=/trunk/; revision=35886
2011-02-09 03:00:51 +00:00
Guy Harris 4f7ae8bf3a For FT_{ABSOLUTE,RELATIVE}_TIME, make the rest of the encoding
orthogonal to the byte order.

This means that we can't just test for a non-zero encoding to determine
whether the format is big-endian or little-endian when we set the
field's endianness flag; instead, for the types where we accept any
non-zero value as meaning "litle-endian", map it to ENC_LITTLE_ENDIAN.

When we use ENC_TIME_NTP, OR in the byte order flag.  While we're at it,
in the dissectors that used ENC_TIME_NTP, update all the other encoding
items in proto_tree_add_item() calls to use the appropriate ENC_ value.

svn path=/trunk/; revision=35841
2011-02-07 08:18:12 +00:00
Jeff Morriss 8fc6e28b6a Add support for passing NTP times to proto_tree_add_item() by specifying
an encoding of ENC_TIME_NTP.

This increases the number of decimal places shown for NTP times (from 6 to 9),
so round the value to the nearest microsecond.  (I can't tell if NTP times are
ever more precise than a microsecond--this rounding is mainly to be closer to
the old behavior.)

Use proto_tree_add_item() for some NTP times.

svn path=/trunk/; revision=35840
2011-02-07 03:31:40 +00:00
Sake Blok 6e74ad9097 Adress => Address corrections (also in comments).
(see bug 5600)


svn path=/trunk/; revision=35600
2011-01-21 00:19:03 +00:00
Jeff Morriss 705f2ede5d Roll some calls to tvb_get_ptr() into proto_tree_add_bytes_format() (instead
of going through a temporary variable).  This just makes it more obvious which
add_bytes_format() calls are or are not being given pointers into the TVB.

Use tvb_ip_to_str() and tvb_ip6_to_str() in a couple spots.

svn path=/trunk/; revision=35593
2011-01-20 03:49:44 +00:00
Jeff Morriss 8d32d2066a There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string() or
tvb_get_const_stringz().

Use tvb_memeql() & tvb_memcmp().

svn path=/trunk/; revision=35558
2011-01-16 20:51:21 +00:00
Guy Harris a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Bill Meier 7b85f43d0e Do some constifying [or other] based upon gcc -Wwrite-strings warnings.
svn path=/trunk/; revision=33198
2010-06-09 18:12:17 +00:00
Stig Bjørlykke f945be91f6 Rewrote to avoid "More data arguments than '%' conversions" warning.
svn path=/trunk/; revision=32908
2010-05-20 11:56:58 +00:00
Jeff Morriss 9c3d944191 Empty strings are not very useful abbreviations. Even if it seems unlikely someone would want to filter on a specific field, we should give the user the option.
svn path=/trunk/; revision=32559
2010-04-25 17:38:46 +00:00
Jaap Keuter 6f9eb5b7af From Dave Higton:
When decoding NTP where the Reference Clock ID is "MSF/0", Wireshark textifies
this as "Rugby (UK) Radio 60 kHz".  The MSF transmitter was moved several years
ago from Rugby to Anthorn.

Also updates from RFC 4330.

svn path=/trunk/; revision=32481
2010-04-15 21:12:34 +00:00
Bill Meier 09764dd969 Remove unneeded #include <stdio.h>
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +00:00
Guy Harris 1d95b0d4bf Squelch a compiler warning.
svn path=/trunk/; revision=31078
2009-11-25 22:30:41 +00:00
Jaap Keuter 1fcf44886e From Michael Speck:
This patch enhances dissection of NTP protocol's Control messages 
as described in RFC1119 and RFC1305.

svn path=/trunk/; revision=31077
2009-11-25 21:47:28 +00:00
Jeff Morriss 3b2c741db6 From Steve via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3781 :
In ntp_fmt_ts() in packet-ntp.c time stamps are displayed to 4 digits (0.1
msec).   More digits may be significant (e.g., if GPS local clocks are used).

Change time stamp format in g_snprintf() from
  %07.4f
to
  %09.6f


svn path=/trunk/; revision=29961
2009-09-17 03:01:26 +00:00
Kovarththanan Rajaratnam 0a5b014cec Don't guard col_clear with col_check
svn path=/trunk/; revision=29344
2009-08-09 07:36:13 +00:00
Kovarththanan Rajaratnam e971354a54 Don't guard col_set_str (COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29340
2009-08-09 06:26:46 +00:00
Stig Bjørlykke 0437f102c3 From Kovarththanan Rajaratnam:
More FT_XXX cleanup.

svn path=/trunk/; revision=28971
2009-07-07 09:02:59 +00:00
Stig Bjørlykke b228488bc0 From Kovarththanan Rajaratnam via bug 3548:
(1) Trailing/leading spaces are removed from 'name's/'blurb's
(2) Duplicate 'blurb's are replaced with NULL
(3) Empty ("") 'blurb's are replaced with NULL
(4) BASE_NONE, NULL, 0x0 are used for 'display', 'strings' and 'bitmask' fields
    for FT_NONE, FT_BYTES, FT_IPv4, FT_IPv6, FT_ABSOLUTE_TIME, FT_RELATIVE_TIME,
    FT_PROTOCOL, FT_STRING and FT_STRINGZ field types
(5) Only allow non-zero value for 'display' if 'bitmask' is non-zero

svn path=/trunk/; revision=28770
2009-06-18 21:30:42 +00:00
Gerald Combs c1e7e4b619 From Peter Hertting: Fix the maximum poll interval.
svn path=/trunk/; revision=27930
2009-04-02 03:55:37 +00:00
Jaap Keuter d4b79ec466 NTP version 1 and 2 can be used as well.
svn path=/trunk/; revision=27290
2009-01-23 19:36:48 +00:00
Gerald Combs 6d04f793f0 Back out r27047 and r27053.
svn path=/trunk/; revision=27062
2008-12-19 17:39:52 +00:00