Commit Graph

13314 Commits

Author SHA1 Message Date
Guy Harris dfcec43973 Shuffle the ett[] array elements around a bit, and add blank lines, to
match their definitions; add two missing elements that turned up.  That
should fix bug 6736.

svn path=/trunk/; revision=40509
2012-01-15 09:07:54 +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
Bill Meier ba04b5b113 Several minor changes:
- use consistent indentation;
- use tvb_reported_length_remaining() in one case;
- reformat a long line.

svn path=/trunk/; revision=40506
2012-01-14 17:18:26 +00:00
Bill Meier 0fee9f56d2 Minor updates:
- checkcol() not req'd in a few cases;
 - Add an XXX comment about the (mis?)use of tvb_length();
 - lenght -> length;

svn path=/trunk/; revision=40505
2012-01-14 17:03:34 +00:00
Bill Meier 6af379e903 Use REPORT_DISSECTOR_BUG() instead of g_print(); Other minor cleanup.
svn path=/trunk/; revision=40504
2012-01-14 16:18:16 +00:00
Bill Meier d86186ac12 check_col() not req'd and other minor cleanups ....
svn path=/trunk/; revision=40503
2012-01-14 15:47:40 +00:00
Jörg Mayer 6197143d6c Ed Beroset <beroset@mindspring.com> via bug 5531
The ANSI C12.22 protocol is a smart grid protocol for utility meters, including
gas, water and electric.  The dissector implemented in the patch file includes
full support for all EPSEM (Extended Protocol Specification for Electricity
Metering) services and includes a full implementation of the C12.22 security
modes.

[...]

To decrypt the attached sample file, you need to set up the key table in the
preferences to include key 0 with a value of 6624C7E23034E4036FE5CB3A8B5DAB44.

Me: Fixes for:

