Commit Graph

16252 Commits

Author SHA1 Message Date
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
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
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 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
Bill Meier 959ae3d687 Use '#if 0 ... #endif' rather than /** ... **/ to comment out
unused hf[] entries (which I should have done in the first place).


svn path=/trunk/; revision=47391
2013-01-31 18:35:06 +00:00
Bill Meier d3a7f4b817 Use '#if 0 ... #endif' rather than /** ... **/ to comment out
unused hf[] entries (which I should have done in the first place).

svn path=/trunk/; revision=47390
2013-01-31 18:31:28 +00:00
Bill Meier c439b805e2 Comment out unused hf[] entries & etc.
(found by checkhf)

svn path=/trunk/; revision=47389
2013-01-31 17:55:31 +00:00
Chris Maynard eb5fcc8d01 Fix Coverity CID 971261: Unused pointer value. Additionally, #if 0 two unused value_string's (should they be deleted altogether?), minor whitespace cleanup, delete a continuation character, try to use a consistent bracketing style throughout. [Is "Movment" a typo?]
svn path=/trunk/; revision=47387
2013-01-31 17:07:19 +00:00
Anders Broman 4a8f124c43 Add an OID translation.
svn path=/trunk/; revision=47386
2013-01-31 16:59:39 +00:00
Guy Harris a4902853a5 Constify a variable to which C string pointers will be assigned.
svn path=/trunk/; revision=47385
2013-01-31 06:50:24 +00:00
Guy Harris 094e30f9db Fix RCS ID.
svn path=/trunk/; revision=47384
2013-01-31 06:49:34 +00:00
Guy Harris 7999b06d76 Get rid of CR's, and set the appropriate properties.
svn path=/trunk/; revision=47383
2013-01-31 06:49:05 +00:00
Michael Mann 9ee8360e4a Add Parrot AR Drone dissector.
Bug 7493 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7493)

svn path=/trunk/; revision=47382
2013-01-31 03:52:06 +00:00
Guy Harris 9b23449384 Clean up white space.
svn path=/trunk/; revision=47379
2013-01-30 22:56:05 +00:00
Guy Harris e9479b543f A "DAAP request" is just an HTTP request of a certain type, possibly on
port 3689.  They don't have the media type application/x-dmap-tagged, so
they're not handed to us any more.  (This means that the Info column now
shows the HTTP URI rather than just "DAAP Request", so that's arguably a
feature; if you want to see all the traffic in the session, use "Follow
TCP Stream" or look for port 3689.)

svn path=/trunk/; revision=47377
2013-01-30 21:56:54 +00:00
Guy Harris a4714f643a Add a routine to allow dissectors to specify ports that carry HTTP
traffic *without* claiming all that traffic for themselves; they might
want, instead, to register for a particular media type.

Not all traffic to or from port 3689 is DAAP - not even traffic between
two Apple machines doing media stuff (e.g., some FairPlay traffic
isn't).  Register for the media type application/x-dmap-tagged, and just
say port 3689 is HTTP.  This means we can get rid of the FPLY hack, as
that traffic is application/octet-stream.  Update some comments.

Leave it up to the DAAP dissector to tag traffic as DAAP in the protocol
column.

svn path=/trunk/; revision=47376
2013-01-30 21:49:33 +00:00
Guy Harris b1e6d2730e Some FairPlay stuff in DAAP starts out with a 4-character FPLY tag, but
what follows the tag isn't a length, it's some unknown form of data.

svn path=/trunk/; revision=47370
2013-01-30 20:08:50 +00:00
Michael Mann d6901da1d1 Wiretap: Add support for files contain GIF, PNG images
From Michal Labedzki, bug 8278 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8278)

svn path=/trunk/; revision=47368
2013-01-30 19:26:05 +00:00
Evan Huus 942ac68bdc Add a cast to hopefully quiet the mac buildbot.
svn path=/trunk/; revision=47367
2013-01-30 01:14:13 +00:00
Evan Huus b8a74f33b6 Add SVN properties, modelines.
svn path=/trunk/; revision=47366
2013-01-30 01:09:31 +00:00
Michael Mann e5ba6f9b1e Add Gearman dissector. Bug 4992 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4992)
svn path=/trunk/; revision=47365
2013-01-30 00:59:27 +00:00
Martin Kaiser b48fb53c7e Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
http://www.wireshark.org/download/automated/analysis/scan-build-2013-01-28-1/report-AQojcV.html#EndPath

svn path=/trunk/; revision=47363
2013-01-29 23:35:30 +00:00
Martin Kaiser a32b153890 Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
http://www.wireshark.org/download/automated/analysis/scan-build-2013-01-28-1/report-eehjto.html#EndPath

