Commit Graph

22586 Commits

Author SHA1 Message Date
Martin Mathieson a8766fb356 Squelch a (bogus) warning about next_tvb being unused initialised.
svn path=/trunk/; revision=51404
2013-08-17 17:52:13 +00:00
Jakub Zawadzki 88eaebaedf Convert few more dissectors to new proto API.
svn path=/trunk/; revision=51403
2013-08-17 08:59:19 +00:00
Jakub Zawadzki 74972b2af0 Fix subtree ett value.
svn path=/trunk/; revision=51402
2013-08-17 08:18:59 +00:00
Jakub Zawadzki 4e870dd240 Fix few concept of new api tree:
- (for now) keep ABI, restore prototype of old proto_tree_add_item, add new proto_tree_add_item_new
- add few helpers for boolean, time, string which will do ->id
- don't use HFI_INIT directly, use it by another macro (MSVC has very small limit for section name)

svn path=/trunk/; revision=51401
2013-08-17 07:16:12 +00:00
Guy Harris 68f9abdc87 Move "aggregate" fields containing bit subfields before the bit
subfields.  Rename some of their hf_ variable names to match the hf_
variable names of the subfields, and rename one field to be a prefix of
its subfields.

For the 64-bit UNIX capabilities, use proto_tree_add_item() for the
flags.

Get rid of a #if 0'ed out field that is duplicated by one of the
newly-added fields.

svn path=/trunk/; revision=51400
2013-08-17 06:30:02 +00:00
Guy Harris 36c6e86029 Get rid of an unused variable.
For some routines, instead of having them check for -1 as the hf_index
and using a default hf_index in that case, just pass them the default
hf_index instead of -1 and just use the hf_index unconditionally.

svn path=/trunk/; revision=51399
2013-08-17 00:38:54 +00:00
Guy Harris f0fc3c20df Fix typo (failure to remove a %).
_U_ify some no-longer-used arguments.

Rename all the hf_pipe variables to hf_smb_pipe, and rename the field
names and protocol name to be "smb_pipe.", for consistency.  (Ceci n'est
pas une pipe.)

Treat and label 1-byte parameters as "byte parameters" and multi-byte
opaque parameters as "bytes parameters".

Format machine-added hf[] entries to match other hf[] entries.

Fix indentation.

svn path=/trunk/; revision=51398
2013-08-16 22:22:36 +00:00
Jakub Zawadzki 1356d07e85 Convert my dissectors to new proto API.
svn path=/trunk/; revision=51397
2013-08-16 21:52:35 +00:00
Jakub Zawadzki 9d79b3233a Introduce new proto_tree API required for hf_ variables removal.
svn path=/trunk/; revision=51396
2013-08-16 21:21:52 +00:00
Chris Maynard 67f1d07176 Initialize val_len to avoid Clang warning: The right operand of '-' is a garbage value. While in there, add some protection against tvb_length_remaining() possibly returning -1, or possibly being less than val_len.
#BACKPORT(1.10)

svn path=/trunk/; revision=51395
2013-08-16 20:46:45 +00:00
Michael Mann 9e92781cdb Make more filterable items courtesy of convert_proto_tree_add_text.pl.
Also converted proto_tree_add_xxx_format into proto_tree_add_xxx_format_value so that label doesn't get out of sync with hf.

svn path=/trunk/; revision=51394
2013-08-16 20:38:21 +00:00
Chris Maynard dc105bb11f Fix 5 warnings: Value stored to 'offset' is never read. Also: misc. whitespace changes, add modelines.
svn path=/trunk/; revision=51393
2013-08-16 20:07:25 +00:00
Chris Maynard 365d223fdd Trivial. Fix warning: Value stored to 'str_index' is never read.
svn path=/trunk/; revision=51392
2013-08-16 19:28:24 +00:00
Anders Broman 1e8f7d9224 From Chris Pane:
More bug fixes and feature additions to IEEE1722.1 dissector.

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

svn path=/trunk/; revision=51388
2013-08-16 04:49:13 +00:00
Evan Huus 6538787c92 Add one 'volatile' keyword to fix a -Wclobbered and change the tree used in one
proto_tree call to fix a -Wunused-but-set-variable, both of which show up in GCC
4.8.

svn path=/trunk/; revision=51386
2013-08-16 01:35:56 +00:00
Michael Mann e2bf819eaf Use convert_proto_tree_add_text.pl to make many filterable items.
Also some cleanup since the filterable items remove the need for tvb_memcpy of static structures.

svn path=/trunk/; revision=51385
2013-08-16 00:08:25 +00:00
Chris Maynard 618c6eeb3c Fix Coverity CID 1062616: Unused pointer value.
svn path=/trunk/; revision=51384
2013-08-15 17:37:14 +00:00
Chris Maynard 543e05b1ec Group all "Seconds elapsed appears to be encoded as little-endian" expert info messages together, regardless of the computed value of the seconds field. This adds a single expandable entry instead of multiple entries (up to 255 potentially) and makes the expert info generally nicer to view (IMO).
svn path=/trunk/; revision=51383
2013-08-15 15:26:12 +00:00
Jakub Zawadzki 68d8cad8f5 [trivial] Use g_stpcpy()
svn path=/trunk/; revision=51381
2013-08-15 09:33:52 +00:00
Guy Harris e4c4c6fbfb Get rid of set-but-not-used variable. Link to the tools.ietf.org HTML
version of RFC 5050.

svn path=/trunk/; revision=51380
2013-08-15 09:09:49 +00:00
Guy Harris 76d868285b Fix $Id$
svn path=/trunk/; revision=51372
2013-08-15 03:54:23 +00:00
Guy Harris 7a3791cc43 Expand $Id$, use native line endings.
svn path=/trunk/; revision=51369
2013-08-15 03:50:36 +00:00
Guy Harris 63fb123d7e Expand $Id$, use native line endings, get rid of CRs (they belong on
Windows, but not on UN*X).

svn path=/trunk/; revision=51368
2013-08-15 03:47:37 +00:00
Michael Mann 7eb98fe481 A few more improvements:
1. Make a "dissect_dictionary" function for the common dissection of the different primary header versions.
2. Remove some of the "dissection aborts" if sdnv values are bad.  Detecting malformed packets can be a good thing.
3. Make fields that use a sdnv value filterable, with expert info if the value is bad.


svn path=/trunk/; revision=51365
2013-08-15 03:05:51 +00:00
Evan Huus 2048ac8ae1 Split the code to convert an ethernet address into an int64 into a function
since it's used in several places. Don't allocate a key just to do a hash-table
lookup, we only need to do that if we're actually inserting. Fixes another ~1KB
of leaks.

svn path=/trunk/; revision=51364
2013-08-15 02:45:58 +00:00
Evan Huus 4577d39122 Free the old name before we add the new one in case the services file has
duplicates (it does). Fixes about 2KB of leaks.

svn path=/trunk/; revision=51363
2013-08-15 02:38:00 +00:00
Evan Huus 21d9e011d0 From Yaniv Kaul via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9040
Small fixes and enhancements to SCSI INQUIRY results.

svn path=/trunk/; revision=51362
2013-08-15 02:23:53 +00:00
Evan Huus bef63735ff From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9037
Update the heuristics for detecting ISO 14443-A payloads with 4 byte UIDs, and
ATS values to support MTCOS-based cards/tokens (e.g. passports) in PN532
InListPassiveTarget responses.

svn path=/trunk/; revision=51361
2013-08-15 02:17:51 +00:00
Martin Kaiser d9fd5d6409 use the correct length for the tvbuff of an unknown usb descriptor
svn path=/trunk/; revision=51359
2013-08-14 21:14:21 +00:00
Chris Maynard 6730531348 Nowhere in the RFC's (793 or otherwise) does it indicate that if the URG bit is not set that the urgent pointer field must be zero.
References:
http://tools.ietf.org/html/rfc793, http://tools.ietf.org/html/rfc1122, ...
http://www.wireshark.org/lists/ethereal-dev/200307/msg00297.html