[ 64%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o            
../../asn1/c1222/packet-c1222-template.c: In function ‘dissect_epsem’:                   
../../asn1/c1222/packet-c1222-template.c:860:15: error: variable ‘ft’ set but not used [-Werror=unused-but-set-variable]

[  5%] Building C object epan/CMakeFiles/epan.dir/dissectors/packet-c1222.c.o
../../asn1/c1222/packet-c1222-template.c:103:19: error: ‘c1222_flags’ defined but not used [-Werror=unused-variable]



svn path=/trunk/; revision=40500
2012-01-14 15:22:10 +00:00
Bill Meier bf87bab697 Minor cleanup:
- Move a global var to be local to a fcn;
- Remove an unneeded forward declaration;
- Do some minor reformatting.

svn path=/trunk/; revision=40486
2012-01-13 22:04:09 +00:00
Bill Meier 26d592209a Minor cleanup:
- Remove set but unused variable;
- Fix indentation to match that specified by the Editor Modelines

svn path=/trunk/; revision=40485
2012-01-13 21:44:13 +00:00
Jörg Mayer 7a3bf9a6aa dfs and mapi do create warnings. move them back to dirty
svn path=/trunk/; revision=40484
2012-01-13 21:25:27 +00:00
Anders Broman dbffa9eaef Introduce a dissector table to be used for proprietary tags.
svn path=/trunk/; revision=40482
2012-01-13 20:45:02 +00:00
Guy Harris 9c845afb6a Only one instance of packet-dcerpc-mapi.c and packet-dcerpc-mapi.h,
please.

Move some generated DCERPC dissectors back to the clean list; if they
actually *do* generate warnings, move them back.

svn path=/trunk/; revision=40479
2012-01-13 20:06:49 +00:00
Jörg Mayer 9781eaf0f5 Sync filelists between autofoo and cmake.
Move some dissectors that throw warnings to DIRTY_
Whitespace cleanups

svn path=/trunk/; revision=40478
2012-01-13 19:29:58 +00:00
Jörg Mayer 1c789b44a5 Add comment about possible expert item
svn path=/trunk/; revision=40477
2012-01-13 19:27:01 +00:00
Alexis La Goutte 2fb9360c96 Update ISAKMP to last IANA Parameters (2011-11-07)
Add new ISAKMP Attribut of RFC6407 and new IKE type (GAP ID 22)

svn path=/trunk/; revision=40476
2012-01-13 16:59:22 +00:00
Alexis La Goutte 0e876f1ab2 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40472
2012-01-13 16:34:32 +00:00
Alexis La Goutte fbb00bdce0 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40471
2012-01-13 16:34:15 +00:00
Alexis La Goutte 4f47f1081a Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40470
2012-01-13 16:33:57 +00:00
Alexis La Goutte 8b22a262e0 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40469
2012-01-13 16:33:40 +00:00
Alexis La Goutte bd931901a0 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40468
2012-01-13 16:33:04 +00:00
Alexis La Goutte 0dde64beae Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40467
2012-01-13 16:30:39 +00:00
Alexis La Goutte cf8e19f435 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40466
2012-01-13 16:28:54 +00:00
Alexis La Goutte a3dbee44b3 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40465
2012-01-13 16:27:50 +00:00
Alexis La Goutte f5f6ac7cdb Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40464
2012-01-13 16:26:45 +00:00
Alexis La Goutte 2747e6bc45 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40463
2012-01-13 16:24:44 +00:00
Alexis La Goutte fe3168dc2a Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40462
2012-01-13 16:22:50 +00:00
Alexis La Goutte 9308fab8e7 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40461
2012-01-13 16:21:08 +00:00
Alexis La Goutte 7dc1bd38a1 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40460
2012-01-13 16:20:23 +00:00
Alexis La Goutte 346bdd6c87 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40459
2012-01-13 16:19:24 +00:00
Alexis La Goutte 16dbe7bf4d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40458
2012-01-13 16:18:39 +00:00
Chris Maynard 2a808af4da Fix some typos.
svn path=/trunk/; revision=40454
2012-01-13 16:05:23 +00:00
Bill Meier 083496f05c Fix:
packet-gsm_a_rr.c:3867:101: error: parameter 'len' set but not used [-Werror=unused-but-set-parameter]
packet-gsm_a_rr.c:6837:46: warning: variable 'bit_offset_sav2' set but not used [-Wunused-but-set-variable]
packet-gsm_a_rr.c:7458:18: warning: variable 'curr_offset' set but not used [-Wunused-but-set-variab

svn path=/trunk/; revision=40453
2012-01-13 14:18:07 +00:00
Bill Meier 0c2a1d316b Minor cleanup:
Merge packet-meta.h into packet-meta.c;
 Remove an unneeded #include;
 Remove an unused variable.

svn path=/trunk/; revision=40452
2012-01-13 14:03:10 +00:00
Anders Broman 77e16b842e Fix:
packet-gsm_a_rr.c:3289: warning: unused parameter 'len'
packet-gsm_a_rr.c:3412: warning: unused parameter 'len'
packet-gsm_a_rr.c:4449: warning: unused variable 'bit_len'
packet-gsm_a_rr.c:4444: warning: unused parameter 'len'
packet-gsm_a_rr.c:4557: warning: unused parameter 'len'
packet-gsm_a_rr.c:6285: warning: unused parameter 'len'
packet-gsm_a_rr.c:6765: warning: unused variable 'bit_len'
packet-gsm_a_rr.c:6759: warning: unused parameter 'len'
packet-gsm_a_rr.c:6987: warning: unused variable 'bit_len'
packet-gsm_a_rr.c:6979: warning: unused parameter 'len'
packet-gsm_a_rr.c:7457: warning: unused parameter 'len'

svn path=/trunk/; revision=40451
2012-01-13 06:42:46 +00:00
Anders Broman d9df8397f4 From Mike Morrin:
This is largely a cosmetic update of the gsm_a_rr dissector:

•    TBF starting time is now fully decoded.
•    “Double indenting” of IE groups (where an IE dissector adds a subtree just
after the generic dissector adds a subtree) has been eliminated.
•    “Null” break points in CSN.1 IEs have been added where they were
previously missing (this could have caused some correct PDUs to be reported as
malformed).
•    The calculation of CSN.1 IE lengths has been corrected: ((a – b)>>3)+1 is
not the same as (a>>3)-(b>>3)+1 .
•    The handling of CSN.1 padding bits is slightly improved.
•    The handling of CSN.1 “truncated” bits is slightly improved.
•    Eliminated superfluous checks for len==0 at the beginning of some
rest-octet dissectors (the generic dissector won’t call the CSN.1 dissector if
len is 0).
•    A few minor corrections to text strings and formatting.

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

svn path=/trunk/; revision=40447
2012-01-13 06:11:44 +00:00
Bill Meier 77a5dfa8e6 Various minor mods;
- check-col() not needed;
- use tvb_new_subset_remaining() iso tvb_new();
- #if 0 (currently ?) unused 'erf_handle';
- Convert some '4 space tabs' to 4 spaces;
- other reformatting.

svn path=/trunk/; revision=40446
2012-01-12 22:25:42 +00:00
Bill Meier d412a94dd5 From Tobias Witek: Add dissector table to 'meta' dissector.
The attached patch adds a dissector table to the 'meta' dissector
  so that other protocol dissectors can register for specific values
  of 'meta.proto'.

  Additionally, the patch also adds three more protocol values.

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


svn path=/trunk/; revision=40445
2012-01-12 22:13:09 +00:00
Bill Meier 34a0aba9d3 Don't do fcn calls in arg of g_?to??(); Macro may very well eval args multiple times.
svn path=/trunk/; revision=40444
2012-01-12 20:40:23 +00:00
Bill Meier dc96e5fee2 Re-indent for readability.
svn path=/trunk/; revision=40442
2012-01-12 15:04:09 +00:00
Martin Mathieson 427122a220 "Call nas-eps" dissector for nas_rrc_r8_lte and nas_rrc_r9_lte frames that have L3 payloads.
svn path=/trunk/; revision=40441
2012-01-11 21:31:11 +00:00
Bill Meier 98fb51a3ed Don't do tvb_get...() in arg of g_htonl(); Macro evals args multiple times.
svn path=/trunk/; revision=40440
2012-01-11 20:12:51 +00:00
Anders Broman e5f14929f1 Add a dissector for h248.2 packages.
svn path=/trunk/; revision=40439
2012-01-11 19:31:45 +00:00
Anders Broman 665cfc31bf From Martin Kaiser:
DVB-CI / CI+ dissect sac message body.

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

svn path=/trunk/; revision=40435
2012-01-11 06:38:25 +00:00
Anders Broman 6fe073426a From Lei Chen:
An error in eutran_measurement_param_desc of GSM si2qua rest octet.

From me fix similar bugs.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6721

svn path=/trunk/; revision=40434
2012-01-11 06:30:20 +00:00
Alexis La Goutte 65ce72e3a3 From mtwire via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6722
Small corrections in the Alcatel UA dissector

The most important change is to add a condition in dissector for TLV with ID equal to 104 as in the case of the 120. No condition causing 'malformed packet'.

svn path=/trunk/; revision=40424
2012-01-10 15:12:13 +00:00
Alexis La Goutte 668e23f9fe From Wojciech Dubowik via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6720
Add STBC flag to MCS field in radiotap packet dissector.

From me:
Replace VALS by TFS (and use boolean hf)

svn path=/trunk/; revision=40422
2012-01-10 12:08:43 +00:00
Alexis La Goutte 2f820b8902 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Try to compile with cmake in Ubuntu 11.10

svn path=/trunk/; revision=40412
2012-01-09 16:36:56 +00:00
Alexis La Goutte 09e95bda3f Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Try to compile with cmake in Ubuntu 11.10

svn path=/trunk/; revision=40410
2012-01-09 16:32:53 +00:00
Anders Broman 82cec1ce89 From Martin Kaiser:
DVB-CI / CI+ decrypt SAC messages.

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

svn path=/trunk/; revision=40407
2012-01-08 15:34:23 +00:00
Anders Broman ec2f398ad1 From Mike Morrin:
GSM RR CCCH dissection ignores last octet of PDU.

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

svn path=/trunk/; revision=40405
2012-01-08 15:30:05 +00:00