Commit Graph

43793 Commits

Author SHA1 Message Date
Bill Meier e5379cd38b Revert SVN #46380; i.e., remove -Wshadow & etc
svn path=/trunk/; revision=46381
2012-12-04 21:22:29 +00:00
Bill Meier 92f1fc7f49 OK: temporarily use -Wshadow and also -Wno-error=shadow
so we can get a complete list of the -Wshadow warnings
    seen by the buildbots.

svn path=/trunk/; revision=46380
2012-12-04 20:36:48 +00:00
Bill Meier fbbe7cb97f Fix [-Wshadow] warning.
svn path=/trunk/; revision=46379
2012-12-04 19:52:01 +00:00
Bill Meier 69de2d7767 Revert SVN #46376
Looks like this is not ready for prime time.

ToDo: determine why the OSX builds are finding issues that I don't see on Fedora.


svn path=/trunk/; revision=46378
2012-12-04 19:40:00 +00:00
Bill Meier 7b69816cbb Fix 2 [-Wshadow] warnings
svn path=/trunk/; revision=46377
2012-12-04 19:24:28 +00:00
Bill Meier 12f5acaefb Enable gcc -Wshadow for default *nix builds;
AFAIK, all GTK Wireshark non-dirty sources now compile
  without [-Wshadow] warnings.

(Altho I haven't tried the QT build or other possible
build variants), hopefully any remaining [-Wshadow] warnings for non-dirty
source can be fixed as they occur.

(Obviously this change can be reverted if there are many issues).

So: let's see if any of the automated builds break;  :)


svn path=/trunk/; revision=46376
2012-12-04 19:03:51 +00:00
Gerald Combs 224666c60e Fix up a comment.
svn path=/trunk/; revision=46375
2012-12-04 18:20:28 +00:00
Gerald Combs c0c7a64d71 Replace GTK_STOCK_SAVE with WIRESHARK_STOCK_FILE in a few places,
including the GTK+ and Qt main toolbars.

svn path=/trunk/; revision=46374
2012-12-04 18:00:50 +00:00
Anders Broman 9ca3f30f75 From Patrik Lundquist Updated V1 header description to reflect corrected specification (BEP 0029). Removed if(tree) in dissect. New style dissector, right? Added heuristics for V0 header. Removed length checking in heuristics since uTP packets can have any lenght, even odd ones, and they do. Fixed Extensions looping over whole packets and added a Data field for the trailing payload. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8048
svn path=/trunk/; revision=46373
2012-12-04 17:47:07 +00:00
Bill Meier 9f5ae02ed7 Fix 2 [-Wshadow] warnings.
svn path=/trunk/; revision=46372
2012-12-04 17:38:05 +00:00
Gerald Combs b2239669e2 Rename utilityToolBar to displayFilterToolbar and move the display
filter widget there. Add a few more items to the main toolbar. Note that
Qt 4.8 doesn't support a unified title+toolbar with multiple toolbar
rows on OS X (at least not easily) but Qt 5 might.

Disable icons-in-menus on OS X.

svn path=/trunk/; revision=46371
2012-12-04 17:16:09 +00:00
Alexis La Goutte cbd6062109 lupdate -no-obsolete QtShark.pro Updating 'qtshark_de.ts'... Found 328 source text(s) (8 new and 320 already existing) Removed 10 obsolete entries Updating 'qtshark_fr.ts'... Found 328 source text(s) (8 new and 320 already existing) Removed 10 obsolete entries Same-text heuristic provided 5 translation(s)
Update the french translation and regenerate qm files.

lrelease QtShark.pro
Updating '/home/prolag/wireshark-ng/ui/qt/qtshark_de.qm'...
    Generated 29 translation(s) (29 finished and 0 unfinished)
    Ignored 299 untranslated source text(s)
Updating '/home/prolag/wireshark-ng/ui/qt/qtshark_fr.qm'...
    Generated 328 translation(s) (328 finished and 0 unfinished)

