Commit Graph

44723 Commits

Author SHA1 Message Date
Pascal Quantin f78791d7d2 Revert changes committed by error in r47433
svn path=/trunk/; revision=47442
2013-02-02 09:02:11 +00:00
Guy Harris bf12f288db Reflect recent.c moving from the top-level directory to the ui
directory.

svn path=/trunk/; revision=47441
2013-02-02 06:05:59 +00:00
Guy Harris 6ebabce7b5 Move the GUI-independent window geometry stuff to ui/recent.c, so we
only have one copy.

svn path=/trunk/; revision=47440
2013-02-02 05:34:31 +00:00
Guy Harris ab3840049e Reflect the move of recent.c to the ui directory.
svn path=/trunk/; revision=47439
2013-02-02 05:25:39 +00:00
Guy Harris 4d85cfeea6 Move recent.c to the ui directory, as we did with its header file.
svn path=/trunk/; revision=47438
2013-02-02 04:49:58 +00:00
Guy Harris 58b5fc9ebf For Qt 5, we need to link with the QtWidgets and QtPrintSupport
libraries as well, at least on OS X.

svn path=/trunk/; revision=47437
2013-02-02 04:00:52 +00:00
Guy Harris e62aba38e6 In Qt 4, C strings are, by default, treated as 7-bit ASCII when
converted to QStrings, and, to get them to be treated as UTF-8, you need
to call the setCodecForCStrings method of the QTextCodec class to set
the codec to a UTF-8 codec.

In Qt 5, C strings are treated always as UTF-8 when converted to
QStrings, and there's no setCodecForCStrings method for the QTextCodec
class.

In addition, there's also no setCodecForTr method for the QTextCodec
class - and QObject isn't documented as even *having* a tr method, so I
don't know what to do there.

svn path=/trunk/; revision=47436
2013-02-02 03:59:57 +00:00
Guy Harris e03896a364 Current version of pkg-config is 0.27.
Update some comments.

svn path=/trunk/; revision=47435
2013-02-02 03:43:44 +00:00
Gerald Combs 7187abf120 Add $(AM_V_GEN) in a few more places.
svn path=/trunk/; revision=47434
2013-02-01 22:57:41 +00:00
Pascal Quantin f26b250595 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8290 :
Allow up to 64 OPTIONAL / DEFAULT components per SEQUENCE

svn path=/trunk/; revision=47433
2013-02-01 22:44:14 +00:00
Gerald Combs 8984a38512 Enable more build silence.
svn path=/trunk/; revision=47432
2013-02-01 22:13:43 +00:00
Gerald Combs b911a42115 Add support for silent builds.
svn path=/trunk/; revision=47431
2013-02-01 22:06:56 +00:00
Gerald Combs c97b7912fa Go far enough down a rabbit hole and you will encounter libtool. See
if changing .o to .lo works.

svn path=/trunk/; revision=47430
2013-02-01 20:16:31 +00:00
Gerald Combs 34df2dbe54 Change some "<x>.c : <y>.h" rules to "<x>.o : <y>.h" in order to fix
distcheck. Add some rules recommended by the Automake manual in order
to avoid duplicate actions.

svn path=/trunk/; revision=47429
2013-02-01 18:20:17 +00:00
Michael Mann cfa53be211 From Gaurav Patwardhan, RFC 6720 - Generalized TTL Security Mechanism (GTSM) for the Label Distribution Protocol (LDP)
Bug 7856 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7856)

svn path=/trunk/; revision=47428
2013-02-01 18:13:50 +00:00
Alexis La Goutte f70b7bb15b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47427
2013-02-01 16:37:04 +00:00
Alexis La Goutte 8524df12c3 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47426
2013-02-01 16:36:55 +00:00
Alexis La Goutte 1951eff160 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47425
2013-02-01 16:36:46 +00:00
Alexis La Goutte c6ff7f75ea Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47424
2013-02-01 16:36:37 +00:00
Alexis La Goutte a3e901f508 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47423
2013-02-01 16:36:29 +00:00
Alexis La Goutte d5557b458e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47422
2013-02-01 16:36:15 +00:00
Michael Mann a71824a38b Replace THROW(ReportedBoundsError) with expert infos
Follow up to rev 47408

