Add IP probe for ip_mreq

Backport 2f1eb816b5cba6977b1a8159

diff --git a/U/modified/d_socket.U b/U/modified/d_socket.U
index 0e1c7d3..0474000 100644 (file)
--- a/U/modified/d_socket.U
+++ b/U/modified/d_socket.U
@@ -21,7 +21,7 @@
 ?MAKE:d_socket d_oldsock d_sockpair socketlib sockethdr \
        d_msg_ctrunc d_msg_dontroute d_msg_oob d_msg_peek d_msg_proxy \
        d_scm_rights d_sockaddr_sa_len d_sockaddr_in6 d_sin6_scope_id \
-       d_ipv6_mreq: \
+       d_ip_mreq d_ipv6_mreq: \
        contains echo n c ar nm nm_opt nm_extract Inlibc Csym _a \
        Compile cat rm_try Setvar Hasfield
 ?MAKE: -pick add $@ %<
@@ -81,6 +81,10 @@
 ?S:    indicates that a struct sockaddr_in6 structure has the sin6_scope_id
 ?S:    member.
 ?S:.
+?S:d_ip_mreq:
+?S:    This variable conditionally defines the HAS_IP_MREQ symbol, which
+?S:    indicates the availability of a struct ip_mreq.
+?S:.
 ?S:d_ipv6_mreq:
 ?S:    This variable conditionally defines the HAS_IPV6_MREQ symbol, which
 ?S:    indicates the availability of a struct ipv6_mreq.
@@ -147,6 +151,10 @@
 ?C:    This symbol, if defined, indicates that the struct sockaddr_in6
 ?C:    structure has a member called sin6_scope_id.
 ?C:.
+?C:HAS_IP_MREQ:
+?C:    This symbol, if defined, indicates the availability of
+?C:    struct ip_mreq;
+?C:.
 ?C:HAS_IPV6_MREQ:
 ?C:    This symbol, if defined, indicates the availability of
 ?C:    struct ipv6_mreq;
@@ -163,13 +171,14 @@
 ?H:#$d_scm_rights      HAS_SCM_RIGHTS  /**/
 ?H:#$d_sockaddr_in6    HAS_SOCKADDR_IN6        /**/
 ?H:#$d_sin6_scope_id   HAS_SIN6_SCOPE_ID       /**/
+?H:#$d_ip_mreq HAS_IP_MREQ     /**/
 ?H:#$d_ipv6_mreq       HAS_IPV6_MREQ   /**/
 ?H:.
 ?T:val net ENUM enum
 ?F:try.c
 ?LINT:set d_sockpair d_sockaddr_sa_len
 ?LINT:set d_msg_ctrunc d_msg_dontroute d_msg_oob d_msg_peek d_msg_proxy
-?LINT:set d_scm_rights d_sockaddr_in6 d_sin6_scope_id d_ipv6_mreq
+?LINT:set d_scm_rights d_sockaddr_in6 d_sin6_scope_id d_ip_mreq d_ipv6_mreq
 : see whether socket exists
 socketlib=''
 sockethdr=''
@@ -301,6 +310,25 @@ $rm_try
 
 echo " "
 ?X: ...
+echo "Checking the availability struct ip_mreq ..." >&4
+$cat >try.c <<EOF
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+int main() {
+struct ip_mreq mreq;
+return (mreq.imr_multiaddr.s_addr);
+}
+EOF
+val="$undef"
+set try; if eval $compile; then
+       val="$define"
+fi
+set d_ip_mreq; eval $setvar
+$rm_try
+
+echo " "
+?X: ...
 echo "Checking the availability struct ipv6_mreq ..." >&4
 $cat >try.c <<EOF
 #include <sys/types.h>