Remove debugging messages

[frescor/ffmpeg.git] / libavformat / udp.c

diff --git a/libavformat/udp.c b/libavformat/udp.c
index bbdb930e4ef7a69632a1f90ff873ce6796f8888c..a89de0080ade88802eff9ce0253817f4067993e2 100644 (file)
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -1,6 +1,6 @@
 /*
  * UDP prototype streaming system
- * Copyright (c) 2000, 2001, 2002 Fabrice Bellard.
+ * Copyright (c) 2000, 2001, 2002 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file udp.c
+ * @file libavformat/udp.c
  * UDP protocol
  */
 
@@ -29,9 +29,10 @@
 #include <unistd.h>
 #include "network.h"
 #include "os_support.h"
-#ifdef HAVE_SYS_SELECT_H
+#if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
+#include <sys/time.h>
 
 #ifndef IPV6_ADD_MEMBERSHIP
 #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
@@ -51,7 +52,7 @@ typedef struct {
     int is_multicast;
     int local_port;
     int reuse_socket;
-#ifndef CONFIG_IPV6
+#if !CONFIG_IPV6
     struct sockaddr_in dest_addr;
 #else
     struct sockaddr_storage dest_addr;
@@ -71,7 +72,7 @@ static int udp_set_multicast_ttl(int sockfd, int mcastTTL, struct sockaddr *addr
         }
     }
 #endif
-#ifdef CONFIG_IPV6
+#if CONFIG_IPV6
     if (addr->sa_family == AF_INET6) {
         if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mcastTTL, sizeof(mcastTTL)) < 0) {
             av_log(NULL, AV_LOG_ERROR, "setsockopt(IPV6_MULTICAST_HOPS): %s\n", strerror(errno));
@@ -95,7 +96,7 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr) {
         }
     }
 #endif
-#ifdef CONFIG_IPV6
+#if CONFIG_IPV6
     if (addr->sa_family == AF_INET6) {
         struct ipv6_mreq mreq6;
 
@@ -123,7 +124,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr) {
         }
     }
 #endif
-#ifdef CONFIG_IPV6
+#if CONFIG_IPV6
     if (addr->sa_family == AF_INET6) {
         struct ipv6_mreq mreq6;
 
@@ -138,7 +139,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr) {
     return 0;
 }
 
-#ifdef CONFIG_IPV6
+#if CONFIG_IPV6
 static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, int type, int family, int flags) {
     struct addrinfo hints, *res = 0;
     int error;
@@ -325,6 +326,9 @@ int udp_get_local_port(URLContext *h)
  * streams at the same time.
  * @param h media file context
  */
+#if (LIBAVFORMAT_VERSION_MAJOR >= 53)
+static
+#endif
 int udp_get_file_handle(URLContext *h)
 {
     UDPContext *s = h->priv_data;
@@ -336,12 +340,12 @@ int udp_get_file_handle(URLContext *h)
 static int udp_open(URLContext *h, const char *uri, int flags)
 {
     char hostname[1024];
-    int port, udp_fd = -1, tmp;
+    int port, udp_fd = -1, tmp, bind_ret = -1;
     UDPContext *s = NULL;
     int is_output;
     const char *p;
     char buf[256];
-#ifndef CONFIG_IPV6
+#if !CONFIG_IPV6
     struct sockaddr_in my_addr;
 #else
     struct sockaddr_storage my_addr;
@@ -404,7 +408,13 @@ static int udp_open(URLContext *h, const char *uri, int flags)
             goto fail;
 
     /* the bind is needed to give a port to the socket now */
-    if (bind(udp_fd,(struct sockaddr *)&my_addr, len) < 0)
+    /* if multicast, try the multicast address bind first */
+    if (s->is_multicast && !(h->flags & URL_WRONLY)) {
+        bind_ret = bind(udp_fd,(struct sockaddr *)&s->dest_addr, len);
+    }
+    /* bind to the local address if not multicast or if the multicast
+     * bind failed */
+    if (bind_ret < 0 && bind(udp_fd,(struct sockaddr *)&my_addr, len) < 0)
         goto fail;
 
     len = sizeof(my_addr);
@@ -521,4 +531,5 @@ URLProtocol udp_protocol = {
     udp_write,
     NULL, /* seek */
     udp_close,
+    .url_get_file_handle = udp_get_file_handle,
 };