Commit graph

132 commits

Author SHA1 Message Date
Jaap Keuter
f7e082ad35 Add expert items for missing end option in:
- vendor option field
- overloaded sname field
- overloaded file name field

Improve the overload determination of sname and file name field.

svn path=/trunk/; revision=31927
2010-02-19 22:46:07 +00:00
Jaap Keuter
a1a0bf1dbb From Hadar Shoham:
Add Packet Cable 2.0 bootp option 60 support:
sub-option 01 new type value 2 for packet cable 2.0
sub-option 1a new sun-option "Certificate Bootstrapping Support" length 01,
value 1 for support and 0 for not supported.

svn path=/trunk/; revision=31647
2010-01-24 22:06:29 +00:00
Stig Bjørlykke
8e3ca1a4f6 From Jon via bug 4344:
Decode "client last transaction time" and "associated ip"
options added to DHCP in RFC4388 as the proper types.

svn path=/trunk/; revision=31347
2009-12-22 12:07:49 +00:00
Kovarththanan Rajaratnam
a8b7853536 ..but make sure we call tvb_get_guint8() at least once ;)
svn path=/trunk/; revision=31043
2009-11-21 11:21:23 +00:00
Kovarththanan Rajaratnam
d56779b966 Don't call tvb_get_guint8() twice
svn path=/trunk/; revision=31039
2009-11-21 10:45:19 +00:00
Gerald Combs
771e9ef518 Option 2 (Time Offset) is signed.
svn path=/trunk/; revision=30695
2009-10-25 17:05:08 +00:00
Bill Meier
8ccb52de00 Upon 2nd thought: revert removal of 'if (check_col(...))' around col_add_fstr & etc.
svn path=/trunk/; revision=30133
2009-09-25 00:29:06 +00:00
Jörg Mayer
f054e6e54f - Remove the comments about the breaks, they were needed.
- Add another break
- Add a comment about suboption 9
- Add suboption 11 decoding while I'm at it
  (Server Identifier Override Suboption)

svn path=/trunk/; revision=30131
2009-09-24 21:42:57 +00:00
Bill Meier
8f95ef909a Various:
- check_col no longer req'd;
 - Remove unneeded #includes;
 - Use consistent indentation/style;
 - Reformat a few lines;

svn path=/trunk/; revision=30121
2009-09-24 19:05:26 +00:00
Bill Meier
bc2f7b7b8b Add what appear to be missing breaks in two cases of a switch () {...}.
svn path=/trunk/; revision=30119
2009-09-24 19:01:42 +00:00
Bill Meier
94f28dd8f9 (FWIW) One step towards including stdio.h & stdlib.h only when req'd.
svn path=/trunk/; revision=29568
2009-08-26 19:27:49 +00:00
Kovarththanan Rajaratnam
60a30e223e From Didier gautheron via bug 3929:
* Expert Info / Expert Info Composite requires a full protocol tree.
* Delay tree NULL pointer check in bootp dissector

svn path=/trunk/; revision=29530
2009-08-23 18:32:29 +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
Jörg Mayer
d9531723b5 - Add rfc number comments on not-yet-decoded options
- Decode autoconfigure option

svn path=/trunk/; revision=29325
2009-08-07 18:45:06 +00:00
Stig Bjørlykke
74ff21bccf From Nathan Hartwell via bug 2733:
Use time_secs_to_str_unsigned().

svn path=/trunk/; revision=28841
2009-06-25 02:08:06 +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
Bill Meier
6f92b028aa Use some default true_false_string's.
svn path=/trunk/; revision=27983
2009-04-07 12:20:41 +00:00
Guy Harris
f41351188a Get rid of an unused variable.
Clean up indentation.

svn path=/trunk/; revision=27939
2009-04-02 20:03:36 +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
Bill Meier
891aa5a6aa Fix bug: ptr to an ep str kept for use while capture file open.
svn path=/trunk/; revision=27905
2009-03-30 21:59:31 +00:00
Anders Broman
e0171e1a79 More size_t casts.
svn path=/trunk/; revision=27880
2009-03-29 13:47:15 +00:00
Stig Bjørlykke
c11055cda9 Fixed some data types to remove some warnings in the solaris build.
svn path=/trunk/; revision=27825
2009-03-23 12:41:56 +00:00
Gerald Combs
18f24c0675 Add an expert item for the seconds-encoded-as-little-endian bug.
svn path=/trunk/; revision=27797
2009-03-19 17:40:18 +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
Jaap Keuter
c99afc9c95 From Karl Heinz Wolf:
Bugfix RFC3825-Decoding

svn path=/trunk/; revision=27388
2009-02-06 20:10:57 +00:00
Guy Harris
6a4f4fdc19 strcasecmp()'s behavior is locale-dependent, and thus unpredictable (and
possibly undesirable - in a Turkish locale, for example, "i" and "I" are
not equal); g_ascii_strcasecmp()'s behavior is not locale-dependent (and
treats "i" and "I" as equal even in a Turkish locale; the strings being
compared against are English, not Turkish, so treating "i" and "I" as
equal is a feature, not a bug).

svn path=/trunk/; revision=27236
2009-01-15 02:40:43 +00:00
Jaap Keuter
c4667a58e6 From Alex Lindberg:
Provide for custom decodes of bootp/dhcp options.
By Jaap Keuter:
Cleaned up some option processing code and made option change more robust.

svn path=/trunk/; revision=27233
2009-01-14 23:32:59 +00:00
Jörg Mayer
e740fddb29 Add reference for changed option space
svn path=/trunk/; revision=27215
2009-01-13 04:22:20 +00:00
Jörg Mayer
ceb0d5b5be Update list of dhcpoptions according to
http://www.iana.org/assignments/bootp-dhcp-parameters/
dated 2008-10-28

