Commit Graph

90 Commits

Author SHA1 Message Date
Bill Meier b5d7b7ab6e Cleanup use of #includes in non-generated epan/dissector/*.c
Specifically:
- Set packet.h to be the first wireshark #include after
   config.h and "system" #includes.
   packet.h added as an #include in some cases when missing.
- Remove some #includes included (directly/indirectly) in
   packet.h. E.g., glib.h.
   (Done only for those files including packet.h).
- As needed, move "system" #includes to be after config.h and
   before wireshark #includes.
- Rework various #include file specifications for consistency.
- Misc.

Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95
Reviewed-on: https://code.wireshark.org/review/5923
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21 05:46:22 +00:00
Michael Mann f8e24c9fdc Eliminate proto_tree_add_text for some dissectors.
Change-Id: Ide14bcac0b1563bee4260ac9c1a280ba99e97e71
Reviewed-on: https://code.wireshark.org/review/5261
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-13 05:17:36 +00:00
Michael Mann 6318a29fa3 convert to proto_tree_add_subtree[_format]
Change-Id: Ia2567695ffed30c990eda3740b08bfab101cea96
Reviewed-on: https://code.wireshark.org/review/2883
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-06 14:21:15 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Bill Meier 48ce5629b0 Minor: use VALS macro (as per convention); Add editor modelines; Do whitespace changes.
Change-Id: I6007c1b2098d06e4a892474dd07f06a7538f94ef
Reviewed-on: https://code.wireshark.org/review/1843
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-05-28 15:40:39 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Anders Broman b781d6c99d - Make local functions static.
- Forward declaration of register functions.

svn path=/trunk/; revision=53958
2013-12-12 06:11:05 +00:00
Michael Mann 9b7fb8a811 Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future.  And search/replace of a function name is easy enough to do.

The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.

All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope().  All other dissectors were converted to using file_scope() which was the original scope for "proto" data.

svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
Michael Mann 02e5ce855a pinfo->private_data is no longer being used, so adjust the logic accordingly.
svn path=/trunk/; revision=53237
2013-11-10 17:45:59 +00:00
Bill Meier 0ad98563a2 From didier gautheron: remove redundant or use faster col_xxx functions
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster.
- same for  replace col_append_fstr and col_append_str
- remove col_clear() when it's redundant:
    + before a col_set/col_add if the dissector can't throw an exception.
- replace col_append() after a col_clear() with faster col_add... or col_set

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


svn path=/trunk/; revision=52948
2013-10-29 14:09:20 +00:00
Jörg Mayer 1b69a6a94d CID 700176: Dereference null return value (NULL_RETURNS)
Not sure whether this is really possible, but add a dissector_assert
just to be safe.

svn path=/trunk/; revision=52820
2013-10-24 20:35:53 +00:00
Evan Huus 63eac3f6fd Fix -Wshadow error
svn path=/trunk/; revision=52726
2013-10-20 23:35:48 +00:00
Michael Mann 24ba431d80 Pass ROHC "private data" from PDCP-LTE using dissector data parameter instead of using pinfo->private_data.
Passing data through the dissector parameter eliminates the need for ROHC dissector to save/restore private_data.

svn path=/trunk/; revision=52723
2013-10-20 20:35:24 +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
Michael Mann e5e4d357e3 Batch of filterable expert infos.
svn path=/trunk/; revision=51518
2013-08-25 21:01:11 +00:00
Pascal Quantin b46f9bebe2 Change some dissectors to use pinfo memory pool instead of malloc if it can trigger an exception between between buffer allocation and tvb_set_free_cb call
svn path=/trunk/; revision=51427
2013-08-19 14:55:41 +00:00
Pascal Quantin 81b6d6aab3 Do not use ephemeral memory when adding a new data source
svn path=/trunk/; revision=51423
2013-08-19 10:39:43 +00:00
Martin Mathieson a8766fb356 Squelch a (bogus) warning about next_tvb being unused initialised.
svn path=/trunk/; revision=51404
2013-08-17 17:52:13 +00:00
Chris Maynard 67f1d07176 Initialize val_len to avoid Clang warning: The right operand of '-' is a garbage value. While in there, add some protection against tvb_length_remaining() possibly returning -1, or possibly being less than val_len.
#BACKPORT(1.10)

