Commit Graph

168 Commits

Author SHA1 Message Date
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
Martin Mathieson 82cbbca3e5 Add and use accessors to get/set per-packet data for LTE MAC.
This will allow plugins to use the dissector.

svn path=/trunk/; revision=35774
2011-02-02 23:21:16 +00:00
Martin Mathieson b5a32fe8ef Improve/rework the way we look for the original frame when there is a DL. retransmission.
svn path=/trunk/; revision=35682
2011-01-27 16:09:24 +00:00
Martin Mathieson 7205313026 - Use correct data pointer during a comparison.
- Add expert info to show when DRX command is received
- Get rid of some tabs


svn path=/trunk/; revision=35568
2011-01-17 15:01:22 +00:00
Jeff Morriss 8d32d2066a There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string() or
tvb_get_const_stringz().

Use tvb_memeql() & tvb_memcmp().

svn path=/trunk/; revision=35558
2011-01-16 20:51:21 +00:00
Martin Mathieson 51170aa0fc When looking for previous frame for UL/DL retx, use harq-id + ndi bit.
svn path=/trunk/; revision=35535
2011-01-14 14:25:24 +00:00
Martin Mathieson b1dd79a122 Rather than repairing out-of-range subframe numbers, make sure error gets reported (and then are not used to access beyond subframe arrays).
svn path=/trunk/; revision=35531
2011-01-14 11:21:28 +00:00
Gerald Combs 73f5cb2503 From non-customers via bug 5530: Fix a buffer overflow in the MAC LTE
dissector.  From me: Add a define, ep_allocate the buffer.

svn path=/trunk/; revision=35292
2010-12-28 20:47:48 +00:00
Martin Mathieson ee714ffac4 Only a new transmission grant should end a Scheduling Request.
svn path=/trunk/; revision=35268
2010-12-26 23:40:22 +00:00
Martin Mathieson 7cd3ff263b Add more PHY attributes to MAC frames.
svn path=/trunk/; revision=35125
2010-12-05 23:34:11 +00:00
Martin Mathieson a8b6aca90c From Pascal Quantin:
- Set a default RNTI value for each type, in case optional RNTI value isn't supplied.
- Improve range checking of given type against acceptable range of values
- fix misplaced return (this fixed bug 5392)

svn path=/trunk/; revision=34859
2010-11-13 15:32:29 +00:00
Martin Mathieson a067c3bb8a Check given RNTI value is consistent with given RNTI-type.
As suggested in bug 5382.  The reported crash didn't happen for me...

svn path=/trunk/; revision=34852
2010-11-12 16:59:22 +00:00
Martin Mathieson fb0bfc17da Show some reserved bits as hex, not decimal.
svn path=/trunk/; revision=34792
2010-11-05 16:47:22 +00:00
Martin Mathieson 829ee8752b Add 'ndi' and 'harq-id' as new MAC-PHY DL attributes.
svn path=/trunk/; revision=34753
2010-11-02 15:20:38 +00:00
Jeff Morriss f5d3a16225 Make tvb_strneql()'s size parameter be a size_t. Remove some now-unnecessary casts.
svn path=/trunk/; revision=34725
2010-10-30 18:18:12 +00:00
Guy Harris 17d4d51b7d Make the third argument to a UAT copy callback a size_t (not that any of
the callbacks we have use that argument - is it really needed?).

svn path=/trunk/; revision=34694
2010-10-29 21:11:33 +00:00
Martin Mathieson 81a49eec81 In heuristic dissector, don't check/allocate struct until/unless signature pattern matches.
svn path=/trunk/; revision=34582
2010-10-20 09:58:40 +00:00
Martin Mathieson 7e938c7071 Don't clear info column when showing MAC or RLC-level info.
svn path=/trunk/; revision=34559
2010-10-18 17:02:19 +00:00
Martin Mathieson 1077ec28f6 Improve info column when showing PHY info for MAC frames.
svn path=/trunk/; revision=34529
2010-10-15 21:32:35 +00:00
Martin Mathieson 62e6b6aceb Add more CRC failure codes.
svn path=/trunk/; revision=34401
2010-10-07 14:44:00 +00:00
Jeff Morriss 0ff5638f37 Replace blurbs that match the name (case insensitive) with NULL.
svn path=/trunk/; revision=34227
2010-09-23 21:46:31 +00:00
Jeff Morriss 381664535b As suggested by Kovarththanan Rajaratnam in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3548 :
Clean up hf fields some more: mostly removing leading and trailing spaces from names and blurbs.

svn path=/trunk/; revision=34165
2010-09-21 03:14:49 +00:00