Commit Graph

137 Commits

Author SHA1 Message Date
Evan Huus ed1528d339 Ensure that the input to strtoul ends with a null.
Otherwise it runs past the end of the array into stack memory. Should fix the
intermittent DVB-CI decryption test suite failures.

Change-Id: Ice17497e661c8579baf3a546efcb5529beda6b49
Reviewed-on: https://code.wireshark.org/review/559
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-08 18:30:16 +00:00
Martin Kaiser 0cd28d043d fix invalid offset for URI's EMI
Change-Id: I397eeed3008d91aeb6c025c9146b9ed6d98881a6
Reviewed-on: https://code.wireshark.org/review/535
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-06 19:59:08 +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
Martin Kaiser 2ab72685fb show if the current service is scrambled or free
Change-Id: I9e50920fbc09fdf0650be3a63fee8153ce0fd3df
Reviewed-on: https://code.wireshark.org/review/462
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:34:48 +00:00
Martin Kaiser c8b62c9237 add cleartext values for retention limit
Change-Id: I8ecfdb1c366310d224660e89c99136a0a9f4a067
Reviewed-on: https://code.wireshark.org/review/461
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:34:26 +00:00
Martin Kaiser f91f43360d move URI dissection to a separate function
Change-Id: Ia1db91ef9344e46a3f32204bbf9cdbcc514980ce
Reviewed-on: https://code.wireshark.org/review/460
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:34:04 +00:00
Martin Kaiser 64ee2935e1 use tvb_memdup() instead of tvb_get_ptr()
Change-Id: I1e9ff715c3e315c9e36abb69fb5f441b71477501
Reviewed-on: https://code.wireshark.org/review/459
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:33:45 +00:00
Martin Kaiser 2286437b2f remove unnecessary if (tree) check
Change-Id: I1542d715594b1b90e2442edb6f220ddc4dd99675
Reviewed-on: https://code.wireshark.org/review/458
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03 15:33:19 +00:00
Martin Kaiser 81f3392d32 country and language are ISO-8859-1
svn path=/trunk/; revision=54935
2014-01-23 22:20:35 +00:00
Martin Kaiser 089cedc784 make the menu string filterable
svn path=/trunk/; revision=54934
2014-01-23 22:19:52 +00:00
Martin Kaiser 055be45abf the menu string is a DVB string
svn path=/trunk/; revision=54933
2014-01-23 22:18:41 +00:00
Martin Kaiser 6517e3ba4b don't use tvb_get_string(..., len) to get exactly len raw bytes
from a tvbuff

svn path=/trunk/; revision=54867
2014-01-20 23:30:01 +00:00
Martin Kaiser ae82a1cafe make MMI strings filterable
svn path=/trunk/; revision=54866
2014-01-20 22:06:19 +00:00
Martin Kaiser 5843e95163 use a value string for the emi
correct the dot offset
other minor cleanup

svn path=/trunk/; revision=54689
2014-01-10 09:23:36 +00:00
Martin Kaiser 8a99c0428c dissect Digital Only Token and retention limit
svn path=/trunk/; revision=54688
2014-01-10 09:15:08 +00:00
Martin Kaiser 80ed2d24bd correct a typo in a filter string
svn path=/trunk/; revision=54687
2014-01-10 08:48:38 +00:00
Martin Kaiser fe98b8ebc8 use STR_ASCII instead of BASE_NONE for strings
svn path=/trunk/; revision=54291
2013-12-20 13:23:13 +00:00
Evan Huus 2ae8edccea Rename more to_str functions to have ep_ in the name if they return ephemeral
buffers. Remove two unused functions.

svn path=/trunk/; revision=54250
2013-12-19 16:28:39 +00:00
Martin Kaiser 9f22d3a558 improve DVB-SI string handling
new function dvb_add_chartbl() adds a tree entry for an encoding
use FT_BTYES as type for encoding hfs
string hfs for DVB-SI strings must have STR_UNICODE, not BASE_NONE
make dvb_string_encoding_vals[] internal to dvb_chartbl.c

svn path=/trunk/; revision=54128
2013-12-15 18:38:35 +00:00
Martin Kaiser db1b70f168 as requested, move the functions/defines for DVB character tables
to separate files

svn path=/trunk/; revision=54113
2013-12-15 12:05:50 +00:00
Jakub Zawadzki 5c79cbf152 Fix some trivial warnings.
svn path=/trunk/; revision=54085
2013-12-14 10:29:26 +00:00
Martin Kaiser 20c7414c71 use large positve values for illegal DVB-SI string encodings
interpret encoding fields as UINT32 so that the displayed value matches
the actual bytes in the packet

svn path=/trunk/; revision=53927
2013-12-10 22:08:07 +00:00
Martin Kaiser c856b1b11d use the new SI string routines in DVB-CI
svn path=/trunk/; revision=53925
2013-12-10 22:05:54 +00:00
Martin Kaiser fa5083e8af make SAC message padding filterable
svn path=/trunk/; revision=53828
2013-12-07 17:40:02 +00:00
Martin Kaiser 1f9d8c5726 dissect Operator Profile's error flag
svn path=/trunk/; revision=53799
2013-12-05 21:32:05 +00:00
Martin Kaiser 5e65315e29 there were two identical copies of the function to process a DVB-SI time
remove the one in DVB-CI, use the version in mpeg-sect instead

svn path=/trunk/; revision=53580
2013-11-25 20:56:34 +00:00
Martin Kaiser 36f11a79cc next unprocessed descriptor 0xFF means that
all descriptors were processed

svn path=/trunk/; revision=53494
2013-11-21 21:54:31 +00:00
Martin Kaiser e542bd8a78 dissect operator tune status, reorder some defines
svn path=/trunk/; revision=53371
2013-11-16 17:23:46 +00:00
Martin Kaiser f161482f47 dissect extended event usage
svn path=/trunk/; revision=53370
2013-11-16 17:22:56 +00:00
Martin Kaiser 65a96c1c59 interpret the flags for EIT p/f, EIT sch usage
svn path=/trunk/; revision=53369
2013-11-16 14:17:06 +00:00
Martin Kaiser 7226846846 share Data Broadcast IDs between MPEG descriptor and DVB-CI
svn path=/trunk/; revision=53323
2013-11-14 21:49:23 +00:00
Martin Kaiser ef7e1f107c fix application capability handling
svn path=/trunk/; revision=53322
2013-11-14 21:44:05 +00:00
Martin Kaiser cc30b3597b dissect Operator Profile's delivery capability bytes
svn path=/trunk/; revision=53320
2013-11-14 21:40:59 +00:00
Martin Kaiser 329873cf97 share service type descriptions between MPEG descriptor and DVB-CI
svn path=/trunk/; revision=53307
2013-11-13 23:10:01 +00:00
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