svn path=/trunk/; revision=51395
2013-08-16 20:46:45 +00:00
Jakub Zawadzki 5fa2a99087 Keep result of [new_]register_dissector in some dissectors.
svn path=/trunk/; revision=51156
2013-08-05 18:09:43 +00:00
Pascal Quantin a9ced211ac Do not display payload twice when using uncompressed profile
svn path=/trunk/; revision=49407
2013-05-18 11:41:44 +00:00
Pascal Quantin a20d3ddf8b Add partial dissection of IR packet with IP profile
svn path=/trunk/; revision=49331
2013-05-16 15:02:55 +00:00
Anders Broman 85a8e304dd Add the posibillity to use a key for per-packet-data.
svn path=/trunk/; revision=49259
2013-05-12 18:11:02 +00:00
Pascal Quantin b3da159427 Enhance dissection of feedback
svn path=/trunk/; revision=49032
2013-04-25 15:21:48 +00:00
Anders Broman ae747e4c4b From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48430
2013-03-19 22:03:00 +00:00
Pascal Quantin 8ed55b8eef Fix dissection of feedback with large CID
svn path=/trunk/; revision=47955
2013-02-28 22:22:52 +00:00
Pascal Quantin 0037adc30e Dissect more feedback options
svn path=/trunk/; revision=47887
2013-02-25 22:36:24 +00:00
Pascal Quantin 1c9c5621c8 Fix display type
svn path=/trunk/; revision=47870
2013-02-24 22:39:46 +00:00
Pascal Quantin 959e3e3e2c Various enhancements to ROHC dissector:
- fix dissection of type 0 packets with large CID
- add dissection of type 1 and 2 packets (extension 3 dissection to be done)
- add dissection of UDP checksum

svn path=/trunk/; revision=47869
2013-02-24 22:06:53 +00:00
Pascal Quantin 622bd16abf Add dissection of uncompressed IP-ID
svn path=/trunk/; revision=47844
2013-02-23 22:26:29 +00:00
Pascal Quantin 3d854528ce Enhance dissection of uncompressed profile and type 0 packets.
Always restore saved private data when returning from dissector.

svn path=/trunk/; revision=47840
2013-02-23 18:45:14 +00:00
Pascal Quantin 13729e9c11 When dissecting a feedback, if no context info is present use private data if available
svn path=/trunk/; revision=47826
2013-02-22 17:34:56 +00:00
Pascal Quantin a3fca22472 Dissect Feedback type 1/2 packets for UDP and Uncompressed profiles
svn path=/trunk/; revision=47806
2013-02-21 19:18:29 +00:00
Bill Meier d3a7f4b817 Use '#if 0 ... #endif' rather than /** ... **/ to comment out
unused hf[] entries (which I should have done in the first place).

svn path=/trunk/; revision=47390
2013-01-31 18:31:28 +00:00
Bill Meier 0960e508e4 Comment out cases of unused hf array entries found by checkhf.
svn path=/trunk/; revision=47302
2013-01-26 18:54:53 +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
Jakub Zawadzki 9f92dc93c5 Add data parameter to call_dissector_only.
svn path=/trunk/; revision=44872
2012-09-11 08:28:07 +00:00
Pascal Quantin 0e79405e0d Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7679:
Do not try to set IR header length when the profile is unknown

svn path=/trunk/; revision=44700
2012-08-30 12:08:53 +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
pascal 736627bb97 Attempt to fix clang warnings (dead assignment and dereference of null pointer)
svn path=/trunk/; revision=42389
2012-05-02 20:40:49 +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
Martin Mathieson 2b13fcbb2c Set the extent of IR, IR-DYN and feedback packet types.
Make some fields display and HEX and DEC.

svn path=/trunk/; revision=41881
2012-04-01 14:55:40 +00:00
Bill Meier 01154ebca4 proto_reg_handoff...() doesn't need 'if(!Initialized)';
Also: Do some whitespace cleanup.

svn path=/trunk/; revision=41088
2012-02-20 22:00:50 +00:00
Michael Tüxen 7b368e3895 Remove redundant ().
svn path=/trunk/; revision=40719
2012-01-25 16:43:04 +00:00
Anders Broman 4caa84610d Restructure the code abit.
svn path=/trunk/; revision=40700
2012-01-24 19:16:32 +00:00
Jeff Morriss dc0ad2aac7 Revert 40675 and set 'protocol' appropriately when IPv6 is used.
Initialize it to something other than UDP if we can't determine the protocol.

Reindent parts of the subject function.
Replace tabs with spaces (for consistency).
Remove trailing white space.

svn path=/trunk/; revision=40677
2012-01-23 22:37:53 +00:00
Jeff Morriss 4e7f5c2e8f Initialize 'protocol' to something, at least until it can be properly assigned in the IPv6 and default cases.
svn path=/trunk/; revision=40675
2012-01-23 22:20:15 +00:00
Anders Broman 4e30aece3a Only continue dissection if protocol is UDP.
svn path=/trunk/; revision=40673
2012-01-23 21:13:10 +00:00