Commit graph

73 commits

Author SHA1 Message Date
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
Tim Potter
89d7f897a2 Display more info for some PXE DHCP options:
- Display UUID for tag #97 (Client machine identifier)
  - Display UNDI major and minor version for tag #94 (Client network 
    interface identifier) 
  - Use value strings for tag #93 (Client system architecture)

The byte ordering is messed up for the GUID though.

svn path=/trunk/; revision=17541
2006-03-09 04:31:10 +00:00
Guy Harris
b13f6dcbd3 Use the new "proto_tree_add_*_format_value" routines.
svn path=/trunk/; revision=17316
2006-02-16 11:43:38 +00:00
Gerald Combs
6f4dd2267c Add support for PacketCable option 60/suboption 5.23. Sponsored by
CableLabs.

svn path=/trunk/; revision=17219
2006-02-08 23:09:17 +00:00
Jörg Mayer
1900bf87fc done:
packet-ntp.c: Rather confused and incorrect use of g_snprintf return value
packet-pim.c: whitespace change
packet-icmpv6.c: g_snprintf takes trailing \0 into account, fix off by 1 error
packet-clnp.c: Fix incorrect use of g_snprintf return value
packet-isakmp.c: g_snprintf takes trailing \0 into account
packet-tr.c: Fix incorrect use of g_snprintf return value
packet-radius.c: Fix incorrect use of g_snprintf return value
packet-radius.h: constify a string variable
packet-ldap.c: The return value isn't needed, so don't use it incorrectly
packet-tcp.c: Fix incorrect use of g_snprintf return value
packet-windows-common.c: Remove unneeded DISSECTOR_ASSERT
packet-smb-sidsnooping.c: g_snprintf takes trailing \0 into account
packet-pvfs2.c: g_snprintf takes trailing \0 into account
packet-ptp.c: Remove #include snprintf
packet-ppp.c: Fix incorrect use of g_snprintf return value
packet-ospf.c: Fix incorrect use of g_snprintf return value
packet-mip6.c: snprintf -> g_snprintf
packet-bootp.c: Remove a commented out bad use of g_snprintf
packet-ber.c: snprintf -> g_snprintf, g_snprintf takes trailing \0 into account

2do:

     52 packet-ieee80211.c: 2DO
      2 packet-nfs.c: 2DO - too many side effects
     33 packet-bgp.c: 2DO
     18 packet-dns.c: 2DO
     14 packet-dcm.c: 2DO
     13 packet-x11.c: 2DO
     11 packet-kerberos.c: 2DO
     10 packet-diameter.c: 2DO
      9 packet-snmp.c: 2DO
      9 packet-pgm.c: 2DO
      7 packet-nbns.c: 2DO
      6 packet-fcswils.c: 2DO
      5 packet-wccp.c: 2DO
      5 packet-cops.c: 2DO
      4 packet-wtp.c: 2DO


svn path=/trunk/; revision=17038
2006-01-16 07:59:44 +00:00
Jaap Keuter
356cbd3a5a From Thomas Sillaber
here is the Patch for:
    - AVA (Alcatel Automatic VLAN Assignment)
    - QBSS ( QOS Basic Service Set)

