Commit graph

216 commits

Author SHA1 Message Date
Anders Broman
d0efafbcb1 From beroset:
remove C++ incompatibilities from UAT_VS_DEF macro and all uses

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

svn path=/trunk/; revision=48259
2013-03-12 06:40:13 +00:00
Anders Broman
2cc8731bec From beroset:
remove C++ incompatibilities

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

svn path=/trunk/; revision=48185
2013-03-08 06:06:56 +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
8cdb2c675b Make the number of RAPIDs in an RAR PDU a generated field.
svn path=/trunk/; revision=47688
2013-02-16 00:05:37 +00:00
Martin Mathieson
9ab999a6f8 Fix a copy and paste error.
svn path=/trunk/; revision=46573
2012-12-17 14:39:59 +00:00
Martin Mathieson
76966a2cec Check that system frame number is in range.
svn path=/trunk/; revision=46548
2012-12-16 00:02:50 +00:00
Pascal Quantin
70c283816b Dissect eMBMS MTCH LCIDs
svn path=/trunk/; revision=46504
2012-12-11 23:20:22 +00:00
Martin Mathieson
5e90582d54 Add versions of a function that doesn't need do substitute specifiers.
svn path=/trunk/; revision=46298
2012-11-29 22:25:18 +00:00
Jeff Morriss
0266cceef3 Make all enum_val_t's const.
svn path=/trunk/; revision=46292
2012-11-29 20:15:37 +00:00
Martin Mathieson
878966a16e Add another DL error code.
svn path=/trunk/; revision=45995
2012-11-10 23:23:25 +00:00
Martin Mathieson
fa79b7580a When configuring DRB mappings (from signalling channel), create a
separate table for each UE.

svn path=/trunk/; revision=45494
2012-10-12 03:00:38 +00:00
Bill Meier
add85b1cbb Remove unneeded code ("[set_but_unused]").
svn path=/trunk/; revision=45347
2012-10-06 15:56:08 +00:00
Bill Meier
4f578199b5 Minor changes:
- proto_reg_handoff...() called only once: simplify;
- move proto_register...() to just before proto_reg_handoff...() as per convention;
- misc.

svn path=/trunk/; revision=45345
2012-10-06 15:52:14 +00:00
Martin Mathieson
5bd351fb32 Look up once and store the RLC and PDCP dissectors.
svn path=/trunk/; revision=45341
2012-10-06 14:59:51 +00:00
Pascal Quantin
5ec061bf0c Add options to dissect MCCH from LTE MAC/RLC dissectors
svn path=/trunk/; revision=45239
2012-10-01 19:51:07 +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
Pascal Quantin
a8f9cd6593 Upgrade MAC LTE dissector to v11.0.0
svn path=/trunk/; revision=45048
2012-09-21 20:11:11 +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
Martin Mathieson
d729f21ad2 Revert r45005.
svn path=/trunk/; revision=45006
2012-09-19 16:56:59 +00:00
Martin Mathieson
a232ae9242 Make proto_item_append_string() behave sanely, and use it in a few more
dissectors.

svn path=/trunk/; revision=45005
2012-09-19 11:58:32 +00:00
Pascal Quantin
cb5b915840 Fix dissection of Scheduling Information MAC Control Element when it is the only LCID in the MCH PDU
svn path=/trunk/; revision=44973
2012-09-18 17:26:00 +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
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
Martin Mathieson
7e88a07e71 proto_item_append_string() doesn't work this case, so stop using it.
I am tempted though to chage proto_item_append_string() just be like
proto_item_append_text() without the call to g_vsnprintf(), which is the
expensize part I was hoping to avoid.

svn path=/trunk/; revision=44614
2012-08-22 19:01:01 +00:00
Martin Mathieson
1470f4a6b7 Call proto_item_append_string() rather than proto_item_append_text()
when there are no specifiers.

svn path=/trunk/; revision=44609
2012-08-21 21:36:59 +00:00
Martin Mathieson
973be664bb Use proto_item_append_string() rather than proto_item_append_text() with
%s.

svn path=/trunk/; revision=44606
2012-08-21 17:12:13 +00:00
Martin Mathieson
cc0130e809 Save time by not appending byte values to the SDU item if will be hidden anyway (as happens
when RLC dissector is called).

svn path=/trunk/; revision=44574
2012-08-19 01:56:39 +00:00
Guy Harris
659cf0527a UATs could be put into "categories". The categories were defined only
implicitly by the #define name and string they were defined to; not all
UATs neatly fit into any of the categories, so some of them were put
into categories that weren't obviously correct for them, and one - the
display filter macro UAT - wasn't put into any category at all (which
caused crashes when editing them, as the GUI code that handled UAT
changes from a dialog assumed the category field was non-null).

The category was, in practice, used only to decide, in the
aforementioned GUI code, whether the packet summary pane needed to be
updated or not.  It also offered no option of "don't update the packet
summary pane *and* don't redissect anything", which is what would be
appropriate for the display filter macro UAT.

Replace the category with a set of fields indicating what the UAT
affects; we currently offer "dissection", which applies to most UATs
(any UAT in libwireshark presumably affects dissection at a minimum) and
"the set of named fields that exist".  Changing any UAT that affects
dissection requires a redissection; changing any UAT that affects the
set of named fields that exist requires a redissection *and* rebuilding
the packet summary pane.

Perhaps we also need "filtering", so that if you change a display filter
macro, we re-filter, in case the display is currently filtered with a
display filter that uses a macro that changed.

