Commit Graph

184 Commits

Author SHA1 Message Date
Bill Meier 6896c2648c packet-fp_umts_fp.c: various
- Use #if 0/#endif to comment out code instead of /* ... */
= Add editor modelines and adjust whitespace as needed.

Change-Id: I6f7e18a7955cd17d6d727090de802374a7cae0c4
Reviewed-on: https://code.wireshark.org/review/4391
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-30 21:06:04 +00:00
Bill Meier b14bf98c06 Fix spelling: cant-->can't, wont-->won't, etc
Change-Id: I4497f1b8b6eab0e576d9dd31b732965f9a6679c6
Reviewed-on: https://code.wireshark.org/review/4124
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-16 13:51:51 +00:00
Michael Mann cf8f11f678 Eliminate proto_tree_add_text from some of the dissectors.
Other minor cleanups while in the area.

Change-Id: I623d941e53128f169e55dfc629547b4221fa72fc
Reviewed-on: https://code.wireshark.org/review/4021
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-08 15:46:05 +00:00
Michael Mann 14824e6adf Revert "Fixup: tvb_* -> tvb_captured"
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html

This reverts commit 246fe2ca4c.

Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f
Reviewed-on: https://code.wireshark.org/review/2430
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-19 18:25:59 +00:00
Dario Lombardo 246fe2ca4c Fixup: tvb_* -> tvb_captured
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f
Reviewed-on: https://code.wireshark.org/review/2377
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-18 14:14:58 +00:00
Michael Mann 73217d9f3f tvb_new_subset -> tvb_new_subset_length when length parameters are equal.
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is.

Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d
Reviewed-on: https://code.wireshark.org/review/1999
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-06-07 15:41:07 +00:00
Michael Mann b40cb1adea Apply found fix-encoding-args.pl errors in the dissector directory.
I coincidentally found a few files with errors, so I thought it might be time to run it on the whole directory again.

Change-Id: Ia32e54b3b1b94e5a418ed758ea79807c8bc7e798
Reviewed-on: https://code.wireshark.org/review/978
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-06 15:11:36 +00:00
Joerg Mayer b0b6064542 Fix
[  5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-umts_fp.c.o
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c: In function ‘umts_fp_init_protocol’:
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4526:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat]
                 umts_fp_conversation_info->iface_type        = uat_umts_fp_ep_and_ch_records[i].interface_type;
                 ^
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4527:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat]
                 umts_fp_conversation_info->division          = uat_umts_fp_ep_and_ch_records[i].division;
                 ^
/home/jmayer/work/wireshark/git/epan/dissectors/packet-umts_fp.c:4533:17: error: enum conversion in assignment is invalid in C++ [-Werror=c++-compat]
                 umts_fp_conversation_info->rlc_mode          = uat_umts_fp_ep_and_ch_records[i].rlc_mode;
                 ^
cc1: all warnings being treated as errors

Change-Id: Ie783a261c40d26ffd105822d5f45bd0513aa1914
Reviewed-on: https://code.wireshark.org/review/693
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-03-16 08:43:52 +00:00
AndersBroman f1996885d2 Add an UAT table to define endpoints and channel data to be able to
presetup conversations with FP dissection data.

Change-Id: Ibced63bf944d7268751f8055095eb26477664be1
Reviewed-on: https://code.wireshark.org/review/643
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-03-16 02:50:25 +00:00
Evan Huus ddd9d274b9 Tight array index guard in packet-umts_fp.c
Fixes bug #9828.

Change-Id: I69b02a0d51921bae77850b599144f35a4fe9ee33
Reviewed-on: https://code.wireshark.org/review/560
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-08 17:44:49 +00:00
Alexis La Goutte 296591399f Remove all $Id$ from top of file
(Using sed : sed -i '/^ \* \$Id\$/,+1 d')

Fix manually some typo (in export_object_dicom.c and crc16-plain.c)

Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8
Reviewed-on: https://code.wireshark.org/review/497
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04 14:27:33 +00:00
Pascal Quantin 92a369eaf4 Remove a few wrong use of tvb_get_string()
Change-Id: I7095e12439fd8c0c5cd3ce14d19662efa3fd841f
Reviewed-on: https://code.wireshark.org/review/339
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-02-25 07:47:57 +00:00
Anders Broman 9bdd3bbde1 - Forward declaration of register functions.
svn path=/trunk/; revision=53911
2013-12-10 19:50:20 +00:00
Anders Broman eb252d2d34 - Make local functions static.
- Forward declaration of register functions.

svn path=/trunk/; revision=53821
2013-12-07 11:37:58 +00:00
Michael Mann 9b7fb8a811 Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future.  And search/replace of a function name is easy enough to do.

The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.

All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope().  All other dissectors were converted to using file_scope() which was the original scope for "proto" data.

svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
Bill Meier 0ad98563a2 From didier gautheron: remove redundant or use faster col_xxx functions
- when the text parameter is constant col_add_str() and col_set_str() are equivalent but col_set_str() is faster.
- same for  replace col_append_fstr and col_append_str
- remove col_clear() when it's redundant:
    + before a col_set/col_add if the dissector can't throw an exception.
