Commit graph

84 commits

Author SHA1 Message Date
Jakub Zawadzki
68ec58d385 Fix some: 'cast discards qualifiers from pointer target type' warnings
- Add const qualifier
- Remove some strange casts

svn path=/trunk/; revision=42131
2012-04-18 12:35:36 +00:00
Martin Mathieson
4d256e6628 Getting closer to deleting old ROHC from PDCP dissector.
Don't register ROHC fields there (so its easier to find real fields with
auto-completion).

svn path=/trunk/; revision=42076
2012-04-15 01:37:08 +00:00
Martin Mathieson
3f592f10e6 For PDCP status reports, show each lost SN as a bit from the map.
svn path=/trunk/; revision=42014
2012-04-10 21:26:55 +00:00
Jakub Zawadzki
23494db817 Add missing const attribute to some char *
Fix some "assignment discards qualifiers from pointer target type", etc

svn path=/trunk/; revision=41996
2012-04-09 18:44:10 +00:00
Martin Mathieson
6407baee32 Obsolete a preference
svn path=/trunk/; revision=41986
2012-04-09 01:50:26 +00:00
Martin Mathieson
d101fb251b Clear info column before calling ROHC dissector.
svn path=/trunk/; revision=41880
2012-04-01 14:52:48 +00:00
Martin Mathieson
5282c1b9c5 When a capture starts with a non-zero SN, don't report 0-(SN-1) as
missing.

svn path=/trunk/; revision=41837
2012-03-30 01:18:12 +00:00
Martin Mathieson
60a22a4072 Want to write RRC info column info always. Also save and restore writable
flag.

svn path=/trunk/; revision=41435
2012-03-08 16:30:39 +00:00
Martin Mathieson
16c443956d Add a preference to show in the info column RLC, PDCP or traffic
details.

svn path=/trunk/; revision=41433
2012-03-08 13:19:41 +00:00
Martin Mathieson
7c0b8e6097 Dissect and check reserved bits at start of signalling format.
svn path=/trunk/; revision=40823
2012-02-03 16:44:56 +00:00
Martin Mathieson
26d6d4ce8a Use plane rather than channelType as part of key for looking up channel
state for sequence analysis.

svn path=/trunk/; revision=40659
2012-01-23 14:39:38 +00:00
Martin Mathieson
7e5f6d9fc1 PDCP:
- Pass is_retx flag to PDCP from RLC in struct instead of calling function
RLC:
- use full key to look up sequence analysis results
    - avoids overwriting and attaching result details to wrong PDU
- add links to previous and next 'OK' PDUs in channel
- shorten some long variable and type names.

svn path=/trunk/; revision=40656
2012-01-23 02:36:46 +00:00
Martin Mathieson
7a17238dab Use detailed key for sequence analysis results to avoid overwriting with
other PDUs info from same frame.  Also:
- initialise next-frame value to 0
- don't show expected-SN when analysis result is 'ok'

svn path=/trunk/; revision=40655
2012-01-22 20:31:09 +00:00
Martin Mathieson
c585d8de24 Allow sequence analysis to be done either for PDCP frames found in RLC
frames, or logged at the PDCP level.  Provide a forward link to the next
SN frame for a channel.

svn path=/trunk/; revision=40649
2012-01-22 03:02:10 +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
Anders Broman
0214486008 Avoid dupliacte entries in col_proto
svn path=/trunk/; revision=40255
2011-12-20 19:34:52 +00:00
Guy Harris
33f6b348d1 #if 0 out a bunch of (currently?) unused routines.
svn path=/trunk/; revision=40219
2011-12-15 21:03:21 +00:00
Guy Harris
3d3c612706 Clean up indentation.
svn path=/trunk/; revision=40218
2011-12-15 21:00:15 +00:00
Anders Broman
8bbb6d5b2a #if 0 now unused variables.
svn path=/trunk/; revision=40216
2011-12-15 20:45:06 +00:00
Anders Broman
a106a9047a Call the rohc dissector directly, the code will be cleaned up
in the next weeks or so.

svn path=/trunk/; revision=40213
2011-12-15 20:22:54 +00:00
Anders Broman
b2678b43d1 From Per Liedberg:
RoHC dissection improvment.

svn path=/trunk/; revision=40210
2011-12-15 17:28:43 +00:00
Anders Broman
9d0fa5cfcb - Change the tree layout to mimic packet-pdcp-lte.c
- Add IPv6 static chain dissectoin
- Part of IPv6 dynamic chain dissectoin

