aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-rlc.c
AgeCommit message (Collapse)AuthorFilesLines
2012-08-18Move deciphering routine in a function and adapt it for unacknowledged modepascal1-229/+249
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44568 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-15Miscellaneous changes:pascal1-50/+79
- move channel information before header dissection - add channel information to TM and RLC Control PDUs - take into account rlc information in rlc_is_ciphered function - update function prototypes according to the coding rules used in packet-rlc.c git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44535 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-14more ephemeral memory cleanupmmann1-2/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44496 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-10From Jacob Nordgren and Rishie Sharma:etxrab1-21/+50
RLC: changed so reassembly fail flag is set per channel instead of globally. RLC: added reset channel function Added support for reconfigurin HSDSCH flows, and E-DCH flows (just needs to figure out when it should become active for 'overloaded' ports), also changed slightly how ehs headers are configured in nbap. Removed extra (debugging) port in nbap This is the last patch set for a while. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44423 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-10From Jacob Nordgren and Rishie Sharma:etxrab1-39/+47
RLC: fixed weird dereferencing of things that were not pointers git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44418 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-09Not usre if this makes sense. At least the compiler doesn't complaintuexen1-14/+14
anymore. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44399 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-09Don't define HAVE_UMTS_KASUMI to anything unless we actually have it.morriss1-8/+9
Use #ifdef HAVE_UMTS_KASUMI instead of #if HAVE_UMTS_KASUMI Put $Id$ tag in kasumi.h git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44398 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-09Fix a couple of typos.etxrab1-4/+4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44395 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-09Small fixes:pascal1-94/+97
- put back return NULL in line 947 that got removed in r44384: it is mandatory to avoid accessing non initialized variables. Change rlc_channel_assign a bit to fix what was the root cause of this removal (I guess) - put back add_channel_info in dissect_rlc_am (removed by error?) - fix some typo errors - fix indentation a bit git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44393 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-09Put #if HAVE_UMTS_KASUMI around a statics that won't be used unless itmartinm1-1/+4
is defined. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44390 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-09Mark parameters as unused when we don't have kasumi.etxrab1-3/+4
Cast the result of strlen to int. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44388 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-09From Jacob Nordgren and Rishie Sharma:etxrab1-1884/+2160
FP: fixed so hsdsch type 1 also uses communication context id Added experimental conditional decryption support. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44384 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-07Various fixes:pascal1-7/+24
- in UM mode, LI size boundary is at 125 bytes (regression introduced in r44292) - define RLC_LI_UPPERLAYER outside of rlc_li_size enum as it is confusing: when set in preferences it means that the dissector will use the variable, 7 bits or 15 bits LI as indicated in the rlc_info struct (so using one of the rlc_li_size enum value); it is not a new LI value - add value_string array for direction - add BCCH channel to UDP framing format - initialize p2p_dir when using UDP framing format git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44318 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-07From Jacob Nordgren and Rishie Sharma:etxrab1-25/+107
- umts_fp: fixed so CS content is not malformed content - RLC: added channel tree so you can filter on rbid etc - umts_fp,rlc,mac: added some hdsch-common code git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44292 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-02Fix a few issues:pascal1-11/+17
- restore test on ciphered and deciphered variables removed in r44035: they are used by dct2000 and fp_hint dissectors - rename channel information lchid to rbid: the corresponding variable is supposed to contain a Radio Bearer Identity and not a Logical Channel Identity and was already used like this in dct2000 and fp_hint dissectors or with UDP framing protocol. Please add a new variable in rlc_info structure if the lchid is really useful - do not display channel information when the direction is unknown (useful for UDP framing protocol for ex) - add channel information to UM dissection also As a rule of thumb, please check that the changes do not break existing dissectors: UMTS RLC dissection can be configured in packet-catapult-dct2000.c, packet-fp_hint.c, through the UDP framing protocol explained in packet-rlc.h and not only in packet-umts_fp.c and packet-umts-mac.c git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44223 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-02Remove a created-but-unused subtree (and its ett). It's not obvious to memorriss1-4/+0
whether this tree was going to be used for something or not. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44218 f5534014-38df-0310-8fa8-9805f1628bb7
2012-08-02From Jacob Nordgren and Rishie Sharma:etxrab1-6/+24
NBAP: fixed segfault, FP: aesthetic fix, RLC: added channel info to GUI, MAC-is: fixed case with reassembly when a middle segment arrives MAC, RLC, added preferences for LI-size and TSN-size git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44205 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-27Fix a few Clang warnings (dead assignment, function call argument is an ↵pascal1-5/+4
uninitialized value) Remove misleading U-RNTI display: it is useless for RLC dissection and the variable is a placeholder used for re-assembly that can contain other identifiers than the real U-RNTI (see packet-umts_fp.c) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44070 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-27From Jacob Nordgren and Rishie Sharma:etxrab1-0/+6
- Added basic support for tracking flows over reconfigured transport channels + mindor bugfixes - small fix in rrc, and some small cleanups git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44062 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-26Mark unused parameter as such.tuexen1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44039 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-26If def offending codeetxrab1-0/+2
packet-rlc.c:2290:7: error: variable ‘i’ set but not used [-Werror=unused-but-set-variable] git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44037 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-26From Jacob Nordgren and Rishie Sharma:etxrab1-10/+10
- FP and RLC fixed spelling - Fixed variable declaration in RRC - removed extra ppi in nbap git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44035 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-26From Jacob Nordgren and Rishie Sharma:etxrab1-22/+25
- RRC now configures logical channels in HS-DSCH hs, and some HSDSCH common support added - RLC: modifed memory management, MAC: dch would set the incorrect logical channel for RLC git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44027 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-26Fix Coverity CID 709737: Structurally dead code.cmaynard1-1/+0
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@44023 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-25From Jacob Nordgren and Rishie Sharma:etxrab1-11/+32
- FP: added payload CRC validation, RLC: some more error reporting - RLC: fixed an exotic LI bug, some cosmetic fixes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43983 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-24From Jacob Nordgren and Rishie Sharma:etxrab1-102/+127
- Added support for EDCH type 2 MAC-is reassembly and slightly improved RLC error reporting - RLC: fixed bug where complete sequences in the end of a trace where not reassembled git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43954 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-18exit() must not be used in dissectors. Use REPORT_DISSECTOR_BUG() andguy1-2/+2
just return NULL instead. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43797 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-18That comment might have confused the API checker into thinking we wereguy1-1/+1
calling abort(); try changing it. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43788 f5534014-38df-0310-8fa8-9805f1628bb7
2012-07-18Merge the rest of Jacob Nordgren and Rishie Sharmas work onetxrab1-72/+287
Updateing conversation handling to dissect FP/MAC/RLC (Work in progress). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43781 f5534014-38df-0310-8fa8-9805f1628bb7
2012-06-28Update Free Software Foundation address.darkjames1-1/+1
(COPYING will be updated in next commit) git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43536 f5534014-38df-0310-8fa8-9805f1628bb7
2012-06-20Use separate filters for the RTT found on a SACK and the RTT found on amorriss1-203/+325
DATA chunk: having them in both places is helpful when looking at the messages but having them separate is helpful when graphing the RTTs. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43406 f5534014-38df-0310-8fa8-9805f1628bb7
2011-12-22What is the airspeed velocity of an unladen swallow?cmaynard1-3/+3
aspell and my own spelling preferences do not always agree with the spelling variations used by folks across the pond. Revert a couple of spelling changes. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40275 f5534014-38df-0310-8fa8-9805f1628bb7
2011-12-21Avoid a potential buffer overflow (and fix some typos). Resolves bug 6391: ↵cmaynard1-6/+6
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6391 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40266 f5534014-38df-0310-8fa8-9805f1628bb7
2011-12-15Fix a typowmeier1-1/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40220 f5534014-38df-0310-8fa8-9805f1628bb7
2011-12-13Use tvb_new_child_real_data() instead of tvb_new_real_data() + ↵wmeier1-2/+1
tvb_set_child_real_data_tvbuff(). git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@40173 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-22Add more packet highlights to the info column.martinm1-4/+11
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39988 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-18From Pascal Quantin:martinm1-2/+2
For status Bitmap, don't show FSN in the info column twice. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39937 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-18Make it easier to see:martinm1-12/+26
- bitmap entries - MRW and MRW-ACK - RESET and RESET-ACK - when the Poll bit is set for data git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39936 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-17Make it easier to see RLIST details.martinm1-1/+9
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39906 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-17Show meaning of special length indication values in the LI root.martinm1-21/+41
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39901 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-16Show more sequence numbers in info column, and in root nodes.martinm1-3/+10
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39881 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-15Rename channel_type enums to avoid possible naming conflicts.cmaynard1-40/+41
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39865 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-15Append important details from LI and SURI trees to root item.martinm1-16/+24
Show some SNs in the info column. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39852 f5534014-38df-0310-8fa8-9805f1628bb7
2011-11-15UMTS RLC:martinm1-5/+58
- 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 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39846 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-28First go at calling UMTS RLC dissector from IxCatapult logs.martinm1-7/+8
Had to change some #defines in the header file (for UDP-framed/heuristic dissector) - will need to update example sending program later on tonight. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39656 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-21For proto_tree_add_item(..., proto_xxx, ...)use ENC_NA as the encoding arg.wmeier1-6/+6
Also: remove trailing whitespace for a number of files. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39503 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-19From Pascal Quantin via ↵morriss1-71/+111
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6468 : The attached patch fixes a memory corruption of the ep_allocated buffer when building the decoded bitmap. From me: some reformatting. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39464 f5534014-38df-0310-8fa8-9805f1628bb7
2011-10-04Use ENC_NA as encoding for proto_tree_add_item() calls which directly ↵wmeier1-16/+16
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 git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39260 f5534014-38df-0310-8fa8-9805f1628bb7
2011-09-22Show if per packet info is missing.etxrab1-2/+7
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39087 f5534014-38df-0310-8fa8-9805f1628bb7
2011-06-19Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.wmeier1-2/+1
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37716 f5534014-38df-0310-8fa8-9805f1628bb7