klavirshik
/
GoodbyeDPI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add files via upload

This commit is contained in:
SashaXser 2023-09-30 22:21:56 +04:00 committed by GitHub
parent e8f00c7c70
commit 5e5d25d887
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/goodbyedpi.c
View File

@ -136,18 +136,18 @@ static int running_from_service = 0;
static int exiting = 0; static int exiting = 0;
static HANDLE filters[MAX_FILTERS]; static HANDLE filters[MAX_FILTERS];
static int filter_num = 0; static int filter_num = 0;
static const char http10_redirect_302[] = "HTTP/1.0 302 "; static const char *http10_redirect_302 = "HTTP/1.0 302 ";
static const char http11_redirect_302[] = "HTTP/1.1 302 "; static const char *http11_redirect_302 = "HTTP/1.1 302 ";
static const char http_host_find[] = "\r\nHost: "; static const char http_host_find[] = "\r\nHost: ";
static const char http_host_replace[] = "\r\nhoSt: "; static const char http_host_replace[] = "\r\nhoSt: ";
static const char http_useragent_find[] = "\r\nUser-Agent: "; static const char http_useragent_find[] = "\r\nUser-Agent: ";
static const char location_http[] = "\r\nLocation: http://"; static const char location_http[] = "\r\nLocation: http://";
static const char connection_close[] = "\r\nConnection: close"; static const char connection_close[] = "\r\nConnection: close";
static const char *http_methods[] = { static const char *http_methods[] = {
"GET ", "GET ",
"HEAD ", "HEAD ",
"POST ", "POST ",
"PUT ", "PUT ",
"DELETE ", "DELETE ",
"CONNECT ", "CONNECT ",
"OPTIONS ", "OPTIONS ",
@ -156,7 +156,7 @@ static const char *http_methods[] = {
static struct option long_options[] = { static struct option long_options[] = {
{"port", required_argument, 0, 'z' }, {"port", required_argument, 0, 'z' },
{"dns-addr", required_argument, 0, 'd' }, {"dns-addr", required_argument, 0, 'd' },
{"dns-port", required_argument, 0, 'g' }, {"dns-port", required_argument, 0, 'g' },
{"dnsv6-addr", required_argument, 0, '!' }, {"dnsv6-addr", required_argument, 0, '!' },
{"dnsv6-port", required_argument, 0, '@' }, {"dnsv6-port", required_argument, 0, '@' },
{"dns-verb", no_argument, 0, 'v' }, {"dns-verb", no_argument, 0, 'v' },
@ -316,42 +316,51 @@ static void mix_case(char *pktdata, unsigned int pktlen) {
static int is_passivedpi_redirect(const char *pktdata, unsigned int pktlen) { static int is_passivedpi_redirect(const char *pktdata, unsigned int pktlen) {
/* First check if this is HTTP 302 redirect */
if (memcmp(pktdata, http11_redirect_302, sizeof(http11_redirect_302)-1) == 0 || /* Check HTTP status code using hash table lookup */
memcmp(pktdata, http10_redirect_302, sizeof(http10_redirect_302)-1) == 0) if (http_status_code_hash(pktdata) == 302) {
{
/* Then check if this is a redirect to new http site with Connection: close */ /* Search for location header using Boyer-Moore */
if (dumb_memmem(pktdata, pktlen, location_http, sizeof(location_http)-1) && if (boyer_moore_search(pktdata, pktlen, location_http, sizeof(location_http)-1)) {
dumb_memmem(pktdata, pktlen, connection_close, sizeof(connection_close)-1)) {
return TRUE; /* Search for connection header using Boyer-Moore */
} if (boyer_moore_search(pktdata, pktlen, connection_close, sizeof(connection_close)-1)) {
return TRUE;
}
} }
return FALSE;
}
return FALSE;
} }
static int find_header_and_get_info(const char *pktdata, unsigned int pktlen, static int find_header_and_get_info(const char *pktdata, unsigned int pktlen,
const char *hdrname, const char *hdrname,
char **hdrnameaddr, char **hdrnameaddr,
char **hdrvalueaddr, unsigned int *hdrvaluelen) { char **hdrvalueaddr, unsigned int *hdrvaluelen) {
char *data_addr_rn;
char *hdr_begin; char *hdr_begin;
char *data_addr_rn;
*hdrvaluelen = 0u; *hdrvaluelen = 0u;
*hdrnameaddr = NULL; *hdrnameaddr = NULL;
*hdrvalueaddr = NULL; *hdrvalueaddr = NULL;
/* Search for the header */ /* Search for the header using Boyer-Moore */
hdr_begin = dumb_memmem(pktdata, pktlen, hdr_begin = boyer_moore_search(pktdata, pktlen,
hdrname, strlen(hdrname)); hdrname, strlen(hdrname));
if (!hdr_begin) return FALSE; if (!hdr_begin) return FALSE;
if (pktdata > hdr_begin) return FALSE; if (pktdata > hdr_begin) return FALSE;
/* Set header address */ /* Set header address */
*hdrnameaddr = hdr_begin; *hdrnameaddr = hdr_begin;
*hdrvalueaddr = hdr_begin + strlen(hdrname); *hdrvalueaddr = hdr_begin + strlen(hdrname);
/* Search for header end (\r\n) */ /* Search for header end using Boyer-Moore */
data_addr_rn = dumb_memmem(*hdrvalueaddr, data_addr_rn = boyer_moore_search(*hdrvalueaddr,
pktlen - (uintptr_t)(*hdrvalueaddr - pktdata), pktlen - (uintptr_t)(*hdrvalueaddr - pktdata),
"\r\n", 2); "\r\n", 2);
if (data_addr_rn) { if (data_addr_rn) {
@ -359,9 +368,11 @@ static int find_header_and_get_info(const char *pktdata, unsigned int pktlen,
if (*hdrvaluelen >= 3 && *hdrvaluelen <= HOST_MAXLEN) if (*hdrvaluelen >= 3 && *hdrvaluelen <= HOST_MAXLEN)
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }
/** /**
* Very crude Server Name Indication (TLS ClientHello hostname) extractor. * Very crude Server Name Indication (TLS ClientHello hostname) extractor.
*/ */