gfwleak/tango-tsg-master
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

邮件协议对应ID是同一个(110)

Browse Source
This commit is contained in:
liuxueli
2020-09-10 09:58:41 +08:00
parent c17a0073d9
commit 9686539a69
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/tsg_entry.cpp
View File

@@ -703,9 +703,10 @@ extern "C" char TSG_MASTER_TCP_ENTRY(struct streaminfo *a_tcp, void **pme, int t
MESA_handle_runtime_log(g_tsg_para.logger, MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG, RLOG_LV_DEBUG,
"SCAN_FQDN", "SCAN_FQDN",
"Not hit %s: %s stream_dir: %d addr: %s", "Not hit %s: %s ret: %d stream_dir: %d addr: %s",
(ret==-1) ? "NULL" : ((identify_info.proto==PROTO_HTTP) ? "host" : "sni"), (ret==-1) ? "NULL" : ((identify_info.proto==PROTO_HTTP) ? "host" : "sni"),
(ret==-1) ? "NULL" : identify_info.domain, (ret==-1) ? "NULL" : identify_info.domain,
ret,
a_tcp->dir, a_tcp->dir,
printaddr(&a_tcp->addr, thread_seq) printaddr(&a_tcp->addr, thread_seq)
); );

4
src/tsg_rule.cpp
View File

@@ -104,8 +104,8 @@ static int proto_str2id(tsg_protocol_t proto)
case PROTO_UDP: return 101; case PROTO_UDP: return 101;
case PROTO_HTTP: return 106; case PROTO_HTTP: return 106;
case PROTO_IMAP: return 110; case PROTO_IMAP: return 110;
case PROTO_POP3: return 116; case PROTO_POP3: return 110;//116
case PROTO_SMTP: return 122; case PROTO_SMTP: return 110;//122
case PROTO_DNS: return 103; case PROTO_DNS: return 103;
case PROTO_FTP: return 104; case PROTO_FTP: return 104;
case PROTO_SSL: return 126; case PROTO_SSL: return 126;