svn path=/trunk/; revision=47362
2013-01-29 22:33:37 +00:00
Martin Kaiser 4a64d51119 simplify dissect_gds() a bit
svn path=/trunk/; revision=47360
2013-01-29 22:15:06 +00:00
Martin Kaiser b3f2e26a7a Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
http://www.wireshark.org/download/automated/analysis/scan-build-2013-01-28-1/report-tWikJH.html#EndPath

svn path=/trunk/; revision=47359
2013-01-29 22:04:32 +00:00
Michael Mann 5d026123c4 Make eDonkey dissector a "new style" and only dissect if first byte matches a valid eDonkey protocol. This addresses the problem of Bug 3033 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3033), but I'm still not sure eDonkey should have explicitly registered TCP and UDP ports.
svn path=/trunk/; revision=47349
2013-01-29 18:16:23 +00:00
Michael Mann 23168c9677 Get Server Info should not have any data unless "challenged", per eMule source code. Addresses bug 3509 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3509).
Also updated documentation links.

svn path=/trunk/; revision=47345
2013-01-29 15:43:33 +00:00
Bill Meier c268f2c153 Add missing '&hf_gtpv2_bss_con_xid' entry to hf[].
(Found by checkhf)

Fix apparent issues with two hf[] entries.

Also: Do minor whitespace cleanup.

##Baclport 1.8

svn path=/trunk/; revision=47344
2013-01-29 14:31:21 +00:00
Bill Meier 39886c79cb Add missing '&hf_fw1_trailer' hf[] entry;
Found by checkhf.

## Backport 1.8

svn path=/trunk/; revision=47343
2013-01-29 14:18:04 +00:00
Bill Meier ef242060b8 Add an XXX comment about some code which will never be executed;
Also: mention that there's a missing hf[] entry.

svn path=/trunk/; revision=47342
2013-01-29 13:59:17 +00:00
Bill Meier 3520ab3889 Add missing 'hf_scsi_persresv_control_unreg' hf[] entry.
(Found by checkhf)

Do some minor whitespace cleanup.

svn path=/trunk/; revision=47341
2013-01-29 13:53:16 +00:00
Bill Meier f10906369a Remove some unneeded parens in hf[] entries;
svn path=/trunk/; revision=47340
2013-01-29 13:33:04 +00:00
Michael Mann 8ad4ccb850 Allow SNMP user table entry to be re-editted even if engineID/Username remains the same.
Bug 2426 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2426)

svn path=/trunk/; revision=47328
2013-01-28 21:08:14 +00:00
Evan Huus 29f02b2bb2 Update the MSRP link, it's an actual RFC now.
svn path=/trunk/; revision=47323
2013-01-28 13:27:28 +00:00
Jaap Keuter 335b2bdc96 From Gyanesh:
Add SPBV MAC address sub-TLV support (802.1aq).

svn path=/trunk/; revision=47321
2013-01-28 06:46:21 +00:00
Martin Kaiser fd85b72d51 the fragment id must depend on the transport connection
fragments from different transport connections can be interleaved

svn path=/trunk/; revision=47320
2013-01-27 22:08:29 +00:00
Pascal Quantin f857265011 Fix some dead increment warnings found by Clang
svn path=/trunk/; revision=47319
2013-01-27 18:58:52 +00:00
Pascal Quantin 2e05d7256c Fix typo error
svn path=/trunk/; revision=47318
2013-01-27 18:57:08 +00:00
Evan Huus 5eb312b04b From Hadar Shoham via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8262
Bootp updates, fixes and additional options.

svn path=/trunk/; revision=47317
2013-01-27 16:07:02 +00:00
Bill Meier c929e42eb4 Fix various instances of unused hf[] entries found
by checkhf.

svn path=/trunk/; revision=47312
2013-01-26 22:43:34 +00:00
Jaap Keuter 38dbf79f14 Fix for CID 718640:
Make sure the AVPs length are right before we go into hash calculation.

svn path=/trunk/; revision=47311
2013-01-26 22:36:54 +00:00
Bill Meier 329f6e8cc0 Initialize some hf_... vars to -1;
(Reduces the number of checkhf false positives)

svn path=/trunk/; revision=47310
2013-01-26 21:42:36 +00:00
Bill Meier 6fe0b4cf12 Init several hf... vars to -1.
(found by checkhf)

svn path=/trunk/; revision=47308
2013-01-26 20:41:55 +00:00
Bill Meier 1cb988eb4c Add two missing hf[] entries (which should have been part of SVN #42819).
(Found by checkhf)

##Backport 1.8

svn path=/trunk/; revision=47304
2013-01-26 19:59:41 +00:00
Bill Meier 0c2e7dbe06 Use "4 space" indentation.
svn path=/trunk/; revision=47303
2013-01-26 19:09:15 +00:00