svn path=/trunk/; revision=27214
2009-01-13 03:47:16 +00:00
Jaap Keuter
0f486eb479 Fix for bug 2839:
Add field for Client hardware address padding.

svn path=/trunk/; revision=27119
2008-12-27 14:28:10 +00:00
Bill Meier
33c99f44fd Fix typos and spelling (mostly in text strings)
svn path=/trunk/; revision=27028
2008-12-17 00:08:38 +00:00
Jaap Keuter
bb250894fd From Karl Heinz Wolf:
This patch adds support for DHCPv4 coordinate-based Location Configuration
Option 123, as proposed by RFC 3825.
The decoding functionality is based on the RFC3825decoder by Klaus Darilion
http://www.enum.at/rfc3825encoder.529.0.html

svn path=/trunk/; revision=26381
2008-10-08 18:26:53 +00:00
Anders Broman
021d8153b2 From Karl Heinz Wolf:
LoST Server Domain Name DHCPv4 Option (RFC 5223)

svn path=/trunk/; revision=26179
2008-09-11 20:44:19 +00:00
Bill Meier
b52d95d591 #include <emem.h> not req'd
svn path=/trunk/; revision=26091
2008-08-26 01:28:50 +00:00
Stig Bjørlykke
cb51efd25d From Roy Marples (bug 2781 and bug 2796):
Display FQDN binary encoded name as text
Ensure that get_dns_name does not cross packet sub boundry

From me:
Preserve the usage of bootp.fqdn.name as a display filter

svn path=/trunk/; revision=25981
2008-08-11 12:00:27 +00:00
Stig Bjørlykke
e2e09deeda Renamed index and ipv4_addr to avoid name collisions.
svn path=/trunk/; revision=25560
2008-06-23 21:31:47 +00:00
Bill Meier
44af6ef887 Fix some of the Errors/warnings detected by checkapi.
svn path=/trunk/; revision=25290
2008-05-14 01:47:41 +00:00
Jörg Mayer
746e5beb47 Fix bug 2395: 2395
svn path=/trunk/; revision=24760
2008-03-30 21:53:59 +00:00
Gerald Combs
fea0442105 Remove leftover debug code.
svn path=/trunk/; revision=24618
2008-03-13 14:45:52 +00:00
Gerald Combs
bf75c9eac6 sscanf() apparently handles negative input values, even when your
target is an unsigned int.  Adjust our bogus value check to match
the recent int -> guint change. Fixes bug 2355.

svn path=/trunk/; revision=24615
2008-03-13 05:24:21 +00:00
Stig Bjørlykke
477b2c061a Fixed uint -> guint.
svn path=/trunk/; revision=24613
2008-03-12 21:43:37 +00:00
Jörg Mayer
80140a78f5 + DHCP overload option parsing changes (triggered by bug 2194):
- The overloaded options are displayed at the same level as other options
  - The bootp file and server name options are displayed as overloaded if
    appropriate. To achieve this the bootp header parsing code needed to be
    moved to a later point.
+ Some signedness warning fixes.
+ Make a global variable (novell_string) static


svn path=/trunk/; revision=24611
2008-03-12 21:00:00 +00:00
Jaap Keuter
89d7589f60 From Karl Heinz Wolf:
This patch decodes the Civic Address Types (CATypes) for Civic Addresses
Configuration Information. This GEOCONF_CIVIC DHCP option number 99 is defined
in RFC 4776.

svn path=/trunk/; revision=24406
2008-02-21 07:05:44 +00:00
Gerald Combs
152b28477a Windows (confirmed with Vista, XP, and 98) sends the "secs" value as a
little-endian value. Add a check and format the value accordingly. Fix up
whitespace.

svn path=/trunk/; revision=24303
2008-02-11 19:18:02 +00:00
Stig Bjørlykke
28ae535b00 Removed even more "statement not reached" warnings.
svn path=/trunk/; revision=24286
2008-02-07 15:44:45 +00:00
Jaap Keuter
574dfb7f8c From Zbigniew Kopek:
Here are additional DHCP Suboptions for Option 43 introduced in new eDOCSIS
Cable Laboratories documentation:
( http://www.cablemodem.com/downloads/specs/CM-SP-eDOCSIS-I13-070803.pdf )
Also display suboptions for Option 43 for OpenCable devices.

svn path=/trunk/; revision=23867
2007-12-14 20:14:15 +00:00
Anders Broman
f4b9f9c3bd From Stefan Puiu:
According to http://www.iana.org/assignments/bootp-dhcp-parameters, suboptions
from 1 to 10 have been defined. 3 is reserved, and most of the others have
their own RFC. For a start I've attached a patch that decodes suboption 6 just
as 1 and 2, and also suboption 3. This might not be entirely correct, since
suboptions 1 and 2 are opaque values (RFC3046), while 6 is an ASCII text
string.

I added something for the other values as well...

svn path=/trunk/; revision=23293
2007-10-27 16:49:13 +00:00
Jaap Keuter
7d2c0c1b61 Logic error
svn path=/trunk/; revision=23220
2007-10-17 18:25:49 +00:00
Gerald Combs
d32b29abd9 Add support for RFC 4243. Tested using a malformed packet, but it should be
correct.

svn path=/trunk/; revision=23117
2007-10-09 18:48:46 +00:00
Jaap Keuter
714a9c0f62 From Thomas Sillaber:
Attached is a patch for packet-bootp.c to support Alcatel-Lucent TFTP1 and TFTP2 vendor specific options.

svn path=/trunk/; revision=22864
2007-09-13 18:51:32 +00:00