Commit Graph

47576 Commits

Author SHA1 Message Date
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
Anders Broman e9872cf077 Update dissection.
svn path=/trunk/; revision=50604
2013-07-15 04:50:42 +00:00
Anders Broman 17c0371414 From Javier Godoy:
fix partitions being inadvertently set as removed.

In dissect_osd_get_attributes and dissect_osd_set_attributes there were calls to dissect_osd_partition_id with the last parameter (is_removed) set to TRUE instead of FALSE. That caused dissect_osd_partition_id reporting the partitions as "removed". 

The only service action where is_removed must be TRUE is dissect_osd_remove_partition.

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

svn path=/trunk/; revision=50603
2013-07-15 04:50:03 +00:00
Jeff Morriss 58b3567ccb From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8920 :
Changed FATTR4_DISSECT_VALUES arg to FATTR4_BITMAP_ONLY in calls to 
dissect_nfs4_fattrs() in cases NFS4_OP_OPEN and NFS4_OP_CREATE of
dissect_nfs4_response_op().

svn path=/trunk/; revision=50602
2013-07-15 04:00:20 +00:00
Jeff Morriss 3c76662814 Try 2 at fixing the Debian package.
svn path=/trunk/; revision=50601
2013-07-15 03:19:32 +00:00
Jeff Morriss a8ad045a77 Add report_err.c to cmake build.
svn path=/trunk/; revision=50600
2013-07-15 03:12:02 +00:00
Jeff Morriss 16ef3ce2f1 Restore inclusion of report_err.h
svn path=/trunk/; revision=50599
2013-07-15 03:06:00 +00:00
Jeff Morriss 54bb2e7a5c Move report_err.{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 capinfos (which don't link against libwireshark).
svn path=/trunk/; revision=50598
2013-07-15 02:48:26 +00:00
Jeff Morriss 27059c2804 Fix up some white space.
svn path=/trunk/; revision=50597
2013-07-15 02:05:54 +00:00
Jeff Morriss a05830e8b2 Try to fix the "make debian-package" buildbot step: update patch 03-preferences
so it applies more cleanly to the modern prefs.c .

Note: I built this patch partially by hand from "svn diff"; hopefully the
Debian stuff likes it.

svn path=/trunk/; revision=50596
2013-07-15 02:03:36 +00:00
Jeff Morriss 021175097a One more try at fixing all the issues reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8908 :

Rename check_expand_children() to check_expand_trees() since the function
doesn't just do the children of the current path/iter.

Add a parameter to that function which controls whether the parent (or just
the children) get expanded.

As suggest by Jakub in the bug: block further calls to expand_tree() when
we're expanding all these trees.  Add a comment telling callers of
check_expand_trees() to do that.

svn path=/trunk/; revision=50595
2013-07-15 01:46:47 +00:00
Jakub Zawadzki 6d7a3a8cee Rename frame_invalidate to frame_cache.
svn path=/trunk/; revision=50594
2013-07-14 23:32:08 +00:00
Jakub Zawadzki c3c6580d18 Fix assertion failed: ERROR:print.c:823:const guint8 *get_field_data(GSList *, field_info *): code should not be reached
svn path=/trunk/; revision=50593
2013-07-14 23:01:03 +00:00
Jakub Zawadzki a25c186eaf Yet another place where + offset was missing.
svn path=/trunk/; revision=50592
2013-07-14 22:43:52 +00:00
Guy Harris d296ebc525 All routines taking an offset and length that want to access the data in
the backing tvbuff must add the subset tvbuff's offset to the offset
argument, to skip to the subset.

svn path=/trunk/; revision=50591
2013-07-14 22:38:03 +00:00
Guy Harris b68e6dcc42 A bit more comment updating.
svn path=/trunk/; revision=50590
2013-07-14 20:26:56 +00:00
Guy Harris 221f39988b Fix incorrect use of dlsw.frame_direction for capability exchange
frames; that should be a separate dlsw.capex_type field.

dlsw.error_cause is a numeric field, so it needs a base; the values in
the value_string table are in hex, so show it in hex.

svn path=/trunk/; revision=50589
2013-07-14 19:34:45 +00:00
Guy Harris cc4197b1fe Fix a comment.
svn path=/trunk/; revision=50588
2013-07-14 19:07:09 +00:00
Guy Harris d3be9807c4 Get rid of duplicate "Old message type" field.
svn path=/trunk/; revision=50587
2013-07-14 19:02:19 +00:00
Guy Harris 0e40234217 Make pointers to raw packet data pointers to guint8, not pointers to
char; they're chunks of raw octets, not characters.

svn path=/trunk/; revision=50586
2013-07-14 17:39:36 +00:00
Guy Harris b161d15f0e Use tvb_new_chain with the tvbuffs from a reassembly.
svn path=/trunk/; revision=50585
2013-07-14 17:34:16 +00:00
Guy Harris 976cca3f98 A fragment_data structure now contains a pointer to a tvbuff to the
fragment or reassembled data, not a pointer to the data itself; instead
of having to construct a tvbuffs for the reassembled data, we can now
just use the existing tvbuff.

Spell out "fragment" and "fragmentation" in comments while we're at it.

svn path=/trunk/; revision=50584
2013-07-14 17:27:57 +00:00
Guy Harris a1ca4be5ef Cast the result of g_malloc(), to avoid warnings about trying to compile
this code as C++.

Make pointers to raw packet data pointers to guint8, not pointers to
char, as they're octets, not characters.

svn path=/trunk/; revision=50583
2013-07-14 17:16:56 +00:00
Jakub Zawadzki 543ba2746b fix: ../../asn1/t38/packet-t38-template.c:346: warning: request for implicit conversion from 'gpointer' to 'char *' not permitted in C++
svn path=/trunk/; revision=50582
2013-07-14 15:51:15 +00:00
Jakub Zawadzki 2671b8a398 fix: packet-mp2t.c:489: warning: implicit declaration of function 'tvb_new_proxy'
svn path=/trunk/; revision=50581
2013-07-14 15:20:09 +00:00
Jakub Zawadzki c766e78cfa Rewrite reassemble API to use TVBs instead of raw data.
(it seems to be working for TCP ^^)

svn path=/trunk/; revision=50580
2013-07-14 14:42:05 +00:00
Gerald Combs d924325d37 [Automatic manuf, services and enterprise-numbers update for 2013-07-14]
svn path=/trunk/; revision=50577
2013-07-14 14:03:38 +00:00
Michael Tüxen 43e20ff200 Don't use compiler options not supported by clang in XCode 4.6.3
on Apple platforms.

svn path=/trunk/; revision=50576
2013-07-14 12:39:25 +00:00
Guy Harris 1f32615d99 Export tvb_free_chain() so that tvbtest can use it.
As on Windows with MSVC, and as with reassemble_test, link tvbtest with
libwireshark and the libraries it requires.

svn path=/trunk/; revision=50575
2013-07-14 10:30:49 +00:00
Guy Harris f99694bb11 Squelch a "not permitted in C++" warning.
svn path=/trunk/; revision=50574
2013-07-14 10:23:59 +00:00
Guy Harris 0ca2dd85ae Build tvbtest the same way we build reassemble_test; see whether that
fixes the build errors we're seeing, with complaints about

	tvbtest.obj : warning LNK4217: locally defined symbol tvb_XX imported in function test
	tvbtest.obj : error LNK2019: unresolved external symbol __imp_tvb_XXX referenced in function run_tests
	tvbuff.obj : error LNK2019: unresolved external symbol tvb_XXX referenced in function tvb_new_YYY

svn path=/trunk/; revision=50573
2013-07-14 10:19:12 +00:00
Guy Harris eedc0601d7 Fix whitespace.
svn path=/trunk/; revision=50572
2013-07-14 09:17:31 +00:00
Jakub Zawadzki 2131f22508 Rewrite packet-mime-encap to use composite tvbs + cloning
svn path=/trunk/; revision=50571
2013-07-14 08:41:04 +00:00
Jakub Zawadzki b3e0623e5c Fix tvbtest linking, move private structures to tvbuff_subset
svn path=/trunk/; revision=50570
2013-07-14 07:59:42 +00:00
Jakub Zawadzki 0d85b75305 Move tvb real and subset implementations to seperate files.
svn path=/trunk/; revision=50569
2013-07-14 07:42:19 +00:00
Guy Harris c089afca5c OK, with Qt 5.1, the pkg-config modules are all called Qt5Xxx rather
than QtXxx, so look for those as well.

svn path=/trunk/; revision=50568
2013-07-14 02:35:26 +00:00
Michael Mann 79aea4b295 Generate better hf_ name
Generate initial filter name
Apply consistent whitespace

svn path=/trunk/; revision=50567
2013-07-14 02:13:07 +00:00
Michael Mann a32513416b First real test of convert_proto_tree_add_text.pl.
svn path=/trunk/; revision=50566
2013-07-14 02:01:49 +00:00
Evan Huus b54d5b7d54 Fix the OID registration leaks.
Only 1,625 bytes to go...

svn path=/trunk/; revision=50565
2013-07-14 01:02:44 +00:00
Evan Huus c7909c4195 Fix one small leak in xml dissector registration.
svn path=/trunk/; revision=50564
2013-07-14 00:54:02 +00:00
Evan Huus afa96c3f33 Fix some of the preferences leaks. Don't strdup the defaults, as they will be
strduped again immediately when they are registered. To make this safe, tweak
the flow a bit so that they are guaranteed to be registered immediately after
being set here.

svn path=/trunk/; revision=50563
2013-07-14 00:45:19 +00:00