Commit Graph

41 Commits

Author SHA1 Message Date
Guy Harris 659cf0527a UATs could be put into "categories". The categories were defined only
implicitly by the #define name and string they were defined to; not all
UATs neatly fit into any of the categories, so some of them were put
into categories that weren't obviously correct for them, and one - the
display filter macro UAT - wasn't put into any category at all (which
caused crashes when editing them, as the GUI code that handled UAT
changes from a dialog assumed the category field was non-null).

The category was, in practice, used only to decide, in the
aforementioned GUI code, whether the packet summary pane needed to be
updated or not.  It also offered no option of "don't update the packet
summary pane *and* don't redissect anything", which is what would be
appropriate for the display filter macro UAT.

Replace the category with a set of fields indicating what the UAT
affects; we currently offer "dissection", which applies to most UATs
(any UAT in libwireshark presumably affects dissection at a minimum) and
"the set of named fields that exist".  Changing any UAT that affects
dissection requires a redissection; changing any UAT that affects the
set of named fields that exist requires a redissection *and* rebuilding
the packet summary pane.

Perhaps we also need "filtering", so that if you change a display filter
macro, we re-filter, in case the display is currently filtered with a
display filter that uses a macro that changed.

svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +00:00
Jakub Zawadzki b18e880040 Update FSF address - part II.
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
Jakub Zawadzki e2c680b245 Fix some "conflicting" value_string warnings.
copy & paste errors, not 0-terminated value_string arrays, etc.

svn path=/trunk/; revision=42260
2012-04-26 14:41:37 +00:00
Jakub Zawadzki 9c48f9ca96 Add missing const attribute to some char *
Fix some "assignment discards qualifiers from pointer target type", etc

svn path=/trunk/; revision=41993
2012-04-09 17:53:04 +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
Bill Meier 5feace57e3 Use 'display'=BASE_NONE for all FT_BOOLEAN hf[] entries with a 0 bitmask;
Do some general whitespace & long-line changes.

svn path=/trunk/; revision=41577
2012-03-15 21:56:52 +00:00
Chris Maynard fb6cce75d9 Fix some duplicate display filter names.
svn path=/trunk/; revision=40669
2012-01-23 20:14:37 +00:00
Guy Harris c8283d1291 Rewrite some odd code. Clang Cat does not want:
packet-reload.c:2875:13: warning: Although the value stored to
	'local_offset' is used in the enclosing expression, the value is
	never actually read from 'local_offset'

although as I read the C90 spec the code is doing pretty much what it
should be doing and the rewritten code does the same thing.  However,
it's also a bit more complicated and harder to read than the rewritten
code.

svn path=/trunk/; revision=39840
2011-11-15 05:25:17 +00:00
Bill Meier 15b6311c01 Fix proto_tree_add_item() encoding args.
svn path=/trunk/; revision=39580
2011-10-25 20:16:26 +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
Bill Meier 126aa85393 Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).



svn path=/trunk/; revision=39426
2011-10-15 18:46:26 +00:00
Michael Tüxen 2579d4f5d0 Make clang on Mac OS X 10.7.2. happy.
svn path=/trunk/; revision=39406
2011-10-13 19:04:25 +00:00
Chris Maynard 92e7adcfc9 When looping, be sure to iterate over the right number of elements. Fixes Coverity OVERRUN_STATIC errors reported in CID's 1305 and 1306. Also, fix the 3 offending display filter names discovered with tools/checkfiltername.pl.
svn path=/trunk/; revision=39393
2011-10-12 18:38:38 +00:00
Bill Meier b666d5ca18 Fix some proto_tree_add_item() FT_ABSOLUTE_TIME encoding parameters:
Again: a tip o'the hat to Guy.


svn path=/trunk/; revision=39383
2011-10-12 14:12:36 +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 56776c54c8 From Stéphane Bryant: fixes in reload fragmentation handling
-Fixes in reload fragmentation
  -also updated the code to reflect draft-zong-p2psip-drr-01

From me:
  Remove one line of the patch which appears to be incorrect:
  At about line 4118 (in dissect_reload_message())
-      pinfo->fragmented = save_fragmented;
+      pinfo->fragmented = pinfo->fragmented;


svn path=/trunk/; revision=39309
2011-10-08 14:42:11 +00:00
Bill Meier 8b3c428699 From Stéphane Bryant: remove the variables that the previous patch left unused
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6317

From me: Add hf[] entry for 'hf_reload_dmflag_underlay_hop'

svn path=/trunk/; revision=39308
2011-10-08 14:14:32 +00:00
Bill Meier cf1c4c12d3 Use '"%" G_GINT64_MODIFIER "d"' instead of "%ld" to format a guint64.
Fixes a compile warning

svn path=/trunk/; revision=39302
2011-10-06 21:12:21 +00:00
Bill Meier e022b330df From Stéphane Bryant: improvements in RELOAD dissection
- Follow closely draft-ietf-p2psip-base-18
- Added support for draft-ietf-p2psip-base-18,
  draft-ietf-p2psip-sip-06,
  draft-ietf-p2psip-service-discovery-03,
  draft-ietf-p2psip-self-tuning-04,
  draft-ietf-p2psip-diagnostics-06,
  draft-zong-p2psip-drr-00,
- Handoff to the xml dissectors for
  configuration data
