Commit graph

76 commits

Author SHA1 Message Date
Alexis La Goutte
6d5591f9f4 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48498
2013-03-23 13:07:36 +00:00
Anders Broman
c5ee81098c From beroset:
remove C++ incompatibilities

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

svn path=/trunk/; revision=48006
2013-03-02 12:10: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
Pascal Quantin
afc90af6fd Add release number to UMTS and LTE RLC
svn path=/trunk/; revision=46486
2012-12-09 22:02:38 +00:00
Bill Meier
7cd0417af5 Fix numerous instances of a variable/parameter name "shadowing" a library function name;
(At least some (gcc ?) compilers give a "shadow" warning for these).

svn path=/trunk/; revision=46402
2012-12-05 15:56:36 +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
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
Pascal Quantin
5bce9d0d7d Move deciphering routine in a function and adapt it for unacknowledged mode
svn path=/trunk/; revision=44568
2012-08-18 20:25:54 +00:00
Pascal Quantin
12a705af47 Miscellaneous changes:
- 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

svn path=/trunk/; revision=44535
2012-08-15 21:45:32 +00:00
Michael Mann
5dd7371960 more ephemeral memory cleanup
svn path=/trunk/; revision=44496
2012-08-14 17:58:41 +00:00
Anders Broman
0e68cac192 From Jacob Nordgren and Rishie Sharma:
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.

svn path=/trunk/; revision=44423
2012-08-10 15:22:50 +00:00
Anders Broman
29140b97c3 From Jacob Nordgren and Rishie Sharma:
RLC: fixed weird dereferencing of things that were not pointers

svn path=/trunk/; revision=44418
2012-08-10 09:45:06 +00:00
Michael Tüxen
10f32a3b7f Not usre if this makes sense. At least the compiler doesn't complain
anymore.

svn path=/trunk/; revision=44399
2012-08-09 20:08:08 +00:00
Jeff Morriss
1c1db865f6 Don't define HAVE_UMTS_KASUMI to anything unless we actually have it.
Use #ifdef HAVE_UMTS_KASUMI instead of #if HAVE_UMTS_KASUMI

Put $Id$ tag in kasumi.h

svn path=/trunk/; revision=44398
2012-08-09 19:33:36 +00:00
Anders Broman
bd1739c87b Fix a couple of typos.
svn path=/trunk/; revision=44395
2012-08-09 19:07:46 +00:00
Pascal Quantin
23c35e6d14 Small fixes:
- 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

svn path=/trunk/; revision=44393
2012-08-09 18:26:08 +00:00
Martin Mathieson
664e7ed5ad Put #if HAVE_UMTS_KASUMI around a statics that won't be used unless it
is defined.

svn path=/trunk/; revision=44390
2012-08-09 17:43:55 +00:00
Anders Broman
084e754a2d Mark parameters as unused when we don't have kasumi.
Cast the result of strlen to int.

svn path=/trunk/; revision=44388
2012-08-09 17:13:44 +00:00
Anders Broman
efa02ebb7a From Jacob Nordgren and Rishie Sharma:
FP: fixed so hsdsch type 1 also uses communication context id 

Added experimental conditional decryption support.

svn path=/trunk/; revision=44384
2012-08-09 16:42:31 +00:00
Pascal Quantin
670be00aea Various fixes:
- 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

svn path=/trunk/; revision=44318
2012-08-07 23:25:07 +00:00
Anders Broman
b2caee1d75 From Jacob Nordgren and Rishie Sharma:
- 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

svn path=/trunk/; revision=44292
2012-08-07 09:44:16 +00:00
Pascal Quantin
a77257f8a0 Fix a few issues:
- 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

svn path=/trunk/; revision=44223
2012-08-02 19:34:40 +00:00
Jeff Morriss
aa65950896 Remove a created-but-unused subtree (and its ett). It's not obvious to me
whether this tree was going to be used for something or not.

svn path=/trunk/; revision=44218
2012-08-02 18:46:36 +00:00
Anders Broman
704e2f524e From Jacob Nordgren and Rishie Sharma:
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

svn path=/trunk/; revision=44205
2012-08-02 14:03:17 +00:00
Pascal Quantin
8c493695ad Fix a few Clang warnings (dead assignment, function call argument is an 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)

svn path=/trunk/; revision=44070
2012-07-27 14:07:20 +00:00
Anders Broman
ad7c4a4bba From Jacob Nordgren and Rishie Sharma:
- Added basic support for tracking flows over reconfigured transport channels + mindor bugfixes 

- small fix in rrc, and some small cleanups