Similarly, nowhere does it say that the acknowledgment number field must be zero if the ACK bit is not set.

This patch effectively reverts r37721.  If non-zero urgent pointers are of interest to you when the URG bit is not set, then a filter such as follows can be used:

    (tcp.flags.urg == 0) && !(tcp[18:2] == 00:00)

Similarly, if non-zero acknowledgment numbers are of interest to you when the ACK bit is not set, then use this filter:

    (tcp.flags.ack == 0) && !(tcp.ack == 0)

For consistency, should we avoid adding the ack field in this case as well?  The above filter would then change to:

    (tcp.flags.ack == 0) && !(tcp[8:4] == 00:00:00:00)

This change was prompted by the following question on ask.wireshark.org:
http://ask.wireshark.org/questions/23753/tcp-urgent-pointer-value-not-displayed

svn path=/trunk/; revision=51356
2013-08-14 18:35:36 +00:00
Evan Huus 0da22d4cb5 Pre-emptively create the other two hash tables in packet.c for simplicity's
sake.

svn path=/trunk/; revision=51355
2013-08-14 17:36:47 +00:00
Guy Harris 9e47411488 Include config.h first; it defines _FILE_OFFSET_BITS, and if some system
header later causes it to be redefined - as happens on my Solaris 11
virtual machine - we get a redefinition warning, which gets treated as
an error.

svn path=/trunk/; revision=51349
2013-08-14 01:15:59 +00:00
Guy Harris 34108edbd1 Get rid of -Wshadow warning - I guess we're including something that
gets <getopt.h>, so we get the optarg global.

svn path=/trunk/; revision=51348
2013-08-14 00:41:02 +00:00
Guy Harris b65e9e9618 UN*X pathnames + PL/I's comment syntax = surprises. Yay C++ (and C99).
svn path=/trunk/; revision=51347
2013-08-14 00:37:14 +00:00
Guy Harris 5dcd6daba7 Get rid of -Wshadow warning - I guess we're including something that
gets <getopt.h>, so we get the optarg global.

svn path=/trunk/; revision=51346
2013-08-14 00:35:27 +00:00
Guy Harris 14fe8951b7 Use 4-space indentation consistently.
svn path=/trunk/; revision=51345
2013-08-14 00:33:36 +00:00
Guy Harris e8f42c6b48 Include config.h first; it defines _FILE_OFFSET_BITS, and if some system
header later causes it to be redefined - as happens on my Solaris 11
virtual machine - we get a redefinition warning, which gets treated as
an error.

svn path=/trunk/; revision=51344
2013-08-14 00:31:14 +00:00
Guy Harris cfa2dc5f6e Add in more comments on the whole "get the path of the executable from
the kernel" thing, and add the NetBSD and DragonFly BSD /proc links (if
they don't mount /proc, that doesn't work, but it doesn't get in the
way).

On Solaris, check for getexecname, just in case somebody tries to build
on an old Solaris that doesn't support it (that could well end up being
the least of their problems, but at least they won't ask us to diagnose
that one).

svn path=/trunk/; revision=51343
2013-08-13 23:37:32 +00:00
Evan Huus d8f00e22e1 As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9033
Make epan_free a no-op if the pointer is NULL. This fixes 99% of the cases
causing problems for wmem_leave_file_scope() - remove that XXX comment and add
back the assertion.

Remove the cleanup_dissection call from epan_cleanup, it doesn't make sense
there. init_dissection is only called from epan_new, so cleanup_dissection
should only be called from epan_free.

Add one missing epan_free call to tshark revealed by the above changes.

svn path=/trunk/; revision=51342
2013-08-13 22:41:34 +00:00
Evan Huus 1eab806d9b Make what appear to be the intended changes so that all variables are used or
removed and it compiles.

svn path=/trunk/; revision=51341
2013-08-13 22:24:59 +00:00
Guy Harris 4771fdbb7e Fix intended proto_tree_add_item() call that mistakenly called
proto_tree_add_uint(); caught by the checkAPI script run in a Windows
build.

svn path=/trunk/; revision=51340
2013-08-13 18:03:17 +00:00
Alexis La Goutte 02462c7310 From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9038
802.11 HT Extended Capabilities B10 decode incorrect

#Backport 1.10 and 1.8

Within the 802.11 HT Capabilities IE the "HT Extended Capabilities" B10's name is incorrect.

It is currently titled "High Throughput". This is incorrect/missleading. It should be something like "High Throughput Control (+HTC)". The field indicates if the "High Throughput Control (HTC)" field is supported - not if HT itself is supported.

svn path=/trunk/; revision=51339
2013-08-13 17:50:22 +00:00
Evan Huus 69e9d50a23 Use start_offset to set the item length in the usual pattern (assuming this was
intended). Fixes the unused variable warning on start_offset.

svn path=/trunk/; revision=51338
2013-08-13 13:28:14 +00:00
Michael Mann 0776754488 Some improvements to the bundle protocol:
1. Cleanly break out Convergence Layer Protocol (TCPCL) into its own (new-style) pure dissector.
2. Make Bundle dissection into a new style dissector and clean so that it can be called using call_disssector.
3. Use tcp_dissect_pdus for TCPCL protocol instead of "manual" while loop.  This allows contact header to benefit from TCP fragmentation.
4. Make time fields use time field types so they can be filterable.
5. A few functions were move to remove need for static declaration at top of file.
6. Remove pri_hdr_procflags global variable.

Next up - making more fields filterable.

svn path=/trunk/; revision=51337
2013-08-13 11:37:27 +00:00
Stig Bjørlykke a31a88b142 Show the Lua plugin being loaded in the splash screen.
svn path=/trunk/; revision=51335
2013-08-13 10:38:30 +00:00
Guy Harris 890093e0e4 Wrap in "extern "C"" for the benefit of C++ code including it.
svn path=/trunk/; revision=51332
2013-08-13 07:58:06 +00:00
Anders Broman 1e9644c204 From Javier Godoy:
Dissect additional OSD-2 service actions (CREATE/REMOVE PARTITION, GET/SET ATTRIBUTES, QUERY).

This patch adds support for some OSD-2 service actions, following the approach described in bug 8832.

The implemented service actions are:   
 - CREATE PARTITION
 - REMOVE PARTITION
 - REMOVE COLLECTION
 - GET ATTRIBUTES
 - SET ATTRIBUTES
 - QUERY
  
The following service action codes was #defined
 - OSD_2_REMOVE_PARTITION	0x888c
	
The following trees were added 
 - ett_osd2_query_criteria_entry

The following fields were added:	
 - hf_scsi_osd2_remove_scope (REMOVE PARTITION)
 - hf_scsi_osd2_immed_tr (QUERY)
 - hf_scsi_osd2_matches_collection_object_id (QUERY)
 - hf_scsi_osd2_query_type (query list CDB continuation descriptor)
 - hf_scsi_osd2_query_entry_length (query list CDB continuation descriptor)
 - hf_scsi_osd2_query_attributes_page (query list CDB continuation descriptor)
 - hf_scsi_osd2_query_attribute_number (query list CDB continuation descriptor)
 - hf_scsi_osd2_query_minimum_attribute_value_length (query list CDB continuation descriptor)*
 - hf_scsi_osd2_query_maximum_attribute_value_length (query list CDB continuation descriptor)*
 * (dissection of the attribute value in query descriptors is not implemented yet)
 
The following value_string arrays were added:
 - scsi_osd2_remove_scope_val (OSD2r4 Table 143)
 - scsi_osd2_query_type_vals (OSD2r4 Table 75)
 
The following value_string arrays were updated:		
 - scsi_osd_svcaction_vals
 - scsi_osd2_object_descriptor_format_val
 
