Commit Graph

43219 Commits

Author SHA1 Message Date
Martin Mathieson f1939f9442 Add 2 new file extension associations, and restore alphabetical order.
svn path=/trunk/; revision=45522
2012-10-13 19:39:05 +00:00
Guy Harris 4fdfccd56d Don't add FT_UINTn values with proto_tree_add_int(). (The fields in
question are 4-byte header fields containing bitfields, so "unsigned" is
appropriate here.)

svn path=/trunk/; revision=45521
2012-10-13 17:57:13 +00:00
Evan Huus 4930f6d820 Enhancements to the CppCheck script:
- make html output a flag (-h), instead of what happens when you
  specify no files
- add flag (-j) for job count, like make et al.
- add flag (-a) to ignore the suppressions file and report all issues
- require /bin/bash instead of just /bin/sh in order to get arithmetic $(())
- add mode-lines

svn path=/trunk/; revision=45520
2012-10-13 02:03:18 +00:00
Evan Huus 93f4ea8838 Always initiailize member variables in constructors, even if it's just to NULL.
Use C++'s initializer syntax more.

svn path=/trunk/; revision=45519
2012-10-13 01:37:48 +00:00
Evan Huus d11b00d760 Reduce variable scopes where possible.
svn path=/trunk/; revision=45518
2012-10-13 01:29:29 +00:00
Evan Huus 1ed9eb2ece Fix compilation with GCC:
- initialization order
- unused and uninitialized local print_args_t
- missing comment on #endif

svn path=/trunk/; revision=45517
2012-10-13 01:15:35 +00:00
Gerald Combs 818cf887f9 Add missing arguments.
svn path=/trunk/; revision=45516
2012-10-13 01:01:48 +00:00
Gerald Combs 86797e9c0a Fix initialization order.
svn path=/trunk/; revision=45515
2012-10-13 00:21:25 +00:00
Gerald Combs 419f851e34 Fix Windows compilation problems from r45513. #ifdef out some non-Windows
code.  Get rid of a few uses of the global cfile.

svn path=/trunk/; revision=45514
2012-10-13 00:18:46 +00:00
Gerald Combs cfa22deaae Add a packet format group box, similar to the packet range group box.
Use it in the new "Export Packet Dissections" dialog.

I'm omitting PostScript exports on purpose. If you *really* need that
feature you can probably get better results than we produce using text +
enscript or print-to-PDF + pdf2ps/pdftops or PSML/PDML + XSL + ...

The Windows code is untested. I'll check in any needed fixes shortly.

svn path=/trunk/; revision=45513
2012-10-12 23:40:29 +00:00
Gerald Combs c91c1df500 Use seasonal allocation for name resolution. This effectively scrubs our
resolution information between capture files so that we don't leak host
entries from one file to another (e.g. embarassing-host-name.example.com
from file1.pcapng into a name resolution block in file2.pcapng).

host_name_lookup_cleanup and host_name_lookup_init must now be called
after each call to se_free_all. As a result we now end up reading our
various name resolution files much more than we should.

svn path=/trunk/; revision=45511
2012-10-12 21:37:02 +00:00
Pascal Quantin c5e0d7ce32 Do not use private_data from caller dissector as IKEv2 decryption parameters
svn path=/trunk/; revision=45510
2012-10-12 21:06:27 +00:00
Guy Harris a2c64e173e And that also means that we need to split the data rate from the
pseudo-header into two bytes and fill in both the rate and direction
fields when writing CommView NCF files out.

svn path=/trunk/; revision=45507
2012-10-12 20:59:08 +00:00
Guy Harris 10b89e0430 The "rate" field in the CommView NCF format is 1 byte long, not 2 bytes
long; that means we read only one byte into our structure, so make its
"rate" element one byte long, so we don't fill in half the "rate"
element with the read - and the *wrong* half on big-endian machines -
and leave the other half un-set and thus containing some random possibly
non-zero data.

