Commit Graph

128 Commits

Author SHA1 Message Date
Michael Mann 478ee0ae73 DHCPv6 option 56, RFC 5908
Bug 8421 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8421)

svn path=/trunk/; revision=49473
2013-05-21 03:24:55 +00:00
Alexis La Goutte 12517d1309 Fix encoding args (via fix-encodings-args tools) Add Modelines info
svn path=/trunk/; revision=48965
2013-04-22 17:28:16 +00:00
Anders Broman 2e52e2ac99 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48347
2013-03-17 09:11:21 +00:00
Anders Broman 263a9d0683 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48341
2013-03-16 16:25:41 +00:00
Michael Mann 4b3d76d426 Add new query types, options and message types for DHCPv6 Bulk Leasequery protocol. Also enforce message rules in RFC 5460 section 4 through expert_info
Part of bug 8172 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8172)

svn path=/trunk/; revision=47267
2013-01-25 03:40:53 +00:00
Michael Mann 8326a92942 Add RFC 5460 - DHCPv6 Bulk Leasequery
Bug 8172 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8172)

svn path=/trunk/; revision=47028
2013-01-11 14:41:17 +00:00
Alexis La Goutte da700a93b6 From François-Xavier Le Bail via https://www.wireshark.org/lists/wireshark-dev/201212/msg00027.html
Add some missing RFC references in DHCPv6 dissector

svn path=/trunk/; revision=46397
2012-12-05 09:38:28 +00:00
Jaap Keuter 6f1847f606 From Jérôme LAFORGE:
Patch that checks the length of OPTION_RECONF_ACCEPT (20).
As defined by RFC3315, its length has to be 0.

svn path=/trunk/; revision=45988
2012-11-10 14:00:30 +00:00
Chris Maynard b29f57e4e0 Fix Coverity CID 739070: Unused pointer value.
svn path=/trunk/; revision=45636
2012-10-18 16:50:49 +00:00
Michael Mann 8856e1a03a convert proto_tree_add_text to proto_tree_add_item and expert_add_info_format for packet-dhcpv6.c and packet-dhcp-failover.c
"Refactor" value_string in ARP dissector

svn path=/trunk/; revision=45535
2012-10-14 15:27:52 +00:00
Alexis La Goutte 3e602ee281 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=45398
2012-10-08 17:55:12 +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
Jakub Zawadzki bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Bill Meier 557ed5e971 Minor: reformatting, unneeded #includes, whitespace cleanup;
Also: use val_to_str_const(0 instead of val_to_str() in a few cases.

svn path=/trunk/; revision=42271
2012-04-26 16:47:37 +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 67ee5049d4 Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
  the encoding parameter for proto_tree_add_item() calls which directly reference
  an item in hf[] which has a type of:
     FT_BOOLEAN
     FT_IPv4
     FT_EUI64
     FT_GUID
     FT_UINT_STRING

Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260)

svn path=/trunk/; revision=39328
2011-10-10 00:39:31 +00:00
Bill Meier 4e57694d4a Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
 the encoding parameter for proto_tree_add_item() calls which directly reference
 an item in hf[] which has a type of:
    FT_UINT8
    FT_UINT16
    FT_UINT24
    FT_UINT32
    FT_UINT64
    FT_INT8
    FT_INT16
    FT_INT24
    FT_INT32
    FT_INT64
    FT_FLOAT
    FT_DOUBLE


svn path=/trunk/; revision=39288
2011-10-06 03:35:44 +00:00
Bill Meier 94f36ca4ff Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:
FT_NONE
   FT_BYTES
   FT_IPV6
   FT_IPXNET
   FT_OID

Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN

svn path=/trunk/; revision=39260
2011-10-04 22:44:31 +00:00
Anders Broman 41a4ccb657 from Joe McEachern:
patch for DHCPv6 DS-Lite AFTR Option RFC 6334

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6222

svn path=/trunk/; revision=38478
2011-08-11 09:25:37 +00:00
Chris Maynard 955008c4b0 When parsing OPTION_REMOTE_ID, don't modify optlen or we'll return the wrong
number of bytes consumed.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5962

svn path=/trunk/; revision=37439
2011-05-27 14:38:42 +00:00
Stig Bjørlykke 1c45c1a243 From Michael Mann via bug 2794:
Fixed display filters with obvious typos.