The following functions were added:	 
 - dissect_osd2_query
 - dissect_osd2_query_list_descriptor (dissect CDB continuation descriptor type 0x0002)
 
The following expert_info fields were added:
 - ei_osd2_query_values_equal (PI_PROTOCOL,PI_NOTE) - the minimum and maximum attribute values are equal in a query descriptor entry
  
Changes in dissect_osd2_cdb_continuation:
 - Dissect case 0x0002 
 
Changes in dissect_osd_*
 - Initialize extra_data->osd2
 - Dissect OSD-2 specific fields
 - Call dissect_osd_cdb_continuation_length / dissect_osd_cdb_continuation  (if osd2)
 - Version-specific increment of offset after dissecting capability/security_parameters

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

svn path=/trunk/; revision=51331
2013-08-13 05:29:04 +00:00
Anders Broman 4daf984804 From Yaniv Kaul:
small addition to SCSI dissection (media rotation speed analysis)

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

svn path=/trunk/; revision=51330
2013-08-13 05:19:48 +00:00
Evan Huus a2b2885daf Create the dissector hash table in only one place, and specify that its values
should be freed when it is destroyed. This requires splitting packet_init in
two: the hash table which must be created before protocol registration, and the
caching of common protocol handles, which must happen after registration.

svn path=/trunk/; revision=51329
2013-08-13 03:11:28 +00:00
Evan Huus 14b098baf7 When freeing the preferences of a module, also free the preferences of its
submodule.

svn path=/trunk/; revision=51328
2013-08-13 02:56:55 +00:00
Evan Huus 7292140b9c Fix name resolution tests:
- if we find a name during lookup, return it even if it's not a dummy
- read personal hosts after global hosts so that they take precedence

Neither of these problems appear to be new - the recent work did not change this
logic, so I have no idea how come name resolution wasn't failing before, but I
guess the old hash table was weirder than I thought...

svn path=/trunk/; revision=51326
2013-08-13 01:41:51 +00:00
Evan Huus 616324c21e Be sure to initialize the jumbo flag when creating a new chunk header by
splitting an existing chunk. Thanks to Jeff for catching this one.

svn path=/trunk/; revision=51325
2013-08-12 23:35:35 +00:00
Guy Harris bebe1200de Just check whether dladdr() is available; we check in the code whether
it succeeds, so there's no point in checking whether it succeeds in a
sample program.

svn path=/trunk/; revision=51322
2013-08-12 20:01:30 +00:00
Pascal Quantin 4b641014a2 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9031 :
SIP contact-param parsing should be stopped when finding a comma separator

svn path=/trunk/; revision=51321
2013-08-12 19:23:08 +00:00
Guy Harris 57b8c51a2e Tell a bit more of the story of dladdr()'s ability, or lack of same, to
return a path for the executable image not based on argv[0].

svn path=/trunk/; revision=51320
2013-08-12 18:51:06 +00:00
Anders Broman 1ef4ba5e32 Move initalisation of IPv4 hastable to the host_name_lookup_init() rotine.
svn path=/trunk/; revision=51319
2013-08-12 18:33:08 +00:00
Martin Kaiser f76303cd6c coverity 280403 (logically dead code)
set first to FALSE after the first block was dissected

svn path=/trunk/; revision=51313
2013-08-12 10:15:01 +00:00
Pascal Quantin 40607cbd27 Check presence of PagingRecordList before trying to fetch the number of Paging Ids
svn path=/trunk/; revision=51312
2013-08-12 09:56:30 +00:00
Pascal Quantin 24e7b8aefd Fix copy paste error and reinitialize actx->private_data to NULL once used
svn path=/trunk/; revision=51311
2013-08-12 09:26:24 +00:00
Guy Harris 9ff00164a8 Fix a comment.
Fix calls checking the Linux version number.

svn path=/trunk/; revision=51310
2013-08-12 09:18:54 +00:00
Guy Harris f568d56df2 Add in a bunch of UNIX-platform-specific ways of getting executable path
information supplied by the kernel; sadly, we can't trust dladdr() to
use those mechanisms, so we try this first.

Expand the comment about finding the application bundle path given the
executable image path.

svn path=/trunk/; revision=51308
2013-08-12 08:28:34 +00:00
Guy Harris 829a4f213a Add a comment discussing the layout of application bundles and the
directories we should - and perhaps should *not* - set up.

svn path=/trunk/; revision=51307
2013-08-12 01:20:20 +00:00
Guy Harris 237c5a7b60 If we weren't started with special privileges, try to figure out if
we're running from inside an OS X app bundle and, if we are, save the
pathname of the top-level bundle directory and use it to get the
pathnames of global data files, plugins, and Python modules.

This obviates the need to set special environment variables for them in
the launcher scripts, so get rid of the commands to do that.

The @rpathification of binaries also obviates the need for the
commented-out setting of DYLD_LIBRARY_PATH, so get rid of that as well.

svn path=/trunk/; revision=51306
2013-08-12 00:59:34 +00:00
Evan Huus bf0f0ec4d9 Reorder and group chunk header flags. Reduces the bit-twiddling needed by the
compiler and provides a surprising (if fairly small) performance win.

svn path=/trunk/; revision=51305
2013-08-11 23:49:56 +00:00
Evan Huus dc46cb0f29 Split jumbo_free and jumbo_realloc into their own functions for readability and
consistency (they are called just once and will be inlined by any reasonable
compiler).

Also add some comments, fix some spacing etc. No functional changes.

svn path=/trunk/; revision=51304
2013-08-11 22:32:46 +00:00
Evan Huus 6eef00ac05 Move the null check outside the function call. Simpler, and more efficient for
compilers that decide not to inline.

svn path=/trunk/; revision=51303
2013-08-11 22:20:35 +00:00
Evan Huus 497e53ee06 Little optimization: move two statements inside an if block.
svn path=/trunk/; revision=51302
2013-08-11 19:33:30 +00:00
Anders Broman 93c9c4b0ff Use g_hashtable for IPv4 name resolution.
svn path=/trunk/; revision=51301
2013-08-11 19:02:26 +00:00
Evan Huus 36ff6f2c25 Add support for allocating more than will fit in a single block, through the use
of a jumbo flag in the chunk header.

svn path=/trunk/; revision=51299
2013-08-11 17:18:19 +00:00
Evan Huus 959ee8f5c0 Instead of using a glib slist to track the list of blocks, embed a short
doubly-linked list at the head of each block. This was intended as a step
towards supporting allocations bigger than the usual block size, but also shows
up as a 2% performance improvement in the speed test, so win-win.

svn path=/trunk/; revision=51298
2013-08-11 16:06:07 +00:00
Evan Huus 3bac7e845b Small optimization: the master-list and recycler cases are different enough that
doing all the safety checks was unnecessarily slow. Do only the appropriate
checks for each case.

svn path=/trunk/; revision=51296
2013-08-11 14:20:00 +00:00
Evan Huus 9fdf6f28e4 Split some asserts so it is more clear what the problem is when they are
triggered.

svn path=/trunk/; revision=51293
2013-08-11 13:44:11 +00:00
Evan Huus 83d31621fb Free a few hash tables in packet.c when we shutdown.
svn path=/trunk/; revision=51292
2013-08-11 13:42:12 +00:00
Evan Huus 1176e2f3d7 Modelines and consistent indentation.
Also tweak some ifdefs of function signatures. The multiple braces were
confusing my folder and my indenter, so ifdef *only* the changed parameters and
leave the bracing alone. This has the benefit of being a bit clearer too, I
think.

svn path=/trunk/; revision=51291
2013-08-11 00:50:51 +00:00
Evan Huus f75302817b Fix 130KB of leaked memory exposed (or caused?) by the conversion to glib hash
tables.

