Commit Graph

162 Commits

Author SHA1 Message Date
Evan Huus a234b68ff0 Fix some system header files that were #included with "" instead of <>.
They made cppcheck unhappy.

svn path=/trunk/; revision=43779
2012-07-18 02:47:56 +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
Jakub Zawadzki 85aad38347 Add proto_tree_add_unicode_string() to add UTF-8 string to tree.
Convert some proto_tree_add_string_format_value(..., val, "%s", val); to use new function.

svn path=/trunk/; revision=43363
2012-06-19 14:32:24 +00:00
Jörg Mayer f679b89649 Revert r41952
BACKPORT to 1.8

svn path=/trunk/; revision=43222
2012-06-12 10:44:57 +00:00
Jörg Mayer 9228ece476 Manually revert r41953
BACKPORT to 1.8

svn path=/trunk/; revision=43221
2012-06-12 10:38:22 +00:00
Bill Meier bdebbb9bdf Re-order 2 value_string arrays so that entries are in ascending order by value.
svn path=/trunk/; revision=43216
2012-06-11 20:35:00 +00:00
Bill Meier 70cc6362fe Don't define value_string arrays in a .h file (included in multiple places).
Also:
 - don't use val_to_str_const() with a "format" default string;
 - rename 'opt_len_type' enumeration  identifiers to be less generic.

svn path=/trunk/; revision=43210
2012-06-11 18:47:42 +00:00
Bill Meier df07bfeba4 Create dscp_vals_ext value_str_ext (based upon dscp_vals); Use it as appropriate.
Also:
 - use val_to_str_const() [instead of val_to_str()] in a few cases;
 - do some trivial formatting cleanup.

svn path=/trunk/; revision=43204
2012-06-11 15:47:50 +00:00
Chris Maynard 0b44e6f99b Mention that dissect_ip_tcp_options() is used by more protocols than just IP and TCP.
svn path=/trunk/; revision=42533
2012-05-10 01:26:53 +00:00
Chris Maynard fd1174b5a5 Remove unused variable not found by MSVC2010EE but found by OSX buildbot.
svn path=/trunk/; revision=42360
2012-04-30 20:38:13 +00:00
Chris Maynard bda12a5882 Add Selective Directed Broadcast (RFC 1770) IP option dissection support.
svn path=/trunk/; revision=42359
2012-04-30 20:24:33 +00:00
Chris Maynard 19fe681849 Add MTU probe, MTU reply and Traceroute IP option dissection support.
svn path=/trunk/; revision=42353
2012-04-30 17:32:33 +00:00
Chris Maynard e936265168 Add missing RFC791 PROG security definition. Reorder ipopts[] so it matches the order at http://www.iana.org/assignments/ip-parameters, which is ordered by 'Number'. Use the descriptions as they appear there as well. Add TODO placeholders in ipopt[] for the yet-to-be-implemented options.
svn path=/trunk/; revision=42348
2012-04-30 14:29:54 +00:00
pascal d39ae2d807 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7064 :
Dissect basic security option according to RFC 791 or RFC 1108 depending on the option length and the first two bytes content.
Also dissect the extended security option.

svn path=/trunk/; revision=42342
2012-04-30 08:21:09 +00:00
Jakub Zawadzki 68ec58d385 Fix some: 'cast discards qualifiers from pointer target type' warnings
- Add const qualifier
- Remove some strange casts

svn path=/trunk/; revision=42131
2012-04-18 12:35:36 +00:00
Anders Broman bb562d518a From Jakub Zawadzki: fix, which changes types from FT_STRING to FT_DOUBLE. Fixes GeoIP: Display Filter comparisons operators do not seem to work for negative latitude or longitude values... https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5077
svn path=/trunk/; revision=42103
2012-04-17 04:51:07 +00:00
Chris Maynard 1e6301fa8b Set the minimum length of the Internet Timestamp option to 4 bytes instead of 5. RFC 791 only states that the smallest legal value of the pointer is 5, not the smallest size for the option itself. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7043
Since backporting must be manually applied anyway, other changes include fixing the displaying of the EOOL and NOP options, as well as other options without a dissect routine associated with them.

svn path=/trunk/; revision=41994
2012-04-09 18:17:33 +00:00
Anders Broman 3f4d248357 Use common code to have the same hf field for DSCP in IPv4 and IPv6.
svn path=/trunk/; revision=41953
2012-04-05 10:35:39 +00:00
Anders Broman 60c4bd3eeb Use common code to add ip version to the tree.
svn path=/trunk/; revision=41952
2012-04-05 08:38:26 +00:00
Bill Meier ca3e8b5d8b 'tab-width/tabstop/tabSize' in editor modelines should really always be 8;
Also: In some cases do some whitespace cleanup and some minor reformatting.

