74fa541acf
Use "generic" tfs (tfs_set_notset...)
...
svn path=/trunk/; revision=50692
2013-07-17 10:43:57 +00:00
e9d236ec0b
Backing out r50690 (exept simple_dialog)
...
struct FILE is different on windows vs *nix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8942
svn path=/trunk/; revision=50691
2013-07-17 05:52:51 +00:00
e0341f776c
From Cal Turney:
...
Unrecognized preferences and color filters created in proprietary or older versions are discarded when saved.
If the user attempts to save the preferences or colorfilters file, a popup is displayed that warns that unrecognized prefs or color filters have been detected and will be discarded if the save operation is allowed to proceed. In the case of Preferences, the popup message includes the version at which the file was last saved. A "Continue without Saving" button is provided so that the user can save the profile under a different name.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8942
svn path=/trunk/; revision=50690
2013-07-17 04:52:19 +00:00
97ca781671
Convert proto_tree_add_tree calls to something filterable.
...
Remove "effectively useless" blurbs.
svn path=/trunk/; revision=50689
2013-07-17 03:13:07 +00:00
547eabc949
Use label_fill also when boolean / bitfield.
...
svn path=/trunk/; revision=50682
2013-07-16 22:21:10 +00:00
13e07be25f
optimize: remove g_snprintf()'s from label_fill[_descr]
...
svn path=/trunk/; revision=50681
2013-07-16 22:09:29 +00:00
cc82d38c8b
set HAVE_GETOPT_H and HAVE_GETOPT variables
...
for both autotools and cmake builds
(in order to use getopt_long(), we have to check if we
can include getopt.h)
svn path=/trunk/; revision=50680
2013-07-16 21:12:12 +00:00
421e9ad4a0
The new frame-based tvbuff code found that the DOS Sniffer code for
...
compressed sniffer files failed if the very first read involves seeking
past the first blob; fix that.
svn path=/trunk/; revision=50679
2013-07-16 20:59:02 +00:00
73e2a75ced
Make fields filterable through proto_tree_add_item (with the help of convert_proto_tree_add_text.pl) and expert info.
...
Do some whitespace cleanup and add modelines.
svn path=/trunk/; revision=50678
2013-07-16 20:53:02 +00:00
b8cc7b5239
make getopt_long() available on systems that don't have it natively
...
svn path=/trunk/; revision=50677
2013-07-16 20:15:02 +00:00
7de40656b5
Convert some proto_tree_add_text into proto_tree_add_expert.
...
svn path=/trunk/; revision=50676
2013-07-16 19:14:26 +00:00
af793696a3
Replace some tabs with spaces.
...
svn path=/trunk/; revision=50674
2013-07-16 18:03:20 +00:00
9bee5819f8
Fix the fuzz failure reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8940 :
...
Test whether idx is in range or not (by seeing if it was found in the
value_string) before using it as an index into any of the elem_var arrays.
This fuzz failure was in elem_telv() but apply the fix to all the elem_*()
functions.
svn path=/trunk/; revision=50672
2013-07-16 17:59:26 +00:00
bd0dbc23ca
Make camins_read_packet static.
...
svn path=/trunk/; revision=50671
2013-07-16 16:24:28 +00:00
91ecc2334f
"man inet_pton" only says that it returns a negative value, zero or a postive value, and not specifically -1, 0, or 1, so even though we know that's what wsutil's inet_pton will return, we shouldn't test against those exact values.
...
svn path=/trunk/; revision=50670
2013-07-16 16:23:31 +00:00
bb05898720
Remove ADWIN_ADD_LE and ADWIN_ADD_BE macros as they don't add much to readability/code savings and they prevent the "check" scripts from doing their job.
...
svn path=/trunk/; revision=50669
2013-07-16 16:02:39 +00:00
70cac937e8
Fix Coverity CID 1050093: Dereference before null check.
...
svn path=/trunk/; revision=50668
2013-07-16 15:37:06 +00:00
02fa8a5d19
Fix Coverity CID 1050092: Dereference null return value.
...
svn path=/trunk/; revision=50667
2013-07-16 15:30:20 +00:00
e93fdab447
Fix Coverity CID 1055436: Improper use of negative value.
...
svn path=/trunk/; revision=50666
2013-07-16 15:19:52 +00:00
1ece46dd80
Fix Coverity CID 1050089: "Explicit null dereferenced", by Move some lines of code into the if(tree != NULL) block.
...
svn path=/trunk/; revision=50665
2013-07-16 15:10:38 +00:00
18ea28c45e
Improve iec104 dissector. Bug 8849 ( https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8849 )
...
1) Decoding type 70 - End of initialization
2) Decoding qualifier of interrogation for type 100
3) Table of data length for all object types => checking length on one place
4) Setting correct number of selected bytes for IOA
From Jiří Engelthaler
svn path=/trunk/; revision=50664
2013-07-16 14:01:45 +00:00
3baf637267
Allow to perform sequence analysis when only RLC headers are logged
...
svn path=/trunk/; revision=50663
2013-07-16 12:28:33 +00:00
ff868427ef
Include merge.h, so it shows up in the distribution tarball.
...
svn path=/trunk/; revision=50662
2013-07-16 04:10:25 +00:00
44e4c933de
Fix warning: cannot optimize possibly infinite loops. There was no actual infinite loop, but the intended loop iteration count could have been wrong due to the implicit "mod 256" when previously assigning a value to a guint8.
...
svn path=/trunk/; revision=50661
2013-07-16 03:34:04 +00:00
86147047f5
Fix one that got missed.
...
svn path=/trunk/; revision=50660
2013-07-16 03:16:26 +00:00
9d3cda266b
Revert r50655 for this file.
...
svn path=/trunk/; revision=50659
2013-07-16 03:04:47 +00:00
f2e1a979fa
Add in basic error checking of the .proto_tree_input file to prevent some issues with updated dissector.
...
svn path=/trunk/; revision=50658
2013-07-16 02:59:16 +00:00
3dbade2423
g711.c and u3.c are now in wsutil.
...
svn path=/trunk/; revision=50657
2013-07-16 02:54:45 +00:00
0a669967fa
Move merge.{h,c} into wiretap: these modules use wiretap to merge files.
...
svn path=/trunk/; revision=50656
2013-07-16 02:35:33 +00:00
d331c33b4f
This should fix warning: to be safe all intermediate pointers in cast from 'gchar **' to 'const char **' must be 'const' qualified.
...
svn path=/trunk/; revision=50655
2013-07-16 02:34:44 +00:00
56735f8c16
Move u3.{h,c} and g711.{h,c} into wsutil.
...
Project g711.h against multiple inclusion and add C++ compatibility wrapper.
svn path=/trunk/; revision=50654
2013-07-16 02:04:55 +00:00
69eb477c9e
Fix warning: ISO C90 forbids specifying subobject to initialize.
...
svn path=/trunk/; revision=50653
2013-07-16 02:00:53 +00:00
a430b138e9
Replace glib memory with wmem. Fixes a substantial memory leak in the TCP
...
dissector (potentially several megabytes for a large capture).
Bug https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8459
svn path=/trunk/; revision=50652
2013-07-16 01:57:30 +00:00
df77b38e6e
Bail in the profinet heuristics if we don't have source and destination mac
...
addresses. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8904
svn path=/trunk/; revision=50651
2013-07-16 01:42:26 +00:00
2d30d5beb1
Move strnatcmp.{h,c} from epan into wsutil: there's nothing epan-specific
...
there and moving it avoids having to recompile the file for use in editcap
and mergecap (which don't link against libwireshark).
svn path=/trunk/; revision=50650
2013-07-16 01:16:50 +00:00
e4bb300667
A better method of avoiding the "ISO C restricts enumerator values to range of 'int'" warning.
...
svn path=/trunk/; revision=50649
2013-07-16 01:14:40 +00:00
3e8b8f0b1a
Explain that we don't have to worry about fixed-length buffers whose
...
size is based on the snapshot length.
svn path=/trunk/; revision=50647
2013-07-16 00:18:55 +00:00
a39e5b9b4a
On the suggestion of Cal Turney, via
...
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8937
Don't warn if a file has packets larger than the global snapshot length.
svn path=/trunk/; revision=50646
2013-07-15 23:58:47 +00:00
1c50729f9f
Use PIE_CFLAGS when building qt-shark, since otherwise I get errors like:
...
/usr/include/qt5/QtCore/qglobal.h:1079:4: error: #error "You must build your
code with position independent code if Qt was built with -reduce-relocations. "
"Compile your code with -fPIC or -fPIE."
There is almost certainly a better way to do this: I'm cheating here because I
don't know enough about autofoo, and it seems to work. I suspect we should be
checking PIE for the C++ compiler separately (since presumably they're not
guaranteed to be related like gcc/g++ are). I also suspect we should only be
building with it in the first place if Qt really needs it, though I have no idea
how to check that. The qt docs I've found suggest that qt5's cmake module has a
flag for it, but autofoo is never mentioned...
svn path=/trunk/; revision=50645
2013-07-15 23:50:43 +00:00
66f7521a17
Revert r50150. I suspect the problem was Ubuntu's transition to qt5 as default,
...
since now the defaults work as they should.
svn path=/trunk/; revision=50644
2013-07-15 23:47:11 +00:00
54ee8a0f9a
Don't compare a guint32 against -1, compare it against 0xFFFFFFFFU.
...
svn path=/trunk/; revision=50643
2013-07-15 22:27:58 +00:00
3cd6045421
Get rid of "win-setup.sh: line 24: $'\r': command not found" warning
...
svn path=/trunk/; revision=50642
2013-07-15 22:02:12 +00:00
42a3ceea66
Fix warning: ISO C restricts enumerator values to range of 'int'
...
svn path=/trunk/; revision=50641
2013-07-15 21:53:52 +00:00
e37533ced7
Fix warnings: comma at end of enumerator list.
...
svn path=/trunk/; revision=50640
2013-07-15 21:37:55 +00:00
1c19a0d61e
Fix warnings: format '%blah' expects argument of type 'foo', but argument 'i' has type 'bar' [-Wformat].
...
svn path=/trunk/; revision=50639
2013-07-15 21:22:34 +00:00
f5f20fa8e3
Fix warning: ISO C does not allow extra ';' outside of a function.
...
svn path=/trunk/; revision=50638
2013-07-15 20:42:57 +00:00
49051b18d1
Fix warning: ISO C does not support %n$ operand number formats.
...
svn path=/trunk/; revision=50637
2013-07-15 20:29:36 +00:00
946b736de2
Set the menuRole for actionCaptureOptions to NoRole similar to
...
actionEditConfigurationProfiles. This keeps it from being converted to
the default preferences item on OS X.
Remove a hack where we stored the text for
actionEditConfigurationProfiles in its iconText in order to keep it from
clobbering actionEditPreferences. It doesn't seem to be necessary.
svn path=/trunk/; revision=50636
2013-07-15 20:17:17 +00:00
b71a5aa351
Expand the big comment about launching browsers.
...
svn path=/trunk/; revision=50635
2013-07-15 19:26:21 +00:00
49b642ab1c
Fix bug #8934 : Fuzz failure: seg-fault in tvb_new_proxy()
...
It is possible to have NULL reassembly data, support this case in tvb_new_proxy().
svn path=/trunk/; revision=50634
2013-07-15 18:59:42 +00:00
Alexis La Goutte