svn path=/trunk/; revision=51290
2013-08-11 00:35:22 +00:00
Alexis La Goutte 05739c8f15 RPKI-RTR is not a asn1 dissector...
svn path=/trunk/; revision=51288
2013-08-10 21:32:48 +00:00
Alexis La Goutte d2c0e56d94 Fix (-W)header-guard error found by clang 3.4
./packet-ldp.h:26:9: error: '__PACKET_LDP_H_' is used as a header guard here,
      followed by #define of a different macro [-Werror,-Wheader-guard]
#ifndef __PACKET_LDP_H_
        ^~~~~~~~~~~~~~~
./packet-ldp.h:27:9: note: '__PACKET_LDP_H__' is defined here; did you mean
      '__PACKET_LDP_H_'?
#define __PACKET_LDP_H__
        ^~~~~~~~~~~~~~~~
        __PACKET_LDP_H_

svn path=/trunk/; revision=51285
2013-08-10 21:32:24 +00:00
Alexis La Goutte d5fed8b085 Fix (-W)header-guard error found by clang 3.4
./packet-idp.h:25:9: error: '__PACKET_IDP_H__' is used as a header guard here,
      followed by #define of a different macro [-Werror,-Wheader-guard]
#ifndef __PACKET_IDP_H__
        ^~~~~~~~~~~~~~~~
./packet-idp.h:26:9: note: '__PACKET_IPX_H__' is defined here; did you mean
      '__PACKET_IDP_H__'?
#define __PACKET_IPX_H__
        ^~~~~~~~~~~~~~~~
        __PACKET_IDP_H__

svn path=/trunk/; revision=51284
2013-08-10 21:32:16 +00:00
Alexis La Goutte 857f89a681 Fix (-W)header-guard error found by clang 3.4
../../epan/dissectors/packet-mpeg-sect.h:26:9: error: '__PACKET_MPEG_SECT_H_' is
      used as a header guard here, followed by #define of a different macro
      [-Werror,-Wheader-guard]
#ifndef __PACKET_MPEG_SECT_H_
        ^~~~~~~~~~~~~~~~~~~~~
../../epan/dissectors/packet-mpeg-sect.h:27:9: note: '__PACKET_MPEG_SECT_H__' is
      defined here; did you mean '__PACKET_MPEG_SECT_H_'?
#define __PACKET_MPEG_SECT_H__
        ^~~~~~~~~~~~~~~~~~~~~~
        __PACKET_MPEG_SECT_H_

svn path=/trunk/; revision=51283
2013-08-10 21:32:08 +00:00
Alexis La Goutte 4398ffa647 Fix (-W)header-guard error found by clang 3.4
./packet-osi-options.h:26:9: error: '_PACKET_OSI_OPTION_H' is used as a header
      guard here, followed by #define of a different macro
      [-Werror,-Wheader-guard]
#ifndef _PACKET_OSI_OPTION_H
        ^~~~~~~~~~~~~~~~~~~~
./packet-osi-options.h:27:9: note: '_PACKET_OSI_OPTIONS_H' is defined here; did
      you mean '_PACKET_OSI_OPTION_H'?
#define _PACKET_OSI_OPTIONS_H
        ^~~~~~~~~~~~~~~~~~~~~
        _PACKET_OSI_OPTION_H

svn path=/trunk/; revision=51282
2013-08-10 21:31:59 +00:00
Alexis La Goutte 178bc22120 Fix (-W)header-guard error found by clang 3.4
./packet-bluetooth-hci.h:24:9: error: '__PACKET_BLUETOOTH_HCI_H__' is used as a
      header guard here, followed by #define of a different macro
      [-Werror,-Wheader-guard]
#ifndef __PACKET_BLUETOOTH_HCI_H__
        ^~~~~~~~~~~~~~~~~~~~~~~~~~
./packet-bluetooth-hci.h:25:9: note: '__PACKET_BLUETOOTH_HCI__H__' is defined
      here; did you mean '__PACKET_BLUETOOTH_HCI_H__'?
#define __PACKET_BLUETOOTH_HCI__H__
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~
        __PACKET_BLUETOOTH_HCI_H__

svn path=/trunk/; revision=51281
2013-08-10 21:31:51 +00:00
Alexis La Goutte c67d8f40e6 Fix (-W)documentation error found by Clang
../../epan/ftypes/../emem.h:34:3: error: empty paragraph passed to '@details'
      command [-Werror,-Wdocumentation]
 */
  ^

svn path=/trunk/; revision=51278
2013-08-10 21:31:27 +00:00
Alexis La Goutte 467ece42b3 Fix (-W)documentation error found by Clang
../../asn1/c1222/packet-c1222-template.c:348:15: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param pinfo
   ~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:349:14: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tree
   ~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:350:16: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param length
   ~~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:351:16: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param offset
   ~~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:758:11: error: parameter 'keybuf' not
      found in the function declaration [-Werror,-Wdocumentation]
 * \param keybuf is updated with a copy of the key data if successful lookup.
          ^~~~~~
../../asn1/c1222/packet-c1222-template.c:758:11: note: did you mean 'keybuff'?
 * \param keybuf is updated with a copy of the key data if successful lookup.
          ^~~~~~
          keybuff
../../asn1/c1222/packet-c1222-template.c:879:13: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tvb
   ~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:880:16: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param offset
   ~~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:881:13: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param len
   ~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:882:15: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param pinfo
   ~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:883:14: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tree
   ~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1023:13: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tvb
   ~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1024:15: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param pinfo
   ~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1025:14: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tree
   ~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1047:15: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param pinfo
   ~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1048:13: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tvb
   ~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1049:16: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param offset
   ~~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1068:13: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tvb
   ~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1069:15: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param pinfo
   ~~~~~~~~~~~^
../../asn1/c1222/packet-c1222-template.c:1070:14: error: empty paragraph passed
      to '\param' command [-Werror,-Wdocumentation]
 * \param tree
   ~~~~~~~~~~^

svn path=/trunk/; revision=51272
2013-08-10 21:30:38 +00:00
Alexis La Goutte 5672a65daa Fix (-W)documentation error found by Clang
packet-umts_fp.c:3486:12: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
* @param tvb
  ~~~~~~~~~^
packet-umts_fp.c:3488:13: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
* @param tree
  ~~~~~~~~~~^
packet-umts_fp.c:3489:15: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
* @param offset
  ~~~~~~~~~~~~^
packet-umts_fp.c:3491:4: error: '@return' command used in a comment that is
      attached to a function returning void [-Werror,-Wdocumentation]
* @return Void.
  ~^~~~~~~~~~~~

svn path=/trunk/; revision=51271
2013-08-10 21:30:30 +00:00
Alexis La Goutte 5741c8cba2 Fix (-W)documentation error found by Clang
packet-ucp.c:781:5: error: '\return' command used in a comment that is attached
      to a function returning void [-Werror,-Wdocumentation]
 * \return              For 'int'-types, the value of the field.
   ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
packet-ucp.c:954:17: error: parameter 'field' not found in the function
      declaration [-Werror,-Wdocumentation]
 * \param       field   The actual field, whose value needs displaying
                ^~~~~

svn path=/trunk/; revision=51270
2013-08-10 21:30:18 +00:00
Alexis La Goutte 7bee34675a Fix (-W)documentation error found by Clang
packet-knet.c:466:5: error: '@return' command used in a comment that is attached
      to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-knet.c:518:5: error: '@return' command used in a comment that is attached
      to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-knet.c:677:5: error: '@return' command used in a comment that is attached
      to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-knet.c:697:5: error: '@return' command used in a comment that is attached
      to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-knet.c:717:5: error: '@return' command used in a comment that is attached
      to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-knet.c:731:5: error: '@return' command used in a comment that is attached
      to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~