- export the message content dissection function
  in the new packet-reload.h file for use in
  related protocols (draft-hautakorpi-p2psip-with-hip-01)

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

From me:
- Fix a few C++ style comments;
- Fix:
packet-reload.c(2156) ... conversion from 'guint64' to 'guint32', possible loss of data
packet-reload.c(3528) ... conversion from 'guint64' to 'guint32', possible loss of data

Note: Additional fix yet req'd since checkhf.pl gives:
  ERROR: NO ARRAY: packet-reload.c, hf_reload_dmflag_underlay_hop
  Unused entry: packet-reload.c, hf_reload_storeddata_signature
  Unused entry: packet-reload.c, hf_reload_storeddataspecifiers

(Compile is OK).

svn path=/trunk/; revision=39301
2011-10-06 20:46:45 +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
Bill Meier 4c46725c2c Fix vi "modeline" so it works;
See https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5748

svn path=/trunk/; revision=39074
2011-09-21 16:28:53 +00:00
Anders Broman 1a768b36b4 - Added new SignatureIdentity values.
From Marc Petit-Huguenin:
- Removed directResponseForwarding.
- The certificate_type enum is now defined as RFC 6091's CertificateType
  so moved the definition to packet-ssl-utils.[ch].
- Fixed invalid values for CERTIFICATE_BY_NODE and CERTIFICATE_BY_USER
  Kinds.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5967

svn path=/trunk/; revision=37452
2011-05-29 06:16:19 +00:00
Bill Meier c628346c1f Remove altogether code '#if 0'd in SVN #37229.
Further research shows that registering the dissector
to "tcp.port" and "udp.port" was explicitly removed in SVN #34969
and thus the code to create tcp and udp handles and the associated
dissect_reload_tcp() and dissect_reload_udp() code is no longer
needed.

svn path=/trunk/; revision=37231
2011-05-18 00:37:35 +00:00
Bill Meier c46c260191 #if 0 some unused code & vars: Coverity 1018 & 1019;
Add a comment the unused code.

svn path=/trunk/; revision=37229
2011-05-18 00:07:32 +00:00
Jeff Morriss c204df4719 Use val_to_str() instead of blindly passing the return value from match_strval()
into a format routine (to ensure a non-NULL string pointer).

svn path=/trunk/; revision=37203
2011-05-17 18:53:35 +00:00
Jeff Morriss 1c515d2af2 Use consistent casing in hf_ descriptions and expert infos.
svn path=/trunk/; revision=37057
2011-05-11 01:39:10 +00:00
Jeff Morriss bb9f347294 Prefix the message class names with RELOAD_ to prevent collisions.
svn path=/trunk/; revision=37006
2011-05-06 01:54:07 +00:00
Jeff Morriss c666536162 From Marc Petit-Huguenin via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5894 :
- Use "RELOAD" everywhere.
- Fix invalid variable name "reload_framing.probe_information.type".
- Fix various names to match the spec.
- Dissect the X.509 certificate embedded in RELOAD messages.
- Use tls_signature_algorithm and tls_hash_algorithm tables in
  packet-ssl-utils.

From me: take out the tabs.  Keep the long dissector name when registering the
protocols.

svn path=/trunk/; revision=37003
2011-05-06 01:09:04 +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
Bill Meier 289bfb0526 From Stéphane Bryant: bug fixes and improvements in RELOAD dissector:
*Bug Fixes
*NodeId length is now configurable
*Added missing messages

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

From me:
-Remove trailing blanks from a few lines;
-Put "editor mode lines" at the end of the source file.

svn path=/trunk/; revision=35674
2011-01-27 03:39:16 +00:00
Jeff Morriss 1f4cdf5a9d From Stephane Bryant via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5358 :
This is a dissector for reload framed message:
ReLOAD packets can be inserted in frame message, as described in
draft-ietf-p2psip-base-10

From me: remove some unnecessary includes.

svn path=/trunk/; revision=35005
2010-11-22 16:19:39 +00:00
Jeff Morriss c6b7cbd5dc Remove some unnecessary includes.
svn path=/trunk/; revision=34969
2010-11-19 13:35:24 +00:00
Jeff Morriss 431eb6a7be From Stephane Bryant via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5412 :
Update ReLOAD dissector to reflect draft-ietf-p2psip-base-12

svn path=/trunk/; revision=34966
2010-11-19 02:32:42 +00:00
Bill Meier a7cc9f5358 Add col_clear; Also: Small reformatting and whitespace changes
svn path=/trunk/; revision=34332
2010-10-02 13:40:43 +00:00
Jeff Morriss 18444502e8 Remove trailing spaces from a couple of hf names
svn path=/trunk/; revision=34321
2010-10-02 01:27:45 +00:00
Anders Broman 5d10ffdef5 Add a couple of casts to make it compile.
svn path=/trunk/; revision=34306
2010-10-01 08:14:03 +00:00
Jaap Keuter 7057b9203a Try to fix the Mac build.
svn path=/trunk/; revision=34304
2010-10-01 06:26:26 +00:00
Stig Bjørlykke d65b82db44 Make it compile.
svn path=/trunk/; revision=34301
2010-09-30 21:38:52 +00:00
Jaap Keuter d571d1431a From Stéphane Bryant:
New Dissector for the ReLOAD dissector.

svn path=/trunk/; revision=34297
2010-09-30 20:34:12 +00:00