Commit Graph

35 Commits

Author SHA1 Message Date
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