Commit Graph

103 Commits

Author SHA1 Message Date
Martin Kaiser 3e41e172db dissect Refresh Request Flag
svn path=/trunk/; revision=53305
2013-11-13 21:52:33 +00:00
Martin Kaiser ff7f1c80cf dissect Operator Profile's delivery system hint
svn path=/trunk/; revision=53304
2013-11-13 20:41:00 +00:00
Martin Kaiser 72f3c258a0 share the text description of service types between MPEG PMT and DVB-CI
svn path=/trunk/; revision=53289
2013-11-12 22:04:47 +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
Bill Meier 2ac134b3c5 whitespace fixes; mostly: remove trailing blanks
svn path=/trunk/; revision=52591
2013-10-13 19:56:52 +00:00
Michael Mann e5846873f4 Convert proto_tree_add_time_format to either proto_tree_add_time or proto_tree_add_time_format_value.
Only proto_tree_add_time_format calls remaining are in packet-ncp2222.inc, which may just need some additional filters.

svn path=/trunk/; revision=52269
2013-09-29 16:40:01 +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
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 154d793f1e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=51733
2013-09-03 18:43:11 +00:00
Evan Huus 6c9fd6e751 Fix two expert calls on the wrong proto_item.
svn path=/trunk/; revision=51628
2013-09-01 13:43:26 +00:00
Michael Mann e597acdc48 Batch of filterable expert info.
svn path=/trunk/; revision=51625
2013-09-01 13:05:27 +00:00
Martin Kaiser 6d97cc86bd revert the last commit, the comment was correct already
svn path=/trunk/; revision=51533
2013-08-27 11:10:36 +00:00
Martin Kaiser 285ab0a5f9 correct a comment: resource -> item
svn path=/trunk/; revision=51532
2013-08-27 11:04:12 +00:00
Martin Kaiser 2f42b3b031 provide a mechnism to exclude some CI+ SAC messages from being
exported in the clear by the export PDU mechanism

use this mechanism to exclude SAC messages that contain CCK precursor data
(Exporting this is not a security issue, but people should be aware of what
 they're doing. It's safer to exlude those messages and prevent people from
 exporting them accidentially.)

svn path=/trunk/; revision=51037
2013-07-30 20:05:49 +00:00
Martin Kaiser 174fa28a31 support exporting decrypted DVB-CI/CI+ SAC messages
using the new export PDU mechanism

svn path=/trunk/; revision=51019
2013-07-29 20:38:20 +00:00
Jakub Zawadzki a18172147f Remove fragment_data, add fragment_head, fragment_item - for now alias it to the same structure.
This is begin of work to split fragment head and fragments items.

svn path=/trunk/; revision=50708
2013-07-17 21:12:24 +00:00
Martin Kaiser 882d0841ae fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8916
reported by Laurent Butti

a TPDU's length field must never be 0
this length field was decremented without prior checking,
allocating length-1 bytes of memory caused a dissector assert

svn path=/trunk/; revision=50474
2013-07-09 20:51:48 +00:00
Martin Kaiser 0d6110e2a4 try_val_to_str() may return NULL
although this is nearly impossible here,
use val_to_str_const() anyway to be on the safe side

svn path=/trunk/; revision=49924
2013-06-14 04:01:21 +00:00
Martin Kaiser 92398bab6a add IDs for host license, play count
svn path=/trunk/; revision=49206
2013-05-07 19:36:46 +00:00
Evan Huus 37600a157b Rename value string (and similar) functions to use a consistent pattern. This
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).

Use a consistent coding style, and make proper use of the WS_DLL_* defines.

Group the functions appropriately in the header.

I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467

svn path=/trunk/; revision=48634
2013-03-29 00:26:23 +00:00
Martin Kaiser 6c4b5b5929 add program number to the cc item tree
svn path=/trunk/; revision=48569
2013-03-26 20:39:58 +00:00
Guy Harris a2414d8909 Don't wire into the reassembly code the notion that reassemblies should
be done on flows from one address to another; reassembly for protocols
running atop TCP should be done on flows from one TCP endpoint to
another.

We do this by:

	adding "reassembly table" as a data structure;

	associating hash tables for both in-progress reassemblies and
	completed reassemblies with that data structure (currently, not
	all reassemblies use the latter; they might keep completed
	reassemblies in the first table);

	having functions to create and destroy keys in that table;

	offering standard routines for doing address-based and
	address-and-port-based flow processing, so that dissectors not
	needing their own specialized flow processing can just use them.

This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where
the second YPALL response is processed as if it were a continuation of
a previous response between different endpoints, even though said
response is already reassembled), and also allows the DCE RPC-specific
stuff to be moved out of epan/reassembly.c into the DCE RPC dissector.

svn path=/trunk/; revision=48491
2013-03-22 23:59:54 +00:00
Martin Kaiser 38a73a32f3 include the wsutil/wsgcrypt.h instead of including gcrypt.h directly
svn path=/trunk/; revision=47802
2013-02-21 18:23:29 +00:00
Martin Kaiser 37146b8bfd remove some unnecessary if(tree) checks
svn path=/trunk/; revision=47501
2013-02-05 20:47:04 +00:00
Martin Kaiser 974afe6319 a DVB-CI session number is not globally unique, it's only unique per
transport connection, so it's not a good choice for a circuit id

use (session number|transport connection id) as circuit id

svn path=/trunk/; revision=47499
2013-02-05 20:38:15 +00:00
Martin Kaiser fd85b72d51 the fragment id must depend on the transport connection
fragments from different transport connections can be interleaved