svn path=/trunk/; revision=46370
2012-12-04 16:43:45 +00:00
Bill Meier 4ab1b84a89 Fix 2 [-Wshadow] warnings.
svn path=/trunk/; revision=46369
2012-12-04 16:31:10 +00:00
Anders Broman c9622178cf Add more dissection for Japan ISUP.
svn path=/trunk/; revision=46368
2012-12-04 16:22:00 +00:00
Bill Meier ddb2a90dd0 Fix [-Wshadow] warning.
svn path=/trunk/; revision=46367
2012-12-04 14:38:38 +00:00
Bill Meier 357ea3fc88 Define variants of CLEANUP_PUSH & etc to allow nested use w/o "shadowing" variables.
svn path=/trunk/; revision=46366
2012-12-04 14:37:21 +00:00
Bill Meier 1c25482ebc Ethereal -> Wireshark; Update FSF address.
svn path=/trunk/; revision=46365
2012-12-04 14:23:53 +00:00
Anders Broman 362dd1dcb5 Add more Japan ISUP parameters to value sting, dissection remains to be done.
svn path=/trunk/; revision=46364
2012-12-04 09:15:21 +00:00
Gerald Combs fceea48622 Use more restrictive selectors, otherwise we end up styling things we
shouldn't (such as scroll bars).

svn path=/trunk/; revision=46363
2012-12-04 00:24:25 +00:00
Evan Huus f72aa597c7 Make the new -T option not overwrite the other options, so it can
be used in conjuction with -2 et al.

svn path=/trunk/; revision=46362
2012-12-04 00:05:58 +00:00
Evan Huus ced8abb125 Reduce the scope of one variable definition slightly.
svn path=/trunk/; revision=46361
2012-12-03 23:15:59 +00:00
Bill Meier 5f9077232e Declare a value_string as static.
svn path=/trunk/; revision=46360
2012-12-03 23:06:30 +00:00
Bill Meier 7316a50499 Declare a value_string as static.
svn path=/trunk/; revision=46359
2012-12-03 23:05:08 +00:00
Bill Meier be99fcad4d Minor cleanup:
- prefs callback not needed;
- move proto_reg_handoff...() to the end of the file as per convention;
- reformat some log lines.

svn path=/trunk/; revision=46358
2012-12-03 22:42:56 +00:00
Bill Meier 52e47754f1 Fix [-Wshadow] warnings.
svn path=/trunk/; revision=46357
2012-12-03 22:27:46 +00:00
Bill Meier 727ed68381 Fix [-Wshadow] warning for purported variable shadowing another.
svn path=/trunk/; revision=46356
2012-12-03 22:26:34 +00:00
Gerald Combs 469c33aff4 Make sure packets_bar_update does something.
svn path=/trunk/; revision=46355
2012-12-03 21:53:53 +00:00
Guy Harris da6f295794 Add some more uic lines.
svn path=/trunk/; revision=46352
2012-12-03 21:33:08 +00:00
Gerald Combs 46a454a94c Automatically size the interface column.
svn path=/trunk/; revision=46351
2012-12-03 20:38:32 +00:00
Gerald Combs 9e67335ea8 Update the interface list to reflect the recent interface name changes.
Allow multiple interface selections. Make sure we update the packet list
properly in a couple of places.

Use the right callback+signal to update capture statistics in the status
bar. Remove the global cfile from the main_statusbar.cpp

Add the version to the main window.

svn path=/trunk/; revision=46350
2012-12-03 19:58:55 +00:00
Bill Meier cef4af718c Fix SVN #46348 (iow, do it properly).
(Fixes compile warning)

svn path=/trunk/; revision=46349
2012-12-03 18:38:16 +00:00
Bill Meier f5ecb42c8e Remove duplicated code added as part of SVN #44777;
Move the SVN #44777 new (unduplicated) code to the correct place.
Also: fixes [-Wshadow] warning.

svn path=/trunk/; revision=46348
2012-12-03 18:11:30 +00:00
Bill Meier 3c0d6b8260 General minor cleanup:
- create/use several extended value strings;
- remove unneeded #includes;
- remove unneeded code & variable initializers;
- convert "4 space tabs" to spaces;
- do some reformatting to use a consistent whitespace style.

svn path=/trunk/; revision=46347
2012-12-03 17:28:43 +00:00
Anders Broman 52a4bd4644 Try to fix packet-sdp.c:1542: warning: 'parameter_item' may be used uninitialized in this function.
svn path=/trunk/; revision=46346
2012-12-03 15:04:24 +00:00
Pascal Quantin d2c32e27ed Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8038 :
Prevent a counter overflow in while loops

