Commit Graph

38523 Commits

Author SHA1 Message Date
Jörg Mayer e05b847713 Accidentally checked in Makefile.in
svn path=/trunk/; revision=40510
2012-01-15 12:28:01 +00:00
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
Guy Harris 6224e81b9f wth->phdr.pkt_encap isn't set on a seek-and-read; pass the encapsulation
directly to k12text_set_pseudo_header(), so that it's passed the right
encapsulation for seek-and-read as well as for read.  Fixes the
"malformed frames when reading some K12 text files" problem for which
we're using bug 6735.

svn path=/trunk/; revision=40508
2012-01-14 20:58:41 +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 c710b63e26 Maybe adding $(GNUTLS_CFLAGS) will fix the build problem.
svn path=/trunk/; revision=40502
2012-01-14 15:46:25 +00:00
Jörg Mayer 39f8880747 commit 40500 missed the asn1 directory
svn path=/trunk/; revision=40501
2012-01-14 15:23:04 +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
Anders Broman 8e8453df1b Fix unused parameter warnings
svn path=/trunk/; revision=40499
2012-01-14 14:47:37 +00:00
Jörg Mayer d038e58987 Optionally build cmake, document why we need xz
svn path=/trunk/; revision=40498
2012-01-14 14:40:58 +00:00
Jörg Mayer bf44748c83 Add another warning (-Warray-bounds) to sync with cmake
svn path=/trunk/; revision=40497
2012-01-14 14:39:30 +00:00
Anders Broman 90f12d807d This seams to leave fewer graphical artefacts.
svn path=/trunk/; revision=40496
2012-01-14 12:52:56 +00:00
Guy Harris 2db032c5d5 NetMon 1.x format does *not* support per-packet encapsulation.
svn path=/trunk/; revision=40495
2012-01-14 10:31:25 +00:00
Guy Harris 7ff623d5a0 In the list of supported file types, put the file type of the file being
saved at the beginning of the list, if it's supported (it might not be
if we don't support writing that file format).  If that happens to be
pcap, put pcap-NG right after it (if we can write something out as pcap,
we can always write it out as pcap-NG); if it happens to be pcap-NG, put
pcap right after it if it's supported (if it has per-packet
encapsulation, pcap won't be supported).

svn path=/trunk/; revision=40494
2012-01-14 09:16:31 +00:00
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