svn path=/trunk/; revision=47421
2013-02-01 16:32:15 +00:00
Chris Maynard eee4f31ab6 Evan Huus pointed out a duplicate block of code, so delete it. Also, move the other block before the "next_tvb=..." statement. Other changes:
-> Delete some unused header fields found with checkhf.pl
-> Fix a couple of typos.
-> Minor whitespace changes.
-> Add a TODO about replacing strstr with either g_strrstr or g_str_has_suffix


svn path=/trunk/; revision=47420
2013-02-01 16:23:16 +00:00
Michael Mann 158574f1d6 follow/clean up to rev 47389. The causes of some of the unused hf_ was typos and refactoring. hf_cip_reserved16 was a "placeholder", so it can remain commented out.
svn path=/trunk/; revision=47419
2013-02-01 16:16:05 +00:00
Jeff Morriss 981c598367 From Hendrik Uhlmann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8289 :
Negative integer values are displayed positive in hmi: -1 = 65535

(Change the variable to signed and add some casts to avoid this problem.)

svn path=/trunk/; revision=47418
2013-02-01 14:36:13 +00:00
Alexis La Goutte 2d776c5c29 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47417
2013-02-01 09:22:57 +00:00
Alexis La Goutte 7ef4c2f29c Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47416
2013-02-01 09:22:49 +00:00
Alexis La Goutte ecb898db1e Fix the dev guide to use the correct indent (Tab => 4 Spaces) and add Modelines info
svn path=/trunk/; revision=47415
2013-02-01 09:22:40 +00:00
Alexis La Goutte 03e97ee7d3 * Fix indent (Tab => 2 Spaces) and add Modelines info
svn path=/trunk/; revision=47414
2013-02-01 09:22:31 +00:00
Alexis La Goutte db66187a16 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
Add also a missing break;

svn path=/trunk/; revision=47413
2013-02-01 09:22:22 +00:00
Alexis La Goutte 794daaa882 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47412
2013-02-01 09:22:07 +00:00
Alexis La Goutte da2a2f39bd Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47411
2013-02-01 09:21:57 +00:00
Alexis La Goutte 5bff584648 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=47410
2013-02-01 09:21:48 +00:00
Alexis La Goutte 8afb6106f2 Fix [ 68%] Building CXX object ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o ui/qt/font_color_preferences_frame.cpp: In member function ‘void FontColorPreferencesFrame::updateWidgets()’: ui/qt/font_color_preferences_frame.cpp:84:54: error: ‘class QFont’ has no member named ‘styleName’ make[2]: *** [ui/qt/CMakeFiles/qtui.dir/font_color_preferences_frame.cpp.o] Erreur 1 make[1]: *** [ui/qt/CMakeFiles/qtui.dir/all] Error 2
StyleName is not available in Qt < 4.8
disable this line for the moment (maye be add if QTVERSION > 4.8 ?)

svn path=/trunk/; revision=47409
2013-02-01 09:21:38 +00:00
Jeff Morriss be111f2192 Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8284 :
Throw an exception if we don't find the guint8 we're looking for.  (This could
also be done as expert infos; throwing an exception is a bit brute force but
anyway the -1 return case has to be dealth with.)

Maybe there should be a version of tvb_find_guint8() which throws an
exception...

svn path=/trunk/; revision=47408
2013-02-01 03:55:49 +00:00
Jeff Morriss 21b1b0c5da Add heuristic MTP3 standard detection to M3UA (not for the draft M3UA versions).
The SCCP heuristics actually don't work all that well here but checking the PCs
(in M3UA) seems to do a decent job at least of differentiating ANSI from ITU.

