Commit Graph

47566 Commits

Author SHA1 Message Date
Chris Maynard 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
Jeff Morriss 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
Chris Maynard 69eb477c9e Fix warning: ISO C90 forbids specifying subobject to initialize.
svn path=/trunk/; revision=50653
2013-07-16 02:00:53 +00:00
Evan Huus 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
Evan Huus 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
Jeff Morriss 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
Chris Maynard 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
Guy Harris 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
Evan Huus 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
Evan Huus 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
Evan Huus 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
Guy Harris 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
Pascal Quantin 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
Chris Maynard 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
Chris Maynard e37533ced7 Fix warnings: comma at end of enumerator list.
svn path=/trunk/; revision=50640
2013-07-15 21:37:55 +00:00
Chris Maynard 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
Chris Maynard 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
Chris Maynard 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
Gerald Combs 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
Guy Harris b71a5aa351 Expand the big comment about launching browsers.
svn path=/trunk/; revision=50635
2013-07-15 19:26:21 +00:00
Jakub Zawadzki 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
Jakub Zawadzki fec836d697 Fix bug #8936: Fuzz failure: attempt to allocate -1 bytes from packet-bacapp.c and/or tvb_generic_clone_offset_len()
Revert r50556: Add new function: validate_offset() which checks if offset is within bounds of tvb.

svn path=/trunk/; revision=50633
2013-07-15 18:32:11 +00:00
Alexis La Goutte 7c5b471584 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50632
2013-07-15 18:06:29 +00:00
Alexis La Goutte 4c34d30a35 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50631
2013-07-15 18:06:19 +00:00
Alexis La Goutte 208071629d Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50630
2013-07-15 18:06:08 +00:00
Alexis La Goutte 9ddfede761 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50629
2013-07-15 18:05:57 +00:00
Alexis La Goutte b583443a75 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50628
2013-07-15 18:05:37 +00:00
Alexis La Goutte 58bf1dc4f7 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50627
2013-07-15 18:05:27 +00:00
Alexis La Goutte f7f3b668ef Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50626
2013-07-15 18:05:14 +00:00
Alexis La Goutte e918ee63e4 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50625
2013-07-15 18:05:04 +00:00
Alexis La Goutte e48f3cd707 Use 2 Spaces indent and add modelines info
svn path=/trunk/; revision=50624
2013-07-15 18:04:53 +00:00
Alexis La Goutte c55d2bc057 Fix warnings found by fix-encoding-args tools.(and remove some tabs also)
svn path=/trunk/; revision=50623
2013-07-15 18:04:43 +00:00
Alexis La Goutte 7614891152 Use 4 Spaces indent and add modelines info
svn path=/trunk/; revision=50622
2013-07-15 18:04:33 +00:00
Alexis La Goutte 3dd52ea2da Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50621
2013-07-15 18:04:23 +00:00
Alexis La Goutte c39ca07c7e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50620
2013-07-15 18:04:14 +00:00
Alexis La Goutte 2aa451859a Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50619
2013-07-15 18:04:03 +00:00
Alexis La Goutte cde1b3d4bb Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50618
2013-07-15 18:03:54 +00:00
Alexis La Goutte 779c37aa20 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50617
2013-07-15 18:03:43 +00:00
Alexis La Goutte 15a785c757 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=50616
2013-07-15 18:03:33 +00:00
Alexis La Goutte 579b937bdf Use "generic" tfs (tfs_set_notset)
svn path=/trunk/; revision=50615
2013-07-15 18:03:13 +00:00
Balint Reczey 928080f536 Make Debian package build depend on xdg-utils to let configure detect xdg-open
svn path=/trunk/; revision=50614
2013-07-15 17:53:24 +00:00
Chris Maynard 42b09314b0 C++ style comments are not allowed in ISO C90. (Fixes the rest of them now that I noticed, "this will be reported only once per input file")
svn path=/trunk/; revision=50613
2013-07-15 15:51:45 +00:00
Chris Maynard e7e260b4fc Trivial: C++ style comments are not allowed in ISO C90.
svn path=/trunk/; revision=50612
2013-07-15 15:48:10 +00:00
Jeff Morriss 891854ca7a As suggest by Balint:
Remove the 03-preferences patch: there's an ongoing discussion over at Debian
about using xdg-open to open URLs[1] (instead of sensible-browser as this
patch was doing) and anyway xdg-open behaves better for Balint.

