if (addr->sa_family == AF_INET) {
if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL, sizeof(mcastTTL)) < 0) {
ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_MULTICAST_TTL)");
- return -1;
+ return ff_neterrno();
}
}
#endif
if (addr->sa_family == AF_INET6) {
if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &mcastTTL, sizeof(mcastTTL)) < 0) {
ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_MULTICAST_HOPS)");
- return -1;
+ return ff_neterrno();
}
}
#endif
if (local_addr)
mreq.imr_interface= ((struct sockaddr_in *)local_addr)->sin_addr;
else
- mreq.imr_interface.s_addr= INADDR_ANY;
+ mreq.imr_interface.s_addr = INADDR_ANY;
if (setsockopt(sockfd, IPPROTO_IP, IP_ADD_MEMBERSHIP, (const void *)&mreq, sizeof(mreq)) < 0) {
ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_ADD_MEMBERSHIP)");
- return -1;
+ return ff_neterrno();
}
}
#endif
memcpy(&mreq6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr));
//TODO: Interface index should be looked up from local_addr
- mreq6.ipv6mr_interface= 0;
+ mreq6.ipv6mr_interface = 0;
if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_ADD_MEMBERSHIP)");
- return -1;
+ return ff_neterrno();
}
}
#endif
mreq.imr_multiaddr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
if (local_addr)
- mreq.imr_interface= ((struct sockaddr_in *)local_addr)->sin_addr;
+ mreq.imr_interface = ((struct sockaddr_in *)local_addr)->sin_addr;
else
- mreq.imr_interface.s_addr= INADDR_ANY;
+ mreq.imr_interface.s_addr = INADDR_ANY;
if (setsockopt(sockfd, IPPROTO_IP, IP_DROP_MEMBERSHIP, (const void *)&mreq, sizeof(mreq)) < 0) {
ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_DROP_MEMBERSHIP)");
return -1;
memcpy(&mreq6.ipv6mr_multiaddr, &(((struct sockaddr_in6 *)addr)->sin6_addr), sizeof(struct in6_addr));
//TODO: Interface index should be looked up from local_addr
- mreq6.ipv6mr_interface= 0;
+ mreq6.ipv6mr_interface = 0;
if (setsockopt(sockfd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6)) < 0) {
ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IPV6_DROP_MEMBERSHIP)");
return -1;
mreqs.imr_multiaddr.s_addr = ((struct sockaddr_in *)addr)->sin_addr.s_addr;
if (local_addr)
- mreqs.imr_interface= ((struct sockaddr_in *)local_addr)->sin_addr;
+ mreqs.imr_interface = ((struct sockaddr_in *)local_addr)->sin_addr;
else
- mreqs.imr_interface.s_addr= INADDR_ANY;
+ mreqs.imr_interface.s_addr = INADDR_ANY;
mreqs.imr_sourceaddr.s_addr = ((struct sockaddr_in *)&sources[i])->sin_addr.s_addr;
if (setsockopt(sockfd, IPPROTO_IP,
uint8_t tmp[4];
int64_t timestamp;
- len=av_fifo_size(s->fifo);
+ len = av_fifo_size(s->fifo);
while (len<4) {
if (s->close_req)
if (pthread_cond_wait(&s->cond, &s->mutex) < 0) {
goto end;
}
- len=av_fifo_size(s->fifo);
+ len = av_fifo_size(s->fifo);
}
av_fifo_generic_read(s->fifo, tmp, 4, NULL);
- len=AV_RL32(tmp);
+ len = AV_RL32(tmp);
av_assert0(len >= 0);
av_assert0(len <= sizeof(s->tmp));
char buf[256];
struct sockaddr_storage my_addr;
socklen_t len;
+ int ret;
h->is_streamed = 1;
s->buffer_size = is_output ? UDP_TX_BUF_SIZE : UDP_RX_BUF_SIZE;
if (s->sources) {
- if (ff_ip_parse_sources(h, s->sources, &s->filters) < 0)
+ if ((ret = ff_ip_parse_sources(h, s->sources, &s->filters)) < 0)
goto fail;
}
if (s->block) {
- if (ff_ip_parse_blocks(h, s->block, &s->filters) < 0)
+ if ((ret = ff_ip_parse_blocks(h, s->block, &s->filters)) < 0)
goto fail;
}
av_strlcpy(localaddr, buf, sizeof(localaddr));
}
if (av_find_info_tag(buf, sizeof(buf), "sources", p)) {
- if (ff_ip_parse_sources(h, buf, &s->filters) < 0)
+ if ((ret = ff_ip_parse_sources(h, buf, &s->filters)) < 0)
goto fail;
}
if (av_find_info_tag(buf, sizeof(buf), "block", p)) {
- if (ff_ip_parse_blocks(h, buf, &s->filters) < 0)
+ if ((ret = ff_ip_parse_blocks(h, buf, &s->filters)) < 0)
goto fail;
}
if (!is_output && av_find_info_tag(buf, sizeof(buf), "timeout", p))
if (!(flags & AVIO_FLAG_READ))
goto fail;
} else {
- if (ff_udp_set_remote_url(h, uri) < 0)
+ if ((ret = ff_udp_set_remote_url(h, uri)) < 0)
goto fail;
}
*/
if (s->reuse_socket > 0 || (s->is_multicast && s->reuse_socket < 0)) {
s->reuse_socket = 1;
- if (setsockopt (udp_fd, SOL_SOCKET, SO_REUSEADDR, &(s->reuse_socket), sizeof(s->reuse_socket)) != 0)
+ if (setsockopt (udp_fd, SOL_SOCKET, SO_REUSEADDR, &(s->reuse_socket), sizeof(s->reuse_socket)) != 0) {
+ ret = ff_neterrno();
goto fail;
+ }
}
if (s->is_broadcast) {
#ifdef SO_BROADCAST
- if (setsockopt (udp_fd, SOL_SOCKET, SO_BROADCAST, &(s->is_broadcast), sizeof(s->is_broadcast)) != 0)
+ if (setsockopt (udp_fd, SOL_SOCKET, SO_BROADCAST, &(s->is_broadcast), sizeof(s->is_broadcast)) != 0) {
+ ret = ff_neterrno();
+ goto fail;
+ }
+#else
+ ret = AVERROR(ENOSYS);
+ goto fail;
#endif
- goto fail;
}
/* Set the checksum coverage for UDP-Lite (RFC 3828) for sending and receiving.
if (dscp >= 0) {
dscp <<= 2;
- if (setsockopt (udp_fd, IPPROTO_IP, IP_TOS, &dscp, sizeof(dscp)) != 0)
+ if (setsockopt (udp_fd, IPPROTO_IP, IP_TOS, &dscp, sizeof(dscp)) != 0) {
+ ret = ff_neterrno();
goto fail;
+ }
}
/* If multicast, try binding the multicast address first, to avoid
/* the bind is needed to give a port to the socket now */
if (bind_ret < 0 && bind(udp_fd,(struct sockaddr *)&my_addr, len) < 0) {
ff_log_net_error(h, AV_LOG_ERROR, "bind failed");
+ ret = ff_neterrno();
goto fail;
}
if (s->is_multicast) {
if (h->flags & AVIO_FLAG_WRITE) {
/* output */
- if (udp_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr *)&s->dest_addr) < 0)
+ if ((ret = udp_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr *)&s->dest_addr)) < 0)
goto fail;
}
if (h->flags & AVIO_FLAG_READ) {
/* input */
if (s->filters.nb_include_addrs) {
- if (udp_set_multicast_sources(h, udp_fd,
+ if ((ret = udp_set_multicast_sources(h, udp_fd,
(struct sockaddr *)&s->dest_addr,
s->dest_addr_len, &s->local_addr_storage,
s->filters.include_addrs,
- s->filters.nb_include_addrs, 1) < 0)
+ s->filters.nb_include_addrs, 1)) < 0)
goto fail;
} else {
- if (udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage) < 0)
+ if ((ret = udp_join_multicast_group(udp_fd, (struct sockaddr *)&s->dest_addr,(struct sockaddr *)&s->local_addr_storage)) < 0)
goto fail;
}
if (s->filters.nb_exclude_addrs) {
- if (udp_set_multicast_sources(h, udp_fd,
+ if ((ret = udp_set_multicast_sources(h, udp_fd,
(struct sockaddr *)&s->dest_addr,
s->dest_addr_len, &s->local_addr_storage,
s->filters.exclude_addrs,
- s->filters.nb_exclude_addrs, 0) < 0)
+ s->filters.nb_exclude_addrs, 0)) < 0)
goto fail;
}
}
tmp = s->buffer_size;
if (setsockopt(udp_fd, SOL_SOCKET, SO_SNDBUF, &tmp, sizeof(tmp)) < 0) {
ff_log_net_error(h, AV_LOG_ERROR, "setsockopt(SO_SNDBUF)");
+ ret = ff_neterrno();
goto fail;
}
} else {
if (s->is_connected) {
if (connect(udp_fd, (struct sockaddr *) &s->dest_addr, s->dest_addr_len)) {
ff_log_net_error(h, AV_LOG_ERROR, "connect");
+ ret = ff_neterrno();
goto fail;
}
}
}
if ((!is_output && s->circular_buffer_size) || (is_output && s->bitrate && s->circular_buffer_size)) {
- int ret;
-
/* start the task going */
s->fifo = av_fifo_alloc(s->circular_buffer_size);
+ if (!s->fifo) {
+ ret = AVERROR(ENOMEM);
+ goto fail;
+ }
ret = pthread_mutex_init(&s->mutex, NULL);
if (ret != 0) {
av_log(h, AV_LOG_ERROR, "pthread_mutex_init failed : %s\n", strerror(ret));
+ ret = AVERROR(ret);
goto fail;
}
ret = pthread_cond_init(&s->cond, NULL);
if (ret != 0) {
av_log(h, AV_LOG_ERROR, "pthread_cond_init failed : %s\n", strerror(ret));
+ ret = AVERROR(ret);
goto cond_fail;
}
ret = pthread_create(&s->circular_buffer_thread, NULL, is_output?circular_buffer_task_tx:circular_buffer_task_rx, h);
if (ret != 0) {
av_log(h, AV_LOG_ERROR, "pthread_create failed : %s\n", strerror(ret));
+ ret = AVERROR(ret);
goto thread_fail;
}
s->thread_started = 1;
closesocket(udp_fd);
av_fifo_freep(&s->fifo);
ff_ip_reset_filters(&s->filters);
- return AVERROR(EIO);
+ return ret;
}
static int udplite_open(URLContext *h, const char *uri, int flags)
uint8_t tmp[4];
av_fifo_generic_read(s->fifo, tmp, 4, NULL);
- avail= AV_RL32(tmp);
+ avail = AV_RL32(tmp);
if(avail > size){
av_log(h, AV_LOG_WARNING, "Part of datagram lost due to insufficient buffer size\n");
- avail= size;
+ avail = size;
}
av_fifo_generic_read(s->fifo, buf, avail, NULL);
} else if(nonblock) {
pthread_mutex_unlock(&s->mutex);
return AVERROR(EAGAIN);
- }
- else {
+ } else {
/* FIXME: using the monotonic clock would be better,
but it does not exist on all supported platforms. */
int64_t t = av_gettime() + 100000;
}
nonblock = 1;
}
- } while( 1);
+ } while(1);
}
#endif
Here we can't know on which packet error was, but it needs to know that error exists.
*/
if (s->circular_buffer_error<0) {
- int err=s->circular_buffer_error;
+ int err = s->circular_buffer_error;
pthread_mutex_unlock(&s->mutex);
return err;
}
projects / ffmpeg / blobdiff