#include "avformat.h"
#include <unistd.h>
#include "network.h"
+#include "os_support.h"
#include <sys/time.h>
-#include <fcntl.h>
typedef struct TCPContext {
int fd;
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]; // PETR: protocol and path strings
+ char hostname[1024],proto[1024],path[1024];
- url_split(proto, sizeof(proto), NULL, 0, hostname, sizeof(hostname),
- &port, path, sizeof(path), uri); // PETR: use url_split
- if (strcmp(proto,"tcp")) goto fail; // PETR: check protocol
- if ((q = strchr(hostname,'@'))) { strcpy(tmp,q+1); strcpy(hostname,tmp); } // PETR: take only the part after '@' for tcp protocol
-
- s = av_malloc(sizeof(TCPContext));
- if (!s)
- return AVERROR(ENOMEM);
- h->priv_data = s;
+ if(!ff_network_init())
+ return AVERROR(EIO);
- if (port <= 0 || port >= 65536)
- goto fail;
+ 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;
- fcntl(fd, F_SETFL, O_NONBLOCK);
+ return AVERROR(EIO);
+ ff_socket_nonblock(fd, 1);
redo:
ret = connect(fd, (struct sockaddr *)&dest_addr,
if (ret < 0) {
if (ff_neterrno() == FF_NETERROR(EINTR))
goto redo;
- if (ff_neterrno() != FF_NETERROR(EINPROGRESS))
+ if (ff_neterrno() != FF_NETERROR(EINPROGRESS) &&
+ ff_neterrno() != FF_NETERROR(EAGAIN))
goto fail;
/* wait until we are connected or until abort */
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;
fail:
- ret = AVERROR_IO;
+ ret = AVERROR(EIO);
fail1:
if (fd >= 0)
closesocket(fd);
- av_free(s);
return ret;
}
{
TCPContext *s = h->priv_data;
closesocket(s->fd);
+ ff_network_close();
av_free(s);
return 0;
}