[Guile-commits] GNU Guile branch, master, updated. release_1-9-13-8-g511246a

[Andy Wingo]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=511246a193dc19d6fa6bc90067fb8b769f27b42c

The branch, master has been updated
       via  511246a193dc19d6fa6bc90067fb8b769f27b42c (commit)
       via  705a2b9bc8c74924129773f0de89f6f3d5a175b0 (commit)
      from  325122263777548d4f9becf2a93c906c37fc7924 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 511246a193dc19d6fa6bc90067fb8b769f27b42c
Author: Tristan Colgate-McFarlane <address@hidden>
Date:   Wed Oct 20 09:36:32 2010 +0100

    Add support for more multicast sockopts.
    
    * libguile/socket.c: Add support for IP_MULTICAST_TTL and IP_MILTICAST_IF 
sockopts.

commit 705a2b9bc8c74924129773f0de89f6f3d5a175b0
Author: Tristan Colgate-McFarlane <address@hidden>
Date:   Wed Oct 20 09:28:30 2010 +0100

    Fix detection of struct ip_mreq
    
    * configura.ac: netinet/in.h is required to complete definition of
      struct ip_mreq.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac      |    3 ++-
 libguile/socket.c |   18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 34ec603..faf31f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -673,7 +673,8 @@ AC_CHECK_TYPE(socklen_t, ,
 #endif
 #include <sys/socket.h>
 ])
-AC_CHECK_TYPE(struct ip_mreq)
+
+AC_CHECK_TYPES([struct ip_mreq], , , [#include <netinet/in.h>])
 
 GUILE_HEADER_LIBC_WITH_UNISTD
 
diff --git a/libguile/socket.c b/libguile/socket.c
index 092f6eb..cc0175a 100644
--- a/libguile/socket.c
+++ b/libguile/socket.c
@@ -603,6 +603,16 @@ SCM_DEFINE (scm_setsockopt, "setsockopt", 4, 0, 0,
            "are defined (when provided by the system).  See @command{man\n"
            "ip} for what they mean.\n"
            "\n"
+           "@defvar IP_MULTICAST_IF\n"
+            "This sets the source interface used by multicast traffic.\n"
+           "@end defvar\n"
+           "\n"
+           "@defvar IP_MULTICAST_TTL\n"
+            "This sets the default TTL for multicast traffic. This defaults \n"
+            "to 1 and should be increased to allow traffic to pass beyond 
the\n"
+            "local network.\n"
+           "@end defvar\n"
+           "\n"
            "@defvar IP_ADD_MEMBERSHIP\n"
            "@defvarx IP_DROP_MEMBERSHIP\n"
            "These can be used only with @code{setsockopt}, not\n"
@@ -1765,6 +1775,14 @@ scm_init_socket ()
   scm_c_define ("IP_DROP_MEMBERSHIP", scm_from_int (IP_DROP_MEMBERSHIP));
 #endif
 
+#ifdef IP_MULTICAST_TTL 
+  scm_c_define ("IP_MULTICAST_TTL", scm_from_int ( IP_MULTICAST_TTL));
+#endif
+
+#ifdef IP_MULTICAST_IF 
+  scm_c_define ("IP_MULTICAST_IF", scm_from_int ( IP_MULTICAST_IF));
+#endif
+
   scm_add_feature ("socket");
 
 #include "libguile/socket.x"


hooks/post-receive
-- 
GNU Guile