Commit graph

179 commits

Author SHA1 Message Date
Pascal Quantin
9de6aa8619 From Fabrice Bellard:
Add Carrier Id and detailed PHY info to MAC LTE UDP framing dissector

svn path=/trunk/; revision=54370
2013-12-22 21:16:31 +00:00
Jakub Zawadzki
c45475ab45 Fix [-Wmissing-prototypes]
svn path=/trunk/; revision=54135
2013-12-15 23:44:12 +00:00
Jakub Zawadzki
65db82872c When including <epan/prefs.h> don't force inclusion of <epan/uat.h>
svn path=/trunk/; revision=53769
2013-12-03 22:16:49 +00:00
Michael Mann
9b7fb8a811 Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future.  And search/replace of a function name is easy enough to do.

The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.

All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope().  All other dissectors were converted to using file_scope() which was the original scope for "proto" data.

svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
Martin Mathieson
edbe198322 Include rohc struct inside pdcp instead of repeating all of the fields
svn path=/trunk/; revision=53262
2013-11-11 22:36:08 +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
Pascal Quantin
7623232f25 Convert a few more dissectors to wmem
svn path=/trunk/; revision=52013
2013-09-13 17:25:54 +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
Michael Mann
7e8e5b347e Batch of filterable expert_infos.
svn path=/trunk/; revision=49581
2013-05-25 17:06:40 +00:00
Anders Broman
85a8e304dd Add the posibillity to use a key for per-packet-data.
svn path=/trunk/; revision=49259
2013-05-12 18:11:02 +00:00
Martin Mathieson
edfccaa019 Add R10 versions of LTE protocols.
svn path=/trunk/; revision=48911
2013-04-18 14:59:41 +00:00
Anders Broman
5970ee5a65 From beroset:
remove C++ incompatibilities from packet-catapult-dct2000.c

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

svn path=/trunk/; revision=48305
2013-03-14 22:10:59 +00:00
Bill Meier
1823aa007c it's ==> its & its ==> it's as needed.
svn path=/trunk/; revision=47891
2013-02-26 01:06:19 +00:00
Pascal Quantin
959e3e3e2c Various enhancements to ROHC dissector:
- fix dissection of type 0 packets with large CID
- add dissection of type 1 and 2 packets (extension 3 dissection to be done)
- add dissection of UDP checksum

svn path=/trunk/; revision=47869
2013-02-24 22:06:53 +00:00
Guy Harris
29715ccc8f How can I get a new tvbuff that starts at an offset within a given
tvbuff and runs to the end of the tvbuff?  Let me count the ways....

Replace a bunch of different ways of doing that (some incorrect, in that
they're not properly handling tvbuffs where the captured and reported
lengths are different) with tvb_new_subset_remaining().

svn path=/trunk/; revision=47751
2013-02-19 23:17:07 +00:00
Martin Mathieson
cf15301cbf Add support for reading/writing 'sprint' lines from test scripts.
svn path=/trunk/; revision=47686
2013-02-15 23:43:30 +00:00
Martin Mathieson
09a694823f Use tvb_get_const_stringz() when I know the tvb will be contiguous.
svn path=/trunk/; revision=46339
2012-12-03 01:45:00 +00:00
Jeff Morriss
49466f95bc Introduce, and start using, TVB_SET_ADDRESS() and TVB_SET_ADDRESS_HF(). They
are like the non-TVB versions except that they take a TVB and an offset
instead of (frequently) a pointer into the TVB.

Calling tvb_get_ptr() before modifying the rest of the fields should help fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7960 (though I can't
reproduce that problem).


Replace a bunch of calls like:

SET_ADDRESS(..., AT_XXX, length, tvb_get_ptr(tvb, offset, length));

with:

TVB_SET_ADDRESS(..., AT_XXX, tvb, offset, length);

svn path=/trunk/; revision=46324
2012-12-02 04:49:13 +00:00
Martin Mathieson
de2aa05555 Support the older format of SR failure for a while longer.
svn path=/trunk/; revision=46065
2012-11-18 01:33:43 +00:00
Martin Mathieson
dbca2e7d8f Get rid of an outdated format
svn path=/trunk/; revision=45450
2012-10-10 16:39:51 +00:00
Martin Mathieson
d8fa6d9c9a Update to format of string that indicates SR failure.
svn path=/trunk/; revision=45448
2012-10-10 15:18:52 +00:00
Martin Mathieson
62d83ed0c8 Give up trying to parse those lines - the format has changed and its too
complicated now.

svn path=/trunk/; revision=45342
2012-10-06 15:00:38 +00:00
Martin Mathieson
516f0c6e5c Also avoid some unnecessary calls to strcmp() here, where the release
number at the end isn't important to know.

svn path=/trunk/; revision=45092
2012-09-24 10:34:27 +00:00
Pascal Quantin
7dd916459e Let's be consistent and display lte_rrc root for all LTE RRC messages
svn path=/trunk/; revision=45080
2012-09-23 21:01:05 +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
9f92dc93c5 Add data parameter to call_dissector_only.
svn path=/trunk/; revision=44872
2012-09-11 08:28:07 +00:00
Martin Mathieson
f6b1932a8a Use tvb_get_stringz() rather than tvb_get_const_stringz(). I know that
these strings will be in a single, contiguous tvb...