svn path=/trunk/; revision=17008
2006-01-11 22:05:43 +00:00
Ronnie Sahlberg
fc97105f24 add Jaap K's extensions
also change one (of several:-( )  arrays to be accessed through accessor functions so proper bounds checking is done.


there are many other inbstances of arrays in this dissector that are accessed with no proper bounds checking and the same thing should be done for them




svn path=/trunk/; revision=16891
2005-12-23 23:54:35 +00:00
Jörg Mayer
409ea74249 As reported by Mark Millet <mmillet@cisco.com>
Add message types 13-17 for option 53 decoding.


svn path=/trunk/; revision=16879
2005-12-22 02:37:22 +00:00
Anders Broman
604d8a8026 From Stephen Donovan:
Allow Ethereal to decode the IP address inside of Option 118

svn path=/trunk/; revision=16275
2005-10-20 05:29:53 +00:00
Ronnie Sahlberg
bc655dfba3 improve get_dns_name now that we have cheap emem allocated buffers
and get rid of a few strcpy()
a whole lot of arrays from the stack
and make the function prototype slightly nicer.



svn path=/trunk/; revision=16166
2005-10-08 12:31:06 +00:00
Guy Harris
973920e91d Convert some more "tvb_memcpy()"s fetching IPv4 and IPv6 addresses to
calls to "tvb_get_ipv4()" and "tvb_get_ipv6()".

Fix a call in the BGP dissector to properly fetch an IEEE floating-point
number.

Update some I-D info.

svn path=/trunk/; revision=15774
2005-09-13 00:50:43 +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
Guy Harris
0ab779b04c Get rid of a no-longer-used #define.
svn path=/trunk/; revision=15659
2005-09-01 18:03:02 +00:00
Guy Harris
471fa4924d Use "proto_tree_append_text()" rather than appending to an ep_alloced
buffer (that buffer wasn't getting cleared for each item).

svn path=/trunk/; revision=15655
2005-09-01 10:38:41 +00:00
Ronnie Sahlberg
88a76dc44d change g_string_sprintf[a]() to g_snprintf() and emem allocated memory.
svn path=/trunk/; revision=15631
2005-08-31 08:09:00 +00:00
Ronnie Sahlberg
57ad54abdc remove some g_string_printf[a]() and replace it with g_snprintf() to ememified buffers
svn path=/trunk/; revision=15622
2005-08-30 09:38:06 +00:00
Ronnie Sahlberg
927b1668d8 another value_string that was not terminated
fix a bug from the previous checking as well.

svn path=/trunk/; revision=15577
2005-08-28 01:51:50 +00:00
Ronnie Sahlberg
a0b48c724a add missing value_string termination
svn path=/trunk/; revision=15576
2005-08-28 01:44:30 +00:00
Anders Broman
9c99a261f0 From Maynard, Chris :
The attached patches, generated via  svn diff , correct various compiler 

& lint warnings, among them: 

 

lemon.c(2582) : warning C4090: '=' : different 'const' qualifiers

packet-ber.c(212) : warning C4018: '<=' : signed/unsigned mismatch

packet-ber.c(228) : warning C4018: '>=' : signed/unsigned mismatch

packet-bootp.c(2112) : warning C4018: '<' : signed/unsigned mismatch

packet-iscsi.c(801) : warning C4018: '>=' : signed/unsigned mismatch


svn path=/trunk/; revision=15085
2005-07-26 09:52:06 +00:00
Jörg Mayer
fb0b83fedf One forgotten warning fix
svn path=/trunk/; revision=14974
2005-07-21 17:17:16 +00:00
Jörg Mayer
9bed71737c small warning fixes
svn path=/trunk/; revision=14973
2005-07-21 17:04:10 +00:00
Gerald Combs
1d3ba8764b From Steve Grubb: Fix off by one errors. Fixes part of bug 217.
svn path=/trunk/; revision=14494
2005-05-30 20:53:08 +00:00
Gerald Combs
1c650087ac Add extra TLV length checks and signedness fixes. Fixes the infinite loop in
bug 196.

svn path=/trunk/; revision=14425
2005-05-24 16:46:18 +00:00
Gilbert Ramirez
61e5a33ea2 A fix for the previous fix for the infinite loop in bootp, bug #160.
svn path=/trunk/; revision=14323
2005-05-06 02:08:30 +00:00
Gilbert Ramirez
01a3ed9c58 Check the offset delta while we loop through the options.
Make sure the delta is > 0.
This intends to fix bug 160, although with a capture file
to test it, I can't be totally sure.

svn path=/trunk/; revision=14322
2005-05-06 01:56:40 +00:00
Jörg Mayer
b6db235c77 Change 802.11f -> F, 802.1d -> D, 802.1x -> X, 802.1q -Q, 802.1P -> p
svn path=/trunk/; revision=14321
2005-05-05 17:07:58 +00:00
Gerald Combs
2078bfc8b4 Fix a pile of format string bugs.
svn path=/trunk/; revision=14141
2005-04-19 20:59:41 +00:00
Ronnie Sahlberg
c2bfab2249 some updates from T Anders
svn path=/trunk/; revision=14125
2005-04-18 10:46:17 +00:00
Ronnie Sahlberg
eb98d35922 use proto_item_appent_text() instead of proto_item_append_string() since the hf field is not neccessarily a FT_STRING value always.
svn path=/trunk/; revision=14019
2005-04-05 20:20:21 +00:00
Guy Harris
873bd2bc91 The correlation ID is a 32-bit integer, not a string.
svn path=/trunk/; revision=13887
2005-03-23 22:30:37 +00:00
Guy Harris
7176376813 The DNS name data starts at the beginning of the suboption data, not the
beginning of the suboption.

svn path=/trunk/; revision=13886
2005-03-23 21:42:40 +00:00
Guy Harris
06009efc45 When checking whether suboption data fits within the option, check
whether the suboption data offset plus the suboption data length is >,
not >=, the end of the option data - the end of the option data is the
first byte *after* the option data.

For CableLabs string suboptions, use the right offset when fetching the
data.

svn path=/trunk/; revision=13884
2005-03-23 21:22:18 +00:00
Guy Harris
d49241d087 Use symbolic names for ARP types.
Clean up indentation.

svn path=/trunk/; revision=13015
2005-01-13 07:49:31 +00:00
Guy Harris
71217a8007 As we've made the tap_specific_data field of a tap_packet_t structure a
const pointer (so that we don't get complaints when we make the
tap-specific data argument to "tap_queue_packet()" a const pointer,
allowing dissectors to hand const data to a tap without a complaint), we
should make the tap per-packet function take a const pointer as an
argument as well.  Do so.

In some taps, use _U_, or actually use the argument, rather than
sticking in dummy "X = X" assignments to fake use of parameters.  (This
means that the tap functions in question no longer have the notion that
they act on a particular static structure wired in.)

svn path=/trunk/; revision=12910
2005-01-01 02:57:02 +00:00
Guy Harris
1220516388 From Yaniv Kaul: add Ethernet address-to-name (or, at least, address-to-
vendor-name-and-next-three-bytes-in-hex) resolution for Ethernet/802.x
hardware addresses.

Move the ARP hardware types into a header file, for use by dissectors
other than the ARP dissector.

svn path=/trunk/; revision=12839
2004-12-26 22:26:02 +00:00
Guy Harris
e20d80ea57 Use "plurality()" rather than locally-defined "PLURALIZE()" macros, and
get rid of the definition of "PLURALIZE()" in modules that don't use it.

svn path=/trunk/; revision=12791
2004-12-20 22:13:48 +00:00
Gerald Combs
7053cbed3b Rename the "boolean" enum to "val_boolean" lest the Microsoft compiler let
its displeasure be known.

svn path=/trunk/; revision=12396
2004-10-26 16:08:16 +00:00
Guy Harris
4011ff29b7 Add a "data" item to the opt_info structure, containing a "const void
*".  For val_u_byte, if non-null, it points to a "value_string" table to
be used to interpret the value.  Replace "toggle" and "yes_no" with
"boolean, and have the "data" pointer point to a "struct
true_false_string" to be used to interpret the value.

The NetBIOS-over-TCP/IP Node Type option can now be a regular val_u_byte
value, with the appropriate value_string table.

Construct the item for DHCP options by initializing it without the value
and appending the value to the item's string with
"proto_item_append_text()".

svn path=/trunk/; revision=12391
2004-10-26 07:00:23 +00:00
Guy Harris
671cd939ae Make yes_no work in "dissect_netware_ip_suboption()" the way it works
elsewhere, and replace "struct o63_opt_info" with "struct opt_info".

svn path=/trunk/; revision=12390
2004-10-25 23:25:59 +00:00