Commit graph

38506 commits

Author SHA1 Message Date
Guy Harris
eb5c7d64a4 Get rid of unused WTAP_FILE_WTAP file type.
Move pcap-NG right after standard pcap in the list of file types, so
that it shows up early in the list of output file types in the "Save
As..." dialog box (if, that is, it's supported; if not, neither is pcap,
as they use the same link-layer header type values).

svn path=/trunk/; revision=40493
2012-01-14 09:12:05 +00:00
Guy Harris
37ffde4018 WTAP_ENCAP_UNKNOWN should never appear as an actual encapsulation type,
and can't be supported as an output encapsulation in any case.

svn path=/trunk/; revision=40492
2012-01-14 09:00:37 +00:00
Guy Harris
24c35a40f4 Get rid of some unused #defines.
Use surface_height for various heights, and set it.

svn path=/trunk/; revision=40491
2012-01-14 03:56:22 +00:00
Jörg Mayer
71520b8759 Remove obsolete GLIB_CHECK_VERSION(2,10,0) checks
svn path=/trunk/; revision=40490
2012-01-14 03:21:28 +00:00
Gerald Combs
5d542b79d5 Add some debugging output to help track down an intermittent problem on
one of the buildbots.

svn path=/trunk/; revision=40489
2012-01-14 01:25:33 +00:00
Gerald Combs
bc957229f8 Initial status bar functionality. Promote the main window's status bar
to a MainStatusBar. Add a "LabelStack" widget, which MainStatusBar uses
to duplicate features in GtkStatusbar. Make the protocol tree a
full-blown ProtoTree widget. Move main_cf_callback from main to
WiresharkApplication. Duplicate a lot of the cf callbacks as signals and
slots. Use Q_UNUSED in a few places.

svn path=/trunk/; revision=40488
2012-01-14 00:16:16 +00:00
Guy Harris
c7857a522b In all these cases, i is a guint32, so if c_match is <= i, c_match fits
in a guint32; cast it to one to squelch compiler warnings.

svn path=/trunk/; revision=40487
2012-01-13 22:27:59 +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
Bill Meier
85c1195fe3 Fix Bug #6276: "Find Packet" Bug:
'The search query e.g. (ASCII or hex) "abac" doesn't find the packet(s)
  containing the string "ababac".'

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

svn path=/trunk/; revision=40483
2012-01-13 21:09:33 +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
Anders Broman
6a70fb0695 Fix a copy paste error.
svn path=/trunk/; revision=40481
2012-01-13 20:43:07 +00:00
Jörg Mayer
974c7b65dc Eliminate duplicate entries created by a merging error
svn path=/trunk/; revision=40480
2012-01-13 20:11:48 +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
125725fb0c Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40475
2012-01-13 16:37:21 +00:00
Alexis La Goutte
e3d0d4bd8f Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40474
2012-01-13 16:37:04 +00:00
Alexis La Goutte
99c039e0d3 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=40473
2012-01-13 16:36:07 +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
Alexis La Goutte
6096016f94 Fix some Dereference of null pointer Warning found by Clang
svn path=/trunk/; revision=40457
2012-01-13 16:17:26 +00:00
Alexis La Goutte
3712c6f6d1 Fix some Dereference of null pointer Warning found by Clang
svn path=/trunk/; revision=40456
2012-01-13 16:16:41 +00:00
Alexis La Goutte
19e4f8374f Add H248-2 Dissector to CMake (Miss in revision 40439)
svn path=/trunk/; revision=40455
2012-01-13 16:13:40 +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
160d5ad55f From Yi Zhang:
DSG_DA_TO_DSID_ASSOCIATION_DA/DSID is not correctly parsed in DOCSIS MDD packet.

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

svn path=/trunk/; revision=40450
2012-01-13 06:34:07 +00:00
Anders Broman
21c58470e4 From Yi Zhang:
The DCD_CLID_BCAST_ID TLV is not supported in DOCSIS plugin.

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

svn path=/trunk/; revision=40449
2012-01-13 06:29:03 +00:00
Anders Broman
5cd5edc8ae From Edward Sheldrake:
Wireshark crashes if you open the file import dialog and choose something from the "Encapsulation type" list.

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

svn path=/trunk/; revision=40448
2012-01-13 06:22:56 +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