svn path=/trunk/; revision=43603
2012-07-08 01:00:46 +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
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
pascal
1cc3ca7aa1 Use extended value strings for BSR and PHR and remove a useless hf entry
svn path=/trunk/; revision=42135
2012-04-18 16:55:06 +00:00
Martin Mathieson
65ddfa9e3a Add a field for the number of SRs indicated in one frame.
svn path=/trunk/; revision=41764
2012-03-25 23:46:01 +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
3a7cc2b725 Change the way the count of subheaders is displayed in the header.
svn path=/trunk/; revision=41434
2012-03-08 13:20:33 +00:00
Martin Mathieson
c516211eb9 Include direction in some malformed expert info strings.
svn path=/trunk/; revision=41418
2012-03-08 04:49:59 +00:00
Martin Mathieson
915eb315d6 Oh dear, had that test the wrong way around...
svn path=/trunk/; revision=40733
2012-01-26 19:25:08 +00:00
Martin Mathieson
246ed9be9d When telling RLC whether a frame is a retx, use direct setting if set
for DL.
Also, check limits during subheader loop.

svn path=/trunk/; revision=40729
2012-01-26 15:19:32 +00:00
Martin Mathieson
3751e782dd Check for DL HARQ retx before calling RLC dissector to avoid sequence
number analysis problems.

svn path=/trunk/; revision=40647
2012-01-22 02:52:50 +00:00
Martin Mathieson
1b33c5f3f5 Add a dissector "mac-lte-framed" that uses the same framing format as
the existing "mac-lte" UDP heuristic dissector. It is hoped that it will be
possible to register a DLT for use with this format.

svn path=/trunk/; revision=40580
2012-01-19 02:58:53 +00:00
Bill Meier
439adbdbcc Remove obsolete comments referring to mem_chunks.
svn path=/trunk/; revision=40507
2012-01-14 20:14:43 +00:00
Martin Mathieson
4dbf893401 Display the meaning of the special values of the Stop MTCH field.
From Pascal Quantin

svn path=/trunk/; revision=40296
2011-12-27 00:27:46 +00:00
Martin Mathieson
412385e6fd Support for MCH PDUs (introduced in R9 for MBMS).
From Pascal Quantin.

svn path=/trunk/; revision=40276
2011-12-22 18:05:48 +00:00
Martin Mathieson
8f871c472d Allow configuration protocol to configure UL priority for channels in mapping.
This value then gets used in call_rlc_dissector().

svn path=/trunk/; revision=40021
2011-11-28 14:52: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
Chris Maynard
647c5c0b27 packet_info's in_error_pkt is now a bitfield like in_gre_pkt.
svn path=/trunk/; revision=39764
2011-11-08 18:39:11 +00:00
Bill Meier
54b72021bb Fix encoding arg for various fcn calls:
- proto_tree_add_bits_item
 - proto_tree_add_bits_ret_val
 - proto_tree_add_bitmask
 - tvb_get_bits
 - tvb_get_bits16
 - tvb_get_bits24
 - tvb_get_bits32
 - tvb_get_bits64


svn path=/trunk/; revision=39539
2011-10-24 19:57:53 +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
293049dfba Do some conversions of proto_tree_add_item() 'encoding' arg.
(previously missed).

    57   FT_BOOLEAN:       FALSE-->ENC_BIG_ENDIAN
    31   FT_BOOLEAN:       TRUE-->ENC_LITTLE_ENDIAN

    10   FT_BYTES:         ENC_BIG_ENDIAN-->ENC_NA
     1   FT_BYTES:         ENC_LITTLE_ENDIAN-->ENC_NA
    21   FT_BYTES:         FALSE-->ENC_NA
     2   FT_BYTES:         TRUE-->ENC_NA

     2   FT_IPXNET:        ENC_BIG_ENDIAN-->ENC_NA

     6   FT_IPv6:          ENC_BIG_ENDIAN-->ENC_NA
     1   FT_IPv6:          FALSE-->ENC_NA

     6   FT_NONE:          ENC_BIG_ENDIAN-->ENC_NA
    19   FT_NONE:          FALSE-->ENC_NA
     3   FT_NONE:          TRUE-->ENC_NA

     1   FT_STRING:        ENC_BIG_ENDIAN-->ENC_ASCII|ENC_NA
     1   FT_STRING:        ENC_LITTLE_ENDIAN-->ENC_ASCII|ENC_NA
     5   FT_STRING:        FALSE-->ENC_ASCII|ENC_NA
     1   FT_STRING:        TRUE-->ENC_ASCII|ENC_NA

     4   FT_STRINGZ:       ENC_NA-->ENC_ASCII|ENC_NA
     8   FT_STRINGZ:       FALSE-->ENC_ASCII|ENC_NA

     1   FT_INT32:         FALSE-->ENC_BIG_ENDIAN
     1   FT_INT32:         TRUE-->ENC_LITTLE_ENDIAN

    11   FT_UINT8:         0-->ENC_BIG_ENDIAN
   111   FT_UINT8:         FALSE-->ENC_BIG_ENDIAN
    17   FT_UINT8:         TRUE-->ENC_LITTLE_ENDIAN
     1   FT_UINT16:        0-->ENC_BIG_ENDIAN
    68   FT_UINT16:        FALSE-->ENC_BIG_ENDIAN
    18   FT_UINT16:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT24:        FALSE-->ENC_BIG_ENDIAN
    70   FT_UINT32:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT32:        TRUE-->ENC_LITTLE_ENDIAN
     4   FT_UINT64:        FALSE-->ENC_BIG_ENDIAN
     1   FT_UINT64:        TRUE-->ENC_LITTLE_ENDIAN

     1   FT_UINT_STRING:   FALSE-->ENC_ASCII|ENC_BIG_ENDIAN


svn path=/trunk/; revision=39442
2011-10-16 23:38:49 +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