Merge branches 'mark' and 'timeout'

[liboping.git] / src / mans / ping_setopt.pod

diff --git a/src/mans/ping_setopt.pod b/src/mans/ping_setopt.pod
index df9cc59..ba7e44f 100644 (file)
--- a/src/mans/ping_setopt.pod
+++ b/src/mans/ping_setopt.pod
@@ -63,8 +63,23 @@ the source address assigned.
 Set the outgoing network device to be used. The value passed must be a
 char-pointer to a null-terminated string specifying an interface name
 (e.E<nbsp>g. C<eth0>). Please note that this might not be supported by all
-operating systems. In that case, B<ping_setopt> sets the error to C<operation
-not supported>.
+operating systems. In that case, B<ping_setopt> sets the error to
+C<operation not supported>.
+
+=item B<PING_OPT_QOS>
+
+Sets the I<Quality of Service> flags that should be used when crafting ICMP and
+ICMPv6 packets. The memory pointed to by I<val> is interpreted as a C<uint8_t>.
+The byte is passed to L<setsockopt(2)> without modification, using the
+C<IP_TOS> (IPv4) or C<IPV6_TCLASS> (IPv6) option. It is the caller's
+responsibility to chose a valid bit combination. For details, read the L<ip(7)>
+and L<ipv6(7)> manual pages, as well as I<RFCE<nbsp>2474>.
+
+=item B<PING_OPT_MARK>
+
+Mark (as in netfilter) outgoing packets using the SO_MARK socket option. Takes
+an int* pointer as a value. Setting this requires CAP_NET_ADMIN under Linux.
+Fails with C<operation not supported> on platforms which don't have SO_MARK.
 
 =back
 
@@ -83,7 +98,7 @@ L<liboping(3)>
 
 =head1 AUTHOR
 
-liboping is written by Florian octo Forster E<lt>octo at verplant.orgE<gt>.
-Its homepage can be found at L<http://verplant.org/liboping/>.
+liboping is written by Florian "octo" Forster E<lt>ff at octo.itE<gt>.
+Its homepage can be found at L<http://noping.cc/>.
 
-(c) 2005-2009 by Florian octo Forster.
+Copyright (c) 2005-2011 by Florian "octo" Forster.