Commit Graph

158 Commits

Author SHA1 Message Date
Bill Meier 9ed99d5c4e Strip some trailing whitespace; Fix some indentation; Add editor-modelines as needed.
Change-Id: I943153e28f468070d86535abad7be032e1386118
Reviewed-on: https://code.wireshark.org/review/2994
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-11 03:20:54 +00:00
Michael Mann 888f22de16 convert to proto_tree_add_subtree[_format]
Change-Id: I2ea1892b5963cc5578cbdd2b03029ca8424f2267
Reviewed-on: https://code.wireshark.org/review/2640
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-25 16:35:14 +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
Pascal Quantin bcff3c57cc Add the ability to dynamically add a new protocol to export PDU dialog box
Change-Id: I83012cc963d514982e40010e837e11a6fcf1bc3e
Reviewed-on: https://code.wireshark.org/review/2423
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-19 06:48:32 +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
Dario Lombardo 971ffd683e Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc
Change-Id: I63a3704effe3fcab01a193dc39b6a22e9f1cf3fe
Reviewed-on: https://code.wireshark.org/review/2376
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:13:58 +00:00
Evan Huus de00c49bd8 Convert a bunch of time_to_str functions to wmem
Change-Id: I24fe3cc4a3589dadc4528a77fe7ff13d06b1a983
Reviewed-on: https://code.wireshark.org/review/2245
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 17:26:25 +00:00
Michael Mann 73217d9f3f tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.

Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 15:41:07 +00:00
Martin Kaiser 8515bd7633 avoid proto_tree_add_uint_format() when we just want the default
description

Change-Id: Ice06e257a72f3b4ce1229ff90129628f0e3bbcfb
Reviewed-on: https://code.wireshark.org/review/1873
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-30 08:03:07 +00:00
Martin Kaiser 0adac831e0 convert SEK and SIV to their binary form only once when a new key/iv is
set, don't do the same conversion for each apdu

Change-Id: I6b19a0b4e138cd9d333b7ab95d6a8ee3eb516293
Reviewed-on: https://code.wireshark.org/review/1694
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-05-19 09:37:03 +00:00
Martin Kaiser f5165ba0f0 remove some more unnecessary initial values
Change-Id: If2abfee444c7a4a163fef031d92b7757b5d23855
Reviewed-on: https://code.wireshark.org/review/1355
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-25 17:53:53 +00:00
Martin Kaiser e417e8bc20 remove unnecessary initial values
Change-Id: I0950daa18c4234677d29101fac74f6f6bd977ef3
Reviewed-on: https://code.wireshark.org/review/1354
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-25 17:53:36 +00:00
Guy Harris 97869f2dec More name changes.
Add ep_ to routines that may return ephemeral strings.

Change "get_XXX" to "XXX_to_display" if the routine returns a formatted
string if it can't get a name.

Change-Id: Ia0e82784349752cf4285bf82788316c9588fdd88
Reviewed-on: https://code.wireshark.org/review/1217
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-19 19:30:17 +00:00
Pascal Quantin ad33357e62 Exported PDU: add support for more than 32 tags
Change-Id: Idc9f105164919827a8a81c88b5a56de4fa25df0b
Reviewed-on: https://code.wireshark.org/review/1197
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-18 20:15:04 +00:00
Martin Kaiser 63b0d89574 if a .png file is sent on the application mmi resource, pass the file
data to the png dissector

Change-Id: I112733f97ba35d9ec497b427c64b2f5ea99fd963
Reviewed-on: https://code.wireshark.org/review/818
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-25 20:09:20 +00:00
Martin Kaiser 9c2e374433 separate function to dissect File Acknowledge APDU
Change-Id: I1824407cae4cded0680b01e9dea1de6f0408c607
Reviewed-on: https://code.wireshark.org/review/817
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-24 21:58:17 +00:00
Martin Kaiser d04cddf6d3 no need for if(tree)
Change-Id: Ia6db5839a8bbbc79a5196406e3f8d59f7ce7498a
Reviewed-on: https://code.wireshark.org/review/814
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-24 14:31:27 +00:00
Martin Kaiser ad39bb3dea test for >0
Change-Id: I7114028ce296ffa875ddfbb24b935dc2573f964c
Reviewed-on: https://code.wireshark.org/review/770
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-21 18:48:50 +00:00
Martin Kaiser 95f5938e95 fix clear/scrambled detection
Change-Id: Id82763dd17e8c4e0902ae8e31ec6554e8f174b59
Reviewed-on: https://code.wireshark.org/review/769
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-21 18:48:14 +00:00
Pascal Quantin 488f2a0974 Exported PDU: add support for data length on the wire
Change-Id: Iff14ec4d0297ec85f3597b33871fb0ab5256a597
Reviewed-on: https://code.wireshark.org/review/728
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-19 05:13:30 +00:00
Martin Kaiser fa6173470d add the CC protocol name to the info column
Change-Id: Ic57c2a36c88a7528c4e37681bc5db4309174019d
Reviewed-on: https://code.wireshark.org/review/463
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-09 14:13:32 +00:00
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