Since we'll be using xdg-open, add a dependency on xdg-utils (also suggested
by Balint).

Both changes are untested.

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=172436

svn path=/trunk/; revision=50611
2013-07-15 14:31:35 +00:00
Jeff Morriss 9fd357b174 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908 :
As per http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script
the portable way to find out if a particular command is available is with "command -v" not
"which".

svn path=/trunk/; revision=50610
2013-07-15 13:28:53 +00:00
Irene Rüngeler 776c949898 Do not hide the interface name in capture options.
Fix for bug 8932 reported by tdarnell5.

svn path=/trunk/; revision=50609
2013-07-15 08:58:32 +00:00
Alexis La Goutte 19fcedc185 Fix error from checkAPI.pl
Error: Found non-ASCII characters on line 871 of packet-scsi-osd.c

svn path=/trunk/; revision=50608
2013-07-15 08:13:28 +00:00
Alexis La Goutte 09d68c76e6 Set convert_proto_tree_add_text has executable
svn path=/trunk/; revision=50607
2013-07-15 07:39:26 +00:00
Jakub Zawadzki 94e8ddf525 Fix misassembly problems in CAP-LINK_ETH-20030618-150138.5VW
When reading packet we need to read whole one including tvb_frame->offset, not only tvb->length

svn path=/trunk/; revision=50606
2013-07-15 05:28:20 +00:00
Anders Broman b99a650455 From Javier Godoy:
adds support for the OSD-2 CREATE USER TRACKING COLLECTION service action, following the approach described in bug 8832. It also implements dissection of the CDB continuation segment.

Change in scsi_osd_extra_data_t:
 - Add a continuation_length field (we need that value from the CDB when later dissecting the Data In buffer)

The following fields were added:	
 - hf_scsi_osd2_cdb_continuation_length
 - hf_scsi_osd2_cdb_continuation_format
 - hf_scsi_osd2_continued_service_action
 - hf_scsi_osd2_cdb_continuation_descriptor_type
 - hf_scsi_osd2_cdb_continuation_descriptor_pad_length
 - hf_scsi_osd2_cdb_continuation_descriptor_length
 - hf_scsi_osd2_source_collection_object_id

The following expert_info fields were added:
 - ei_osd2_cdb_continuation_format_unknown (PI_UNDECODED, PI_ERROR)
 - ei_osd2_continued_service_action_mismatch (PI_PROTOCOL, PI_WARN)
 - ei_osd2_cdb_continuation_descriptor_type_unknown (PI_UNDECODED, PI_WARN)
 - ei_osd2_cdb_continuation_descriptor_length_invalid (PI_PROTOCOL, PI_ERROR)
 - ei_osd2_cdb_continuation_length_invalid (PI_PROTOCOL, PI_ERROR)
 
The following value_string arrays were added:
 - scsi_osd2_cdb_continuation_format_val (OSD2r4 Table 69)
 - scsi_osd2_cdb_continuation_descriptor_type_val (OSD2r4 Table 71)
 
The following functions were added:	 
 - dissect_osd2_cdb_continuation_length (dissect the cdb continuation length field in cdb and save continuation_length in extra_data)
 - dissect_osd2_cdb_continuation (dissect the cdb continuation segment from the data out buffer; currently, descriptor-specific fields are not dissected)
 - dissect_osd2_create_user_tracking_collection 
 
Changes in dissect_osd_collection_object_id 
 - add an int hfindex parameter
 - the return type was made void (previously it returned int, but the return type was unused)
 - this function is used for filling collection_id related fields (there are several flavors of them) and may be modified for displaying creation/removal information (à la dissect_osd_partition_id)
 - one call to dissect_osd_requested_collection_object_id was replaced by dissect_osd_collection_object_id(...,hf_scsi_osd_requested_collection_object_id)
 - two calls to dissect_osd_collection_object_id were updated with the new signature

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

svn path=/trunk/; revision=50605
2013-07-15 04:56:01 +00:00