svn path=/trunk/; revision=36713
2011-04-19 08:22:58 +00:00
Jaap Keuter ab3fbb4d31 From Hadar Shoham:
Add support to correlation ID under DHCPv6 according to 
"CL-SP-CANN-DHCP-Reg-I06-110210" 
DHCPv6 option 17 Vendor-specific Information, sub option 2172 (paragraph 5.4.3)

svn path=/trunk/; revision=36347
2011-03-26 11:23:46 +00:00
Jeff Morriss be81bc949a Rename arphrdaddr_to_str() to tvb_arphrdaddr_to_str() and make it take a pointer a TVB
and an offset instead of (generally) a pointer into a TVB.

svn path=/trunk/; revision=35913
2011-02-11 03:33:11 +00:00
Jeff Morriss d8659693ef Check for places where tvb_bytes_to_str() or tvb_get_bytes_to_str_punct()
should be used (instead of the non-tvb functions with a call to tvb_get_ptr()).

Use those functions in a bunch of places.

svn path=/trunk/; revision=35911
2011-02-11 02:43:07 +00:00
Bill Meier 1f1563946e I believe 0 was meant instead of sizeof(0)....
svn path=/trunk/; revision=35694
2011-01-28 21:02:40 +00:00
Stephen Fisher 624ebe8464 Fix bug #5627: DHCPv6 dissector formats DUID_LLT time incorrectly
Add 30 years of seconds, not 20 years, since the DHCP_LLT time is seconds
since Jan 1 2000 and epoch is 30 years before that.


svn path=/trunk/; revision=35686
2011-01-28 00:20:37 +00:00
Jeff Morriss 61876001c3 Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.

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().

svn path=/trunk/; revision=35548
2011-01-16 03:57:12 +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 03b57df5a0 Fix various typos and spelling errors.
svn path=/trunk/; revision=35126
2010-12-06 01:34:58 +00:00
Bill Meier 7219ee2a49 Use val_to_str_ext() & friends to access sminmpec_values[];
Also: packet-nhrp.c: #include sminmpec.h not req'd;

svn path=/trunk/; revision=34143
2010-09-17 04:51:21 +00:00
Stephen Fisher 67aa3ba7d1 Fix display of Client's FQDN and clear up the confusion with the S, O and N bits from the RFC descriptions.
svn path=/trunk/; revision=33820
2010-08-16 21:41:29 +00:00
Jaap Keuter a541950ca8 From Hadar Shoham:
Change DHCPv6 option 17.8 to be the same as BOOTP option 43.8 
CableLabs specs treat 43.8\17.8 inconsistently as either binary (3 byte) 
or string (6 byte)

Additional cleanup and extension of interface ID presentation by me.

svn path=/trunk/; revision=32982
2010-05-26 21:10:02 +00:00
Guy Harris 927b7da346 Have abs_time_to_str() and abs_time_to_str_secs() take an additional
argument indicating whether to include the time zone in the string.  If
we're constructing a display filter, don't include the time zone,
otherwise do.  Fixes bug 4756.

svn path=/trunk/; revision=32913
2010-05-21 06:33:25 +00:00
Jaap Keuter 951485bf35 From Hadar Shohami:
Add support to option 17 sub option 2171 for Packet Cable 2.0 according to
CL-SP-CANN-DHCP-Reg-I03-090811.doc

svn path=/trunk/; revision=32788
2010-05-13 17:22:53 +00:00
Bill Meier 10ffd14b8f Indentation & whitespace cleanup (including: "4 space tabs" ==> spaces)
svn path=/trunk/; revision=32735
2010-05-10 15:54:57 +00:00
Bill Meier 69df32fb11 #include <string.h> not needed.
svn path=/trunk/; revision=32411
2010-04-06 22:09:47 +00:00
Jörg Mayer da757e0833 - Reorder some functions to avoid as many forward declarations
as possible.
- Rename a few hf_ variables
- Display some values in the COL_INFO and options caption.

svn path=/trunk/; revision=31765
2010-02-01 22:31:37 +00:00
Jörg Mayer 3d5756ea07 - Make all top level elements filterable.
- Get rid of dhcpv6_enterprise_number and replace it by a one
  line ..._add_item each time.
- Move common code out of if () {} else {}.

svn path=/trunk/; revision=31757
2010-02-01 16:26:54 +00:00
Jörg Mayer fb9c5f1da3 Bugfix: Hilight the correct range of bytes when dissecting embeeded
dhvpv6 payload.
New feature: Allow minimalistic filtering on dhcpv6 options:
  type, length and value (value as hex dump)