svn path=/trunk/; revision=41724
2012-03-21 18:20:44 +00:00
Alexis La Goutte fa68273f40 Add Quick Start IPv6 Option ( And shared Quick Start option between IPv4/IPv6/TCP )
svn path=/trunk/; revision=41681
2012-03-20 08:51:05 +00:00
Bill Meier b2102cc092 FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE;
svn path=/trunk/; revision=41582
2012-03-15 23:26:40 +00:00
Chris Maynard f88e871171 Fix some typos.
svn path=/trunk/; revision=40786
2012-02-01 01:41:11 +00:00
Chris Maynard 5cfa297971 Don't pass 'len' to the dissect routine since we know there's only 1 byte present. This fixes the buildbot complaint about using 'len' uninitialized.
svn path=/trunk/; revision=40008
2011-11-26 04:45:49 +00:00
Chris Maynard 6dc3290d68 Add a few casts to try to make the buildbots happy.
svn path=/trunk/; revision=40007
2011-11-26 04:31:40 +00:00
Chris Maynard d51167076a IP option improvements. While fixing bug 6561, I noticed some deficiencies in the IP options dissection capabilities. Testing of these changes primarily used the capture file attached to that bug report as there were several IP options present. Packet 222 is an interesting packet that illustrates some of the new filters available. Further work is needed, but hopefully this is a good first step. Fuzz testing was performed using my own "menagerie".
svn path=/trunk/; revision=40006
2011-11-26 04:16:11 +00:00
Chris Maynard 1f513638e0 Display protocol ID consistently in decimal throughout. Append each IP option to top-level Options field. Whitespace cleanup - the majority of the dissector used 2-space indentation, so that's the format chosen. Added modelines to match.
svn path=/trunk/; revision=39994
2011-11-23 18:33:45 +00:00
Chris Maynard db39b3da06 For now, display the protocol in hexadecimal again so displaying it in decimal doesn't get backported to the 1.6 and 1.4 trunks at the request of Joerg.
svn path=/trunk/; revision=39986
2011-11-22 15:18:20 +00:00
Chris Maynard f2e8579ba3 Fix potential infinite loop introduced with r39961 and find by the buildbot. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6599
svn path=/trunk/; revision=39963
2011-11-21 02:01:59 +00:00
Chris Maynard 3c8e31e055 Fix bug 6561: IPv4 UDP/TCP Checksum incorrect if routing header present.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6561

svn path=/trunk/; revision=39961
2011-11-20 15:47:14 +00:00
Bill Meier 54b72021bb Fix encoding arg for various fcn calls:
- proto_tree_add_bits_item
 - proto_tree_add_bits_ret_val
 - proto_tree_add_bitmask
 - tvb_get_bits
 - tvb_get_bits16
 - tvb_get_bits24
 - tvb_get_bits32
 - tvb_get_bits64


svn path=/trunk/; revision=39539
2011-10-24 19:57:53 +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
Gerald Combs 583ac864c0 Enable GeoIP lookups by default. Don't add GeoIP subtrees if we didn't
find any databases.

svn path=/trunk/; revision=39363
2011-10-11 17:57:09 +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
Stig Bjørlykke 1becef31f0 Use IPv4 as protocol name, to align with IPv6.
svn path=/trunk/; revision=37070
2011-05-12 10:27:02 +00:00
Jakub Zawadzki 38c2f2a151 Cleanup: replace sizeof(arr)/sizeof(arr[0]) with shorter array_length(arr)
svn path=/trunk/; revision=36986
2011-05-04 19:32:35 +00:00
Chris Maynard ba9dc9f45f Make ip.fragments an FT_BYTES field so a PDML Export will display the bytes in
the value="..." attribute.  Fixes bug 1520.

svn path=/trunk/; revision=36378
2011-03-28 14:53:35 +00:00
Stig Bjørlykke a07fff3b15 Corrected hack for TAPA by checking for "not IPv4".
Coverity 343.

svn path=/trunk/; revision=36244
2011-03-22 10:12:07 +00:00
Stig Bjørlykke 84bc28bd6a Introduce "Fragment count" filter element for all protocols doing reassembly.
svn path=/trunk/; revision=35705
2011-01-30 21:01:07 +00:00
Guy Harris 158e9a3dae Clean up indentation.
svn path=/trunk/; revision=35257
2010-12-23 21:22:55 +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
Stig Bjørlykke 8b21f50474 Added hint about "TCP segmentation offload" when IP length == 0.
Added expert info item for bogus IP length.
Added hint about "IP checksum offload" for invalid IP checksum.
Describe TSO in the preference setting. 

svn path=/trunk/; revision=34830
2010-11-10 13:49:55 +00:00
Bill Meier 9675740701 Use value_string_ext fcns to access certain value_string arrays;
Sort several value_string arrays to be in ascending order.
Also: Minor whitespace cleanup.

svn path=/trunk/; revision=34766
2010-11-03 22:08:49 +00:00
Jaap Keuter 694383d4a8 From Simon Leinen:
The IP Timestamp Option (RFC 781) has three variants.  One (flag=0) just stores
a sequence timestamps in the option, but the other two (flag=1 and flag=3)
store alternate IP addresses and timestamps.

From me:
Mark option full when offset (pointer) is set to one, as per RFC 781.

svn path=/trunk/; revision=34750
2010-11-02 08:48:06 +00:00
Gerald Combs 0e64b1749c Enable "Support packet-capture from IP TSO-enabled hardware" by default.
Like checksum offloading this seems to be common on modern systems.

svn path=/trunk/; revision=34383
2010-10-05 16:32:12 +00:00
Stig Bjørlykke 2d93bc5e9a Make "4 NOP in a row" work again after changing the NOP name for TCP and IP
in revisions 34095 and 34097.

svn path=/trunk/; revision=34134
2010-09-16 12:29:22 +00:00
Stig Bjørlykke 894941e532 Only check for 4 NOP in a row within a uint32 boundary.
svn path=/trunk/; revision=34100
2010-09-10 21:24:32 +00:00
Stig Bjørlykke f2e302eee0 Follow TCP and expand description for "NOP" and "EOL" options to "No-Operation (NOP)"
and "End of Options List (EOL)" respectively.

svn path=/trunk/; revision=34097
2010-09-10 16:48:00 +00:00
Stig Bjørlykke aca8a4d989 Update dsfield ECN according to RFC3168.
svn path=/trunk/; revision=34092
2010-09-10 11:16:29 +00:00
Stig Bjørlykke e71daa1fc1 Revert revision 33780, because the checksum is only calculated
from the header and not the content.

svn path=/trunk/; revision=34080
2010-09-08 13:38:47 +00:00