osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity
41,506 Commits 23 Branches 0 Tags 1.3 GiB
Commit Graph

106 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
Jeff Morriss 030a76319c Correct the IPv6 fragment offset shown in COL_INFO. 
Make some Fragment header fields filterable (add_text() -> add_item()).
Display (and make filterable) the reserved octet and bits.

svn path=/trunk/; revision=43389
 2012-06-19 20:20:18 +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
Gerald Combs 0bf0ece483 Integrate r43221 and 43222 with 43211. (Revert back to having only 
dscp_vals_ext.)

svn path=/trunk/; revision=43335
 2012-06-18 17:23:10 +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 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
Anders Broman 867de6145e From Sheetal Kshirsagar and Andrew Williams: 
Updating the RPL SRH dissector and implementing RPL Options header dissection.

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

svn path=/trunk/; revision=42937
 2012-05-31 07:25:11 +00:00
Jakub Zawadzki 4c3735771a Fix bug #5077 in IPv6. 
svn path=/trunk/; revision=42909
 2012-05-30 05:39:39 +00:00
Jakub Zawadzki a2dac52152 Cleanup geoip support in ipv6. 
svn path=/trunk/; revision=42908
 2012-05-30 05:33:37 +00:00
Gerald Combs 691ea690c8 Fix a few scan-build warnings along with some whitespace. 
svn path=/trunk/; revision=42630
 2012-05-15 19:11:08 +00:00
Alexis La Goutte f5a1787a06 Enhance Unknown IPv6 Extension Header 
svn path=/trunk/; revision=42511
 2012-05-08 17:34:46 +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
Anders Broman 3472f44238 Use common value string for DSCP. 
svn path=/trunk/; revision=41951
 2012-04-05 08:02:32 +00:00
Alexis La Goutte 2ddb826f55 Add IPv6 Option : RPL Option RFC-ietf-6man-rpl-option-06 
svn path=/trunk/; revision=41797
 2012-03-27 13:50:50 +00:00
Alexis La Goutte 22e69ad398 Add IPv6 Option : 
* Tunnel Encapsulation Limit (RFC 2473)
* CALIPSO (RFC 5570)
* Experimental Option (RFC 4727)

svn path=/trunk/; revision=41796
 2012-03-27 13:42:54 +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
Alexis La Goutte d033740bc7 Fix typo (wrong proto_item is used... when there is PAD1 Option) 
svn path=/trunk/; revision=41636
 2012-03-18 11:54:23 +00:00
Alexis La Goutte c604cb5fa9 Remove dissect_ipv6_options function (unused from Revision 16302...) 
svn path=/trunk/; revision=41624
 2012-03-16 21:01:32 +00:00
Alexis La Goutte 20a52095aa Enhance and update IPv6 Option of Extension Header 
* Make field filterable...
* Display unknown option payload 

svn path=/trunk/; revision=41513
 2012-03-12 23:13:03 +00:00
Chris Maynard 3db18f185e Fix some typos. 
svn path=/trunk/; revision=40787
 2012-02-01 02:05:19 +00:00
Alexis La Goutte 0a8ea997e1 Fix indent and add modelines information 
svn path=/trunk/; revision=40258
 2011-12-21 14:18:28 +00:00
Chris Maynard ec5aa661d9 Explicitly display "Source or Destination Address/Host" like IPv4. 
svn path=/trunk/; revision=40095
 2011-12-05 19:12:24 +00:00
Chris Maynard 8e83e11d3f Call tap_queue_packet() after pinfo data is updated. Also, like IPv4, display next header field in decimal instead of hexadecimal (REF: http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml) 
svn path=/trunk/; revision=40083
 2011-12-03 17:03:06 +00:00
Chris Maynard a5924e3fa3 Some code needs to execute (potentially) whether the tree is NULL or not. Also, changed "Left Segments" to read, "Segments Left" to better match RFC 2460 and RFC 3775 terminology. 
svn path=/trunk/; revision=40077
 2011-12-03 04:32:08 +00:00
Chris Maynard 33c8389976 If a type 2 Mobile IP routing header is present, only set pinfo->dst if seg_left is non-zero. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6560 
svn path=/trunk/; revision=40076
 2011-12-03 04:07:20 +00:00
Alexis La Goutte a21d6f0a96 Remove unused code (Add in Revision 836) 
Fix also some Clang/GCC Warning about unused variable

svn path=/trunk/; revision=40000
 2011-11-25 10:41:11 +00:00
Bill Meier 30cee99009 Fix a number of proto_tree_add_item() encoding args. 
svn path=/trunk/; revision=39774
 2011-11-09 17:33:18 +00:00
Jeff Morriss f5e838b602 Remove comma at the end of several enumerator lists. 
svn path=/trunk/; revision=39700
 2011-11-01 01:23:10 +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 cca6984ab9 Do some more conversions of proto_tree_add_item() 'encoding' arg 