- replace col_append() after a col_clear() with faster col_add... or col_set

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


svn path=/trunk/; revision=52948
2013-10-29 14:09:20 +00:00
Pascal Quantin a0c53ffaa1 emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly

svn path=/trunk/; revision=52172
2013-09-22 15:50:55 +00:00
Jörg Mayer 1965ab5d3e emem -> wmem ("tshark -v" tested)
svn path=/trunk/; revision=51979
2013-09-12 20:25:51 +00:00
Michael Mann 9e3f9b449f expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
Michael Mann 6880359a5f Batch of filterable expert infos.
svn path=/trunk/; revision=51486
2013-08-23 03:17:34 +00:00
Alexis La Goutte 5672a65daa Fix (-W)documentation error found by Clang
packet-umts_fp.c:3486:12: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
* @param tvb
  ~~~~~~~~~^
packet-umts_fp.c:3488:13: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
* @param tree
  ~~~~~~~~~~^
packet-umts_fp.c:3489:15: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
* @param offset
  ~~~~~~~~~~~~^
packet-umts_fp.c:3491:4: error: '@return' command used in a comment that is
      attached to a function returning void [-Werror,-Wdocumentation]
* @return Void.
  ~^~~~~~~~~~~~

svn path=/trunk/; revision=51271
2013-08-10 21:30:30 +00:00
Anders Broman 85a8e304dd Add the posibillity to use a key for per-packet-data.
svn path=/trunk/; revision=49259
2013-05-12 18:11:02 +00:00
Anders Broman ae747e4c4b From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48430
2013-03-19 22:03:00 +00:00
Bill Meier 96a24cc79f Fix spelling/typos found using a list of commonly misspelled words.
The misspellings were mostly in comments but some were
in text strings visible to the user.


svn path=/trunk/; revision=47899
2013-02-26 04:42:26 +00:00
Bill Meier 1823aa007c it's ==> its & its ==> it's as needed.
svn path=/trunk/; revision=47891
2013-02-26 01:06:19 +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
Bill Meier d3a7f4b817 Use '#if 0 ... #endif' rather than /** ... **/ to comment out
unused hf[] entries (which I should have done in the first place).

svn path=/trunk/; revision=47390
2013-01-31 18:31:28 +00:00
Bill Meier 0960e508e4 Comment out cases of unused hf array entries found by checkhf.
svn path=/trunk/; revision=47302
2013-01-26 18:54:53 +00:00
Martin Mathieson 0b194f98ad Control the heuristic dissector with a preference. It is only a 7-bit
CRC, so was firing too readily...

svn path=/trunk/; revision=45147
2012-09-26 10:10:27 +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
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
Martin Mathieson 5f1b2bd6ed If not configured to call MAC for MAC-is PDUs, don't (avoiding
assertion).  Do show extent of MAC-is PDU.

Didn't it used to show the MAC-is SDUs inside too?

svn path=/trunk/; revision=44411
2012-08-10 00:34:39 +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
Anders Broman 508e1c3027 From Jacob Nordgren and Rishie Sharma:
FP: fixed exotic bug where fakes counter was sometimes not reset, RRC: fixed bug where num_chans_per_flow was not properly cleared

svn path=/trunk/; revision=44375
2012-08-09 10:06:01 +00:00
Jeff Morriss adcb1775f6 Remove set-but-not-used variable.
svn path=/trunk/; revision=44365
2012-08-08 23:02:49 +00:00
Anders Broman a1218c94c9 From Jacob Nordgren and Rishie Sharma:
- FP: added header CRC validation, added crc11.c and crc11.h in wsutil/ for EDCH 11 bit CRC, fixed bug in RRC,
And also smaller bugfixes in umts_fp and rrc.

svn path=/trunk/; revision=44349
2012-08-08 17:24:14 +00:00
Jeff Morriss fe7e9760fa Remove a set-but-not-used variable.
svn path=/trunk/; revision=44297
2012-08-07 13:18:01 +00:00
Anders Broman 7623b9bae7 From Rishie Sharma:
compile error fix

svn path=/trunk/; revision=44296
2012-08-07 11:49:06 +00:00
Anders Broman 1c20e4da84 error: variable ‘hsdsch_physical_layer_category’ set but not used
svn path=/trunk/; revision=44295
2012-08-07 10:54:24 +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
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
Anders Broman ee071c887a From Jacob Nordgren and Rishie Sharma:
-MAC-is update

svn path=/trunk/; revision=44129
2012-07-30 08:37:00 +00:00
Pascal Quantin 1f6b7eb9c4 Fix dead assignment Clang warning and use consistent indentation
The two remaining Clang warnings (function call argument is an uninitialized value, result of operation is garbage or undefined) seem to be false positives

svn path=/trunk/; revision=44079
2012-07-27 21:09:11 +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
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
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
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