Commit Graph

131 Commits

Author SHA1 Message Date
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
Bill Meier 75f6458053 From Martin Kaiser:
"attached is a simple fix for CID281213. Although the bug can't crash wireshark,
 dissect_si_string() is not really fit for handling negative string lengths (and
 doesn't need to)."

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

svn path=/trunk/; revision=42523
2012-05-09 20:39:21 +00:00
Jeff Morriss 2e11463277 Fix some more hf encodings.
svn path=/trunk/; revision=42434
2012-05-05 00:19:49 +00:00
pascal 95eb2e7288 From Martin Kaiser:
Fix some 'intermediate pointers must be const qualified' warnings
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7215

svn path=/trunk/; revision=42355
2012-04-30 19:14:14 +00:00
pascal 89e4c91d7a From Martin Kaiser:
fix a few clang warnings in DVB-CI dissector
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7215

svn path=/trunk/; revision=42347
2012-04-30 14:05:22 +00:00
Anders Broman 64242c565b From Martin Kaiser: DVB-CI host control: dissect pmt section by calling mpeg_pmt dissector https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7052
svn path=/trunk/; revision=42015
2012-04-10 21:27:24 +00:00
Anders Broman d3c804e3fa From Martin Kaiser: DVB-CI: register an application for the SAS resource, new OIPF dissector for application messages https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7039
svn path=/trunk/; revision=41990
2012-04-09 14:53:42 +00:00
Anders Broman 045b55d881 From Martin Kaiser:
DVB-CI: check APDUs against resource id.

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

svn path=/trunk/; revision=41916
2012-04-04 07:40:20 +00:00
Jeff Morriss cf58e2bd83 From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7023 :
For each message, the DVB-CI dissector checks the message size against the
buffer size negotiated at startup. If the buffer size negotation was not
captured, a warning is flagged up for each packet saying its size is too big. 

Obviously, the check only makes sense if we know the negotiated buffer size...

svn path=/trunk/; revision=41901
2012-04-03 01:52:44 +00:00
Anders Broman 012c9d729d From Martin Kaiser:
dvb-ci dissector: dissect descriptor loops by using mpeg-descriptor.

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

svn path=/trunk/; revision=41673
2012-03-19 14:12:07 +00:00
Bill Meier 2df5dc3d53 From Reinhard Speyerer: Fix several misspellings/typos in Wireshark
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6967

svn path=/trunk/; revision=41645
2012-03-18 22:24:24 +00:00
Bill Meier 87cf82e056 Use tvb_new_subset_remaining() rather than tvb_new_subset();
#include <styring.h> not req'd (in a few cases);
Minor reformating & whitespace cleanup.

svn path=/trunk/; revision=41374
2012-03-06 16:58:09 +00:00
Anders Broman d75c3d384e From Martin Kaiser: DVB-CI authentication resource https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6905
svn path=/trunk/; revision=41338
2012-03-04 16:16:03 +00:00
Jeff Morriss 7c55e4513a From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6890 :
The attached patch for the DVB-CI dissector creates a circuit for each DVB-CI
session, using the session number as circuit id.

The DVB-CI session commands are:

- open_session_request(resource_id)
- session_opened(resource_id, newly assigned session number)
- payload transfer(session_number, payload data)
- close session(session_number)

For now, the circuit will store the resource id and make it available (as a
generated item) to subsequent packets that contain only the session number.
Doing this, the resource id (which is like a tcp/udp port) can be used for
filtering.

svn path=/trunk/; revision=41253
2012-03-01 02:50:16 +00:00
Anders Broman 665cfc31bf From Martin Kaiser:
DVB-CI / CI+ dissect sac message body.

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

svn path=/trunk/; revision=40435
2012-01-11 06:38:25 +00:00
Anders Broman 82cec1ce89 From Martin Kaiser:
DVB-CI / CI+ decrypt SAC messages.

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

svn path=/trunk/; revision=40407
2012-01-08 15:34:23 +00:00
Anders Broman f5ca06136a From Martin Kaiser:
DVB-CI / CI+ dissect X.509 certificates.

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

svn path=/trunk/; revision=39832
2011-11-14 19:16:47 +00:00
Alexis La Goutte 0ec187967e From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6545
DVB-CI / CI+ fix clang warning about unused variable

svn path=/trunk/; revision=39745
2011-11-06 19:02:36 +00:00
Anders Broman 773f294db6 From Martin Kaiser:
DVB-CI / CI+ Operator Profile Resource

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

svn path=/trunk/; revision=39675
2011-10-30 16:02:20 +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
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
Anders Broman 59cd698822 From Martin Kaiser:
DVB-CI / CI+ CC resource version 2

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

svn path=/trunk/; revision=39306
2011-10-07 16:46:37 +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
Anders Broman 2f9778be01 From Martin Kaiser:
Low Speed Communication Resource

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

svn path=/trunk/; revision=39224
2011-10-02 16:42:41 +00:00
Anders Broman 17528136d4 From Martin Kaiser:
DVB-CI / CI+ Host Control Version 2

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

svn path=/trunk/; revision=39223
2011-10-02 16:39:04 +00:00
Anders Broman 69bfd68ac4 From Martin Kaiser:
Implement the content control resource from the CI+
specification 1.2.

From me:
Change ENC_NA to ENC_BIG_ENDIAN as i suppose this is a big endian protocol and ENC_NA was erroneously used for irems bigger than i byte in some cases.

svn path=/trunk/; revision=39143
2011-09-26 05:17:57 +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 b859833c05 From Martin Kaiser:
DVB-CI / CI+ Application MMI version 2

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

svn path=/trunk/; revision=39037
2011-09-19 08:37:10 +00:00
Anders Broman eb0f64c320 From Martin Kaiser:
DVB-CI / CI+ Specific Application Support (SAS) resource
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6334

svn path=/trunk/; revision=38966
2011-09-11 19:16:54 +00:00
Anders Broman 834ffe219c From Martin Kaiser:
DVB-CI / CI+ Application MMI resource.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6332

svn path=/trunk/; revision=38965
2011-09-11 19:13:27 +00:00
Anders Broman bde7c0f545 From Martin Kaiser:
DVB-CI / CI+ CAM upgrade resource
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6309

svn path=/trunk/; revision=38908
2011-09-07 04:46:43 +00:00
Anders Broman b38faa9a99 From Martin Kaiser:
DVB-CI / CI+ Host language and country resource.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6308

svn path=/trunk/; revision=38907
2011-09-07 04:35:41 +00:00
Anders Broman 625e4ab9f6 From Martin Kaiser:
DVB-CI / CI+ appinfo v3 apdus.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6307

svn path=/trunk/; revision=38906
2011-09-07 04:29:34 +00:00
Anders Broman 59d488010a From Martin Kaiser:
correct the filter names
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6239

svn path=/trunk/; revision=38767
2011-08-29 05:35:51 +00:00
Anders Broman d9928a9d38 From Martin Kaiser:
DVB-CI dissector: reassembly on the transport layer.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6221

svn path=/trunk/; revision=38766
2011-08-29 05:32:21 +00:00
Alexis La Goutte f53bdb659f From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6220
DVB-CI dissector: fix buildbot warnings

svn path=/trunk/; revision=38428
2011-08-09 14:42:33 +00:00
Anders Broman 955981834e From Martin Kaiser:
DVB-CI dissector, packet reassembly on the link layer.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6075

svn path=/trunk/; revision=38305
2011-08-02 05:12:53 +00:00
Anders Broman a9259c309e From Martin Kaiser:
Add support for the ca_pmt_reply apdu as defined in section 8.4.3.5 of the DVB-CI standard (EN 50221).

Also some new apdu tags and their descriptions are added for completeness.
After applying this patch, DVB-CI support is complete except for reassembly

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

svn path=/trunk/; revision=38137
2011-07-20 22:34:57 +00:00
Bill Meier 83b642557a tvb_reported_length_remaining() can return -1;
Remove a few lines of not really req'd code;
Minor whitespace cleanup.

svn path=/trunk/; revision=37744
2011-06-22 04:20:46 +00:00
Bill Meier 19bc84f3b0 From Martin Kaiser: Fix forBug #6048 (fuzztest crash)
"this is caused by my newly added DVB-CI MMI code

endless loop when dissect_dvbci_text() returns 0 because the text pseudo-apdu
is invalid"

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

svn path=/trunk/; revision=37743
2011-06-22 01:20:20 +00:00
Anders Broman a6e3b54d15 From Martin Kaiser:
adds dissection
of the Card Information Structure (CIS). It shows the CIS as a list of tuples
without going into the details of each tuple.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6036

svn path=/trunk/; revision=37738
2011-06-21 05:16:23 +00:00
Anders Broman 51c77ea450 From Martin Kaiser:
adds the MMI resource as defined in
the DVB-CI specification (EN50221), section 8.6 (low-level MMI is excluded as
it's not used in practice).

The patch allows dissection of all text boxes that a DVB-CI host displays on
behalf of the CI module.

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

svn path=/trunk/; revision=37737
2011-06-21 05:12:14 +00:00
Anders Broman b520ff3a1d From Michael Mann:
Dissect DVB-CI host control resource
according to section 8.5.1 of the DVB-CI specification (EN50221). 

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

svn path=/trunk/; revision=37472
2011-05-31 06:01:09 +00:00
Anders Broman 3c0b5a41fe From Martin Kaiser:
allows filtering
of the event in the pseudo header and removes the pointless filter for
version_number+current_next_indicator.

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

svn path=/trunk/; revision=37456
2011-05-29 06:59:54 +00:00
Anders Broman 06e2b1ae51 From Martin Kaiser:
DVB-CI dissector: exception in close_session_request apdus (wrong offset)

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

svn path=/trunk/; revision=37455
2011-05-29 06:43:27 +00:00
Anders Broman 62c7cdacea From Martin Kaiser:
checks the address of the Configuration
Option Register that is used for switching a PC-Card in DVB-CI mode.

The address must be <= 0xffe..

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

svn path=/trunk/; revision=37454
2011-05-29 06:34:05 +00:00
Anders Broman bb31fde9fe From Martin Kaiser:
implements the DVB-CI date-time resource
according to section 8.5.2 of the DVB-CI specification (EN50221).

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

svn path=/trunk/; revision=37453
2011-05-29 06:29:48 +00:00
Chris Maynard 521b65f257 From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5959
Use _U_ for unused function parameter.

svn path=/trunk/; revision=37442
2011-05-27 18:18:28 +00:00
Bill Meier 11af835982 (Trivial) Fix a typo; Add spme punctuation in a coment.
svn path=/trunk/; revision=37263
2011-05-18 21:20:22 +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
Bill Meier d9beb8fcb0 From Martin Kaiser: initialize hdr_tag with NO_TAG
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5654

svn path=/trunk/; revision=36163
2011-03-08 13:52:16 +00:00
Stephen Fisher 664916ad64 Squelch compiler warning:
packet-dvbci.c: In function 'dissect_dvbci_lpdu':
packet-dvbci.c:1153: warning: 'hdr_tag' may be used uninitialized in this function
packet-dvbci.c:1153: note: 'hdr_tag' was declared here

By setting hdr_tag = 0, but see question on bug #5654 on whether 0 is a 
good default value or not.


svn path=/trunk/; revision=36157
2011-03-07 17:01:55 +00:00
Bill Meier 3e92ea5c2f Fix compiler error on Windows 64: cast strlen() to (int);
Also: Apparently the length of an address of type AT_STRINGZ must include the NULL.

svn path=/trunk/; revision=36151
2011-03-07 03:10:51 +00:00
Bill Meier 16b528aaf1 From Martin Kaiser: dissector for DVB-CI (Common Interface)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5654

From me:
- Entry for DVBCI added to wtap.c encap_table_base[];
- Some code simplification with respect to the use of col_...() for COL_INFO;
- Certain tests for "enough bytes available" not really needed;
- (Other minor tweaks);
- #include<stdio.h> not req'd;
- Minor reformatting and whitespace cleanup;


svn path=/trunk/; revision=36149
2011-03-07 02:22:48 +00:00