amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-29 14:45:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复startSendRtp接口发送ipv4 udp地址失败的bug: #1635

Browse Source
This commit is contained in:
xiongziliang 2022-05-14 17:14:38 +08:00
parent f1555a5501
commit b4166d5cfe
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Rtp/RtpSender.cpp
View File

@ -31,37 +31,43 @@ void RtpSender::startSend(const MediaSourceEvent::SendRtpArgs &args, const funct
_socket = Socket::createSocket(_poller, false); _socket = Socket::createSocket(_poller, false);
weak_ptr<RtpSender> weak_self = shared_from_this(); weak_ptr<RtpSender> weak_self = shared_from_this();
if (args.is_udp) { if (args.is_udp) {
if (args.src_port) {
//指定端口
_socket->bindUdpSock(args.src_port);
} else {
auto pr = std::make_pair(std::move(_socket), Socket::createSocket(_poller, false));
//从端口池获取随机端口
makeSockPair(pr, "::", true);
_socket = std::move(pr.first);
}
auto poller = _poller; auto poller = _poller;
auto local_port = _socket->get_local_port(); WorkThreadPool::Instance().getPoller()->async([cb, args, weak_self, poller]() {
WorkThreadPool::Instance().getPoller()->async([cb, args, weak_self, poller, local_port]() {
struct sockaddr_storage addr; struct sockaddr_storage addr;
//切换线程目的是为了dns解析放在后台线程执行 //切换线程目的是为了dns解析放在后台线程执行
if (!SockUtil::getDomainIP(args.dst_url.data(), args.dst_port, addr, AF_INET, SOCK_DGRAM, IPPROTO_UDP)) { if (!SockUtil::getDomainIP(args.dst_url.data(), args.dst_port, addr, AF_INET, SOCK_DGRAM, IPPROTO_UDP)) {
poller->async([args, cb, local_port]() { poller->async([args, cb]() {
//切回自己的线程 //切回自己的线程
cb(local_port, SockException(Err_dns, StrPrinter << "dns解析域名失败:" << args.dst_url)); cb(0, SockException(Err_dns, StrPrinter << "dns解析域名失败:" << args.dst_url));
}); });
return; return;
} }
//dns解析成功 //dns解析成功
poller->async([addr, weak_self, cb, local_port]() { poller->async([args, addr, weak_self, cb]() {
//切回自己的线程 //切回自己的线程
cb(local_port, SockException());
auto strong_self = weak_self.lock(); auto strong_self = weak_self.lock();
if (strong_self) { if (!strong_self) {
return;
}
string ifr_ip = addr.ss_family == AF_INET ? "0.0.0.0" : "::";
try {
if (args.src_port) {
//指定端口
strong_self->_socket->bindUdpSock(args.src_port, ifr_ip);
} else {
auto pr = std::make_pair(std::move(strong_self->_socket), Socket::createSocket(strong_self->_poller, false));
//从端口池获取随机端口
makeSockPair(pr, ifr_ip, true);
strong_self->_socket = std::move(pr.first);
}
} catch (std::exception &ex) {
cb(0, SockException(Err_other, ex.what()));
return;
}
strong_self->_socket->bindPeerAddr((struct sockaddr *)&addr); strong_self->_socket->bindPeerAddr((struct sockaddr *)&addr);
strong_self->onConnect(); strong_self->onConnect();
} cb(strong_self->_socket->get_local_port(), SockException());
}); });
}); });
} else { } else {