osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity
51919 commits 23 branches 0 tags 1.3 GiB
Commit graph

104 commits

Author SHA1 Message Date
Pascal Quantin
58db464aff Remove executable bit from a few files 
Change-Id: Ib9be221e3d325379c8b665ab73d976254bb23bb6
Reviewed-on: https://code.wireshark.org/review/342
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
 2014-02-24 22:34:26 +00:00
Bill Meier
5ae232664c Fix "off by 1" bug in dissection of OPTION_AFTR_NAME introduced in 0548a7d5. 
Change-Id: I461601cd952f1c4d27a004c0a65cfefe82dc0f49
Reviewed-on: https://code.wireshark.org/review/272
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-02-20 21:49:17 +00:00
Bill Meier
dc53a65bef Fix minor bug; Use a consistent whitespace & formatting style; add extended value-string. 
Bug fix: don't call col_...() under 'if (tree)'

Change-Id: I5f586f16f0e64b30da49fbbb0bb8e41b04ba8833
Reviewed-on: https://code.wireshark.org/review/267
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-02-20 04:55:08 +00:00
Bill Meier
2bb54d5e20 Create/Use some extended value strings. 
Change-Id: I750d04a25a4f7d600e4156aaac4a4580a1f7a345
Reviewed-on: https://code.wireshark.org/review/259
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-02-19 20:55:33 +00:00
Bill Meier
0548a7d549 Simplify/improve handling of FQDN field in various options; Fix some minor bugs. 
Details:
- Use dhcpv6_domain() to handle dissection of certain FQDN fields:
  + OPTION_AFTR_NAME:           Don't use get_dns_name(); It allows "compression"
                                 which is not valid forthis field.
  + OPTION_CCCV6_IETF_PROV_SRV: Replace use of swap_field_length_with_char();
                                Fix bug which caused invalid "expert" message.
  + OPTION_CCCV6_KRB_REALM:     Remove validation; replace use of swap_field_length_with_char().

- Allow filtering for each different FQDN field (rather than using a generic "dhcpv6.domain"
   for the various FQDN fields).

- Fix some bugs in the display of the dissection for NTP_SERVER_OPTION;
- Add some "XXX ToDo" comments.
- Add some comments as the to specific RFC for certain options;
- Note that RFC 4075 is now "deprecated";
- CL-SP-CANN-DHCP-Reg: version I10 is the latest as  Feb 2014.

Change-Id: I82edafb8293b71037b84629406ce609f9a835f04
Reviewed-on: https://code.wireshark.org/review/257
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-02-19 18:30:52 +00:00
Bill Meier
0d244eeb28 Remove code which dissects CableLabs options 17.2170.3 thru 17.2170.9 
inasmuch as these options don't exist per the spec.

 See: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9690
      (especially comment #5).

Change-Id: Iab757a71fe1865bbd0b97443512bf947f027dbe1
Reviewed-on: https://code.wireshark.org/review/256
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
 2014-02-19 18:28:29 +00:00
Bill Meier
ff85833235 Fix Bug #9690: DHCPv6 Packet dissector incorrectly handling FQDN in option 17.2171.6 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9690

Change-Id: I606bb73f4a226cbf1eb56cc0a27b926b97a453a0
Reviewed-on: https://code.wireshark.org/review/131
Reviewed-by: Bill Meier <wmeier@newsguy.com>
 2014-02-06 23:27:34 +00:00
Jakub Zawadzki
deb2b236f2 Add missing includes 
svn path=/trunk/; revision=54332
 2013-12-21 17:23:17 +00:00
Evan Huus
a6415ece0a Rename a couple of to_str functions to have ep_ in the name. This makes it 
obvious that the returned string is ephemeral, and opens up the original names
in the API for versions that take a wmem pool (and thus can work in any scope).

svn path=/trunk/; revision=54249
 2013-12-19 15:49:09 +00:00
Jakub Zawadzki
f049bec3ca DHCPv6: update list of message types and options (from IANA) 
svn path=/trunk/; revision=53992
 2013-12-12 21:29:51 +00:00
Michael Mann
8081cf1d90 Add data parameter to tcp_dissect_pdus() as well as convert it to using "new" style dissectors. 
Now that "bytes consumed" can be determined, should tcp_dissect_pdus() take advantage of that?

Should tcp_dissect_pdus return length (bytes consumed)?  There are many dissectors that just call tcp_dissect_pdus() then return tvb_length(tvb).  Seems like that could all be rolled into one.

svn path=/trunk/; revision=53198
 2013-11-09 17:46:28 +00:00
Bill Meier
9874da2fcb #if 0 numerous "unused const variables" (mostly value-string-arrays); 
Also; fix a few "set but not used" warnings.

svn path=/trunk/; revision=52780
 2013-10-23 06:29:11 +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
Evan Huus
4212b20048 Don't use g_strv_length on a single string, just use strlen. Also do the 
null-check *before* calling strlen (if it's even necessary?)

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

svn path=/trunk/; revision=52156
 2013-09-20 14:41:22 +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
Michael Mann
9e3f9b449f expert_add_info_format_text -> expert_add_info_format 
svn path=/trunk/; revision=51852
 2013-09-09 00:44:09 +00:00
Alexis La Goutte
1dfecc041c Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang 
svn path=/trunk/; revision=50244
 2013-06-29 22:00:50 +00:00
Alexis La Goutte
0a249bf647 Fix errors found by fix-encoding-args script 
epan/dissectors/packet-dhcpv6.c:  FT_IPv6:          proto_tree_add_item(pkt_s_tree, hf_packetcable_cccV6_prov_srv_ipv6, tvb, suboptoff+1, 4, [[ENC_BIG_ENDIAN]-->[ENC_NA]]);
epan/dissectors/packet-dhcpv6.c:  FT_BYTES:         proto_tree_add_item(subtree2, hf_capabilities_encoding_bytes, tvb, tlv5_cap_index, tlv5_cap_len, [[ENC_BIG_ENDIAN]-->[ENC_NA]]);

svn path=/trunk/; revision=50084
 2013-06-20 20:17:21 +00:00
Alexis La Goutte
dc82f1cc93 Fix packet-dhcpv6.c: In function 'dhcpv6_option': packet-dhcpv6.c:1826:36: error: 'ti' may be used uninitialized in this function [-Werror=maybe-uninitialized] 
svn path=/trunk/; revision=50082
 2013-06-20 18:32:18 +00:00
Evan Huus
612d14c883 From Brian Otte via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8592 
Numerous fixes and improvements to DHCPv6 Cable Television Labs vendor-specific
information dissection.

svn path=/trunk/; revision=50075
 2013-06-20 16:22:53 +00:00
Pascal Quantin
285bc53826 Fix typo error 
svn path=/trunk/; revision=49918
 2013-06-13 14:20:20 +00:00
Pascal Quantin
53c658bb19 Add basic dissection of Prefix Exclude option 
svn path=/trunk/; revision=49917
 2013-06-13 14:18:10 +00:00
Michael Mann
57fc882623 Simplify the "bad length" expert info into a single filterable item with formatting determining the particulars because the filter names just didn't make much sense to separate. 
svn path=/trunk/; revision=49801
 2013-06-06 02:10:22 +00:00
Michael Mann
7e8e5b347e Batch of filterable expert_infos. 
svn path=/trunk/; revision=49581
 2013-05-25 17:06:40 +00:00
Michael Mann
b2027be0f8 Add filterable expert info. 
svn path=/trunk/; revision=49573
 2013-05-25 03:27:31 +00:00
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