(previously missed).

svn path=/trunk/; revision=39450
 2011-10-18 00:17:48 +00:00
Bill Meier 293049dfba Do some conversions of proto_tree_add_item() 'encoding' arg. 
(previously missed).

    57   FT_BOOLEAN:       FALSE-->ENC_BIG_ENDIAN
    31   FT_BOOLEAN:       TRUE-->ENC_LITTLE_ENDIAN

    10   FT_BYTES:         ENC_BIG_ENDIAN-->ENC_NA
     1   FT_BYTES:         ENC_LITTLE_ENDIAN-->ENC_NA
    21   FT_BYTES:         FALSE-->ENC_NA
     2   FT_BYTES:         TRUE-->ENC_NA

     2   FT_IPXNET:        ENC_BIG_ENDIAN-->ENC_NA

     6   FT_IPv6:          ENC_BIG_ENDIAN-->ENC_NA
     1   FT_IPv6:          FALSE-->ENC_NA

     6   FT_NONE:          ENC_BIG_ENDIAN-->ENC_NA
    19   FT_NONE:          FALSE-->ENC_NA
     3   FT_NONE:          TRUE-->ENC_NA

     1   FT_STRING:        ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA
     1   FT_STRING:        ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA
     5   FT_STRING:        FALSE-->ENC_ASCII|ENC_NA
     1   FT_STRING:        TRUE-->ENC_ASCII|ENC_NA

     4   FT_STRINGZ:       ENC_NA-->ENC_ASCII|ENC_NA
     8   FT_STRINGZ:       FALSE-->ENC_ASCII|ENC_NA

     1   FT_INT32:         FALSE-->ENC_BIG_ENDIAN
     1   FT_INT32:         TRUE-->ENC_LITTLE_ENDIAN

    11   FT_UINT8:         0-->ENC_BIG_ENDIAN
   111   FT_UINT8:         FALSE-->ENC_BIG_ENDIAN
    17   FT_UINT8:         TRUE-->ENC_LITTLE_ENDIAN
     1   FT_UINT16:        0-->ENC_BIG_ENDIAN
    68   FT_UINT16:        FALSE-->ENC_BIG_ENDIAN
    18   FT_UINT16:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT24:        FALSE-->ENC_BIG_ENDIAN
    70   FT_UINT32:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT32:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT64:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT64:        TRUE-->ENC_LITTLE_ENDIAN

     1   FT_UINT_STRING:   FALSE-->ENC_ASCII|ENC_BIG_ENDIAN


svn path=/trunk/; revision=39442
 2011-10-16 23:38:49 +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 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
Gerald Combs 210262ad24 Assume all strings coming from GeoIP are ISO-8859-1. Fix IPv6 
destination GeoIP lookups.

svn path=/trunk/; revision=39299
 2011-10-06 19:33:15 +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
Gerald Combs 2841728510 Fix GeoIP-sans-IPv6 compilation. 
svn path=/trunk/; revision=39281
 2011-10-05 22:37:00 +00:00
Gerald Combs b9b05239f1 Add GeoIP IPv6 database support. Tested with GeoIP 1.4.7, but older 
versions *should* be supported.

svn path=/trunk/; revision=39280
 2011-10-05 22:27:51 +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
Bill Meier 2bf572bc41 Remove unneeded #includes: proto.h,tvbuff.h,value_string.h,stdlib.h,... 
svn path=/trunk/; revision=38413
 2011-08-08 17:59:32 +00:00
Bill Meier d2269ce7d5 Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings. 
svn path=/trunk/; revision=37716
 2011-06-19 18:47:35 +00:00
Alexis La Goutte 08dcc37848 From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5980 
Add draft-ietf-6man-rpl-routing-header-03 Support (RH4 RPL Routing Header)

From me :
* Display Bytes of Address and Full Address (Generated)
* Fix some Whitespace and minor enhance...




svn path=/trunk/; revision=37632
 2011-06-09 18:02:13 +00:00
Stig Bjørlykke 516442af8f Prefix "fragments" with IPv6, as is done with IPv4. 
svn path=/trunk/; revision=37071
 2011-05-12 10:27:30 +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
Jeff Morriss 61876001c3 Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the 
return string is NULL terminated.

There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

svn path=/trunk/; revision=35548
 2011-01-16 03:57:12 +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
Jaap Keuter 57a7873857 Fix for bug 5252: 
Use real IPv6 destination address when RH0 has 0 segments left.

svn path=/trunk/; revision=34199
 2010-09-23 06:58:55 +00:00
Jeff Morriss 381664535b As suggested by Kovarththanan Rajaratnam in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548 : 
Clean up hf fields some more: mostly removing leading and trailing spaces from names and blurbs.

svn path=/trunk/; revision=34165
 2010-09-21 03:14:49 +00:00