svn path=/trunk/; revision=46345
2012-12-03 14:44:12 +00:00
Anders Broman a07cfc3b50 Protect against malformed crypto-suite parameters.
Fixes SDP infinite loop.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8041

svn path=/trunk/; revision=46344
2012-12-03 13:55:03 +00:00
Anders Broman e23327c0bb From Michal Labedzki:
Bluetooth: AVDTP: Dissect RFA bits in header compression

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893

svn path=/trunk/; revision=46343
2012-12-03 11:39:22 +00:00
Anders Broman 4fdcd47001 From Michal Labedzki:
Bluetooth: AVDTP: Fix initialization of codec and some
 compiler warnings

If cannot obtain codec information by SetConfiguration/Reconfigure
use value "-1" to ensure that there will be no any stream dissected.


Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893

svn path=/trunk/; revision=46342
2012-12-03 11:36:06 +00:00
Anders Broman ccb3fb14e2 From Michal Labedzki:
Bluetooth: Fix uninitialized fields on the USB side

Also make indentation/spaces cleanup in hci_usb dissector.

Part of:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5032

svn path=/trunk/; revision=46341
2012-12-03 11:26:36 +00:00
Anders Broman 191aaba217 Wrong check for quote_offset.
Fixes  Bug 8042 - SIP infinite loop.

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

svn path=/trunk/; revision=46340
2012-12-03 09:49:52 +00:00
Martin Mathieson 09a694823f Use tvb_get_const_stringz() when I know the tvb will be contiguous.
svn path=/trunk/; revision=46339
2012-12-03 01:45:00 +00:00
Bill Meier 020df2e24c Fix 2 bugs in heuristic tests which resulted in various false positives;
I believe this fix addresses the remaining issues for Bug #6047.
  https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6047

Also:
- Fix {-Wshadow] warning;
- Use tvb_get_ntoh24() in 2 places;
- Add ToDo comment about a TCP reassembly issue.

svn path=/trunk/; revision=46338
2012-12-03 01:41:32 +00:00
Martin Mathieson f5b9238ed6 Make list of file extensions to register display properly, using 3 text
lines rather than 2.  Add 2 new extensions to common.nsh.
Not sure if changes to wireshark.ini are necessary, copied what was done
for "Field 7", which is also just a label.

svn path=/trunk/; revision=46337
2012-12-02 23:55:44 +00:00
Pascal Quantin e52313959b Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8036 :
Check length of Slow Protocol OAM Vendor Specific Event Notification and add an expert info if it is not at least 2 bytes long

svn path=/trunk/; revision=46336
2012-12-02 22:19:37 +00:00
Pascal Quantin 8b5aa91371 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8037 :
Fix an infinite loop in CSN.1 dissector when having more than 255 padding bits

svn path=/trunk/; revision=46335
2012-12-02 21:37:34 +00:00
Pascal Quantin 51323635aa From Ojab via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8035 :
Wrong packet bytes are selected for ISUP CUG binary code

svn path=/trunk/; revision=46334
2012-12-02 20:49:19 +00:00
Evan Huus 93a15fa28a Actually destroy the pool in epan_dissect_cleanup. There are many cases
where the edt is on the stack, in which case epan_dissect_free never gets
called and we were leaking the pool (although not any of the memory in it).

svn path=/trunk/; revision=46333
2012-12-02 18:16:21 +00:00
Evan Huus d4261b289f Document the new pinfo pool, add a TODO list.
svn path=/trunk/; revision=46332
2012-12-02 17:16:09 +00:00
Evan Huus b9c6f71fe4 Create a wmem pool in pinfo and use it for some address allocations.
A (better?) fix for https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8030

See also thread starting at:
http://www.wireshark.org/lists/wireshark-dev/201212/msg00001.html

svn path=/trunk/; revision=46331
2012-12-02 17:01:04 +00:00
Evan Huus 2461373edd Remove unneeded variable initializers.
svn path=/trunk/; revision=46328
2012-12-02 15:21:53 +00:00