make it clear that the new metadata API is a work in progress

[ffmpeg] / libavformat / tcp.c

diff --git a/libavformat/tcp.c b/libavformat/tcp.c
index 957b1adfe7f9a4d32bb9e54f51a373155c425545..b81ab93cfc374a694dcd8f6c4432b59b6f947f21 100644 (file)
--- a/libavformat/tcp.c
+++ b/libavformat/tcp.c
@@ -1,6 +1,6 @@
 /*
  * TCP protocol
- * Copyright (c) 2002 Fabrice Bellard.
+ * Copyright (c) 2002 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -22,6 +22,9 @@
 #include <unistd.h>
 #include "network.h"
 #include "os_support.h"
+#if HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
 #include <sys/time.h>
 
 typedef struct TCPContext {
@@ -32,40 +35,30 @@ typedef struct TCPContext {
 static int tcp_open(URLContext *h, const char *uri, int flags)
 {
     struct sockaddr_in dest_addr;
-    char hostname[1024], *q;
     int port, fd = -1;
     TCPContext *s = NULL;
     fd_set wfds;
     int fd_max, ret;
     struct timeval tv;
     socklen_t optlen;
-    char proto[1024],path[1024],tmp[1024];
-
-    url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
-      &port, path, sizeof(path), uri);
-    if (strcmp(proto,"tcp")) goto fail;
-    if ((q = strchr(hostname,'@'))) { strcpy(tmp,q+1); strcpy(hostname,tmp); }
-
-    s = av_malloc(sizeof(TCPContext));
-    if (!s)
-        return AVERROR(ENOMEM);
-    h->priv_data = s;
-    h->is_streamed = 1;
-
-    if (port <= 0 || port >= 65536)
-        goto fail;
+    char hostname[1024],proto[1024],path[1024];
 
     if(!ff_network_init())
         return AVERROR(EIO);
 
+    url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
+        &port, path, sizeof(path), uri);
+    if (strcmp(proto,"tcp") || port <= 0 || port >= 65536)
+        return AVERROR(EINVAL);
+
     dest_addr.sin_family = AF_INET;
     dest_addr.sin_port = htons(port);
     if (resolve_host(&dest_addr.sin_addr, hostname) < 0)
-        goto fail;
+        return AVERROR(EIO);
 
     fd = socket(AF_INET, SOCK_STREAM, 0);
     if (fd < 0)
-        goto fail;
+        return AVERROR(EIO);
     ff_socket_nonblock(fd, 1);
 
  redo:
@@ -100,6 +93,11 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
         if (ret != 0)
             goto fail;
     }
+    s = av_malloc(sizeof(TCPContext));
+    if (!s)
+        return AVERROR(ENOMEM);
+    h->priv_data = s;
+    h->is_streamed = 1;
     s->fd = fd;
     return 0;
 
@@ -108,7 +106,6 @@ static int tcp_open(URLContext *h, const char *uri, int flags)
  fail1:
     if (fd >= 0)
         closesocket(fd);
-    av_free(s);
     return ret;
 }