svn path=/trunk/; revision=40156
2011-12-12 06:58:37 +00:00
Anders Broman
58221afc41 Fix a couple of warnings.
svn path=/trunk/; revision=40149
2011-12-10 13:18:45 +00:00
Anders Broman
8f480def7c Dissect the whole IR dyn packet in packet-rohc.c
svn path=/trunk/; revision=40147
2011-12-10 12:50:05 +00:00
Anders Broman
08ca01b2a4 Dissect the whole IR packet in packet-rohc.c
svn path=/trunk/; revision=40135
2011-12-09 18:58:26 +00:00
Anders Broman
1372c03cf3 Use correct offset.
svn path=/trunk/; revision=40125
2011-12-09 06:16:07 +00:00
Guy Harris
3f199f793a Move the definition of enum rohc_mode into packet-rohc.h.
Have packet-pdcp-lte.h include packet-rohc.h to pick up that definition.

Get rid of now-no-longer-necessary includes.

svn path=/trunk/; revision=40123
2011-12-09 02:34:53 +00:00
Guy Harris
f2f48a2b7e packet-pdcp-lte.h defines "enum rohc_mode", and packet-rohc.h uses it,
so include packet-pdcp-lte.h first.

No extra tokens after #endif, please.

Fix indentation.

svn path=/trunk/; revision=40121
2011-12-09 00:56:48 +00:00
Anders Broman
f6dbd0863e Start using functions from packet-rohc.c
svn path=/trunk/; revision=40120
2011-12-08 21:45:35 +00:00
Martin Mathieson
61d252a42b Skip correct number of bytes.
svn path=/trunk/; revision=40115
2011-12-08 11:15:31 +00:00
Martin Mathieson
a64e6e5e59 Fix for bug 6650: IP-ID is 2 bytes.
Note that I'm still aiming to change PDCP to use packet-rohc rather than its own, separate implementation...

svn path=/trunk/; revision=40111
2011-12-07 12:19:59 +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
20aa78a1d2 Fix a benign bug: Use correct proto_tree_add_item() encoding arg.
svn path=/trunk/; revision=39384
2011-10-12 15:02:11 +00:00
Bill Meier
67ee5049d4 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_BOOLEAN
     FT_IPv4
     FT_EUI64
     FT_GUID
     FT_UINT_STRING

Also: For type FT_ITv6 use ENC_NA. (This was missed in SVN #39260)

svn path=/trunk/; revision=39328
2011-10-10 00:39:31 +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
5aeb03334c Use val_to_str_const().
svn path=/trunk/; revision=39109
2011-09-23 17:02:56 +00:00
Jeff Morriss
339136d1d0 Based on patch from Denis Ovsienko via
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6244 :

Fix typo: s/unkown/unknown/

svn path=/trunk/; revision=38561
2011-08-16 13:16:33 +00:00
Martin Mathieson
c2dadba8f4 From Pascal Quantin (bug 6159).
When decoding drb payload, call IPv4, IPv6 or data dissector as appropriate.

Am slightly concerned that we always dereference the first byte of the frame - is it safe to assume that the length can't be 0?

svn path=/trunk/; revision=38199
2011-07-25 13:47:26 +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
33a21986f1 Trivial: add a couple of newlines.
svn path=/trunk/; revision=37941
2011-07-08 16:10:25 +00:00
Bill Meier
91191c6c00 Fix some gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings;
(Code commented out since it may be required in the future (at least in some cases).

svn path=/trunk/; revision=37723
2011-06-20 01:13:21 +00:00
Jakub Zawadzki
ed59c450f4 Cleanup: replace se_alloc+memcpy combo with single se_memdup().
svn path=/trunk/; revision=36996
2011-05-05 06:55:12 +00:00
Martin Mathieson
b138ffa9e7 Avoid some unnecessary assignments (as reported by clang).
svn path=/trunk/; revision=36204
2011-03-16 23:18:59 +00:00
Martin Mathieson
4d3d029e09 Remove some instances of _U_ where the parameter is now used.
svn path=/trunk/; revision=36148
2011-03-06 23:10:28 +00:00
Martin Mathieson
7d5ffdb44b Show some top-level info about PDCP frame in protocol root.
Especially useful when PDCP is called from RLC.

svn path=/trunk/; revision=35815
2011-02-04 11:47:38 +00:00