Commit graph

189 commits

Author SHA1 Message Date
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
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
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
Martin Mathieson
4eccc98bbc Show in info line if predefined contents lines are truncated.
svn path=/trunk/; revision=38365
2011-08-05 14:40:47 +00:00
Martin Mathieson
0e83124e46 Fix the SR state report for when get SR following SR with no grant or failure in-between.
svn path=/trunk/; revision=38322
2011-08-03 17:05:30 +00:00
Martin Mathieson
2c877da104 Make links forward from DL tx to retx frames.
svn path=/trunk/; revision=38242
2011-07-28 16:52:02 +00:00
Martin Mathieson
be1334ed8f Fix bug 6160.
Use correct string to search for RRC BCH dissectors.

svn path=/trunk/; revision=38198
2011-07-25 13:34:40 +00:00
Martin Mathieson
7d7f7d870e Register nicer entry points for LTE RRC BCH messages, and use them in RLC, MAC, PDCP.
svn path=/trunk/; revision=38131
2011-07-20 12:19:22 +00:00
Martin Mathieson
b1eb5b9a1a For UL retx, show links forward to next Tx as well as backwards to previous.
svn path=/trunk/; revision=38077
2011-07-18 11:57:38 +00:00
Martin Mathieson
b3cbce492a Warn if there are > 2 padding subheaders at the beginning of a frame.
svn path=/trunk/; revision=37570
2011-06-06 16:07:09 +00:00
Martin Mathieson
9c0ba9fc85 Detect when padding non-final padding comes after other control subheaders.
svn path=/trunk/; revision=37367
2011-05-23 16:11:32 +00:00
Martin Mathieson
bfb7f0cf94 Set subheader root length to 1, so if contentsinvalid will already be correctl length.
svn path=/trunk/; revision=37271
2011-05-19 01:03:56 +00:00
Martin Mathieson
9a4b6db704 Support multiple Scheduling Requests in one PDU.
svn path=/trunk/; revision=37060
2011-05-11 11:10:30 +00:00
Martin Mathieson
a02a2eed3b Properly (re)initialise structs used for keeping track of UEs/TTI.
svn path=/trunk/; revision=36734
2011-04-20 10:23:41 +00:00
Martin Mathieson
a4b6665653 Retire a preference that can be always on now.
svn path=/trunk/; revision=36693
2011-04-17 21:43:20 +00:00
Martin Mathieson
d4e9304fd2 Add a way for configuration protocol (e.g. RRC) to configure MAC-> RLC mappings, and add a preference to use this or the static UAT.
API is not yet called by RRC.

svn path=/trunk/; revision=36676
2011-04-17 11:22:03 +00:00
Martin Mathieson
960376a8f3 Show max UEs/TTI in MAC stats window (UL/DL separately).
svn path=/trunk/; revision=36658
2011-04-16 10:56:18 +00:00
Martin Mathieson
ae149510e6 Keep track of how many UL/DL UEs in a TTI, and attach this info to each UL-SCH/DL-SCH frame..
svn path=/trunk/; revision=36657
2011-04-15 23:32:44 +00:00
Martin Mathieson
a8f1a17b68 - for UL/DL HARQ, show number of ms since previous tx
- for SR state-machine problems, show UEId in report
- incomplete beginnings of support for grouping/counting UEs per TTI

svn path=/trunk/; revision=36564
2011-04-11 21:33:33 +00:00
Martin Mathieson
4611533752 There can be up to 15 DL HARQ processes (depending upon TDD config index).
svn path=/trunk/; revision=36250
2011-03-22 14:39:02 +00:00
Martin Mathieson
d36178cd5d Improve expert info output when detect Scheduling Request 'state machine' problem.
svn path=/trunk/; revision=36147
2011-03-06 22:52:33 +00:00
Martin Mathieson
2f6486166f Allow linking back to previous UL tx 32 ms ago.
svn path=/trunk/; revision=36119
2011-03-02 11:33:46 +00:00
Martin Mathieson
c5c0195362 Don't overwrite isPhyRetx field for UL frames with DL check.
svn path=/trunk/; revision=36118
2011-03-02 11:16:28 +00:00
Martin Mathieson
3fac9089cb After SR failure, allow for another attempt in SR state machine (presumably with a subsequent RACH happening in-between...)
svn path=/trunk/; revision=36109
2011-03-01 14:58:51 +00:00
Martin Mathieson
93333d8fa1 Make UL retx use warning, rather than error, expert level.
svn path=/trunk/; revision=36090
2011-02-28 12:24:45 +00:00
Martin Mathieson
1660ed63ab Previous UL frame may be 8 OR 16 subframes ago.
svn path=/trunk/; revision=36020
2011-02-21 14:43:16 +00:00
Martin Mathieson
f30d00e00a Show subheaders summary in subheader root item.
svn path=/trunk/; revision=35908
2011-02-11 00:29:40 +00:00
Jeff Morriss
50e1634f4c Modify proto_tree_add_bytes_format() and proto_tree_add_bytes_format_value()
so that if the start_ptr is NULL the bytes are extracted from the given TVB
using the given offset and length.

Replace a bunch of:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, tvb_get_ptr(tvb, offset, length), [...])

with:

proto_tree_add_bytes_format*(tree, hf, tvb, offset, length, NULL, [...])

svn path=/trunk/; revision=35896
2011-02-10 16:31:00 +00:00