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

For #1488, add test and improve coverage for parsing client ip.

Browse source
This commit is contained in:
winlin 2019-12-26 12:07:52 +08:00
parent 316cab794a
commit 2115d5d22a
8 changed files with 88 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

32
trunk/src/app/srs_app_utility.cpp
View file

@ -49,7 +49,6 @@ using namespace std;
#include <srs_kernel_buffer.hpp>
#include <srs_protocol_amf0.hpp>
#include <srs_kernel_utility.hpp>
#include <srs_http_stack.hpp>
// the longest time to wait for a process to quit.
#define SRS_PROCESS_QUIT_TIMEOUT_MS 1000
@ -1274,34 +1273,3 @@ void srs_api_dump_summaries(SrsJsonObject* obj)
sys->set("conn_srs", SrsJsonAny::integer(nrs->nb_conn_srs));
}
string srs_get_original_ip(ISrsHttpMessage* r)
{
string x_forwarded_for, x_real_ip;
for (int i = 0; i < r->request_header_count(); i++) {
string k = r->request_header_key_at(i);
if (k == "X-Forwarded-For") {
x_forwarded_for = r->request_header_value_at(i);
} else if (k == "X-Real-IP") {
x_real_ip = r->request_header_value_at(i);
}
}
if (!x_forwarded_for.empty()) {
size_t pos = string::npos;
if ((pos = x_forwarded_for.find(",")) == string::npos) {
return x_forwarded_for;
}
return x_forwarded_for.substr(0, pos);
}
if (!x_real_ip.empty()) {
size_t pos = string::npos;
if ((pos = x_real_ip.find(":")) == string::npos) {
return x_real_ip;
}
return x_real_ip.substr(0, pos);
}
return "";
}