diff --git a/CHANGES b/CHANGES
index e5d3261..de98545 100644
--- a/CHANGES
+++ b/CHANGES
@@ -59,6 +59,9 @@ Testing:
Documentation:
Removed obselete file doc/xio.help
+ Added doc for option ipv6-join-group (ipv6-add-membership)
+ Thanks to Martin Buck for sending the patch.
+
####################### V 1.7.4.5 (not released):
Corrections:
diff --git a/doc/socat.yo b/doc/socat.yo
index 175d734..3cee60f 100644
--- a/doc/socat.yo
+++ b/doc/socat.yo
@@ -412,6 +412,7 @@ label(ADDRESS_IP_DATAGRAM)dit(bf(tt(IP-DATAGRAM:
:)))
link(ip-multicast-if)(OPTION_IP_MULTICAST_IF),
link(ip-add-membership)(OPTION_IP_ADD_MEMBERSHIP),
link(ip-add-source-membership)(OPTION_IP_ADD_SOURCE_MEMBERSHIP),
+ link(ipv6-join-group)(OPTION_IPV6_JOIN_GROUP),
link(ttl)(OPTION_TTL),
link(tos)(OPTION_TOS),
link(pf)(OPTION_PROTOCOL_FAMILY)nl()
@@ -1127,6 +1128,7 @@ label(ADDRESS_UDP_DATAGRAM)dit(bf(tt(UDP-DATAGRAM::)))
link(ip-multicast-if)(OPTION_IP_MULTICAST_IF),
link(ip-add-membership)(OPTION_IP_ADD_MEMBERSHIP),
link(ip-add-source-membership)(OPTION_IP_ADD_SOURCE_MEMBERSHIP),
+ link(ipv6-join-group)(OPTION_IPV6_JOIN_GROUP),
link(ttl)(OPTION_TTL),
link(tos)(OPTION_TOS),
link(sourceport)(OPTION_SOURCEPORT),
@@ -2160,11 +2162,12 @@ dit(bf(tt(ip-add-membership=)))
dit(bf(tt(ip-add-membership=)))
dit(bf(tt(ip-add-membership=)))
dit(bf(tt(ip-add-membership=)))
- Makes the socket member of the specified multicast group. This is currently
- only implemented for IPv4. The option takes the IP address of the multicast
- group and info about the desired network interface. The most common syntax
- is the first one, while the others are only available on systems that
- provide tt(struct mreqn) (Linux).nl()
+ Makes the socket member of the specified multicast group. This only works
+ for IPv4, see link(ipv6-join-group)(OPTION_IPV6_JOIN_GROUP) for the IPv6
+ variant. The option takes the IP address of the multicast group and info
+ about the desired network interface. The most common syntax is the first
+ one, while the others are only available on systems that provide
+ tt(struct mreqn) (Linux).nl()
The indices of active network interfaces can be shown using the utility
procan().
label(OPTION_IP_ADD_SOURCE_MEMBERSHIP)
@@ -2172,6 +2175,15 @@ dit(bf(tt(ip-add-source-membership=)))
+dit(bf(tt(ipv6-join-group=)))
+ Makes the socket member of the specified multicast group. This only works
+ for IPv6, see link(ip-add-membership)(OPTION_IP_ADD_MEMBERSHIP) for the
+ IPv4 variant. The option takes the IP address of the multicast
+ group and info about the desired network interface.
+ The indices of active network interfaces can be shown using the utility
+ procan().
label(OPTION_IP_MULTICAST_IF)
dit(bf(tt(ip-multicast-if=)))
Specifies hostname or address of the network interface to be used for