In addition, that's not the full data rate for faster networks; for
Wi-Fi, the one-byte "direction" field is actually the upper 8 bits of
the data rate, so combine them when we fill in the data rate in the
pseudo-header.

#BACKPORT

svn path=/trunk/; revision=45504
2012-10-12 20:51:04 +00:00
Bill Meier 58c859dd90 Move proto_register...() and proto_reg_handoff...() to the end of the file as per convention;
Do minor whitespace changes.

svn path=/trunk/; revision=45503
2012-10-12 19:59:56 +00:00
Bill Meier 96f708abd5 Fix (what appears to be) a minor "off by one" bug in 'for' loop.
svn path=/trunk/; revision=45500
2012-10-12 18:31:31 +00:00
Anders Broman cfa7c28fe7 From Josip Medved:
Wrong casing for Auth-Request-Type enumerations.

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

svn path=/trunk/; revision=45499
2012-10-12 13:06:15 +00:00
Anders Broman 8527d3912c From Andrei Emeltchenko:
Register eapol dissector.

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

svn path=/trunk/; revision=45498
2012-10-12 12:52:36 +00:00
Anders Broman 1f867e7901 Include setup.ini in the tarball.
Copy setup.ini to etc/gtk-3.0

svn path=/trunk/; revision=45497
2012-10-12 12:36:22 +00:00
Guy Harris 928ebf0ea3 If we see an SHB after we've read the first SHB, report that as an
unsupported feature.

If we see an IDB after all the IDBs at the beginning of the file,
process it.  Fixes bug 7851.

Get rid of unused read_idbs flag in pcapng_t structure.  (Also, as per
the above, just because we've read all the IDBs at the beginning of the
section, that doesn't necessarily mean we've read all the IDBs in the
section.)

Fix some places where we reject SPBs.

svn path=/trunk/; revision=45495
2012-10-12 03:55:10 +00:00
Martin Mathieson fa79b7580a When configuring DRB mappings (from signalling channel), create a
separate table for each UE.