svn path=/trunk/; revision=51269
2013-08-10 21:30:08 +00:00
Alexis La Goutte f1c0e519b8 Fix (-W)documentation error found by Clang
packet-jxta.c:1668:13: error: parameter 'names' not found in the function
      declaration [-Werror,-Wdocumentation]
*   @param  names The table of names.
            ^~~~~
packet-jxta.c:1668:13: note: did you mean 'names_table'?
*   @param  names The table of names.
            ^~~~~
            names_table

svn path=/trunk/; revision=51268
2013-08-10 21:29:59 +00:00
Alexis La Goutte 3c0c2e2e75 Fix (-W)documentation error found by Clang
./packet-gsm_rlcmac.h:1086:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< MS Radio Access capability IE >
^~~
/**<
./packet-gsm_rlcmac.h:1089:26: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
typedef guint8 A5_bits_t;/*<A5 bits> ::= < A5/1 : bit> <A5/2 : bit> <A5/...
                         ^~~~~
                         /**<
packet-gsm_rlcmac.c:169:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Global TFI IE >*/
^~~
/**<
packet-gsm_rlcmac.c:171:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Starting Frame Number Description IE >*/
^~~
/**<
packet-gsm_rlcmac.c:174:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Ack/Nack Description IE >*/
^~~
/**<
packet-gsm_rlcmac.c:178:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Timing Advance IE >*/
^~~
/**<
packet-gsm_rlcmac.c:183:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Power Control Parameters IE >*/
^~~
/**<
packet-gsm_rlcmac.c:191:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Global Power Control Parameters IE >*/
^~~
/**<
packet-gsm_rlcmac.c:195:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Global Packet Timing Advance IE >*/
^~~
/**<
packet-gsm_rlcmac.c:197:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Channel Quality Report struct >*/
^~~
/**<
packet-gsm_rlcmac.c:210:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< EGPRS Ack/Nack Description >*/
^~~
/**<
packet-gsm_rlcmac.c:216:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*<P1 Rest Octets>*/
^~~~~
/**<
packet-gsm_rlcmac.c:218:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*<P2 Rest Octets>*/
^~~~~
/**<
packet-gsm_rlcmac.c:264:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< SI 13 Rest Octets >*/
^~~
/**<
packet-gsm_rlcmac.c:288:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet TBF Release message content >*/
^~~
/**<
packet-gsm_rlcmac.c:293:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Control Acknowledgement message content >*/
^~~
/**<
packet-gsm_rlcmac.c:299:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Downlink Dummy Control Block message content >*/
^~~
/**<
packet-gsm_rlcmac.c:301:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< Packet Uplink Dummy Control Block message content >*/
^~~
/**<
packet-gsm_rlcmac.c:305:1: error: not a Doxygen trailing comment
      [-Werror,-Wdocumentation]
/*< MS Radio Access capability IE >*/
^~~
/**<

svn path=/trunk/; revision=51267
2013-08-10 21:29:51 +00:00
Alexis La Goutte 44085718ba Fix (-W)documentation error found by Clang
packet-eigrp.c:633:10: error: unrecognized parameter passing direction, valid
      directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
 * @param[in|out] tree  detail dissection result
         ^~~~~~~~
packet-eigrp.c:638:5: error: '@return' command used in a comment that is
      attached to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-eigrp.c:691:10: error: unrecognized parameter passing direction, valid
      directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
 * @param[in|out] tree  detail dissection result
         ^~~~~~~~
packet-eigrp.c:696:5: error: '@return' command used in a comment that is
      attached to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-eigrp.c:765:10: error: unrecognized parameter passing direction, valid
      directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
 * @param[in|out] tree  detail dissection result
         ^~~~~~~~
packet-eigrp.c:769:5: error: '@return' command used in a comment that is
      attached to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-eigrp.c:814:10: error: unrecognized parameter passing direction, valid
      directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
 * @param[in|out] tree  detail dissection result
         ^~~~~~~~
packet-eigrp.c:818:5: error: '@return' command used in a comment that is
      attached to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-eigrp.c:853:10: error: unrecognized parameter passing direction, valid
      directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
 * @param[in|out] tree  detail dissection result
         ^~~~~~~~
packet-eigrp.c:857:5: error: '@return' command used in a comment that is
      attached to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-eigrp.c:878:10: error: unrecognized parameter passing direction, valid
      directions are '[in]', '[out]' and '[in,out]' [-Werror,-Wdocumentation]
 * @param[in|out] tree  detail dissection result
         ^~~~~~~~
packet-eigrp.c:882:19: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param[out] None
   ~~~~~~~~~~~~~~~^
packet-eigrp.c:884:5: error: '@return' command used in a comment that is
      attached to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-eigrp.c:880:15: error: parameter 'pinfo' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param[in] pinfo     general data about the protocol
              ^~~~~
packet-eigrp.c:881:15: error: parameter 'ti' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param[in] ti        protocol item
              ^~
packet-eigrp.c:882:16: error: parameter 'None' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param[out] None
               ^~~~
packet-eigrp.c:902:19: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param[out] None
   ~~~~~~~~~~~~~~~^
packet-eigrp.c:904:5: error: '@return' command used in a comment that is
      attached to a function returning void [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~
packet-eigrp.c:902:16: error: parameter 'None' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param[out] None
               ^~~~
packet-eigrp.c:1712:15: error: parameter 'pinfo' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param[in] pinfo     general data about the protocol
              ^~~~~
packet-eigrp.c:1712:15: note: did you mean 'ti'?
 * @param[in] pinfo     general data about the protocol
              ^~~~~
              ti
packet-eigrp.c:2585:18: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param[in] void
   ~~~~~~~~~~~~~~^
packet-eigrp.c:2585:15: error: parameter 'void' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param[in] void
              ^~~~
packet-eigrp.c:3324:18: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param[in] void
   ~~~~~~~~~~~~~~^
packet-eigrp.c:3324:15: error: parameter 'void' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param[in] void
              ^~~~

svn path=/trunk/; revision=51266
2013-08-10 21:29:42 +00:00
Alexis La Goutte 32e5c9f8bf Fix (-W)documentation error found by Clang
./packet-ssl-utils.h:463:16: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 @param comp_str
 ~~~~~~~~~~~~~~^

svn path=/trunk/; revision=51265
2013-08-10 21:29:33 +00:00
Alexis La Goutte 9381244dd8 Fix (-W)documentation error found by Clang
./packet-mstp.h:31:13: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param val
   ~~~~~~~~~^
./packet-mstp.h:41:13: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param tvb
   ~~~~~~~~~^
./packet-mstp.h:42:15: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param pinfo
   ~~~~~~~~~~~^
./packet-mstp.h:43:14: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param tree
   ~~~~~~~~~~^
./packet-mstp.h:44:17: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param subtree
   ~~~~~~~~~~~~~^
./packet-mstp.h:45:16: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param offset
   ~~~~~~~~~~~~^
./packet-mstp.h:46:5: error: '@return' command used in a comment that is
      attached to a function returning void [-Werror,-Wdocumentation]
 * @return none
   ~^~~~~~~~~~~

svn path=/trunk/; revision=51264
2013-08-10 21:29:24 +00:00
Alexis La Goutte 33b09b4674 Fix (-W)documentation error found by Clang
./packet-cell_broadcast.h:33:13: error: empty paragraph passed to '@param'
      command [-Werror,-Wdocumentation]
 * @param tvb
   ~~~~~~~~~^
./packet-cell_broadcast.h:34:14: error: empty paragraph passed to '@param'
      command [-Werror,-Wdocumentation]
 * @param tree
   ~~~~~~~~~~^
./packet-cell_broadcast.h:35:16: error: empty paragraph passed to '@param'
      command [-Werror,-Wdocumentation]
 * @param offset
   ~~~~~~~~~~~~^
./packet-cell_broadcast.h:43:13: error: empty paragraph passed to '@param'
      command [-Werror,-Wdocumentation]
 * @param tvb
   ~~~~~~~~~^
./packet-cell_broadcast.h:44:14: error: empty paragraph passed to '@param'
      command [-Werror,-Wdocumentation]
 * @param tree
   ~~~~~~~~~~^
./packet-cell_broadcast.h:45:16: error: empty paragraph passed to '@param'
      command [-Werror,-Wdocumentation]
 * @param offset
   ~~~~~~~~~~~~^
./packet-cell_broadcast.h:53:13: error: empty paragraph passed to '@param'
      command [-Werror,-Wdocumentation]
 * @param tvb
   ~~~~~~~~~^
./packet-cell_broadcast.h:54:15: error: empty paragraph passed to '@param'
      command [-Werror,-Wdocumentation]
 * @param pinfo
   ~~~~~~~~~~~^
./packet-cell_broadcast.h:55:14: error: empty paragraph passed to '@param'
      command [-Werror,-Wdocumentation]
 * @param tree
   ~~~~~~~~~~^

svn path=/trunk/; revision=51263
2013-08-10 21:29:16 +00:00
Alexis La Goutte aaf75afbff Fix (-W)documentation error found by Clang
../../epan/xdlc.h:48:29: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
#define XDLC_N_R_MASK           0xE0    /*< basic */
                                        ^~~
                                        /**<
../../epan/xdlc.h:50:34: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
#define XDLC_N_R_EXT_MASK       0xFE00  /*< extended */
                                        ^~~
                                        /**<
../../epan/xdlc.h:52:29: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
#define XDLC_N_S_MASK           0x0E    /*< basic */
                                        ^~~
                                        /**<
../../epan/xdlc.h:54:34: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
#define XDLC_N_S_EXT_MASK       0x00FE  /*< extended */
                                        ^~~
                                        /**<
../../epan/xdlc.h:60:24: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
#define XDLC_P_F                0x10    /*< basic */
                                        ^~~
                                        /**<
../../epan/xdlc.h:61:29: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
#define XDLC_P_F_EXT    0x0100  /*< extended */
                                ^~~
                                /**<

svn path=/trunk/; revision=51262
2013-08-10 21:29:08 +00:00
Alexis La Goutte 4c81d15a4a Fix (-W)documentation error found by Clang
packet-bacapp.c:78:13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param tvb
   ~~~~~~~~~^
packet-bacapp.c:79:15: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param pinfo
   ~~~~~~~~~~~^
packet-bacapp.c:80:14: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param tree
   ~~~~~~~~~~^
packet-bacapp.c💯13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param tvb
   ~~~~~~~~~^
packet-bacapp.c:101:15: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param pinfo
   ~~~~~~~~~~~^
packet-bacapp.c:102:14: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param tree
   ~~~~~~~~~~^
packet-bacapp.c:103:16: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param offset
   ~~~~~~~~~~~~^
packet-bacapp.c:110:13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param tvb
   ~~~~~~~~~^
packet-bacapp.c:111:15: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param pinfo
   ~~~~~~~~~~~^
packet-bacapp.c:112:14: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param tree
   ~~~~~~~~~~^
packet-bacapp.c:113:16: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param offset
   ~~~~~~~~~~~~^
packet-bacapp.c:130:13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param tvb
   ~~~~~~~~~^
packet-bacapp.c:131:15: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param pinfo
   ~~~~~~~~~~~^
packet-bacapp.c:132:14: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param tree
   ~~~~~~~~~~^
packet-bacapp.c:133:16: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param offset
   ~~~~~~~~~~~~^
packet-bacapp.c:146:13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param tvb
   ~~~~~~~~~^
packet-bacapp.c:147:15: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param pinfo
   ~~~~~~~~~~~^
packet-bacapp.c:148:14: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param tree
   ~~~~~~~~~~^
packet-bacapp.c:149:16: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param offset
   ~~~~~~~~~~~~^

packet-bacapp.c:251:15: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param label
   ~~~~~~~~~~~^
packet-bacapp.c:263:15: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param label
   ~~~~~~~~~~~^
packet-bacapp.c:275:15: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param label
   ~~~~~~~~~~~^
packet-bacapp.c:288:15: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param label
   ~~~~~~~~~~~^
packet-bacapp.c:300:15: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param label
   ~~~~~~~~~~~^
packet-bacapp.c:325:24: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param service_choice
   ~~~~~~~~~~~~~~~~~~~~^
packet-bacapp.c:338:24: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param service_choice
   ~~~~~~~~~~~~~~~~~~~~^
packet-bacapp.c:521:15: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param label
   ~~~~~~~~~~~^
packet-bacapp.c:522:13: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param src
   ~~~~~~~~~^
packet-bacapp.c:521:11: error: parameter 'label' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param label
          ^~~~~
packet-bacapp.c:522:11: error: parameter 'src' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param src
          ^~~
packet-bacapp.c:654:11: error: parameter 'tree' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param tree the tree to append this item to
          ^~~~
packet-bacapp.c:654:11: note: did you mean 'subtree'?
 * @param tree the tree to append this item to
          ^~~~
          subtree
packet-bacapp.c:723:11: error: parameter 'tree' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param tree the tree to append this item to
          ^~~~
packet-bacapp.c:723:11: note: did you mean 'subtree'?
 * @param tree the tree to append this item to
          ^~~~
          subtree
packet-bacapp.c:749:11: error: parameter 'tree' not found in the function
      declaration [-Werror,-Wdocumentation]
 * @param tree the tree to append this item to
          ^~~~
packet-bacapp.c:749:11: note: did you mean 'subtree'?
 * @param tree the tree to append this item to
          ^~~~
          subtree
packet-bacapp.c:1076:24: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param service_choice
   ~~~~~~~~~~~~~~~~~~~~^
packet-bacapp.c:1266:17: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param service
   ~~~~~~~~~~~~~^
packet-bacapp.c:1337:4: error: unknown command tag name 'pram'; did you mean
      'param'? [-Werror,-Wdocumentation]
 * @pram pinfo
   ^~~~~
    param
packet-bacapp.c:1337:14: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @pram pinfo
         ~~~~^
packet-bacapp.c:1366:15: error: empty paragraph passed to '@param' command
      [-Werror,-Wdocumentation]
 * @param label
   ~~~~~~~~~~~^

svn path=/trunk/; revision=51261
2013-08-10 21:28:59 +00:00
Alexis La Goutte c28b726878 Fix (-W)documentation error found by Clang
packet-9p.c:342:16: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
        guint16  len; /*< Length of the string */
                      ^~~
                      /**<
packet-9p.c:343:13: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
        char *str; /*< The string */
                   ^~~
                   /**<
packet-9p.c:364:15: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
        guint8 type; /*< Type */
                     ^~~
                     /**<
packet-9p.c:365:19: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
        guint32 version; /*< Monotonically incrementing version number */
                         ^~~
                         /**<
packet-9p.c:366:16: error: not a Doxygen trailing comment [-Werror,-Wdocumentation]
        guint64 path; /*< Per-server-unique ID for a file system element */
                      ^~~
                      /**<
5 errors generated

svn path=/trunk/; revision=51260
2013-08-10 21:28:50 +00:00
Alexis La Goutte d26b7fc516 Fix (-W)documentation error found by Clang
../../epan/wmem/wmem_user_cb.h:52:11: error: parameter 'allocator' not found in the function declaration
      [-Werror,-Wdocumentation]
 * @param allocator The allocator that triggered this callback.
          ^~~~~~~~~
../../epan/wmem/wmem_user_cb.h:53:11: error: parameter 'event' not found in the function declaration
      [-Werror,-Wdocumentation]
 * @param event     The event type that triggered this callback.
          ^~~~~
../../epan/wmem/wmem_user_cb.h:54:11: error: parameter 'user_data' not found in the function declaration
      [-Werror,-Wdocumentation]
 * @param user_data Whatever user_data was originally passed to the call to
          ^~~~~~~~~
../../epan/wmem/wmem_user_cb.h:63:11: error: parameter 'recurring' not found in the function declaration
      [-Werror,-Wdocumentation]
 * @param recurring If this is FALSE then the callback is called exactly once.
          ^~~~~~~~~
4 errors generated.

svn path=/trunk/; revision=51259
2013-08-10 21:28:42 +00:00
Alexis La Goutte 6b2498b349 Fix (-W)documentation error found by Clang
../../epan/expert.h:176:9: warning: parameter 'pi' not found in the function declaration [-Wdocumentation]
 @param pi Current protocol item (or NULL)
        ^~
../../epan/expert.h:176:9: note: did you mean 'tree'?
 @param pi Current protocol item (or NULL)
        ^~
        tree
../../epan/expert.h:195:9: warning: parameter 'pi' not found in the function declaration [-Wdocumentation]
 @param pi Current protocol item (or NULL)
        ^~
2 warnings generated.

svn path=/trunk/; revision=51258
2013-08-10 21:28:33 +00:00
Alexis La Goutte a7c7742dc2 Fix (-W)documentation error found by Clang
../../epan/uat.h:245:23: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 * @param num_items_ptr
   ~~~~~~~~~~~~~~~~~~~^
1 error generated.

svn path=/trunk/; revision=51257
2013-08-10 21:28:25 +00:00
Alexis La Goutte 9f24c44709 Fix (-W)documentation error found by Clang
../../epan/range.h:87:11: error: empty paragraph passed to '@return' command [-Werror,-Wdocumentation]
 * @return
   ~~~~~~~^
../../epan/range.h:86:11: error: parameter 'max_value'' not found in the function declaration [-Werror,-Wdocumentation]
 * @param max_value' specifies the maximum value in a range.
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../epan/range.h:86:11: note: did you mean 'max_value'?
 * @param max_value' specifies the maximum value in a range.
          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          max_value

svn path=/trunk/; revision=51256
2013-08-10 21:28:17 +00:00
Alexis La Goutte c47aad79dd Fix (-W)documentation error found by Clang
In file included from ../../epan/packet.h:29:
./../proto.h:1775:16: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 @param protocol
 ~~~~~~~~~~~~~~^
./../proto.h:1947:13: error: empty paragraph passed to '@param' command [-Werror,-Wdocumentation]
 @param flags
 ~~~~~~~~~~~^

svn path=/trunk/; revision=51255
2013-08-10 21:28:10 +00:00
Alexis La Goutte 2c3468da11 Fix (-W)documentation error found by Clang
airpdcap.c:131:11: error: parameter 'password' not found in the function declaration [-Werror,-Wdocumentation]
 * @param password [IN] pointer to a password (sequence of between 8 and
          ^~~~~~~~
airpdcap.c:154:11: error: parameter 'password' not found in the function declaration [-Werror,-Wdocumentation]
 * @param password [IN] pointer to a password (sequence of between 8 and
          ^~~~~~~~

svn path=/trunk/; revision=51254
2013-08-10 21:28:01 +00:00
Alexis La Goutte 7b4431903d Fix (-W)documentation error found by Clang
../../epan/emem.h:560:5: error: '@return' command used in a comment that is attached to a function returning void
      [-Werror,-Wdocumentation]
 * @return void
   ~^~~~~~~~~~~

svn path=/trunk/; revision=51253
2013-08-10 21:27:52 +00:00
Martin Mathieson 1abc2eb191 IxVeriwave 11ac patch (bug 8912) from Tom Cook.
This was the 4th patch, but also:
- use gmalloc0() to allocate vwr struct.  Otherwise, valgrind says that
  many of fields were still uninitialised when parse_s1_W_stats later
read them
- whitespace tidyup, got rid of remaining tabs and trailing whitespace

Did a fair bit of fuzz-testing without seeing any problems.

svn path=/trunk/; revision=51248
2013-08-10 20:57:46 +00:00
Jakub Zawadzki c6669a3c63 dfilter: report warning if OR and AND logic operands are mixed without parentheses.
svn path=/trunk/; revision=51247
2013-08-10 17:49:28 +00:00
Martin Mathieson 237182ba42 Use proper macros to cast between uint and pointer
svn path=/trunk/; revision=51246
2013-08-10 17:09:12 +00:00
Martin Mathieson 11304a30ee Try again...
svn path=/trunk/; revision=51245
2013-08-10 16:53:05 +00:00
Martin Mathieson 8cddb7a24e Try using guint.
svn path=/trunk/; revision=51244
2013-08-10 16:34:19 +00:00
Martin Mathieson 0fb73abcc9 Add a malformed check to show if GroupA has more RAPIDs than A & B
combined.

svn path=/trunk/; revision=51243
2013-08-10 16:17:33 +00:00
Martin Kaiser 1ea4e88824 coverity 1058716
set but not used variable

svn path=/trunk/; revision=51242
2013-08-10 12:37:47 +00:00
Martin Kaiser 48485e2c98 dissect the URL in the transport protocol descriptor
svn path=/trunk/; revision=51241
2013-08-10 12:16:00 +00:00
Evan Huus c4befc8a7a Decode Kafka metadata requests and responses.
svn path=/trunk/; revision=51239
2013-08-09 15:37:07 +00:00
Evan Huus 1c2cb57a38 Enhance verification to assert that the recycler and master list contain all
free chunks of sufficient size.

svn path=/trunk/; revision=51234
2013-08-09 11:20:02 +00:00
Pascal Quantin 2214b3f9d0 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9022 :
Fix dissection of Feature-Caps header field

svn path=/trunk/; revision=51233
2013-08-09 07:58:27 +00:00
Michael Mann 48fcd0c243 Make more filterable items courtesy of convert_proto_tree_add_text.pl
Fix a few misspelled hf_ variables.

svn path=/trunk/; revision=51229
2013-08-09 01:51:23 +00:00
Jeff Morriss 2bbe93006f As suggested in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9011 :
Rename packet-cmd.c to packet-cisco-metadata.c .

Assign copyright to the author.

Also add the dissector to cmake (oops, should have been in r51198!).

svn path=/trunk/; revision=51226
2013-08-08 18:56:42 +00:00
Jeff Morriss 77ff8f6d59 Remove a couple of set-but-no-longer-used variables.
svn path=/trunk/; revision=51225
2013-08-08 18:03:29 +00:00
Jeff Morriss 45d2989e8b From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9024 :
In dissect_rsvp_lsp_attributes() there is a check for invalid Attributes 
TLV length that is no more correct in light of changes described in 
Section 14 of RFC 5420.  This patch fixes that.

svn path=/trunk/; revision=51224
2013-08-08 17:53:11 +00:00
Michael Mann 30e199e2a1 Use convert_proto_tree_add_text.pl to make many more fields filterable.
Someone may want to check that the display filter naming scheme is consistent, I at least tried to make it consistent with the new filters created.
May want to also add subtrees for the bit flags that used to be grouped in a single proto_tree_add_text.

svn path=/trunk/; revision=51223
2013-08-08 17:25:03 +00:00
Martin Mathieson aabda8b275 Improve stats of broadcast messages
svn path=/trunk/; revision=51219
2013-08-08 14:45:45 +00:00
Evan Huus c5319ebc93 One more chunk header alignment fix.
svn path=/trunk/; revision=51218
2013-08-08 12:23:23 +00:00
Evan Huus 0ebe18dcea Make sure our chunk headers are large enough to correctly align the actual data
pointer we return.

svn path=/trunk/; revision=51217
2013-08-08 11:27:39 +00:00
Evan Huus d8684cf32d When splitting a free chunk, if we don't have room for a free header don't even
bother splitting. This greatly simplifies the logic, trims another 4% off the
fast path, and doesn't actually affect the results at all because of the way we
pad for alignment anyways.

svn path=/trunk/; revision=51216
2013-08-08 11:16:10 +00:00
Evan Huus 2d2271f12b Correctly check bounds on dim_max.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9019

svn path=/trunk/; revision=51213
2013-08-08 10:50:11 +00:00
Guy Harris 1219287df3 Rename variables to reflect their use and to avoid a shadowing warning.
Fix some indentation while we're at it.

svn path=/trunk/; revision=51211
2013-08-08 05:14:33 +00:00
Anders Broman 08d223eb71 When dissecting IMSI handle the zero length tvb case, fixes "Malformed Packet: CAMEL (empty IMSI tag)"
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9015

svn path=/trunk/; revision=51208
2013-08-08 04:36:54 +00:00
Anders Broman fd4a111149 Don't call eth_addr_resolve() unconditionally.
svn path=/trunk/; revision=51207
2013-08-08 04:32:19 +00:00
Anders Broman 812ad4f3bf From Tommy Wu:
-          Show major and Minor version.
-          Correct SPI Name.

svn path=/trunk/; revision=51206
2013-08-08 04:31:07 +00:00
Jeff Morriss 786adc8522 From Francesco Fondelli via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8954 :
This patch adds XRO (Exclude Routes) support to RSVP dissector.  It
also extends coverage of some new Attribute Flags (LSP_ATTRIBUTES object).

svn path=/trunk/; revision=51199
2013-08-07 23:07:15 +00:00
Jeff Morriss a018f63bca From Vaibhav Katkade via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9011 :
Add support for the Cisco MetaData (0x8909) ethertype.

From me:

Don't try to register the "eth.type" abbreviation; use "cmd.type" instead.
Add SVN id.
Clean up trailing white space and fix up some indentation.
Don't declare a variable static that need not be.

svn path=/trunk/; revision=51198
2013-08-07 22:52:43 +00:00
Jeff Morriss c44883cb1a From Роман Донченко via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9018 :
This patch enables Wireshark to correctly decode messages specific to the
selected key exchange method by determining and remembering that method.
It's a little incomplete in that it doesn't support the case where
first_kex_packet_follows is true, but then the current implementation
doesn't either.

It also adds/fixes dissection for the plain Diffie-Hellman key exchange and
DH group exchange messages that were broken/missing, completing support for
both of these key exchange methods.

svn path=/trunk/; revision=51197
2013-08-07 22:20:49 +00:00
Martin Kaiser 07ee14d5c1 fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9020
make sure that the loop counter is always incremented

svn path=/trunk/; revision=51196
2013-08-07 21:17:53 +00:00
Martin Kaiser 2f072ac53c add a range check for dch_id
this should fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9005

svn path=/trunk/; revision=51195
2013-08-07 20:18:11 +00:00
Pascal Quantin a2452d6926 Fix dissection of FemtoInterfaceMsg media type when it includes a mandatory LV or V IE
svn path=/trunk/; revision=51193
2013-08-07 17:34:49 +00:00
Jeff Morriss 2c81a97d55 Ensure we have both _initialize() and a corresponding _cleanup() routines for
the various name resolvers; put those two routines next to each other.

Add generic addr_resolv_init() and addr_resolv_cleanup() routines which call
all of those internal routines.

Call the generic init/cleanup routine from epan_init() and epan_cleanup().

Create the hash tables for each name resolver in those initialization routines
in order to avoid having to repeatedly check if the table is already created
or not (and to avoid glib warnings if we neglected to perform that check):

http://www.wireshark.org/lists/wireshark-dev/201308/msg00012.html


Don't clean up   hostnames in init_dissection():    it's done already in cleanup_dissection().
Don't initialize hostnames in cleanup_dissection(): it's done already in init_dissection().

svn path=/trunk/; revision=51191
2013-08-07 16:46:08 +00:00
Alexis La Goutte c617a6a64b Enhance LISP Dissector (Mapping, Locator and Record type...)
Convert proto_tree_add_text calls to proto_tree_add_item

(the end of my original commit...)

svn path=/trunk/; revision=51187
2013-08-07 13:44:44 +00:00
Jeff Morriss 0995eb9edd Remove some set-but-no-longer-used variables.
svn path=/trunk/; revision=51186
2013-08-07 13:26:05 +00:00
Martin Mathieson 9b85c5b17f Try to fix build by removing proto_tree_add_text() call replaced by items
svn path=/trunk/; revision=51185
2013-08-07 12:56:39 +00:00
Alexis La Goutte 90e273cb91 Enhance BGP Update
Step 4 : Convert proto_tree_add_text calls to proto_tree_add_item and use new name of RFC4271 (  Withdrawn Routes Length ...)

svn path=/trunk/; revision=51184
2013-08-07 12:05:23 +00:00
Alexis La Goutte b4beea213f Enhance LISP Dissector (Mapping, Locator and Record type...)
Convert proto_tree_add_text calls to proto_tree_add_item

svn path=/trunk/; revision=51183
2013-08-07 12:05:11 +00:00
Alexis La Goutte 8da9a76650 From Matt Texier
Enhance BGP Dissector

Step 3 :Variable consistency and renaming, adding RFC and draft as comments (Preperation for next enhance...)

From me :
Fix some typo/whitespace
Make checkhf happy...

Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>

svn path=/trunk/; revision=51182
2013-08-07 12:04:04 +00:00
Anders Broman 4317fade8c From Michael Mann:
the heuristics of NDMP require 28 bytes to be present in order for it to be dissected as NDMP.  NDMP is purely a heuristic dissector because TCPENCAP shares the same TCP port.
Since NDMP officially registered port 10000 with IANA, allow it to use dissector_add_uint() instead of packet-ipsec-tcp.c, and by default have TCPENCAP only rely on its heuristics.

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

svn path=/trunk/; revision=51180
2013-08-07 04:39:32 +00:00
Anders Broman 907e735f60 From Javier Godoy:
Dissect SCSI OSD attribute identification sense data descriptor.

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

svn path=/trunk/; revision=51179
2013-08-07 04:28:35 +00:00
Jeff Morriss a1c6c09f8f Get rid of a set-but-unused variable.
Replace tabs with spaces (for consistency).

svn path=/trunk/; revision=51177
2013-08-06 21:44:21 +00:00
Jakub Zawadzki 97bddef1a2 Try to fix compilation under MSVC
__builtin_ctz() with bitmask == 0 is UB, so only do g_assert there.

svn path=/trunk/; revision=51176
2013-08-06 21:06:56 +00:00
Jakub Zawadzki 9cfac1227d Replace hfinfo pointer to same_name_prev, with same_name_prev_id.
svn path=/trunk/; revision=51175
2013-08-06 20:53:47 +00:00
Jakub Zawadzki 72ea2f9c9c Remove hfinfo->bitshift member, add hfinfo_bitshift() to get it.
svn path=/trunk/; revision=51174
2013-08-06 20:10:59 +00:00
Jakub Zawadzki 93f56d8a77 Optimize wrs_count_bitshift()
- Use __builtin_ctz for GCC/clang
- Do multiply and lookup on other platforms

svn path=/trunk/; revision=51173
2013-08-06 19:53:54 +00:00
Anders Broman fcc3728630 From Chris Bontje:
RTAC Serial Dissector Improvement for INFO Column Display.

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

svn path=/trunk/; revision=51172
2013-08-06 17:18:40 +00:00
Anders Broman 06c37f8665 Add code and a preference to use GSM SAPI to call sub dissectors.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9017

svn path=/trunk/; revision=51171
2013-08-06 17:11:42 +00:00
Anders Broman cc7c777f55 Store the port number as a string for the unresolved ports to avoid repeated calls to getservbyport() for all unresolved ports.
svn path=/trunk/; revision=51170
2013-08-06 17:07:20 +00:00