Commit Graph

111 Commits

Author SHA1 Message Date
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
Richard van der Hoff 32d5537966 From Francois-Xavier Le Bail <fx.lebail@yahoo.com> / bug 1724:
The following patch decode DHCP option 249 (Classless Static Route) used by
some Microsoft systems. Same decoding as option 121 (RFC 3442).


svn path=/trunk/; revision=22576
2007-08-21 21:40:18 +00:00
Jaap Keuter 44b31f98f3 From Francois-Xavier Le Bail:
The following patch decodes DHCP option 121. (RFC 3442)

svn path=/trunk/; revision=22399
2007-07-24 21:23:55 +00:00
Guy Harris 5a43799a17 Use G_GINT64_MODIFIER, rather than the PRI[douxX]64 macros, for GLib
routines and routines using those routines.  GLib might use different
modifiers for 64-bit quantities than the platform's C library does.

svn path=/trunk/; revision=21990
2007-05-29 18:52:42 +00:00
Stephen Fisher 3f239a2fc7 Fix bug #1416: crash (stack smashing) on single DHCP packet
svn path=/trunk/; revision=21947
2007-05-26 00:38:53 +00:00
Gerald Combs ad3702a7c2 Fix a crash bug found through fuzz testing. The bug was introduced
after the 0.99.5 release.

svn path=/trunk/; revision=21924
2007-05-24 17:36:07 +00:00
Jaap Keuter a25bb5b393 From Stefan Puiu:
A DHCP Discover option 90 has no Secret ID nor HMAC MD5 Hash.

svn path=/trunk/; revision=21636
2007-05-02 06:17:19 +00:00
Martin Mathieson a6b92e3e39 Make these protocols findable by name.
svn path=/trunk/; revision=21633
2007-05-01 09:45:34 +00:00
Guy Harris 1bc049906a Add some GCC warnings to the standard set, and add some others to the
--enable-extra-gcc-checks set.

If we turn on -pedantic, try turning on -Wno-long-long as well, so that
it's not *so* pedantic that it rejects the 64-bit integral data types
that we explicitly require.

Constify a bunch of stuff, and make some other changes, to get rid of
warnings.

Clean up some indentation.

svn path=/trunk/; revision=21526
2007-04-23 10:59:26 +00:00
Ronnie Sahlberg d5d5159b6d From Sebastien Tandel
fixes for various compiler warnings

svn path=/trunk/; revision=21210
2007-03-26 11:06:26 +00:00
Stephen Fisher 280ab16dfa Remove unused variable
svn path=/trunk/; revision=20786
2007-02-11 06:44:18 +00:00
Stephen Fisher 0c72000b0d From Joe McEachern:
Attached is a wireshark patch that adds support for decoding DHCP option 125
and the DHCP option 125 suboptions defined by the DSL Forum's TR-111
specification.


svn path=/trunk/; revision=20783
2007-02-11 03:36:04 +00:00
Guy Harris ec38620f1b Clean up some compiler warnings.
svn path=/trunk/; revision=19679
2006-10-25 03:03:53 +00:00
Guy Harris 196bb24bdd Do the suboption processing in dissect_netware_ip_suboption() a bit more
like the way it's done in other suboption dissectors.

Fix a typo.

svn path=/trunk/; revision=19532
2006-10-14 20:17:14 +00:00
Guy Harris 3b1726527a Add some space after commas.
svn path=/trunk/; revision=19274
2006-09-21 17:42:23 +00:00
Guy Harris 2b56ab8695 Fix the handling of IPv4-address and Boolean suboptions of the Novell
options item.

svn path=/trunk/; revision=19273
2006-09-21 17:41:47 +00:00
Jörg Mayer c5bf44c6ad Always print length as well as type in Option line.
Count amount of padding.


svn path=/trunk/; revision=18920
2006-08-16 00:12:02 +00:00
Jörg Mayer 591167281e Complete: Make dhcp options filterable
svn path=/trunk/; revision=18916
2006-08-15 20:32:08 +00:00
Jörg Mayer 9c53d1894b Start making dhcp options filterable (special cases still missing)
svn path=/trunk/; revision=18912
2006-08-15 13:24:02 +00:00
Jörg Mayer 3fee10cc41 Change a label a bit to be able to differentiate it from the default
case.

svn path=/trunk/; revision=18879
2006-08-10 20:49:58 +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
Jaap Keuter b59ad33b63 From Thomas Anders:
- allow DHCP option 43 suboption 8 (OUI) for CableLabs clients to be a 6-byte string (as required for DOCSIS CMs) to 
  account for inconsistencies in different CableLabs specifications
- add new DHCP option 60 fields 0x0d (IP Filters Support) and 0x0e (LLC Filters Support) for CableLabs DOCSIS 2.0 CMs
- rename PKT_CM_* variables to have a DOCS_CM prefix instead (overdue, as indicated by an existing comment)
- update specification references

svn path=/trunk/; revision=17884
2006-04-17 08:38:08 +00:00