svn path=/trunk/; revision=45494
2012-10-12 03:00:38 +00:00
Alexis La Goutte 9392d98978 Make new text translatable (a
And lupdate QtShark.pro (update translation file)
Updating 'qtshark_de.ts'...
    Found 257 source text(s) (15 new and 242 already existing)
    Kept 1 obsolete entries
Updating 'qtshark_fr.ts'...
    Found 257 source text(s) (15 new and 242 already existing)
    Kept 1 obsolete entries
    Same-text heuristic provided 1 translation(s)


svn path=/trunk/; revision=45492
2012-10-11 21:45:05 +00:00
Alexis La Goutte 29862fd1a1 Reorder 80211 dissector code (put value_string/true_false_string in top of file not in proto_register_...
svn path=/trunk/; revision=45491
2012-10-11 21:37:37 +00:00
Pascal Quantin 5f4f0b2637 Enhance dissection of Terminal Profile
svn path=/trunk/; revision=45490
2012-10-11 21:29:01 +00:00
Alexis La Goutte 969dcb9475 Small enhance following patch about 802.11ac (VHT)
svn path=/trunk/; revision=45489
2012-10-11 21:18:23 +00:00
Bill Meier d9c189e2d8 Correction to SVN #45476
svn path=/trunk/; revision=45486
2012-10-11 21:01:51 +00:00
Alexis La Goutte ea4f518997 Add Qtshark to Windows Installer (NSIS)
Detect if ./wireshark-qt/qtshark.exe is present and add a option to install Qtshark (Experimental), also add a shortcut.
The option to install qtshark is disable by default (for the moment...)

Now qtshark is (normally) available in automated build !

svn path=/trunk/; revision=45485
2012-10-11 20:45:35 +00:00
Alexis La Goutte b34abdc943 From Alex Badea via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7849
IPsec ESP: allow filtering by ICV verification result

Add hf_esp_icv_good and hf_esp_icv_bad (similar to IP checksums), to allow
filtering based on the ICV check results.

svn path=/trunk/; revision=45483
2012-10-11 20:38:39 +00:00
Alexis La Goutte b504e64b6a From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7842
Make relative time columns rightly right justified

When showing the relative time in the framelist columns, they are left aligned.
This is sub-optimal if you are scanning the list for a different time.

This patch, very small, will properly right justify these times:
DELTA_TIME
DELTA_TIME_DIS

svn path=/trunk/; revision=45481
2012-10-11 20:16:24 +00:00
Alexis La Goutte b0b96f7f07 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7840
packet-smb.c does not handle truncated frames well when dealing with TRANS2 FIND_{FIRST/NEXT} responses

The current code simply throws an exception if any of the expected data is
missing, even though there might be several file's worth of data available.

I will attach a patch that does a better job of handling truncated frames in
such cases.

svn path=/trunk/; revision=45480
2012-10-11 20:09:44 +00:00
Alexis La Goutte a6c72491e4 From Richard Sharpe via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7838
packet-smb.c does not correctly dissect INFO_QUERY_EAS_FROM_LIST

[MS-CIFS].pdf makes it clear that, contrary to what packet-smb.c says, handling
the response to a TRANS2/FIND_{FIRST,NEXT} with a level of
INFO_QUERY_EAS_FROM_LIST is not the same as handling INFO_QUERY_EA_SIZE.


svn path=/trunk/; revision=45479
2012-10-11 20:01:37 +00:00
Bill Meier 82d40100d2 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'
Done on general principles altho upon inspection
none of the cases changed would have actually
resulted in an infinite loop.



svn path=/trunk/; revision=45478
2012-10-11 19:39:32 +00:00
Bill Meier ad0219d033 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)
The changes fix definite problems or
are done "just in case" for cases not esily determined
to be a problem by quick inspection.

Note: in some cases for loop index variables have been renamed
      to ensure  all required codes changes detected.

##backport

svn path=/trunk/; revision=45477
2012-10-11 19:20:21 +00:00
Bill Meier b2cb4007e3 Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'.
The changes fix possibly problematical cases
 (not clear upon quick inspection).

Also: fix several bugs wherein an inner 'for' loop used
the same index variable name as an outer loop thus
messing up the outerloop.

##backport


svn path=/trunk/; revision=45476
2012-10-11 19:14:29 +00:00
Gerald Combs 552a9c6b1e Make sure sync_interface_stats_close calls sync_pipe_kill on all
platforms.  This ham-fistedly fixes a delay when moving from the
"Capture" item to the "Open" and "Learn" items on the welcome screen in
the Qt version.

svn path=/trunk/; revision=45475
2012-10-11 16:55:28 +00:00
Anders Broman d7c4e6ccf0 In GTK3 the settings.ini file serves the same purpose as the gtkrc file.
It should be copied to the wireshark executable dir ..\etc\gtk-3.0

I'm not sure if this is the right place to put it.

makefile will be updated later if no one beats me to it or has a better idea where to put the file. I'm not sure if we should strive to make the GTK3 version as equal to the GTK2 version as possible or accept that it looks more like the *nix version.
If we are to use it it needs to be in the nsi installer as well.

svn path=/trunk/; revision=45474
2012-10-11 15:41:34 +00:00
Anders Broman 94374cb6d7 Fix:
../../../epan/dissectors/packet-giop.c: In function 'get_CDR_typeCode':
../../../epan/dissectors/packet-giop.c:3341:15: warning: variable 'ti' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'decode_ServiceContextList':
../../../epan/dissectors/packet-giop.c:3871:7: warning: variable 'temp_offset' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'dissect_giop_request_1_2':
../../../epan/dissectors/packet-giop.c:4443:10: warning: variable 'response_flags' set but not used [-Wunused-but-set-variable]
../../../epan/dissectors/packet-giop.c: In function 'get_giop_pdu_len':
../../../epan/dissectors/packet-giop.c:4837:81: error: unused parameter 'offset' [-Werror=unused-parameter]

svn path=/trunk/; revision=45473
2012-10-11 15:04:09 +00:00
Michael Mann a5d56d30b4 Make idl2wrs dissectors filterable - Part 1
Updated wireshark_gen.py to generate hf_ variables for all of the IDL "types".  The "simple" types use proto_tree_add_* (not text), while the "complex" types use the GIOP dissector API.  checkhf.pl generates some warnings because (some of) the hf_ variables are being generated for the "complex" types, but are not being used.  That will be done in Part 2.

expert_add_info_format now linked to a real item instead of being attached to a duplicative proto_tree_add_text().  This cleaned up literally thousands of unnecessary proto_tree_add_text()s

svn path=/trunk/; revision=45472
2012-10-11 14:42:33 +00:00
Michael Mann e258b8e353 Should have been part of r45470, changing format of "magic number"
svn path=/trunk/; revision=45471
2012-10-11 14:22:13 +00:00
Michael Mann 756a564fff General cleanup, made more items filterable. Checking in now to get a new baseline for some idl2wrs improvements involving getting more items filterable (see bug 7822)
svn path=/trunk/; revision=45470
2012-10-11 14:16:25 +00:00
Michael Mann 552e411031 Fix infinite loop in HART/IP dissector (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7845)
I also did a small bit of cleanup dissection while I was there, but it could definitely use more.  I just want to fix the fuzztest crash I discovered before the buildbots get a hold of it.

svn path=/trunk/; revision=45469
2012-10-11 14:05:27 +00:00
Alexis La Goutte 85b7bec830 Fix crash when use pcapng with comments (with QtShark)
ERROR:proto_tree.cpp:125:void proto_tree_draw_node(proto_node*, gpointer): code should not be reached

(Missing color information for PI_COMMENT)

svn path=/trunk/; revision=45468
2012-10-11 12:31:39 +00:00
Anders Broman d88e1202a5 From Bartosz Brachaczek:
Make the SSL dissector work with GnuTLS compiled with nettle.

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

#BACKPORT

svn path=/trunk/; revision=45465
2012-10-11 08:28:57 +00:00
Guy Harris dda0e94161 hf_isup_cic is now BASE_DEC, so there's no reason to use
proto_tree_add_uint_format() to make it display in decimal -
proto_tree_add_uint() suffices.

svn path=/trunk/; revision=45464
2012-10-11 08:23:29 +00:00
Anders Broman f6914a05af "Prepare/Apply a filter" on ISUP CIC should make a filter with decimal CIC number, not hex.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7848

svn path=/trunk/; revision=45463
2012-10-11 08:12:41 +00:00
Bill Meier 38f3198b2b Change 'for (i=1; i<=n;...' to 'for (i=0; i<n; ...)'
Done on general principles altho none of the cases
changed would have actually resulted in an infinite
loop because a Bounds error would eventually occur.

svn path=/trunk/; revision=45462
2012-10-11 03:55:33 +00:00
Guy Harris f154882eb5 The usual idiom in C for "do this N times" is "for (i = 0; i < N; i++)",
not "for (i = 1; i < N+1; i++)".

Even if it weren't the idiom, it'd be safer, at least for unsigned
values, as, if i and N are the same width, and N has the maximum
possible value for that width, the first of those runs i from 0 to N-1,
all of which fit in a variable of that width, and the second of those
runs i from 1 to N, the latter of which doesn't fit into a variable of
that width, so modulo arithmetic turns it into 0 and the loop keeps
running forever.

Fixes bug 7844.

svn path=/trunk/; revision=45459
2012-10-11 00:02:14 +00:00
Martin Mathieson 6f112aa115 Copy of tap details needed to be a little bit deeper.
svn path=/trunk/; revision=45458
2012-10-10 23:09:52 +00:00
Guy Harris b8b899fc36 From Bill Parker: fix typo.
svn path=/trunk/; revision=45457
2012-10-10 21:09:10 +00:00
Gerald Combs f003add90f Fix a copy+paste error and a missing include. Adjust the format_size
digit threshold.

svn path=/trunk/; revision=45456
2012-10-10 20:19:18 +00:00