svn path=/trunk/; revision=47320
2013-01-27 22:08:29 +00:00
Martin Kaiser 697514cd35 2012->2013
svn path=/trunk/; revision=46998
2013-01-08 21:51:01 +00:00
Martin Kaiser 898dfde383 bring up a warning if an APDU's length field does not match the number
of payload bytes

svn path=/trunk/; revision=46997
2013-01-08 21:44:12 +00:00
Martin Kaiser bf0fede1eb display the content of cc status fields in the info colum
svn path=/trunk/; revision=46124
2012-11-21 21:55:29 +00:00
Martin Kaiser ff9f439c9a all CI+ SAC messages are encrypted
there's no point in displaying this fact in the info column

svn path=/trunk/; revision=46123
2012-11-21 21:42:50 +00:00
Martin Kaiser 8a8956552f dissect config and cftable tuples in the Card Information Structure
svn path=/trunk/; revision=46122
2012-11-21 21:37:22 +00:00
Martin Kaiser 149880291e fix copy&paste error
svn path=/trunk/; revision=46121
2012-11-21 21:21:07 +00:00
Martin Kaiser 52f1565bd4 cc status 0x03 means either "authentication failed" or "no srm required"
svn path=/trunk/; revision=46119
2012-11-21 21:08:43 +00:00
Martin Kaiser 9310cd0952 dissect ask_release_reply apdu
svn path=/trunk/; revision=46055
2012-11-17 11:19:09 +00:00
Martin Kaiser 3ac801d7bd make cor address and cor value filterable
svn path=/trunk/; revision=45855
2012-10-31 21:53:37 +00:00
Martin Kaiser 3a8b276c81 Card Information Structure (CIS) dissection
- restructure the existing code
- consistent filter names
- remove unnecessary if(tree) checks
- dissect the tpll_v1 and manfid tuples

svn path=/trunk/; revision=45840
2012-10-30 22:08:24 +00:00
Martin Kaiser 93343248cb add CC datatype IDs for the SRM protocol
svn path=/trunk/; revision=45643
2012-10-18 20:12:46 +00:00
Martin Kaiser 1ca75014ae dvb-ci: display cc item's name in the subtree title
svn path=/trunk/; revision=45224
2012-09-30 17:58:45 +00:00
Michael Mann 65ef9e9d6b replaced decode_numeric_bitfield calls with filterable item or removed it if it didn't mathematically do anything.
svn path=/trunk/; revision=45166
2012-09-27 04:36:40 +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 5a8783f5b1 Initial commit to support yet another method of passing data between dissectors.
Add new parameter 'data' to heur_dissector_t and new_dissector_t, for now it's always NULL

svn path=/trunk/; revision=44860
2012-09-10 21:40:21 +00:00
Jeff Morriss aa5d9d78dd From Robert Bullen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7683 :
The reassembled fragments tree in the Packet Details view is awesome, but it
lacks one thing: a field that exposes the reassembled data.

tcp.data already exists for exposing a single TCP segment's payload as a byte
array. It would be handy to have something similar for a single application
layer PDU when TCP segment reassembly is involved. I propose
tcp.reassembled.data, named and placed after the already existing field
tcp.reassembled.length.

My primary use case for this feature is outputting tcp.reassembled.data with
tshark for further processing with a script.

The attached patch implements this very feature. Because the reassembled
fragment tree code is general purpose, i.e. not specific to just TCP, any
dissector that relies upon it can add a similar field very cheaply. In that
vein I've also implemented ip.reassembled.data and ipv6.reassembled.data, which
expose reassembled fragment data as a single byte stream for IPv4 and IPv6,
respectively. All other protocols that use the reassembly code have been left
alone, other than inserting NULL into their initializer lists for the newly
introduced struct field reassemble.h:fragment_items.hf_reassembled_data.

svn path=/trunk/; revision=44802
2012-09-07 02:09:59 +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
Martin Kaiser 9f4c89bad3 call mpeg_pmt dissector directly for CI+ tune_broadcast_req apdu
svn path=/trunk/; revision=44400
2012-08-09 20:24:50 +00:00
Martin Kaiser 02bb7124f9 dissect multiple nit sections in the CI+ operator_nit apdu
fetch handles for dvb_nit and data dissectors only once

svn path=/trunk/; revision=44261
2012-08-04 06:25:11 +00:00
Pascal Quantin 9ee1981c7f From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7468 :
DVB-CI/CI+: fix offset error in operator_info apdu

svn path=/trunk/; revision=43668
2012-07-11 20:20:10 +00:00
Anders Broman f207987aa3 From Martin Kaiser:
DVB-CI/CI+: dissect the payload of LSC messages.

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

svn path=/trunk/; revision=43620
2012-07-09 02:28:14 +00:00
Pascal Quantin d25ae90a67 From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7420 :
CI/CI+: dissect CICAM NIT

svn path=/trunk/; revision=43546
2012-06-29 20:10:25 +00:00
Anders Broman b160466dd2 From Martin Kaiser:
add X.509 certificate extensions for DVB-CI/CI+

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

svn path=/trunk/; revision=43485
2012-06-25 21:16:43 +00:00
Pascal Quantin 8b72c6506e From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7303
Remove unnecessary null checks before calling proto_item_set_len() in DVB-CI dissector

svn path=/trunk/; revision=42901
2012-05-29 20:28:41 +00:00