? mypatch.diff
Index: gst/udp/gstmultiudpsink.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/udp/gstmultiudpsink.c,v
retrieving revision 1.27
diff -u -p -r1.27 gstmultiudpsink.c
--- gst/udp/gstmultiudpsink.c	18 Jan 2008 13:40:38 -0000	1.27
+++ gst/udp/gstmultiudpsink.c	13 Feb 2008 12:31:11 -0000
@@ -96,9 +96,12 @@ enum
 };
 
 #define CLOSE_IF_REQUESTED(udpctx)                                        \
-  if ((!udpctx->externalfd) || (udpctx->externalfd && udpctx->closefd))   \
+  if ((!udpctx->externalfd) || (udpctx->externalfd && udpctx->closefd)) { \
     CLOSE_SOCKET(udpctx->sock);                                           \
-  udpctx->sock = -1;
+    CLOSE_SOCKET(udpctx->sock6);                                          \
+  }                                                                       \
+  udpctx->sock = -1;                                                      \
+  udpctx->sock6 = -1
 
 static void gst_multiudpsink_base_init (gpointer g_class);
 static void gst_multiudpsink_class_init (GstMultiUDPSinkClass * klass);
@@ -312,6 +315,7 @@ gst_multiudpsink_init (GstMultiUDPSink *
 
   sink->client_lock = g_mutex_new ();
   sink->sock = -1;
+  sink->sock6 = -1;
   sink->sockfd = DEFAULT_SOCKFD;
   sink->closefd = DEFAULT_CLOSEFD;
   sink->externalfd = (sink->sockfd != -1);
@@ -526,24 +530,13 @@ join_multicast (GstUDPClient * client)
   /* FIXME, can we use multicast and unicast over the same
    * socket? if not, search for socket of this multicast group or
    * create a new one. */
-  if (setsockopt (*(client->sock), IPPROTO_IP, IP_ADD_MEMBERSHIP,
-          &(client->multi_addr), sizeof (client->multi_addr)) < 0)
-    perror ("setsockopt IP_ADD_MEMBERSHIP\n");
-  if (setsockopt (*(client->sock), IPPROTO_IP, IP_MULTICAST_TTL, &ttl,
-          sizeof (ttl)) < 0)
-    perror ("setsockopt IP_MULTICAST_TTL\n");
-  if (setsockopt (*(client->sock), IPPROTO_IP, IP_MULTICAST_LOOP, &loop,
-          sizeof (loop)) < 0)
-    perror ("setsockopt IP_MULTICAST_LOOP\n");
+  gst_udp_join_group(*(client->sock), loop, ttl, &client->theiraddr);
 }
 
 static void
 leave_multicast (GstUDPClient * client)
 {
-  if (setsockopt (*(client->sock), IPPROTO_IP, IP_DROP_MEMBERSHIP,
-          &(client->multi_addr), sizeof (client->multi_addr)) < 0)
-    GST_WARNING ("setsockopt IP_DROP_MEMBERSHIP failed '%s'",
-        g_strerror (errno));
+  gst_udp_leave_group(*(client->sock), &client->theiraddr);
 }
 
 /* create a socket for sending to remote machine */
@@ -559,11 +552,15 @@ gst_multiudpsink_init_send (GstMultiUDPS
     /* create sender socket */
     if ((sink->sock = socket (AF_INET, SOCK_DGRAM, 0)) == -1)
       goto no_socket;
+    sink->sock6 = socket (AF_INET6, SOCK_DGRAM, 0);
+    if( sink->sock6 == -1 && errno != EAFNOSUPPORT )
+      goto no_socket;
 
     sink->externalfd = FALSE;
   } else {
     /* we use the configured socket */
-    sink->sock = sink->sockfd;
+    /* FIXME: we need two sockets for each proto or else we can only support one */
+    sink->sock6 = sink->sock = sink->sockfd;
     sink->externalfd = TRUE;
   }
 