svn path=/trunk/; revision=31753
2010-02-01 14:53:00 +00:00
Jaap Keuter 093885ecf9 From Alexandre Forget:
Fix the ORO suboption offset error.

svn path=/trunk/; revision=31609
2010-01-21 21:46:46 +00:00
Bill Meier de4c6ff515 Fix a number of gcc _Wshadow warnings
svn path=/trunk/; revision=31557
2010-01-18 21:49:47 +00:00
Jaap Keuter a1738f2fec Fix for bug 3987:
Option Request option values are in 16 bit units.

svn path=/trunk/; revision=29814
2009-09-09 07:22:44 +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 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
Sake Blok a3601ba7d4 Make buildbot happy again...
svn path=/trunk/; revision=27940
2009-04-02 20:51:55 +00:00
Anders Broman 0f17f96acf From Garey Hassler:
CableLabs vendor-specific decoding for Bootp, DHCPv6.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3218

svn path=/trunk/; revision=27938
2009-04-02 19:41:09 +00:00
Stig Bjørlykke d7d058214e From Alexis La Goutte (bug 3308):
Add DHCP(v4 & v6) Option for CAPWAP (RFC5417)

svn path=/trunk/; revision=27625
2009-03-06 19:43:45 +00:00
Jörg Mayer ea57cc5776 Fix for bug 3134: Dissection would stop at a malformed dhcpv6 client FQDN
option, which are currently being sent by MS Vista dhcpv6 clients.

svn path=/trunk/; revision=27045
2008-12-18 08:17:27 +00:00
Jörg Mayer cf40bd9747 Dump the contents of some elements.
Standardize printing of enterprise id.

svn path=/trunk/; revision=26447
2008-10-14 00:17:42 +00:00
Bill Meier f8e3822738 Fix some warnings reported by gcc -Wshadow ...
Fix some spacing in packet-dcom.c

svn path=/trunk/; revision=25618
2008-06-27 16:15:30 +00:00
Jaap Keuter 7e262d1ccb From Francis Dupont:
DHCPv6 dissector is pretty old, i.e., it needs some updates (provided in the patch).
For instance, RFC 5007 (leasequery) is not taken into account.

svn path=/trunk/; revision=23950
2007-12-27 10:38:03 +00:00
Anders Broman 9d316093f6 Apply yet another set of the optimization patches:
-set_str2add_str_val_to_str

svn path=/trunk/; revision=23406
2007-11-08 22:49:03 +00:00
Jaap Keuter 79e035e3f3 Fix for bug 1935.
RFC3315 says that the vendor-specific information option must encapsulate each
option in the format code/length/value.  The current dhcpv6 dissector does not
differentiate these fields, it just puts it all together as one option-data
field. Attached is a patch that addresses this issue.

svn path=/trunk/; revision=23284
2007-10-27 09:24:31 +00:00
Richard van der Hoff e704e4c8c4 From Chris Maynard <christopher.maynard@gtech.com> / Bug 1798: packet-d*.c display filter fields incorrectly named.
svn path=/trunk/; revision=23090
2007-10-08 00:32:03 +00:00
Martin Mathieson ef3f75d6df Make dhcpv6 findable by name.
svn path=/trunk/; revision=21740
2007-05-10 10:56:36 +00:00
Stephen Fisher 8fd3ee0560 Remove almost all of the casts I committed recently and in place of
them, add -Wno-pointer-sign to CFLAGS when gcc will accept it.


svn path=/trunk/; revision=21253
2007-03-28 21:55:11 +00:00
Stephen Fisher ab8f589336 Fix about 100 simple to fix warnings from gcc 4.0 in epan/dissectors
svn path=/trunk/; revision=21233
2007-03-27 22:50:11 +00:00
Jaap Keuter 32304503e0 Fix for bug 1235. Elapsed time is in 10ms units.
svn path=/trunk/; revision=19937
2006-11-20 19:39:19 +00:00
Gilbert Ramirez b5aa125db4 Provide field names for fields with true/false values so they
can be searched on.

svn path=/trunk/; revision=19761
2006-10-31 21:29:34 +00:00
Ronnie Sahlberg feab79e328 change a whole bunch of ethereal into wireshark
svn path=/trunk/; revision=18196
2006-05-21 04:49:01 +00:00
Guy Harris 25c4bc9379 Replace tvb_memcpy() calls that extract IPv4 addresses into a guint32,
and that extract IPv6 addresses into a "struct e_in6_addr", with
tvb_get_ipv4() and tvb_get_ipv6() calls - except for some that we
remove, by using proto_tree_add_item(), rather than replacing.