svn path=/trunk/; revision=44607
2012-08-21 17:17:53 +00:00
Martin Mathieson
c0a913afda Match R9 versions of some more LTE protocols to registered dissector names.
svn path=/trunk/; revision=43777
2012-07-18 01:19:48 +00:00
Martin Mathieson
409cdcc5ed Speed up reading of out-header values, and add a couple of 'monitor'
fields.

svn path=/trunk/; revision=43678
2012-07-12 01:26:08 +00:00
Jakub Zawadzki
bf81b42e1e Update Free Software Foundation address.
(COPYING will be updated in next commit)

svn path=/trunk/; revision=43536
2012-06-28 22:56:06 +00:00
Guy Harris
1637f2965e packet-umts_fp.h now requires epan/conversation.h.
svn path=/trunk/; revision=42470
2012-05-07 17:37:30 +00:00
Martin Mathieson
b77cd5d0f4 Check result of sscanf(), and avoid a mirrored variable declaration.
From Visual Studio Analyzer output.

svn path=/trunk/; revision=42327
2012-04-28 23:58:06 +00:00
Martin Mathieson
68841134b7 Don't look up p_fp_info only to always overwrite it.
svn path=/trunk/; revision=42314
2012-04-28 16:23:23 +00:00
pascal
2787ebf988 Upgrade MAC LTE dissector to Release 10 (V10.5.0)
svn path=/trunk/; revision=42240
2012-04-25 20:02:12 +00:00
Martin Mathieson
92cd70bd61 Improve support for primitives that carry NAS-EPS.
Also parse beginning of "Monitor" lines.

svn path=/trunk/; revision=41821
2012-03-29 01:24:49 +00:00
Bill Meier
198c9ba55f FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE;
In some cases:
 Use val_to_str_const() instead of val_to_str();
 Reformat long lines;
 Do some general whitespace changes.


svn path=/trunk/; revision=41587
2012-03-16 02:00:29 +00:00
Martin Mathieson
9cfb5a1ea8 Call X2AP dissector.
svn path=/trunk/; revision=41373
2012-03-06 13:56:02 +00:00
Martin Mathieson
427122a220 "Call nas-eps" dissector for nas_rrc_r8_lte and nas_rrc_r9_lte frames that have L3 payloads.
svn path=/trunk/; revision=40441
2012-01-11 21:31:11 +00:00
Martin Mathieson
899155a563 Add the reason for a UL ReTx (PDCCH retx grant or PHICH NACK).
svn path=/trunk/; revision=40001
2011-11-25 11:19:03 +00:00
Martin Mathieson
ab9ede8e8f Add the system frame number (SFN) to the context fields logged along with LTE MAC frames.
svn path=/trunk/; revision=39971
2011-11-21 16:18:33 +00:00
Martin Mathieson
62d16f0fbb UMTS RLC:
- add lookup for "unknown" channel type dissector (mode is known)
- set length extent for SUFI root item
- show data frames in the info column (at least for AM...)

DCT:
- call RLCDCH with "unknown" channel type (as don't know whether IP or RRC)
- support R9

svn path=/trunk/; revision=39846
2011-11-15 12:03:52 +00:00
Martin Mathieson
8df10bb4b5 Add remaining UMTS RLC primitive parameters preceding RLC payload.
svn path=/trunk/; revision=39826
2011-11-14 12:22:54 +00:00
Jeff Morriss
7e24821c3d Terminate a value_string.
svn path=/trunk/; revision=39731
2011-11-04 13:41:12 +00:00
Martin Mathieson
fd521521f4 Add (most) primitive header items to the tree before calling UMTS RLC dissector.
svn path=/trunk/; revision=39724
2011-11-03 16:52:37 +00:00
Martin Mathieson
338cb689a6 Fix the width of a type (and hopefully please the buildbots).
svn path=/trunk/; revision=39657
2011-10-28 18:59:30 +00:00
Martin Mathieson
ec748afa3a First go at calling UMTS RLC dissector from IxCatapult logs.
Had to change some #defines in the header file (for UDP-framed/heuristic
dissector) - will need to update example sending program later on tonight.

svn path=/trunk/; revision=39656
2011-10-28 18:36:20 +00:00
Bill Meier
379f083acd Fix some proto_tree_add_item() encoding args;
Remove some unneeded #includes.

svn path=/trunk/; revision=39612
2011-10-26 18:11:24 +00:00
Bill Meier
794757ae8f For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.
Also: remove trailing whitespace for a number of files.

svn path=/trunk/; revision=39503
2011-10-21 02:10:19 +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
4e57694d4a 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_UINT8
    FT_UINT16
    FT_UINT24
    FT_UINT32
    FT_UINT64
    FT_INT8
    FT_INT16
    FT_INT24
    FT_INT32
    FT_INT64
    FT_FLOAT
    FT_DOUBLE


svn path=/trunk/; revision=39288
2011-10-06 03:35:44 +00:00