svn path=/trunk/; revision=44062
2012-07-27 08:10:31 +00:00
Michael Tüxen
baa41c7d99 Mark unused parameter as such.
svn path=/trunk/; revision=44039
2012-07-26 12:33:20 +00:00
Anders Broman
46d1c5c5ec If def offending code
packet-rlc.c:2290:7: error: variable ‘i’ set but not used [-Werror=unused-but-set-variable]

svn path=/trunk/; revision=44037
2012-07-26 11:39:11 +00:00
Anders Broman
180f7aa1e0 From Jacob Nordgren and Rishie Sharma:
-  FP and RLC fixed spelling 
- Fixed variable declaration in RRC 
- removed extra ppi in nbap

svn path=/trunk/; revision=44035
2012-07-26 09:42:07 +00:00
Anders Broman
aed65b0c7b From Jacob Nordgren and Rishie Sharma:
- 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

svn path=/trunk/; revision=44027
2012-07-26 08:15:20 +00:00
Chris Maynard
a3a50ecb03 Fix Coverity CID 709737: Structurally dead code.
svn path=/trunk/; revision=44023
2012-07-26 02:16:37 +00:00
Anders Broman
e5d974ec6a From Jacob Nordgren and Rishie Sharma:
- FP: added payload CRC validation, RLC: some more error reporting 
- RLC: fixed an exotic LI bug, some cosmetic fixes.

svn path=/trunk/; revision=43983
2012-07-25 09:09:32 +00:00
Anders Broman
3743a01714 From Jacob Nordgren and Rishie Sharma:
- 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

svn path=/trunk/; revision=43954
2012-07-24 07:31:46 +00:00
Guy Harris
87ad190d49 exit() must not be used in dissectors. Use REPORT_DISSECTOR_BUG() and
just return NULL instead.

svn path=/trunk/; revision=43797
2012-07-18 22:57:04 +00:00
Guy Harris
bbe3a78d3a That comment might have confused the API checker into thinking we were
calling abort(); try changing it.

svn path=/trunk/; revision=43788
2012-07-18 18:50:29 +00:00
Anders Broman
fccbea6702 Merge the rest of Jacob Nordgren and Rishie Sharmas work on
Updateing conversation handling to dissect FP/MAC/RLC
(Work in progress).

svn path=/trunk/; revision=43781
2012-07-18 07:45:19 +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 Quantin
a891f54067 Keep backward compatibility with UDP framing format for UMTS RLC dissector
Fix a few typo errors while we are at it

svn path=/trunk/; revision=42889
2012-05-28 20:34:27 +00:00
Anders Broman
55261641d9 Extend the switch statement.
svn path=/trunk/; revision=42879
2012-05-28 15:09:33 +00:00
Anders Broman
d8ddd39c3d Enhance CHANNEL_HSDSCH dissection.
svn path=/trunk/; revision=42876
2012-05-28 13:38:40 +00:00
Martin Mathieson
a9463e89b3 Avoid needlessly shadowing a variable.
svn path=/trunk/; revision=42549
2012-05-10 15:49:25 +00:00
Guy Harris
bf09922d1d packet-umts_fp.h now requires epan/conversation.h.
svn path=/trunk/; revision=42473
2012-05-07 17:40:05 +00:00
Bill Meier
74f884820e FT_BOOLEAN hf[] entries with a 0 'bitmask' should have 'display' = BASE_NONE;
Reformat long lines;
Do some general whitespace changes.

svn path=/trunk/; revision=41585
2012-03-16 00:05:36 +00:00
Chris Maynard
4b735ad5f3 What is the airspeed velocity of an unladen swallow?
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.

svn path=/trunk/; revision=40275
2011-12-22 14:49:43 +00:00
Chris Maynard
796847fdc7 Avoid a potential buffer overflow (and fix some typos). Resolves bug 6391: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6391
svn path=/trunk/; revision=40266
2011-12-21 21:34:37 +00:00
Bill Meier
ad769d824d Fix a typo
svn path=/trunk/; revision=40220
2011-12-15 21:30:51 +00:00
Bill Meier
4a976f1be7 Use tvb_new_child_real_data() instead of tvb_new_real_data() + tvb_set_child_real_data_tvbuff().
svn path=/trunk/; revision=40173
2011-12-13 04:01:33 +00:00
Martin Mathieson
996dc0ad13 Add more packet highlights to the info column.
svn path=/trunk/; revision=39988
2011-11-22 17:57:25 +00:00
Martin Mathieson
4ad5ff513b From Pascal Quantin:
For status Bitmap, don't show FSN in the info column twice.

svn path=/trunk/; revision=39937
2011-11-18 13:42:55 +00:00
Martin Mathieson
556a0558b9 Make it easier to see:
- bitmap entries
- MRW and MRW-ACK
- RESET and RESET-ACK
- when the Poll bit is set for data

svn path=/trunk/; revision=39936
2011-11-18 12:45:50 +00:00