@@ -572,6 +569,11 @@ gst_multiudpsink_init_send (GstMultiUDPS
           setsockopt (sink->sock, SOL_SOCKET, SO_BROADCAST, &bc_val,
               sizeof (bc_val))) < 0)
     goto no_broadcast;
+  if (sink->sock6 != -1
+      && (ret =
+          setsockopt (sink->sock6, SOL_SOCKET, SO_BROADCAST, &bc_val,
+              sizeof (bc_val))) < 0)
+    goto no_broadcast;
 
   sink->bytes_to_serve = 0;
   sink->bytes_served = 0;
@@ -580,8 +582,9 @@ gst_multiudpsink_init_send (GstMultiUDPS
 
   for (clients = sink->clients; clients; clients = g_list_next (clients)) {
     client = (GstUDPClient *) clients->data;
-    if (client->multi_addr.imr_multiaddr.s_addr && sink->auto_multicast)
+    if (gst_udp_is_multicast(&client->theiraddr) && sink->auto_multicast) {
       join_multicast (client);
+    }
   }
   return TRUE;
 
@@ -612,8 +615,6 @@ static void
 gst_multiudpsink_add_internal (GstMultiUDPSink * sink, const gchar * host,
     gint port, gboolean lock)
 {
-  struct hostent *he;
-  struct in_addr addr;
   GstUDPClient *client;
   GTimeVal now;
 
@@ -623,42 +624,27 @@ gst_multiudpsink_add_internal (GstMultiU
   client->port = port;
   client->sock = &sink->sock;
 
-  memset (&client->theiraddr, 0, sizeof (client->theiraddr));
-  memset (&client->multi_addr, 0, sizeof (client->multi_addr));
-  client->theiraddr.sin_family = AF_INET;       /* host byte order */
-  client->theiraddr.sin_port = htons (port);    /* short, network byte order */
+  if( gst_udp_get_addr(host, port, &client->theiraddr) < 0)
+    goto getaddrinfo_error;
+
+  if( gst_udp_is_ipv6_addr(&client->theiraddr) ) {
+    GST_DEBUG_OBJECT (sink, "ipv6 client address detected");
+    client->sock = &sink->sock6;
+  } else {
+    GST_DEBUG_OBJECT (sink, "ipv4 client address detected");
+  }
 
   g_get_current_time (&now);
   client->connect_time = GST_TIMEVAL_TO_TIME (now);
 
-  /* if its an IP address */
-  if (inet_aton (host, &addr)) {
-    /* check if its a multicast address */
-    if ((ntohl (addr.s_addr) & 0xf0000000) == 0xe0000000) {
-      GST_DEBUG_OBJECT (sink, "multicast address detected");
-      client->multi_addr.imr_multiaddr.s_addr = addr.s_addr;
-      client->multi_addr.imr_interface.s_addr = INADDR_ANY;
-
-      client->theiraddr.sin_addr = client->multi_addr.imr_multiaddr;
-
-    } else {
-      GST_DEBUG_OBJECT (sink, "normal address detected");
-      client->theiraddr.sin_addr = *((struct in_addr *) &addr);
-    }
-    /* if init_send has already been called, set sockopts for multicast */
-    if (*client->sock > 0 && client->multi_addr.imr_multiaddr.s_addr &&
-        sink->auto_multicast)
+  /* check if its a multicast address */
+  if (gst_udp_is_multicast(&client->theiraddr)) {
+    GST_DEBUG_OBJECT (sink, "multicast address detected");
+    if (*client->sock > 0)
       join_multicast (client);
-  }
-  /* we dont need to lookup for localhost */
-  else if (strcmp (host, "localhost") == 0 && inet_aton ("127.0.0.1", &addr)) {
-    client->theiraddr.sin_addr = *((struct in_addr *) &addr);
-  }
-  /* if its a hostname */
-  else if ((he = gethostbyname (host))) {
-    client->theiraddr.sin_addr = *((struct in_addr *) he->h_addr);
+
   } else {
-    goto host_error;
+    GST_DEBUG_OBJECT (sink, "normal address detected");
   }
 
   if (lock)
@@ -673,9 +659,9 @@ gst_multiudpsink_add_internal (GstMultiU
   return;
 
   /* ERRORS */
-host_error:
+getaddrinfo_error:
   {
-    GST_WARNING_OBJECT (sink, "hostname lookup error?");
+    GST_WARNING_OBJECT (sink, "getaddrinfo lookup error?");
     g_free (client->host);
     g_free (client);
     return;
@@ -728,7 +714,7 @@ gst_multiudpsink_remove (GstMultiUDPSink
   g_get_current_time (&now);
   client->disconnect_time = GST_TIMEVAL_TO_TIME (now);
 
-  if (*(client->sock) != -1 && client->multi_addr.imr_multiaddr.s_addr
+  if (*(client->sock) != -1 && gst_udp_is_multicast(&client->theiraddr)
       && sink->auto_multicast)
     leave_multicast (client);
 
Index: gst/udp/gstmultiudpsink.h
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/udp/gstmultiudpsink.h,v
retrieving revision 1.10
diff -u -p -r1.10 gstmultiudpsink.h
--- gst/udp/gstmultiudpsink.h	17 Jan 2008 11:13:16 -0000	1.10
+++ gst/udp/gstmultiudpsink.h	13 Feb 2008 12:31:11 -0000
@@ -40,8 +40,7 @@ typedef struct _GstMultiUDPSinkClass Gst
 typedef struct {
   int *sock;
 
-  struct sockaddr_in theiraddr;
-  struct ip_mreq multi_addr;
+  struct sockaddr_storage theiraddr;
 
   gchar *host;
   gint port;
@@ -59,6 +58,7 @@ struct _GstMultiUDPSink {
   GstBaseSink parent;
 
   int sock;
+  int sock6;    /* for ipv6 address */
 
   GMutex        *client_lock;
   GList         *clients;
Index: gst/udp/gstudpnetutils.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/udp/gstudpnetutils.c,v
retrieving revision 1.1
diff -u -p -r1.1 gstudpnetutils.c
--- gst/udp/gstudpnetutils.c	24 Jul 2006 11:48:03 -0000	1.1
+++ gst/udp/gstudpnetutils.c	13 Feb 2008 12:31:11 -0000
@@ -22,21 +22,14 @@
 #include "config.h"
 #endif
 
+#include <errno.h>
+#include <stdio.h>
+#include <memory.h>
+
 #include "gstudpnetutils.h"
 
 #ifdef G_OS_WIN32
 
-int
-gst_udp_net_utils_win32_inet_aton (const char *c, struct in_addr *paddr)
-{
-  paddr->s_addr = inet_addr (c);
-
-  if (paddr->s_addr == INADDR_NONE)
-    return 0;
-
-  return 1;
-}
-
 gboolean
 gst_udp_net_utils_win32_wsa_startup (GstObject * obj)
 {
@@ -60,3 +53,161 @@ gst_udp_net_utils_win32_wsa_startup (Gst
 }
 
 #endif
+
+int gst_udp_get_addr(const char *hostname, int port, struct sockaddr_storage *addr)
+{
+  struct addrinfo hints, *res;
+  char service[NI_MAXSERV];
+  int ret;
+
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_DGRAM;
+  snprintf(service, sizeof(service)-1, "%d", port);
+
+  if((ret = getaddrinfo(hostname, (port == -1) ? NULL : service, &hints, &res)) < 0)
+    return ret;
+
+  memcpy(addr, res->ai_addr, sizeof(struct sockaddr_storage));
+  freeaddrinfo(res);
+
+  return ret;
+}
+
+int gst_udp_socket(const char *hostname, int port, struct sockaddr_storage *addr)
+{
+  struct addrinfo hints, *res;
+  char service[NI_MAXSERV];
+  int ret;
+
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_DGRAM;
+  snprintf(service, sizeof(service)-1, "%d", port);
+
+  if ((ret = getaddrinfo(hostname, (port == -1) ? NULL : service, &hints, &res)) < 0)
+    return ret;
+  ret = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+
+  if(addr != NULL) {
+    memcpy(addr, res->ai_addr, sizeof(struct sockaddr_storage));
+  }
+  freeaddrinfo(res);
+
+  return ret;
+}
+
+int gst_udp_join_group(int sockfd, int loop, int ttl, struct sockaddr_storage *addr)
+{
+  int ret = -1;
+
+  switch (addr->ss_family) {
+  case AF_INET:
+    {
+      struct ip_mreq mreq4;
+
+      mreq4.imr_multiaddr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
+      mreq4.imr_interface.s_addr= INADDR_ANY;
+
+      if ((ret = setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_LOOP, &loop, sizeof(loop))) < 0)
+        return ret;
+
+      if ((ret = setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl))) < 0)
+        return ret;
+
+      if ((ret = setsockopt(sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (const void *)&mreq4, sizeof(mreq4))) < 0)
+        return ret;
+    }
+    break;
+
+    case AF_INET6:
+      {
+        struct ipv6_mreq    mreq6;
+
+        memcpy(&mreq6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr));
+        mreq6.ipv6mr_interface = 0;
+
+        if ((ret = setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &loop, sizeof(loop))) < 0)
+          return ret;
+
+        if ((ret = setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &ttl, sizeof(ttl))) < 0)
+          return ret;
+
+        if ((ret = setsockopt(sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, (const void *)&mreq6, sizeof(mreq6))) < 0)
+          return ret;
+     }
+     break;
+
+    default:
+      errno = EAFNOSUPPORT;
+  }
+
+  return ret;
+}
+
+int gst_udp_leave_group(int sockfd, struct sockaddr_storage *addr)
+{
+  int ret = -1;
+
+  switch (addr->ss_family) {
+  case AF_INET:
+    {
+      struct ip_mreq mreq4;
+
+      mreq4.imr_multiaddr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
+      mreq4.imr_interface.s_addr= INADDR_ANY;
+
+      if ((ret = setsockopt(sockfd, IPPROTO_IP, IP_DROP_MEMBERSHIP, (const void *)&mreq4, sizeof(mreq4))) < 0)
+        return ret;
+    }
+    break;
+
+    case AF_INET6:
+      {
+        struct ipv6_mreq mreq6;
+
+        memcpy(&mreq6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr));
+        mreq6.ipv6mr_interface = 0;
+
+        if ((ret = setsockopt(sockfd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, (const void *)&mreq6, sizeof(mreq6))) < 0)
+          return ret;
+     }
+     break;
+
+    default:
+      errno = EAFNOSUPPORT;
+  }
+
+  return ret;
+}
+
+int gst_udp_is_multicast(struct sockaddr_storage *addr)
+{
+  int ret = -1;
+
+  switch (addr->ss_family) {
+  case AF_INET:
+    {
+      struct sockaddr_in *addr4 = (struct sockaddr_in *)addr;
+      ret = IN_MULTICAST(ntohl(addr4->sin_addr.s_addr));
+    }
+    break;
+
+  case AF_INET6:
+    {
+      struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)addr;
+      ret = IN6_IS_ADDR_MULTICAST(&addr6->sin6_addr);
+    }
+    break;
+
+  default:
+    errno = EAFNOSUPPORT;
+  }
+
+  return ret;
+}
+
+int gst_udp_is_ipv6_addr(struct sockaddr_storage *addr)
+{
+  return (addr->ss_family == AF_INET6) ? 1 : 0;
+}
Index: gst/udp/gstudpnetutils.h
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/udp/gstudpnetutils.h,v
retrieving revision 1.2
diff -u -p -r1.2 gstudpnetutils.h
--- gst/udp/gstudpnetutils.h	11 Feb 2007 12:57:47 -0000	1.2
+++ gst/udp/gstudpnetutils.h	13 Feb 2008 12:31:11 -0000
@@ -52,7 +52,6 @@
 #define IOCTL_SOCKET ioctlsocket
 #define CLOSE_SOCKET(sock) closesocket(sock)
 #define setsockopt(sock,l,opt,val,len) setsockopt(sock,l,opt,(char *)(val),len)
-#define inet_aton(c,addr) gst_udp_net_utils_win32_inet_aton ((c),(addr))
 #define WSA_STARTUP(obj) gst_udp_net_utils_win32_wsa_startup(GST_OBJECT(obj))
 #define WSA_CLEANUP(obj) WSACleanup ()
 
@@ -68,10 +67,16 @@
 
 #ifdef G_OS_WIN32
 
-int      gst_udp_net_utils_win32_inet_aton (const char *c, struct in_addr * addr);
 gboolean gst_udp_net_utils_win32_wsa_startup (GstObject * obj);
 
 #endif
 
+int gst_udp_get_addr(const char *hostname, int port, struct sockaddr_storage *addr);
+int gst_udp_socket(const char *hostname, int port, struct sockaddr_storage *addr);
+int gst_udp_join_group(int sockfd, int loop, int ttl, struct sockaddr_storage *addr);
+int gst_udp_leave_group(int sockfd, struct sockaddr_storage *addr);
+int gst_udp_is_multicast(struct sockaddr_storage *addr);
+int gst_udp_is_ipv6_addr(struct sockaddr_storage *addr);
+
 #endif /* __GST_UDP_NET_UTILS_H__*/
 
Index: gst/udp/gstudpsink.h
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/udp/gstudpsink.h,v
retrieving revision 1.17
diff -u -p -r1.17 gstudpsink.h
--- gst/udp/gstudpsink.h	2 Nov 2007 21:16:09 -0000	1.17
+++ gst/udp/gstudpsink.h	13 Feb 2008 12:31:12 -0000
@@ -26,6 +26,12 @@
 
 G_BEGIN_DECLS
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+
 #include "gstudp.h"
 #include "gstudpnetutils.h"
 
Index: gst/udp/gstudpsrc.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/udp/gstudpsrc.c,v
retrieving revision 1.80
diff -u -p -r1.80 gstudpsrc.c
--- gst/udp/gstudpsrc.c	2 Nov 2007 21:16:09 -0000	1.80
+++ gst/udp/gstudpsrc.c	13 Feb 2008 12:31:14 -0000
@@ -366,7 +366,7 @@ gst_udpsrc_create (GstPushSrc * psrc, Gs
 {
   GstUDPSrc *udpsrc;
   GstNetBuffer *outbuf;
-  struct sockaddr_in tmpaddr;
+  struct sockaddr_storage tmpaddr;
   socklen_t len;
   fd_set read_fds;
   guint max_sock;
@@ -496,8 +496,25 @@ no_select:
   GST_BUFFER_DATA (outbuf) = pktdata;
   GST_BUFFER_SIZE (outbuf) = ret;
 
-  gst_netaddress_set_ip4_address (&outbuf->from, tmpaddr.sin_addr.s_addr,
-      tmpaddr.sin_port);
+  switch( tmpaddr.ss_family ) {
+  case AF_INET:
+    {
+      gst_netaddress_set_ip4_address (&outbuf->from, ((struct sockaddr_in*)&tmpaddr)->sin_addr.s_addr,
+          ((struct sockaddr_in*)&tmpaddr)->sin_port);
+    }
+    break;
+  case AF_INET6:
+    {
+      guint8 ip6[16];
+
+      memcpy(ip6, &((struct sockaddr_in6*)&tmpaddr)->sin6_addr, sizeof(ip6));
+      gst_netaddress_set_ip6_address (&outbuf->from, ip6, ((struct sockaddr_in*)&tmpaddr)->sin_port);
+    }
+    break;
+  default:
+    errno = EAFNOSUPPORT;
+    goto receive_error;
+  }
 
   gst_buffer_set_caps (GST_BUFFER_CAST (outbuf), udpsrc->caps);
 
@@ -704,7 +721,7 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
 {
   guint bc_val;
   gint reuse;
-  struct sockaddr_in my_addr;
+  struct sockaddr_storage my_addr;
   guint len;
   int port;
   GstUDPSrc *src;
@@ -729,12 +746,9 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
   fcntl (WRITE_SOCKET (src), F_SETFL, O_NONBLOCK);
 #endif
 
-  if (!inet_aton (src->multi_group, &(src->multi_addr.imr_multiaddr)))
-    src->multi_addr.imr_multiaddr.s_addr = 0;
-
   if (src->sockfd == -1) {
     /* need to allocate a socket */
-    if ((ret = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
+    if ((ret = gst_udp_socket(src->multi_group, src->port, &src->myaddr)) < 0)
       goto no_socket;
 
     src->sock = ret;
@@ -746,15 +760,6 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
                 sizeof (reuse))) < 0)
       goto setsockopt_error;
 
-    memset (&src->myaddr, 0, sizeof (src->myaddr));
-    src->myaddr.sin_family = AF_INET;   /* host byte order */
-    src->myaddr.sin_port = htons (src->port);   /* short, network byte order */
-
-    if (src->multi_addr.imr_multiaddr.s_addr)
-      src->myaddr.sin_addr.s_addr = src->multi_addr.imr_multiaddr.s_addr;
-    else
-      src->myaddr.sin_addr.s_addr = INADDR_ANY;
-
     GST_DEBUG_OBJECT (src, "binding on port %d", src->port);
     if ((ret = bind (src->sock, (struct sockaddr *) &src->myaddr,
                 sizeof (src->myaddr))) < 0)
@@ -765,11 +770,8 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
     src->externalfd = TRUE;
   }
 
-  if (src->multi_addr.imr_multiaddr.s_addr) {
-    src->multi_addr.imr_interface.s_addr = INADDR_ANY;
-    if ((ret =
-            setsockopt (src->sock, IPPROTO_IP, IP_ADD_MEMBERSHIP,
-                &src->multi_addr, sizeof (src->multi_addr))) < 0)
+  if( gst_udp_is_multicast(&src->myaddr) ) {
+    if ((ret = gst_udp_join_group(src->sock, 1, src->ttl, &src->myaddr)) < 0)
       goto membership;
   }
 
@@ -804,7 +806,10 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
               sizeof (bc_val))) < 0)
     goto no_broadcast;
 
-  port = ntohs (my_addr.sin_port);
+  /* NOTE: sockaddr_in.sin_port works for ipv4 and ipv6 because sin_port
+   * follows ss_family on both
+   */
+  port = ntohs (((struct sockaddr_in*)&my_addr)->sin_port);
   GST_DEBUG_OBJECT (src, "bound, on port %d", port);
   if (port != src->port) {
     src->port = port;
@@ -812,7 +817,7 @@ gst_udpsrc_start (GstBaseSrc * bsrc)
     g_object_notify (G_OBJECT (src), "port");
   }
 
-  src->myaddr.sin_port = htons (src->port + 1);
+  ((struct sockaddr_in*)&src->myaddr)->sin_port = htons (src->port + 1);
 
   return TRUE;
 
Index: gst/udp/gstudpsrc.h
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-good/gst/udp/gstudpsrc.h,v
retrieving revision 1.22
diff -u -p -r1.22 gstudpsrc.h
--- gst/udp/gstudpsrc.h	29 Mar 2007 09:59:23 -0000	1.22
+++ gst/udp/gstudpsrc.h	13 Feb 2008 12:31:14 -0000
@@ -68,8 +68,7 @@ struct _GstUDPSrc {
   int      control_sock[2];
   gboolean externalfd;
 
-  struct   sockaddr_in myaddr;
-  struct   ip_mreq multi_addr;
+  struct   sockaddr_storage myaddr;
 };
 
 struct _GstUDPSrcClass {