svn path=/trunk/; revision=47407
2013-02-01 02:42:01 +00:00
Evan Huus 5754564be8 Fix format string error.
svn path=/trunk/; revision=47406
2013-02-01 02:19:17 +00:00
Michael Mann 73d339a5a4 Add Port Control Protocol dissector and convert NAT-PMP dissector to "new" style.
The Port Control Protocol overtakes the NAT-PMP IANA UDP ports, but is backwards compatible enough to trigger off of the version number (NAT-PMP is version 0).  NAT-PMP can still use Decode As.

Left the two dissectors with their own unique display filters despite a few overlapping fields.  Didn't want it to turn into a BOOTP/DHCP situation.

svn path=/trunk/; revision=47405
2013-02-01 01:29:58 +00:00
Gerald Combs 52baba10a2 Update some tooltips.
svn path=/trunk/; revision=47404
2013-02-01 00:21:35 +00:00
Gerald Combs 89c5066f67 Add interface prefs. Adjust some spacing and resize behavior.
svn path=/trunk/; revision=47403
2013-02-01 00:14:15 +00:00
Jeff Morriss 7fb4d231c3 Eliminate a bunch of basically useless/duplicate hf's for affected PCs: they
all have the same name and abbreviation so there's not much point in having
multiple variables for them.  (Arguably the ansi_apc and chinese_apc variables
should be merged too but we may as well preserve the user interface: they have
different abbreviations.)

(Prompted by Bill's discovery of a cut-n-paste problem which rendered a couple
of these hf's unused.)

svn path=/trunk/; revision=47402
2013-01-31 22:43:04 +00:00
Pascal Quantin baa9dd683f Fix dissection of SI6 when carried in a SACCH Info Modify message
Issue reported by damker: http://www.wireshark.org/lists/wireshark-users/201301/msg00067.html

svn path=/trunk/; revision=47401
2013-01-31 22:34:12 +00:00
Bill Meier e169262c57 Remove some trailing whitespace from 3 field labels (aka names)
which was used to align the display of a few field values.

It certainly is desirable to align value fields;
However, the current convention is to not pad field labels
(which is enforced by checkAPIs).

As Evan Huus notes:
 "If we want fields to align (which would be nice, I admit) it should be
  done in some dissector-agnostic way."

Also: do a little whitespace cleanup.


svn path=/trunk/; revision=47400
2013-01-31 22:32:07 +00:00
Martin Kaiser b451f267b6 for an interface that does not support monitor mode, make sure that
monitor mode is not enabled

(this fixes the gui part but there's probably more to do)

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

svn path=/trunk/; revision=47399
2013-01-31 22:30:56 +00:00
Bill Meier 414b0c09e6 col...() and expert...() fcns should not be under 'if (tree0'.
svn path=/trunk/; revision=47398
2013-01-31 22:12:13 +00:00
Martin Kaiser 3d143dc3ff gerald@ethereal.com -> gerald@wireshark.org
svn path=/trunk/; revision=47397
2013-01-31 21:02:23 +00:00
Martin Kaiser aa297f4ed3 replaced TABs+spaces mixture with spaces
added editor modelines
removed one more if(tree)
other minor reformatting

svn path=/trunk/; revision=47396
2013-01-31 20:58:48 +00:00
Martin Kaiser a50877b1e5 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
http://www.wireshark.org/download/automated/analysis/scan-build-2013-01-31-1/report-vSXKx6.html#EndPath
use NULL instead of 0 for pointers
remove some unnecessary if (tree) checks

svn path=/trunk/; revision=47395
2013-01-31 20:51:15 +00:00
Pascal Quantin 98c1748e12 Add SIB type to info column
svn path=/trunk/; revision=47394
2013-01-31 20:08:38 +00:00
Gerald Combs 3604d301c2 Use the name "Wireshark" instead of "qtshark" on OS X.
svn path=/trunk/; revision=47393
2013-01-31 18:54:14 +00:00