Have epan/tvbuff.h include epan/ipv6-utils.h, to define "struct
e_in6_addr" (not necessary to declare the tvbuff routines, but including
it there means "struct e_in6_addr" is guaranteed to be defined before
those declarations, so we don't get compiler complaints if we define it
*after* those declarations).

svn path=/trunk/; revision=15758
2005-09-11 21:25:37 +00:00
Ronnie Sahlberg ec3ab9ec3e rename ep_tvb_get_string() to tvb_get_ephemeral_string() asnd update the documentation in README.developer
svn path=/trunk/; revision=15270
2005-08-10 13:41:13 +00:00
Ronnie Sahlberg 0d7a2abbc7 some more memification of tvb_get_string() no obvious memleaks fixed this time :-(
svn path=/trunk/; revision=15131
2005-07-28 09:47:28 +00:00
Ronnie Sahlberg 10856f2f9a prettify the HW type and address printouts slightly.
svn path=/trunk/; revision=14969
2005-07-20 12:20:56 +00:00
Ronnie Sahlberg 9de2aaec7c add proper decoding and presentation of domain strings in dhcpv6
this fixes bug 273


svn path=/trunk/; revision=14967
2005-07-20 11:44:57 +00:00
Gerald Combs 3969acf046 From Vincent Jardin: Fix the dissection of relayed messages.
svn path=/trunk/; revision=12868
2004-12-30 16:45:37 +00:00
Gerald Combs dce666e0d1 From Vincent Jardin:
- support for new DHCPv6 options
 - fix for the support of OPTION_RELAY_MSG 

svn path=/trunk/; revision=12838
2004-12-26 18:58:52 +00:00
Ulf Lamping e8459f4ea1 Again, some warnings removed.
svn path=/trunk/; revision=12831
2004-12-25 10:30:58 +00:00
Guy Harris 4d98722689 Get rid of an unused true_false_string value.
svn path=/trunk/; revision=12680
2004-12-07 18:21:21 +00:00
Guy Harris cfde79b7de From Tomasz Mrugalski:
- option values updated to match RFC3898 (NIS/NIS+ options)
- FQDN option added (draft-ietf-dhc-dhcpv6-opt-fqdn-00.txt)
- Lifetime option added (draft-ietf-dhc-dhcpv6-opt-lifetime-00.txt)
- Long lasting typo corrected (those are identiTy associations, not
  identiFy associations)
- Fixed bug always reporting SIP DOMAIN option to be malformed (break was
  missing)
- Domains names are now parsed (in DOMAIN_LIST, SIP_SERVER_A, NIS_DOMAIN
  and NISPLUS_DOMAIN options). 

svn path=/trunk/; revision=12663
2004-12-03 09:51:16 +00:00
Guy Harris ea3aa64618 From Marc Poulhies: fix the handling of the authentication option when
the authentication information is missing (which it can be), and fix a
typo.

svn path=/trunk/; revision=12637
2004-12-01 12:15:16 +00:00
Jörg Mayer 8c788146a0 initializing unsigned variables to -1 is considered interesting
svn path=/trunk/; revision=12173
2004-10-01 12:35:55 +00:00
Guy Harris c68f62210f Add "tvb_get_ntoh64()" and "tvb_get_letoh64()" routines to fetch 64-bit
integers.

Make FT_INT64 and FT_UINT64 add numerical values, rather than byte-array
values, to the protocol tree, and add routines to add specified 64-bit
integer values to the protocol tree.

Use those routines in the RSVP dissector.

svn path=/trunk/; revision=11796
2004-08-22 00:31:58 +00:00
Guy Harris 9e2658ed78 Don't give up on the entire DHCPv6 packet if we find an error in
encapsulated options, just give up on the option in which they're
encapsulated.

Note that for the Relay Message option, we should perhaps dissect the
option data as a DHCP message, not just a sequence of options.

svn path=/trunk/; revision=11756
2004-08-17 00:21:13 +00:00
Guy Harris 8bf903b464 Whenever we call "dhcpv6_option()", check to make sure it didn't set
"at_end" - if it does, the option is sufficiently bad that we can't
continue dissecting the packet, so we give up.

svn path=/trunk/; revision=11750
2004-08-16 07:52:07 +00:00
Gilbert Ramirez 669db206cb Move dissectors to epan/dissectors directory.
Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410
2004-07-18 18:06:47 +00:00