qiurui
/
uvgrtp-base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipv6: fix compiler error

This commit is contained in:
Heikki Tampio 2023-03-13 10:39:25 +02:00
parent 84bf8c9e4c
commit 5c9c5562e2
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/uvgrtp/media_stream.hh
View File

@ -10,9 +10,9 @@
#ifndef _WIN32
#include <sys/socket.h>
#include <netinet/in.h>
#endif
#else
#include <ws2ipdef.h>
#endif
namespace uvgrtp {
// forward declarations

2
src/rtcp.cc
View File

@ -49,7 +49,7 @@ uvgrtp::rtcp::rtcp(std::shared_ptr<uvgrtp::rtp> rtp, std::shared_ptr<std::atomic
members_(0), senders_(0), rtcp_bandwidth_(0), reduced_minimum_(0),
we_sent_(false), local_addr_(""), remote_addr_(""), local_port_(0), dst_port_(0),
avg_rtcp_pkt_pize_(0), avg_rtcp_size_(64), rtcp_pkt_count_(0), rtcp_byte_count_(0),
rtcp_pkt_sent_count_(0), initial_(true), ssrc_(rtp->get_ssrc()),
rtcp_pkt_sent_count_(0), initial_(true), ssrc_(ssrc),
num_receivers_(0),
ipv6_(false),
socket_address_({}),

18
src/socket.cc
View File

@ -244,14 +244,10 @@ std::string uvgrtp::socket::get_socket_path_string() const
std::string uvgrtp::socket::sockaddr_to_string(const sockaddr_in& addr) const
{
// tyhjennä turhat "ipv6 supportit" pois
int addr_len = INET6_ADDRSTRLEN;
char* c_string = new char[INET_ADDRSTRLEN];
memset(c_string, 0, INET_ADDRSTRLEN);
if (addr.sin_family == AF_INET6)
{
addr_len = INET6_ADDRSTRLEN;
}
char* addr_string = new char[addr_len];
memset(addr_string, 0, addr_len);
@ -316,16 +312,17 @@ rtp_error_t uvgrtp::socket::__sendto(sockaddr_in& addr, sockaddr_in6& addr6, boo
#ifndef _WIN32
if (ipv6) {
nsend = ::sendto(socket_, buf, buf_len, send_flags, (const struct sockaddr*)&addr6, sizeof(addr6)));
nsend = ::sendto(socket_, buf, buf_len, send_flags, (const struct sockaddr*)&addr6, sizeof(addr6));
}
else {
nsend = ::sendto(socket_, buf, buf_len, send_flags, (const struct sockaddr*)&addr, sizeof(addr)));
nsend = ::sendto(socket_, buf, buf_len, send_flags, (const struct sockaddr*)&addr, sizeof(addr));
}
if ((nsend == -1) {
if (nsend == -1) {
UVG_LOG_ERROR("Failed to send data: %s", strerror(errno));
if (bytes_sent)
if (bytes_sent) {
*bytes_sent = -1;
}
return RTP_SEND_ERROR;
}
#else
@ -353,8 +350,9 @@ rtp_error_t uvgrtp::socket::__sendto(sockaddr_in& addr, sockaddr_in6& addr6, boo
nsend = sent_bytes;
#endif
if (bytes_sent)
if (bytes_sent) {
*bytes_sent = nsend;
}
#ifndef NDEBUG
++sent_packets_;

2
src/socket.hh
View File

@ -202,7 +202,7 @@ namespace uvgrtp {
rtp_error_t __sendtov(sockaddr_in& addr, sockaddr_in6& addr6, bool ipv6, buf_vec& buffers, int send_flags, int *bytes_sent);
rtp_error_t __sendtov(sockaddr_in& addr, sockaddr_in6& addr6, bool ipv6, uvgrtp::pkt_vec& buffers, int send_flags, int *bytes_sent);
SOCKET socket_;
socket_t socket_;
sockaddr_in remote_address_;
sockaddr_in local_address_;
sockaddr_in6 remote_ip6_address_;