external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

RTC: Refine the UDP address parsing, no string

Browse source
This commit is contained in:
winlin 2021-02-07 20:05:36 +08:00
parent 95193979f4
commit d41a925694
2 changed files with 44 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

72
trunk/src/app/srs_app_listener.cpp
View file

@ -296,6 +296,7 @@ SrsUdpMuxSocket::SrsUdpMuxSocket(srs_netfd_t fd)
peer_port = 0; peer_port = 0;
fast_id_ = 0; fast_id_ = 0;
address_changed_ = false;
cache_buffer_ = new SrsBuffer(buf, nb_buf); cache_buffer_ = new SrsBuffer(buf, nb_buf);
} }
@ -323,39 +324,13 @@ int SrsUdpMuxSocket::recvfrom(srs_utime_t timeout)
} }
// Parse address from cache. // Parse address from cache.
bool parsed = false;
if (from.ss_family == AF_INET) { if (from.ss_family == AF_INET) {
sockaddr_in* addr = (sockaddr_in*)&from; sockaddr_in* addr = (sockaddr_in*)&from;
fast_id_ = uint64_t(addr->sin_port)<<48 | uint64_t(addr->sin_addr.s_addr);
// Load from fast cache, previous ip.
std::map<uint32_t, string>::iterator it = cache_.find(addr->sin_addr.s_addr);
if (it == cache_.end()) {
peer_ip = inet_ntoa(addr->sin_addr);
cache_[addr->sin_addr.s_addr] = peer_ip;
} else {
peer_ip = it->second;
}
peer_id_ = "";
peer_port = ntohs(addr->sin_port);
fast_id_ = uint64_t(peer_port)<<48 | uint64_t(addr->sin_addr.s_addr);
parsed = true;
} }
if (!parsed && nread > 0) { // We will regenerate the peer_ip, peer_port and peer_id.
// TODO: FIXME: Maybe we should not covert to string for each packet. address_changed_ = true;
char address_string[64];
char port_string[16];
if (getnameinfo((sockaddr*)&from, fromlen,
(char*)&address_string, sizeof(address_string),
(char*)&port_string, sizeof(port_string),
NI_NUMERICHOST|NI_NUMERICSERV)) {
return -1;
}
peer_ip = std::string(address_string);
peer_port = atoi(port_string);
}
return nread; return nread;
} }
@ -414,11 +389,48 @@ int SrsUdpMuxSocket::get_peer_port() const
std::string SrsUdpMuxSocket::peer_id() std::string SrsUdpMuxSocket::peer_id()
{ {
if (peer_id_.empty()) { if (address_changed_) {
address_changed_ = false;
// Parse address from cache.
bool parsed = false;
if (from.ss_family == AF_INET) {
sockaddr_in* addr = (sockaddr_in*)&from;
// Load from fast cache, previous ip.
std::map<uint32_t, string>::iterator it = cache_.find(addr->sin_addr.s_addr);
if (it == cache_.end()) {
peer_ip = inet_ntoa(addr->sin_addr);
cache_[addr->sin_addr.s_addr] = peer_ip;
} else {
peer_ip = it->second;
}
peer_port = ntohs(addr->sin_port);
parsed = true;
}
if (!parsed) {
// TODO: FIXME: Maybe we should not covert to string for each packet.
char address_string[64];
char port_string[16];
if (getnameinfo((sockaddr*)&from, fromlen,
(char*)&address_string, sizeof(address_string),
(char*)&port_string, sizeof(port_string),
NI_NUMERICHOST|NI_NUMERICSERV)) {
return "";
}
peer_ip = std::string(address_string);
peer_port = atoi(port_string);
}
// Build the peer id.
static char id_buf[128]; static char id_buf[128];
int len = snprintf(id_buf, sizeof(id_buf), "%s:%d", peer_ip.c_str(), peer_port); int len = snprintf(id_buf, sizeof(id_buf), "%s:%d", peer_ip.c_str(), peer_port);
peer_id_ = string(id_buf, len); peer_id_ = string(id_buf, len);
} }
return peer_id_; return peer_id_;
} }

2
trunk/src/app/srs_app_listener.hpp
View file

@ -153,6 +153,8 @@ private:
private: private:
// Cache for peer id. // Cache for peer id.
std::string peer_id_; std::string peer_id_;
// If the address changed, we should generate the peer_id.
bool address_changed_;
// For IPv4 client, we use 8 bytes int id to find it fastly. // For IPv4 client, we use 8 bytes int id to find it fastly.
uint64_t fast_id_; uint64_t fast_id_;
public: public: