drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-01-18 20:22:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

tpws,nfqws: --comment

Browse Source
This commit is contained in:
bol-van 2024-12-10 11:27:35 +03:00
parent 9d8398628c
commit 4ec6e5fa9f
2 changed files with 213 additions and 205 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

318
nfq/nfqws.c
View File

@ -1049,6 +1049,7 @@ static void exithelp(void)
#endif #endif
" --debug=0|1|syslog|@<filename>\n" " --debug=0|1|syslog|@<filename>\n"
" --dry-run\t\t\t\t\t; verify parameters and exit with code 0 if successful\n" " --dry-run\t\t\t\t\t; verify parameters and exit with code 0 if successful\n"
" --comment=any_text\n"
#ifdef __linux__ #ifdef __linux__
" --qnum=<nfqueue_number>\n" " --qnum=<nfqueue_number>\n"
#elif defined(BSD) #elif defined(BSD)
@ -1283,101 +1284,102 @@ int main(int argc, char **argv)
const struct option long_options[] = { const struct option long_options[] = {
{"debug",optional_argument,0,0}, // optidx=0 {"debug",optional_argument,0,0}, // optidx=0
{"dry-run",no_argument,0,0}, // optidx=1 {"dry-run",no_argument,0,0}, // optidx=1
{"comment",optional_argument,0,0}, // optidx=2
#ifdef __linux__ #ifdef __linux__
{"qnum",required_argument,0,0}, // optidx=2 {"qnum",required_argument,0,0}, // optidx=3
#elif defined(BSD) #elif defined(BSD)
{"port",required_argument,0,0}, // optidx=2 {"port",required_argument,0,0}, // optidx=3
#else #else
{"disabled_argument_1",no_argument,0,0},// optidx=2 {"disabled_argument_1",no_argument,0,0},// optidx=3
#endif #endif
{"daemon",no_argument,0,0}, // optidx=3 {"daemon",no_argument,0,0}, // optidx=4
{"pidfile",required_argument,0,0}, // optidx=4 {"pidfile",required_argument,0,0}, // optidx=5
#ifndef __CYGWIN__ #ifndef __CYGWIN__
{"user",required_argument,0,0 }, // optidx=5 {"user",required_argument,0,0 }, // optidx=6
{"uid",required_argument,0,0 }, // optidx=6 {"uid",required_argument,0,0 }, // optidx=7
#else #else
{"disabled_argument_2",no_argument,0,0}, // optidx=5 {"disabled_argument_2",no_argument,0,0}, // optidx=6
{"disabled_argument_3",no_argument,0,0}, // optidx=6 {"disabled_argument_3",no_argument,0,0}, // optidx=7
#endif #endif
{"wsize",required_argument,0,0}, // optidx=7 {"wsize",required_argument,0,0}, // optidx=8
{"wssize",required_argument,0,0}, // optidx=8 {"wssize",required_argument,0,0}, // optidx=9
{"wssize-cutoff",required_argument,0,0},// optidx=9 {"wssize-cutoff",required_argument,0,0},// optidx=10
{"ctrack-timeouts",required_argument,0,0},// optidx=10 {"ctrack-timeouts",required_argument,0,0},// optidx=11
{"hostcase",no_argument,0,0}, // optidx=11 {"hostcase",no_argument,0,0}, // optidx=12
{"hostspell",required_argument,0,0}, // optidx=12 {"hostspell",required_argument,0,0}, // optidx=13
{"hostnospace",no_argument,0,0}, // optidx=13 {"hostnospace",no_argument,0,0}, // optidx=14
{"domcase",no_argument,0,0 }, // optidx=14 {"domcase",no_argument,0,0 }, // optidx=15
{"methodeol",no_argument,0,0 }, // optidx=15 {"methodeol",no_argument,0,0 }, // optidx=16
{"dpi-desync",required_argument,0,0}, // optidx=17 {"dpi-desync",required_argument,0,0}, // optidx=17
#ifdef __linux__ #ifdef __linux__
{"dpi-desync-fwmark",required_argument,0,0}, // optidx=17 {"dpi-desync-fwmark",required_argument,0,0}, // optidx=18
#elif defined(SO_USER_COOKIE) #elif defined(SO_USER_COOKIE)
{"dpi-desync-sockarg",required_argument,0,0}, // optidx=17 {"dpi-desync-sockarg",required_argument,0,0}, // optidx=18
#else #else
{"disabled_argument_4",no_argument,0,0}, // optidx=17 {"disabled_argument_4",no_argument,0,0}, // optidx=18
#endif #endif
{"dpi-desync-ttl",required_argument,0,0}, // optidx=18 {"dpi-desync-ttl",required_argument,0,0}, // optidx=19
{"dpi-desync-ttl6",required_argument,0,0}, // optidx=19 {"dpi-desync-ttl6",required_argument,0,0}, // optidx=20
{"dpi-desync-autottl",optional_argument,0,0}, // optidx=20 {"dpi-desync-autottl",optional_argument,0,0}, // optidx=21
{"dpi-desync-autottl6",optional_argument,0,0}, // optidx=21 {"dpi-desync-autottl6",optional_argument,0,0}, // optidx=22
{"dpi-desync-fooling",required_argument,0,0}, // optidx=22 {"dpi-desync-fooling",required_argument,0,0}, // optidx=23
{"dpi-desync-repeats",required_argument,0,0}, // optidx=23 {"dpi-desync-repeats",required_argument,0,0}, // optidx=24
{"dpi-desync-skip-nosni",optional_argument,0,0},// optidx=24 {"dpi-desync-skip-nosni",optional_argument,0,0},// optidx=25
{"dpi-desync-split-pos",required_argument,0,0},// optidx=25 {"dpi-desync-split-pos",required_argument,0,0},// optidx=26
{"dpi-desync-split-http-req",required_argument,0,0 },// optidx=26 {"dpi-desync-split-http-req",required_argument,0,0 },// optidx=27
{"dpi-desync-split-tls",required_argument,0,0 },// optidx=27 {"dpi-desync-split-tls",required_argument,0,0 },// optidx=28
{"dpi-desync-split-seqovl",required_argument,0,0 },// optidx=28 {"dpi-desync-split-seqovl",required_argument,0,0 },// optidx=29
{"dpi-desync-split-seqovl-pattern",required_argument,0,0 },// optidx=29 {"dpi-desync-split-seqovl-pattern",required_argument,0,0 },// optidx=30
{"dpi-desync-fakedsplit-pattern",required_argument,0,0 },// optidx=30 {"dpi-desync-fakedsplit-pattern",required_argument,0,0 },// optidx=31
{"dpi-desync-ipfrag-pos-tcp",required_argument,0,0},// optidx=31 {"dpi-desync-ipfrag-pos-tcp",required_argument,0,0},// optidx=32
{"dpi-desync-ipfrag-pos-udp",required_argument,0,0},// optidx=32 {"dpi-desync-ipfrag-pos-udp",required_argument,0,0},// optidx=33
{"dpi-desync-badseq-increment",required_argument,0,0},// optidx=33 {"dpi-desync-badseq-increment",required_argument,0,0},// optidx=34
{"dpi-desync-badack-increment",required_argument,0,0},// optidx=34 {"dpi-desync-badack-increment",required_argument,0,0},// optidx=35
{"dpi-desync-any-protocol",optional_argument,0,0},// optidx=35 {"dpi-desync-any-protocol",optional_argument,0,0},// optidx=36
{"dpi-desync-fake-http",required_argument,0,0},// optidx=36 {"dpi-desync-fake-http",required_argument,0,0},// optidx=37
{"dpi-desync-fake-tls",required_argument,0,0},// optidx=37 {"dpi-desync-fake-tls",required_argument,0,0},// optidx=38
{"dpi-desync-fake-unknown",required_argument,0,0},// optidx=38 {"dpi-desync-fake-unknown",required_argument,0,0},// optidx=39
{"dpi-desync-fake-syndata",required_argument,0,0},// optidx=39 {"dpi-desync-fake-syndata",required_argument,0,0},// optidx=40
{"dpi-desync-fake-quic",required_argument,0,0},// optidx=40 {"dpi-desync-fake-quic",required_argument,0,0},// optidx=41
{"dpi-desync-fake-wireguard",required_argument,0,0},// optidx=41 {"dpi-desync-fake-wireguard",required_argument,0,0},// optidx=42
{"dpi-desync-fake-dht",required_argument,0,0},// optidx=42 {"dpi-desync-fake-dht",required_argument,0,0},// optidx=43
{"dpi-desync-fake-unknown-udp",required_argument,0,0},// optidx=43 {"dpi-desync-fake-unknown-udp",required_argument,0,0},// optidx=44
{"dpi-desync-udplen-increment",required_argument,0,0},// optidx=44 {"dpi-desync-udplen-increment",required_argument,0,0},// optidx=45
{"dpi-desync-udplen-pattern",required_argument,0,0},// optidx=45 {"dpi-desync-udplen-pattern",required_argument,0,0},// optidx=46
{"dpi-desync-cutoff",required_argument,0,0},// optidx=46 {"dpi-desync-cutoff",required_argument,0,0},// optidx=47
{"dpi-desync-start",required_argument,0,0},// optidx=47 {"dpi-desync-start",required_argument,0,0},// optidx=48
{"hostlist",required_argument,0,0}, // optidx=48 {"hostlist",required_argument,0,0}, // optidx=49
{"hostlist-domains",required_argument,0,0},// optidx=49 {"hostlist-domains",required_argument,0,0},// optidx=50
{"hostlist-exclude",required_argument,0,0}, // optidx=50 {"hostlist-exclude",required_argument,0,0}, // optidx=51
{"hostlist-exclude-domains",required_argument,0,0},// optidx=51 {"hostlist-exclude-domains",required_argument,0,0},// optidx=52
{"hostlist-auto",required_argument,0,0}, // optidx=52 {"hostlist-auto",required_argument,0,0}, // optidx=53
{"hostlist-auto-fail-threshold",required_argument,0,0}, // optidx=53 {"hostlist-auto-fail-threshold",required_argument,0,0}, // optidx=54
{"hostlist-auto-fail-time",required_argument,0,0}, // optidx=54 {"hostlist-auto-fail-time",required_argument,0,0}, // optidx=55
{"hostlist-auto-retrans-threshold",required_argument,0,0}, // optidx=55 {"hostlist-auto-retrans-threshold",required_argument,0,0}, // optidx=56
{"hostlist-auto-debug",required_argument,0,0}, // optidx=56 {"hostlist-auto-debug",required_argument,0,0}, // optidx=57
{"new",no_argument,0,0}, // optidx=57 {"new",no_argument,0,0}, // optidx=58
{"skip",no_argument,0,0}, // optidx=58 {"skip",no_argument,0,0}, // optidx=59
{"filter-l3",required_argument,0,0}, // optidx=59 {"filter-l3",required_argument,0,0}, // optidx=60
{"filter-tcp",required_argument,0,0}, // optidx=60 {"filter-tcp",required_argument,0,0}, // optidx=61
{"filter-udp",required_argument,0,0}, // optidx=61 {"filter-udp",required_argument,0,0}, // optidx=62
{"filter-l7",required_argument,0,0}, // optidx=62 {"filter-l7",required_argument,0,0}, // optidx=63
{"ipset",required_argument,0,0}, // optidx=63 {"ipset",required_argument,0,0}, // optidx=64
{"ipset-ip",required_argument,0,0}, // optidx=64 {"ipset-ip",required_argument,0,0}, // optidx=65
{"ipset-exclude",required_argument,0,0},// optidx=65 {"ipset-exclude",required_argument,0,0},// optidx=66
{"ipset-exclude-ip",required_argument,0,0}, // optidx=66 {"ipset-exclude-ip",required_argument,0,0}, // optidx=67
#ifdef __linux__ #ifdef __linux__
{"bind-fix4",no_argument,0,0}, // optidx=67 {"bind-fix4",no_argument,0,0}, // optidx=68
{"bind-fix6",no_argument,0,0}, // optidx=68 {"bind-fix6",no_argument,0,0}, // optidx=69
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
{"wf-iface",required_argument,0,0}, // optidx=67 {"wf-iface",required_argument,0,0}, // optidx=68
{"wf-l3",required_argument,0,0}, // optidx=68 {"wf-l3",required_argument,0,0}, // optidx=69
{"wf-tcp",required_argument,0,0}, // optidx=69 {"wf-tcp",required_argument,0,0}, // optidx=70
{"wf-udp",required_argument,0,0}, // optidx=70 {"wf-udp",required_argument,0,0}, // optidx=71
{"wf-raw",required_argument,0,0}, // optidx=71 {"wf-raw",required_argument,0,0}, // optidx=72
{"wf-save",required_argument,0,0}, // optidx=72 {"wf-save",required_argument,0,0}, // optidx=73
{"ssid-filter",required_argument,0,0}, // optidx=73 {"ssid-filter",required_argument,0,0}, // optidx=74
{"nlm-filter",required_argument,0,0}, // optidx=74 {"nlm-filter",required_argument,0,0}, // optidx=75
{"nlm-list",optional_argument,0,0}, // optidx=75 {"nlm-list",optional_argument,0,0}, // optidx=76
#endif #endif
{NULL,0,NULL,0} {NULL,0,NULL,0}
}; };
@ -1430,7 +1432,9 @@ int main(int argc, char **argv)
case 1: /* dry-run */ case 1: /* dry-run */
bDry=true; bDry=true;
break; break;
case 2: /* qnum or port */ case 2: /* comment */
break;
case 3: /* qnum or port */
#ifdef __linux__ #ifdef __linux__
params.qnum = atoi(optarg); params.qnum = atoi(optarg);
if (params.qnum < 0 || params.qnum>65535) if (params.qnum < 0 || params.qnum>65535)
@ -1450,15 +1454,15 @@ int main(int argc, char **argv)
} }
#endif #endif
break; break;
case 3: /* daemon */ case 4: /* daemon */
daemon = true; daemon = true;
break; break;
case 4: /* pidfile */ case 5: /* pidfile */
strncpy(pidfile, optarg, sizeof(pidfile)); strncpy(pidfile, optarg, sizeof(pidfile));
pidfile[sizeof(pidfile) - 1] = '\0'; pidfile[sizeof(pidfile) - 1] = '\0';
break; break;
#ifndef __CYGWIN__ #ifndef __CYGWIN__
case 5: /* user */ case 6: /* user */
{ {
struct passwd *pwd = getpwnam(optarg); struct passwd *pwd = getpwnam(optarg);
if (!pwd) if (!pwd)
@ -1471,7 +1475,7 @@ int main(int argc, char **argv)
params.droproot = true; params.droproot = true;
break; break;
} }
case 6: /* uid */ case 7: /* uid */
params.gid = 0x7FFFFFFF; // default gid. drop gid=0 params.gid = 0x7FFFFFFF; // default gid. drop gid=0
params.droproot = true; params.droproot = true;
if (sscanf(optarg, "%u:%u", &params.uid, &params.gid)<1) if (sscanf(optarg, "%u:%u", &params.uid, &params.gid)<1)
@ -1481,32 +1485,32 @@ int main(int argc, char **argv)
} }
break; break;
#endif #endif
case 7: /* wsize */ case 8: /* wsize */
if (!parse_ws_scale_factor(optarg,&dp->wsize,&dp->wscale)) if (!parse_ws_scale_factor(optarg,&dp->wsize,&dp->wscale))
exit_clean(1); exit_clean(1);
break; break;
case 8: /* wssize */ case 9: /* wssize */
if (!parse_ws_scale_factor(optarg,&dp->wssize,&dp->wsscale)) if (!parse_ws_scale_factor(optarg,&dp->wssize,&dp->wsscale))
exit_clean(1); exit_clean(1);
break; break;
case 9: /* wssize-cutoff */ case 10: /* wssize-cutoff */
if (!parse_cutoff(optarg, &dp->wssize_cutoff, &dp->wssize_cutoff_mode)) if (!parse_cutoff(optarg, &dp->wssize_cutoff, &dp->wssize_cutoff_mode))
{ {
DLOG_ERR("invalid wssize-cutoff value\n"); DLOG_ERR("invalid wssize-cutoff value\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 10: /* ctrack-timeouts */ case 11: /* ctrack-timeouts */
if (sscanf(optarg, "%u:%u:%u:%u", &params.ctrack_t_syn, &params.ctrack_t_est, &params.ctrack_t_fin, &params.ctrack_t_udp)<3) if (sscanf(optarg, "%u:%u:%u:%u", &params.ctrack_t_syn, &params.ctrack_t_est, &params.ctrack_t_fin, &params.ctrack_t_udp)<3)
{ {
DLOG_ERR("invalid ctrack-timeouts value\n"); DLOG_ERR("invalid ctrack-timeouts value\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 11: /* hostcase */ case 12: /* hostcase */
dp->hostcase = true; dp->hostcase = true;
break; break;
case 12: /* hostspell */ case 13: /* hostspell */
if (strlen(optarg) != 4) if (strlen(optarg) != 4)
{ {
DLOG_ERR("hostspell must be exactly 4 chars long\n"); DLOG_ERR("hostspell must be exactly 4 chars long\n");
@ -1515,7 +1519,7 @@ int main(int argc, char **argv)
dp->hostcase = true; dp->hostcase = true;
memcpy(dp->hostspell, optarg, 4); memcpy(dp->hostspell, optarg, 4);
break; break;
case 13: /* hostnospace */ case 14: /* hostnospace */
if (dp->methodeol) if (dp->methodeol)
{ {
DLOG_ERR("--hostnospace and --methodeol are incompatible\n"); DLOG_ERR("--hostnospace and --methodeol are incompatible\n");
@ -1523,10 +1527,10 @@ int main(int argc, char **argv)
} }
dp->hostnospace = true; dp->hostnospace = true;
break; break;
case 14: /* domcase */ case 15: /* domcase */
dp->domcase = true; dp->domcase = true;
break; break;
case 15: /* methodeol */ case 16: /* methodeol */
if (dp->hostnospace) if (dp->hostnospace)
{ {
DLOG_ERR("--hostnospace and --methodeol are incompatible\n"); DLOG_ERR("--hostnospace and --methodeol are incompatible\n");
@ -1534,7 +1538,7 @@ int main(int argc, char **argv)
} }
dp->methodeol = true; dp->methodeol = true;
break; break;
case 16: /* dpi-desync */ case 17: /* dpi-desync */
{ {
char *mode=optarg,*mode2,*mode3; char *mode=optarg,*mode2,*mode3;
mode2 = mode ? strchr(mode,',') : NULL; mode2 = mode ? strchr(mode,',') : NULL;
@ -1580,7 +1584,7 @@ int main(int argc, char **argv)
} }
break; break;
#ifndef __CYGWIN__ #ifndef __CYGWIN__
case 17: /* dpi-desync-fwmark/dpi-desync-sockarg */ case 18: /* dpi-desync-fwmark/dpi-desync-sockarg */
#if defined(__linux__) || defined(SO_USER_COOKIE) #if defined(__linux__) || defined(SO_USER_COOKIE)
params.desync_fwmark = 0; params.desync_fwmark = 0;
if (sscanf(optarg, "0x%X", &params.desync_fwmark)<=0) sscanf(optarg, "%u", &params.desync_fwmark); if (sscanf(optarg, "0x%X", &params.desync_fwmark)<=0) sscanf(optarg, "%u", &params.desync_fwmark);
@ -1595,27 +1599,27 @@ int main(int argc, char **argv)
#endif #endif
break; break;
#endif #endif
case 18: /* dpi-desync-ttl */ case 19: /* dpi-desync-ttl */
dp->desync_ttl = (uint8_t)atoi(optarg); dp->desync_ttl = (uint8_t)atoi(optarg);
break; break;
case 19: /* dpi-desync-ttl6 */ case 20: /* dpi-desync-ttl6 */
dp->desync_ttl6 = (uint8_t)atoi(optarg); dp->desync_ttl6 = (uint8_t)atoi(optarg);
break; break;
case 20: /* dpi-desync-autottl */ case 21: /* dpi-desync-autottl */
if (!parse_autottl(optarg, &dp->desync_autottl)) if (!parse_autottl(optarg, &dp->desync_autottl))
{ {
DLOG_ERR("dpi-desync-autottl value error\n"); DLOG_ERR("dpi-desync-autottl value error\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 21: /* dpi-desync-autottl6 */ case 22: /* dpi-desync-autottl6 */
if (!parse_autottl(optarg, &dp->desync_autottl6)) if (!parse_autottl(optarg, &dp->desync_autottl6))
{ {
DLOG_ERR("dpi-desync-autottl6 value error\n"); DLOG_ERR("dpi-desync-autottl6 value error\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 22: /* dpi-desync-fooling */ case 23: /* dpi-desync-fooling */
{ {
char *e,*p = optarg; char *e,*p = optarg;
while (p) while (p)
@ -1650,17 +1654,17 @@ int main(int argc, char **argv)
} }
} }
break; break;
case 23: /* dpi-desync-repeats */ case 24: /* dpi-desync-repeats */
if (sscanf(optarg,"%u",&dp->desync_repeats)<1 || !dp->desync_repeats || dp->desync_repeats>20) if (sscanf(optarg,"%u",&dp->desync_repeats)<1 || !dp->desync_repeats || dp->desync_repeats>20)
{ {
DLOG_ERR("dpi-desync-repeats must be within 1..20\n"); DLOG_ERR("dpi-desync-repeats must be within 1..20\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 24: /* dpi-desync-skip-nosni */ case 25: /* dpi-desync-skip-nosni */
dp->desync_skip_nosni = !optarg || atoi(optarg); dp->desync_skip_nosni = !optarg || atoi(optarg);
break; break;
case 25: /* dpi-desync-split-pos */ case 26: /* dpi-desync-split-pos */
{ {
int ct; int ct;
if (!parse_split_pos_list(optarg,dp->splits+dp->split_count,MAX_SPLITS-dp->split_count,&ct)) if (!parse_split_pos_list(optarg,dp->splits+dp->split_count,MAX_SPLITS-dp->split_count,&ct))
@ -1671,7 +1675,7 @@ int main(int argc, char **argv)
dp->split_count += ct; dp->split_count += ct;
} }
break; break;
case 26: /* dpi-desync-split-http-req */ case 27: /* dpi-desync-split-http-req */
// obsolete arg // obsolete arg
DLOG_CONDUP("WARNING ! --dpi-desync-split-http-req is deprecated. use --dpi-desync-split-pos with markers.\n",MAX_SPLITS); DLOG_CONDUP("WARNING ! --dpi-desync-split-http-req is deprecated. use --dpi-desync-split-pos with markers.\n",MAX_SPLITS);
if (dp->split_count>=MAX_SPLITS) if (dp->split_count>=MAX_SPLITS)
@ -1686,7 +1690,7 @@ int main(int argc, char **argv)
} }
dp->split_count++; dp->split_count++;
break; break;
case 27: /* dpi-desync-split-tls */ case 28: /* dpi-desync-split-tls */
// obsolete arg // obsolete arg
DLOG_CONDUP("WARNING ! --dpi-desync-split-tls is deprecated. use --dpi-desync-split-pos with markers.\n",MAX_SPLITS); DLOG_CONDUP("WARNING ! --dpi-desync-split-tls is deprecated. use --dpi-desync-split-pos with markers.\n",MAX_SPLITS);
if (dp->split_count>=MAX_SPLITS) if (dp->split_count>=MAX_SPLITS)
@ -1701,7 +1705,7 @@ int main(int argc, char **argv)
} }
dp->split_count++; dp->split_count++;
break; break;
case 28: /* dpi-desync-split-seqovl */ case 29: /* dpi-desync-split-seqovl */
if (!strcmp(optarg,"0")) if (!strcmp(optarg,"0"))
{ {
// allow zero = disable seqovl // allow zero = disable seqovl
@ -1714,7 +1718,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 29: /* dpi-desync-split-seqovl-pattern */ case 30: /* dpi-desync-split-seqovl-pattern */
{ {
char buf[sizeof(dp->seqovl_pattern)]; char buf[sizeof(dp->seqovl_pattern)];
size_t sz=sizeof(buf); size_t sz=sizeof(buf);
@ -1722,7 +1726,7 @@ int main(int argc, char **argv)
fill_pattern(dp->seqovl_pattern,sizeof(dp->seqovl_pattern),buf,sz); fill_pattern(dp->seqovl_pattern,sizeof(dp->seqovl_pattern),buf,sz);
} }
break; break;
case 30: /* dpi-desync-fakedsplit-pattern */ case 31: /* dpi-desync-fakedsplit-pattern */
{ {
char buf[sizeof(dp->fsplit_pattern)]; char buf[sizeof(dp->fsplit_pattern)];
size_t sz=sizeof(buf); size_t sz=sizeof(buf);
@ -1730,7 +1734,7 @@ int main(int argc, char **argv)
fill_pattern(dp->fsplit_pattern,sizeof(dp->fsplit_pattern),buf,sz); fill_pattern(dp->fsplit_pattern,sizeof(dp->fsplit_pattern),buf,sz);
} }
break; break;
case 31: /* dpi-desync-ipfrag-pos-tcp */ case 32: /* dpi-desync-ipfrag-pos-tcp */
if (sscanf(optarg,"%u",&dp->desync_ipfrag_pos_tcp)<1 || dp->desync_ipfrag_pos_tcp<1 || dp->desync_ipfrag_pos_tcp>DPI_DESYNC_MAX_FAKE_LEN) if (sscanf(optarg,"%u",&dp->desync_ipfrag_pos_tcp)<1 || dp->desync_ipfrag_pos_tcp<1 || dp->desync_ipfrag_pos_tcp>DPI_DESYNC_MAX_FAKE_LEN)
{ {
DLOG_ERR("dpi-desync-ipfrag-pos-tcp must be within 1..%u range\n",DPI_DESYNC_MAX_FAKE_LEN); DLOG_ERR("dpi-desync-ipfrag-pos-tcp must be within 1..%u range\n",DPI_DESYNC_MAX_FAKE_LEN);
@ -1742,7 +1746,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 32: /* dpi-desync-ipfrag-pos-udp */ case 33: /* dpi-desync-ipfrag-pos-udp */
if (sscanf(optarg,"%u",&dp->desync_ipfrag_pos_udp)<1 || dp->desync_ipfrag_pos_udp<1 || dp->desync_ipfrag_pos_udp>DPI_DESYNC_MAX_FAKE_LEN) if (sscanf(optarg,"%u",&dp->desync_ipfrag_pos_udp)<1 || dp->desync_ipfrag_pos_udp<1 || dp->desync_ipfrag_pos_udp>DPI_DESYNC_MAX_FAKE_LEN)
{ {
DLOG_ERR("dpi-desync-ipfrag-pos-udp must be within 1..%u range\n",DPI_DESYNC_MAX_FAKE_LEN); DLOG_ERR("dpi-desync-ipfrag-pos-udp must be within 1..%u range\n",DPI_DESYNC_MAX_FAKE_LEN);
@ -1754,63 +1758,63 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 33: /* dpi-desync-badseq-increments */ case 34: /* dpi-desync-badseq-increments */
if (!parse_badseq_increment(optarg,&dp->desync_badseq_increment)) if (!parse_badseq_increment(optarg,&dp->desync_badseq_increment))
{ {
DLOG_ERR("dpi-desync-badseq-increment should be signed decimal or signed 0xHEX\n"); DLOG_ERR("dpi-desync-badseq-increment should be signed decimal or signed 0xHEX\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 34: /* dpi-desync-badack-increment */ case 35: /* dpi-desync-badack-increment */
if (!parse_badseq_increment(optarg,&dp->desync_badseq_ack_increment)) if (!parse_badseq_increment(optarg,&dp->desync_badseq_ack_increment))
{ {
DLOG_ERR("dpi-desync-badack-increment should be signed decimal or signed 0xHEX\n"); DLOG_ERR("dpi-desync-badack-increment should be signed decimal or signed 0xHEX\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 35: /* dpi-desync-any-protocol */ case 36: /* dpi-desync-any-protocol */
dp->desync_any_proto = !optarg || atoi(optarg); dp->desync_any_proto = !optarg || atoi(optarg);
break; break;
case 36: /* dpi-desync-fake-http */ case 37: /* dpi-desync-fake-http */
dp->fake_http_size = sizeof(dp->fake_http); dp->fake_http_size = sizeof(dp->fake_http);
load_file_or_exit(optarg,dp->fake_http,&dp->fake_http_size); load_file_or_exit(optarg,dp->fake_http,&dp->fake_http_size);
break; break;
case 37: /* dpi-desync-fake-tls */ case 38: /* dpi-desync-fake-tls */
dp->fake_tls_size = sizeof(dp->fake_tls); dp->fake_tls_size = sizeof(dp->fake_tls);
load_file_or_exit(optarg,dp->fake_tls,&dp->fake_tls_size); load_file_or_exit(optarg,dp->fake_tls,&dp->fake_tls_size);
break; break;
case 38: /* dpi-desync-fake-unknown */ case 39: /* dpi-desync-fake-unknown */
dp->fake_unknown_size = sizeof(dp->fake_unknown); dp->fake_unknown_size = sizeof(dp->fake_unknown);
load_file_or_exit(optarg,dp->fake_unknown,&dp->fake_unknown_size); load_file_or_exit(optarg,dp->fake_unknown,&dp->fake_unknown_size);
break; break;
case 39: /* dpi-desync-fake-syndata */ case 40: /* dpi-desync-fake-syndata */
dp->fake_syndata_size = sizeof(dp->fake_syndata); dp->fake_syndata_size = sizeof(dp->fake_syndata);
load_file_or_exit(optarg,dp->fake_syndata,&dp->fake_syndata_size); load_file_or_exit(optarg,dp->fake_syndata,&dp->fake_syndata_size);
break; break;
case 40: /* dpi-desync-fake-quic */ case 41: /* dpi-desync-fake-quic */
dp->fake_quic_size = sizeof(dp->fake_quic); dp->fake_quic_size = sizeof(dp->fake_quic);
load_file_or_exit(optarg,dp->fake_quic,&dp->fake_quic_size); load_file_or_exit(optarg,dp->fake_quic,&dp->fake_quic_size);
break; break;
case 41: /* dpi-desync-fake-wireguard */ case 42: /* dpi-desync-fake-wireguard */
dp->fake_wg_size = sizeof(dp->fake_wg); dp->fake_wg_size = sizeof(dp->fake_wg);
load_file_or_exit(optarg,dp->fake_wg,&dp->fake_wg_size); load_file_or_exit(optarg,dp->fake_wg,&dp->fake_wg_size);
break; break;
case 42: /* dpi-desync-fake-dht */ case 43: /* dpi-desync-fake-dht */
dp->fake_dht_size = sizeof(dp->fake_dht); dp->fake_dht_size = sizeof(dp->fake_dht);
load_file_or_exit(optarg,dp->fake_dht,&dp->fake_dht_size); load_file_or_exit(optarg,dp->fake_dht,&dp->fake_dht_size);
break; break;
case 43: /* dpi-desync-fake-unknown-udp */ case 44: /* dpi-desync-fake-unknown-udp */
dp->fake_unknown_udp_size = sizeof(dp->fake_unknown_udp); dp->fake_unknown_udp_size = sizeof(dp->fake_unknown_udp);
load_file_or_exit(optarg,dp->fake_unknown_udp,&dp->fake_unknown_udp_size); load_file_or_exit(optarg,dp->fake_unknown_udp,&dp->fake_unknown_udp_size);
break; break;
case 44: /* dpi-desync-udplen-increment */ case 45: /* dpi-desync-udplen-increment */
if (sscanf(optarg,"%d",&dp->udplen_increment)<1 || dp->udplen_increment>0x7FFF || dp->udplen_increment<-0x8000) if (sscanf(optarg,"%d",&dp->udplen_increment)<1 || dp->udplen_increment>0x7FFF || dp->udplen_increment<-0x8000)
{ {
DLOG_ERR("dpi-desync-udplen-increment must be integer within -32768..32767 range\n"); DLOG_ERR("dpi-desync-udplen-increment must be integer within -32768..32767 range\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 45: /* dpi-desync-udplen-pattern */ case 46: /* dpi-desync-udplen-pattern */
{ {
char buf[sizeof(dp->udplen_pattern)]; char buf[sizeof(dp->udplen_pattern)];
size_t sz=sizeof(buf); size_t sz=sizeof(buf);
@ -1818,21 +1822,21 @@ int main(int argc, char **argv)
fill_pattern(dp->udplen_pattern,sizeof(dp->udplen_pattern),buf,sz); fill_pattern(dp->udplen_pattern,sizeof(dp->udplen_pattern),buf,sz);
} }
break; break;
case 46: /* desync-cutoff */ case 47: /* desync-cutoff */
if (!parse_cutoff(optarg, &dp->desync_cutoff, &dp->desync_cutoff_mode)) if (!parse_cutoff(optarg, &dp->desync_cutoff, &dp->desync_cutoff_mode))
{ {
DLOG_ERR("invalid desync-cutoff value\n"); DLOG_ERR("invalid desync-cutoff value\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 47: /* desync-start */ case 48: /* desync-start */
if (!parse_cutoff(optarg, &dp->desync_start, &dp->desync_start_mode)) if (!parse_cutoff(optarg, &dp->desync_start, &dp->desync_start_mode))
{ {
DLOG_ERR("invalid desync-start value\n"); DLOG_ERR("invalid desync-start value\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 48: /* hostlist */ case 49: /* hostlist */
if (bSkip) break; if (bSkip) break;
if (!RegisterHostlist(dp, false, optarg)) if (!RegisterHostlist(dp, false, optarg))
{ {
@ -1840,7 +1844,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 49: /* hostlist-domains */ case 50: /* hostlist-domains */
if (bSkip) break; if (bSkip) break;
if (!anon_hl && !(anon_hl=RegisterHostlist(dp, false, NULL))) if (!anon_hl && !(anon_hl=RegisterHostlist(dp, false, NULL)))
{ {
@ -1853,7 +1857,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 50: /* hostlist-exclude */ case 51: /* hostlist-exclude */
if (bSkip) break; if (bSkip) break;
if (!RegisterHostlist(dp, true, optarg)) if (!RegisterHostlist(dp, true, optarg))
{ {
@ -1861,7 +1865,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 51: /* hostlist-exclude-domains */ case 52: /* hostlist-exclude-domains */
if (bSkip) break; if (bSkip) break;
if (!anon_hl_exclude && !(anon_hl_exclude=RegisterHostlist(dp, true, NULL))) if (!anon_hl_exclude && !(anon_hl_exclude=RegisterHostlist(dp, true, NULL)))
{ {
@ -1874,7 +1878,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 52: /* hostlist-auto */ case 53: /* hostlist-auto */
if (bSkip) break; if (bSkip) break;
if (dp->hostlist_auto) if (dp->hostlist_auto)
{ {
@ -1902,7 +1906,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 53: /* hostlist-auto-fail-threshold */ case 54: /* hostlist-auto-fail-threshold */
dp->hostlist_auto_fail_threshold = (uint8_t)atoi(optarg); dp->hostlist_auto_fail_threshold = (uint8_t)atoi(optarg);
if (dp->hostlist_auto_fail_threshold<1 || dp->hostlist_auto_fail_threshold>20) if (dp->hostlist_auto_fail_threshold<1 || dp->hostlist_auto_fail_threshold>20)
{ {
@ -1910,7 +1914,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 54: /* hostlist-auto-fail-time */ case 55: /* hostlist-auto-fail-time */
dp->hostlist_auto_fail_time = (uint8_t)atoi(optarg); dp->hostlist_auto_fail_time = (uint8_t)atoi(optarg);
if (dp->hostlist_auto_fail_time<1) if (dp->hostlist_auto_fail_time<1)
{ {
@ -1918,7 +1922,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 55: /* hostlist-auto-retrans-threshold */ case 56: /* hostlist-auto-retrans-threshold */
dp->hostlist_auto_retrans_threshold = (uint8_t)atoi(optarg); dp->hostlist_auto_retrans_threshold = (uint8_t)atoi(optarg);
if (dp->hostlist_auto_retrans_threshold<2 || dp->hostlist_auto_retrans_threshold>10) if (dp->hostlist_auto_retrans_threshold<2 || dp->hostlist_auto_retrans_threshold>10)
{ {
@ -1926,7 +1930,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 56: /* hostlist-auto-debug */ case 57: /* hostlist-auto-debug */
{ {
FILE *F = fopen(optarg,"a+t"); FILE *F = fopen(optarg,"a+t");
if (!F) if (!F)
@ -1940,7 +1944,7 @@ int main(int argc, char **argv)
} }
break; break;
case 57: /* new */ case 58: /* new */
if (bSkip) if (bSkip)
{ {
dp_clear(dp); dp_clear(dp);
@ -1961,18 +1965,18 @@ int main(int argc, char **argv)
anon_hl = anon_hl_exclude = NULL; anon_hl = anon_hl_exclude = NULL;
anon_ips = anon_ips_exclude = NULL; anon_ips = anon_ips_exclude = NULL;
break; break;
case 58: /* skip */ case 59: /* skip */
bSkip = true; bSkip = true;
break; break;
case 59: /* filter-l3 */ case 60: /* filter-l3 */
if (!wf_make_l3(optarg,&dp->filter_ipv4,&dp->filter_ipv6)) if (!wf_make_l3(optarg,&dp->filter_ipv4,&dp->filter_ipv6))
{ {
DLOG_ERR("bad value for --filter-l3\n"); DLOG_ERR("bad value for --filter-l3\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 60: /* filter-tcp */ case 61: /* filter-tcp */
if (!parse_pf_list(optarg,&dp->pf_tcp)) if (!parse_pf_list(optarg,&dp->pf_tcp))
{ {
DLOG_ERR("Invalid port filter : %s\n",optarg); DLOG_ERR("Invalid port filter : %s\n",optarg);
@ -1982,7 +1986,7 @@ int main(int argc, char **argv)
if (!port_filters_deny_if_empty(&dp->pf_udp)) if (!port_filters_deny_if_empty(&dp->pf_udp))
exit_clean(1); exit_clean(1);
break; break;
case 61: /* filter-udp */ case 62: /* filter-udp */
if (!parse_pf_list(optarg,&dp->pf_udp)) if (!parse_pf_list(optarg,&dp->pf_udp))
{ {
DLOG_ERR("Invalid port filter : %s\n",optarg); DLOG_ERR("Invalid port filter : %s\n",optarg);
@ -1992,14 +1996,14 @@ int main(int argc, char **argv)
if (!port_filters_deny_if_empty(&dp->pf_tcp)) if (!port_filters_deny_if_empty(&dp->pf_tcp))
exit_clean(1); exit_clean(1);
break; break;
case 62: /* filter-l7 */ case 63: /* filter-l7 */
if (!parse_l7_list(optarg,&dp->filter_l7)) if (!parse_l7_list(optarg,&dp->filter_l7))
{ {
DLOG_ERR("Invalid l7 filter : %s\n",optarg); DLOG_ERR("Invalid l7 filter : %s\n",optarg);
exit_clean(1); exit_clean(1);
} }
break; break;
case 63: /* ipset */ case 64: /* ipset */
if (bSkip) break; if (bSkip) break;
if (!RegisterIpset(dp, false, optarg)) if (!RegisterIpset(dp, false, optarg))
{ {
@ -2007,7 +2011,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 64: /* ipset-ip */ case 65: /* ipset-ip */
if (bSkip) break; if (bSkip) break;
if (!anon_ips && !(anon_ips=RegisterIpset(dp, false, NULL))) if (!anon_ips && !(anon_ips=RegisterIpset(dp, false, NULL)))
{ {
@ -2020,7 +2024,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 65: /* ipset-exclude */ case 66: /* ipset-exclude */
if (bSkip) break; if (bSkip) break;
if (!RegisterIpset(dp, true, optarg)) if (!RegisterIpset(dp, true, optarg))
{ {
@ -2028,7 +2032,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 66: /* ipset-exclude-ip */ case 67: /* ipset-exclude-ip */
if (bSkip) break; if (bSkip) break;
if (!anon_ips_exclude && !(anon_ips_exclude=RegisterIpset(dp, true, NULL))) if (!anon_ips_exclude && !(anon_ips_exclude=RegisterIpset(dp, true, NULL)))
{ {
@ -2044,28 +2048,28 @@ int main(int argc, char **argv)
#ifdef __linux__ #ifdef __linux__
case 67: /* bind-fix4 */ case 68: /* bind-fix4 */
params.bind_fix4 = true; params.bind_fix4 = true;
break; break;
case 68: /* bind-fix6 */ case 69: /* bind-fix6 */
params.bind_fix6 = true; params.bind_fix6 = true;
break; break;
#elif defined(__CYGWIN__) #elif defined(__CYGWIN__)
case 67: /* wf-iface */ case 68: /* wf-iface */
if (!sscanf(optarg,"%u.%u",&IfIdx,&SubIfIdx)) if (!sscanf(optarg,"%u.%u",&IfIdx,&SubIfIdx))
{ {
DLOG_ERR("bad value for --wf-iface\n"); DLOG_ERR("bad value for --wf-iface\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 68: /* wf-l3 */ case 69: /* wf-l3 */
if (!wf_make_l3(optarg,&wf_ipv4,&wf_ipv6)) if (!wf_make_l3(optarg,&wf_ipv4,&wf_ipv6))
{ {
DLOG_ERR("bad value for --wf-l3\n"); DLOG_ERR("bad value for --wf-l3\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 69: /* wf-tcp */ case 70: /* wf-tcp */
hash_wf_tcp=hash_jen(optarg,strlen(optarg)); hash_wf_tcp=hash_jen(optarg,strlen(optarg));
if (!wf_make_pf(optarg,"tcp","SrcPort",wf_pf_tcp_src,sizeof(wf_pf_tcp_src)) || if (!wf_make_pf(optarg,"tcp","SrcPort",wf_pf_tcp_src,sizeof(wf_pf_tcp_src)) ||
!wf_make_pf(optarg,"tcp","DstPort",wf_pf_tcp_dst,sizeof(wf_pf_tcp_dst))) !wf_make_pf(optarg,"tcp","DstPort",wf_pf_tcp_dst,sizeof(wf_pf_tcp_dst)))
@ -2074,7 +2078,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 70: /* wf-udp */ case 71: /* wf-udp */
hash_wf_udp=hash_jen(optarg,strlen(optarg)); hash_wf_udp=hash_jen(optarg,strlen(optarg));
if (!wf_make_pf(optarg,"udp","SrcPort",wf_pf_udp_src,sizeof(wf_pf_udp_src)) || if (!wf_make_pf(optarg,"udp","SrcPort",wf_pf_udp_src,sizeof(wf_pf_udp_src)) ||
!wf_make_pf(optarg,"udp","DstPort",wf_pf_udp_dst,sizeof(wf_pf_udp_dst))) !wf_make_pf(optarg,"udp","DstPort",wf_pf_udp_dst,sizeof(wf_pf_udp_dst)))
@ -2083,7 +2087,7 @@ int main(int argc, char **argv)
exit_clean(1); exit_clean(1);
} }
break; break;
case 71: /* wf-raw */ case 72: /* wf-raw */
hash_wf_raw=hash_jen(optarg,strlen(optarg)); hash_wf_raw=hash_jen(optarg,strlen(optarg));
if (optarg[0]=='@') if (optarg[0]=='@')
{ {
@ -2097,11 +2101,11 @@ int main(int argc, char **argv)
windivert_filter[sizeof(windivert_filter) - 1] = '\0'; windivert_filter[sizeof(windivert_filter) - 1] = '\0';
} }
break; break;
case 72: /* wf-save */ case 73: /* wf-save */
strncpy(wf_save_file, optarg, sizeof(wf_save_file)); strncpy(wf_save_file, optarg, sizeof(wf_save_file));
wf_save_file[sizeof(wf_save_file) - 1] = '\0'; wf_save_file[sizeof(wf_save_file) - 1] = '\0';
break; break;
case 73: /* ssid-filter */ case 74: /* ssid-filter */
hash_ssid_filter=hash_jen(optarg,strlen(optarg)); hash_ssid_filter=hash_jen(optarg,strlen(optarg));
{ {
char *e,*p = optarg; char *e,*p = optarg;
@ -2119,7 +2123,7 @@ int main(int argc, char **argv)
} }
} }
break; break;
case 74: /* nlm-filter */ case 75: /* nlm-filter */
hash_nlm_filter=hash_jen(optarg,strlen(optarg)); hash_nlm_filter=hash_jen(optarg,strlen(optarg));
{ {
char *e,*p = optarg; char *e,*p = optarg;
@ -2137,7 +2141,7 @@ int main(int argc, char **argv)
} }
} }
break; break;
case 75: /* nlm-list */ case 76: /* nlm-list */
if (!nlm_list(optarg && !strcmp(optarg,"all"))) if (!nlm_list(optarg && !strcmp(optarg,"all")))
{ {
DLOG_ERR("could not get list of NLM networks\n"); DLOG_ERR("could not get list of NLM networks\n");

100
tpws/tpws.c
View File

@ -176,6 +176,7 @@ static void exithelp(void)
" --debug=0|1|2|syslog|@<filename>\t; 1 and 2 means log to console and set debug level. for other targets use --debug-level.\n" " --debug=0|1|2|syslog|@<filename>\t; 1 and 2 means log to console and set debug level. for other targets use --debug-level.\n"
" --debug-level=0|1|2\t\t\t; specify debug level\n" " --debug-level=0|1|2\t\t\t; specify debug level\n"
" --dry-run\t\t\t\t; verify parameters and exit with code 0 if successful\n" " --dry-run\t\t\t\t; verify parameters and exit with code 0 if successful\n"
" --comment=any_text\n"
"\nMULTI-STRATEGY:\n" "\nMULTI-STRATEGY:\n"
" --new\t\t\t\t\t; begin new strategy\n" " --new\t\t\t\t\t; begin new strategy\n"
" --skip\t\t\t\t\t; do not use this strategy\n" " --skip\t\t\t\t\t; do not use this strategy\n"
@ -669,21 +670,22 @@ void parse_params(int argc, char *argv[])
{ "debug",optional_argument,0,0 },// optidx=45 { "debug",optional_argument,0,0 },// optidx=45
{ "debug-level",required_argument,0,0 },// optidx=46 { "debug-level",required_argument,0,0 },// optidx=46
{ "dry-run",no_argument,0,0 },// optidx=47 { "dry-run",no_argument,0,0 },// optidx=47
{ "local-rcvbuf",required_argument,0,0 },// optidx=48 { "comment",optional_argument,0,0 },// optidx=48
{ "local-sndbuf",required_argument,0,0 },// optidx=49 { "local-rcvbuf",required_argument,0,0 },// optidx=49
{ "remote-rcvbuf",required_argument,0,0 },// optidx=50 { "local-sndbuf",required_argument,0,0 },// optidx=50
{ "remote-sndbuf",required_argument,0,0 },// optidx=51 { "remote-rcvbuf",required_argument,0,0 },// optidx=51
{ "socks",no_argument,0,0 },// optidx=52 { "remote-sndbuf",required_argument,0,0 },// optidx=52
{ "no-resolve",no_argument,0,0 },// optidx=53 { "socks",no_argument,0,0 },// optidx=53
{ "resolver-threads",required_argument,0,0 },// optidx=54 { "no-resolve",no_argument,0,0 },// optidx=54
{ "skip-nodelay",no_argument,0,0 },// optidx=55 { "resolver-threads",required_argument,0,0 },// optidx=55
{ "tamper-start",required_argument,0,0 },// optidx=56 { "skip-nodelay",no_argument,0,0 },// optidx=56
{ "tamper-cutoff",required_argument,0,0 },// optidx=57 { "tamper-start",required_argument,0,0 },// optidx=57
{ "connect-bind-addr",required_argument,0,0 },// optidx=58 { "tamper-cutoff",required_argument,0,0 },// optidx=58
{ "connect-bind-addr",required_argument,0,0 },// optidx=59
{ "new",no_argument,0,0 }, // optidx=59 { "new",no_argument,0,0 }, // optidx=60
{ "skip",no_argument,0,0 }, // optidx=60 { "skip",no_argument,0,0 }, // optidx=61
{ "filter-l3",required_argument,0,0 }, // optidx=61 { "filter-l3",required_argument,0,0 }, // optidx=62
{ "filter-tcp",required_argument,0,0 }, // optidx=63 { "filter-tcp",required_argument,0,0 }, // optidx=63
{ "filter-l7",required_argument,0,0 }, // optidx=64 { "filter-l7",required_argument,0,0 }, // optidx=64
{ "ipset",required_argument,0,0 }, // optidx=65 { "ipset",required_argument,0,0 }, // optidx=65
@ -692,17 +694,17 @@ void parse_params(int argc, char *argv[])
{ "ipset-exclude-ip",required_argument,0,0 }, // optidx=68 { "ipset-exclude-ip",required_argument,0,0 }, // optidx=68
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
{ "enable-pf",no_argument,0,0 },// optidx=68 { "enable-pf",no_argument,0,0 },// optidx=69
#elif defined(__APPLE__) #elif defined(__APPLE__)
{ "local-tcp-user-timeout",required_argument,0,0 }, // optidx=68 { "local-tcp-user-timeout",required_argument,0,0 }, // optidx=69
{ "remote-tcp-user-timeout",required_argument,0,0 }, // optidx=69 { "remote-tcp-user-timeout",required_argument,0,0 }, // optidx=70
#elif defined(__linux__) #elif defined(__linux__)
{ "local-tcp-user-timeout",required_argument,0,0 }, // optidx=68 { "local-tcp-user-timeout",required_argument,0,0 }, // optidx=69
{ "remote-tcp-user-timeout",required_argument,0,0 }, // optidx=69 { "remote-tcp-user-timeout",required_argument,0,0 }, // optidx=70
{ "mss",required_argument,0,0 }, // optidx=70 { "mss",required_argument,0,0 }, // optidx=71
{ "fix-seg",optional_argument,0,0 }, // optidx=71 { "fix-seg",optional_argument,0,0 }, // optidx=72
#ifdef SPLICE_PRESENT #ifdef SPLICE_PRESENT
{ "nosplice",no_argument,0,0 }, // optidx=72 { "nosplice",no_argument,0,0 }, // optidx=73
#endif #endif
#endif #endif
{ "hostlist-auto-retrans-threshold",optional_argument,0,0}, // ignored. for nfqws command line compatibility { "hostlist-auto-retrans-threshold",optional_argument,0,0}, // ignored. for nfqws command line compatibility
@ -1153,41 +1155,43 @@ void parse_params(int argc, char *argv[])
case 47: /* dry-run */ case 47: /* dry-run */
bDry = true; bDry = true;
break; break;
case 48: /* local-rcvbuf */ case 48: /* comment */
break;
case 49: /* local-rcvbuf */
#ifdef __linux__ #ifdef __linux__
params.local_rcvbuf = atoi(optarg)/2; params.local_rcvbuf = atoi(optarg)/2;
#else #else
params.local_rcvbuf = atoi(optarg); params.local_rcvbuf = atoi(optarg);
#endif #endif
break; break;
case 49: /* local-sndbuf */ case 50: /* local-sndbuf */
#ifdef __linux__ #ifdef __linux__
params.local_sndbuf = atoi(optarg)/2; params.local_sndbuf = atoi(optarg)/2;
#else #else
params.local_sndbuf = atoi(optarg); params.local_sndbuf = atoi(optarg);
#endif #endif
break; break;
case 50: /* remote-rcvbuf */ case 51: /* remote-rcvbuf */
#ifdef __linux__ #ifdef __linux__
params.remote_rcvbuf = atoi(optarg)/2; params.remote_rcvbuf = atoi(optarg)/2;
#else #else
params.remote_rcvbuf = atoi(optarg); params.remote_rcvbuf = atoi(optarg);
#endif #endif
break; break;
case 51: /* remote-sndbuf */ case 52: /* remote-sndbuf */
#ifdef __linux__ #ifdef __linux__
params.remote_sndbuf = atoi(optarg)/2; params.remote_sndbuf = atoi(optarg)/2;
#else #else
params.remote_sndbuf = atoi(optarg); params.remote_sndbuf = atoi(optarg);
#endif #endif
break; break;
case 52: /* socks */ case 53: /* socks */
params.proxy_type = CONN_TYPE_SOCKS; params.proxy_type = CONN_TYPE_SOCKS;
break; break;
case 53: /* no-resolve */ case 54: /* no-resolve */
params.no_resolve = true; params.no_resolve = true;
break; break;
case 54: /* resolver-threads */ case 55: /* resolver-threads */
params.resolver_threads = atoi(optarg); params.resolver_threads = atoi(optarg);
if (params.resolver_threads<1 || params.resolver_threads>300) if (params.resolver_threads<1 || params.resolver_threads>300)
{ {
@ -1195,10 +1199,10 @@ void parse_params(int argc, char *argv[])
exit_clean(1); exit_clean(1);
} }
break; break;
case 55: /* skip-nodelay */ case 56: /* skip-nodelay */
params.skip_nodelay = true; params.skip_nodelay = true;
break; break;
case 56: /* tamper-start */ case 57: /* tamper-start */
{ {
const char *p=optarg; const char *p=optarg;
if (*p=='n') if (*p=='n')
@ -1212,7 +1216,7 @@ void parse_params(int argc, char *argv[])
} }
params.tamper_lim = true; params.tamper_lim = true;
break; break;
case 57: /* tamper-cutoff */ case 58: /* tamper-cutoff */
{ {
const char *p=optarg; const char *p=optarg;
if (*p=='n') if (*p=='n')
@ -1226,7 +1230,7 @@ void parse_params(int argc, char *argv[])
} }
params.tamper_lim = true; params.tamper_lim = true;
break; break;
case 58: /* connect-bind-addr */ case 59: /* connect-bind-addr */
{ {
char *p = strchr(optarg,'%'); char *p = strchr(optarg,'%');
if (p) *p++=0; if (p) *p++=0;
@ -1254,7 +1258,7 @@ void parse_params(int argc, char *argv[])
break; break;
case 59: /* new */ case 60: /* new */
if (bSkip) if (bSkip)
{ {
dp_clear(dp); dp_clear(dp);
@ -1275,31 +1279,31 @@ void parse_params(int argc, char *argv[])
anon_hl = anon_hl_exclude = NULL; anon_hl = anon_hl_exclude = NULL;
anon_ips = anon_ips_exclude = NULL; anon_ips = anon_ips_exclude = NULL;
break; break;
case 60: /* skip */ case 61: /* skip */
bSkip = true; bSkip = true;
break; break;
case 61: /* filter-l3 */ case 62: /* filter-l3 */
if (!wf_make_l3(optarg,&dp->filter_ipv4,&dp->filter_ipv6)) if (!wf_make_l3(optarg,&dp->filter_ipv4,&dp->filter_ipv6))
{ {
DLOG_ERR("bad value for --filter-l3\n"); DLOG_ERR("bad value for --filter-l3\n");
exit_clean(1); exit_clean(1);
} }
break; break;
case 62: /* filter-tcp */ case 63: /* filter-tcp */
if (!parse_pf_list(optarg,&dp->pf_tcp)) if (!parse_pf_list(optarg,&dp->pf_tcp))
{ {
DLOG_ERR("Invalid port filter : %s\n",optarg); DLOG_ERR("Invalid port filter : %s\n",optarg);
exit_clean(1); exit_clean(1);
} }
break; break;
case 63: /* filter-l7 */ case 64: /* filter-l7 */
if (!parse_l7_list(optarg,&dp->filter_l7)) if (!parse_l7_list(optarg,&dp->filter_l7))
{ {
DLOG_ERR("Invalid l7 filter : %s\n",optarg); DLOG_ERR("Invalid l7 filter : %s\n",optarg);
exit_clean(1); exit_clean(1);
} }
break; break;
case 64: /* ipset */ case 65: /* ipset */
if (bSkip) break; if (bSkip) break;
if (!RegisterIpset(dp, false, optarg)) if (!RegisterIpset(dp, false, optarg))
{ {
@ -1308,7 +1312,7 @@ void parse_params(int argc, char *argv[])
} }
params.tamper = true; params.tamper = true;
break; break;
case 65: /* ipset-ip */ case 66: /* ipset-ip */
if (bSkip) break; if (bSkip) break;
if (!anon_ips && !(anon_ips=RegisterIpset(dp, false, NULL))) if (!anon_ips && !(anon_ips=RegisterIpset(dp, false, NULL)))
{ {
@ -1322,7 +1326,7 @@ void parse_params(int argc, char *argv[])
} }
params.tamper = true; params.tamper = true;
break; break;
case 66: /* ipset-exclude */ case 67: /* ipset-exclude */
if (bSkip) break; if (bSkip) break;
if (!RegisterIpset(dp, true, optarg)) if (!RegisterIpset(dp, true, optarg))
{ {
@ -1331,7 +1335,7 @@ void parse_params(int argc, char *argv[])
} }
params.tamper = true; params.tamper = true;
break; break;
case 67: /* ipset-exclude-ip */ case 68: /* ipset-exclude-ip */
if (bSkip) break; if (bSkip) break;
if (!anon_ips_exclude && !(anon_ips_exclude=RegisterIpset(dp, true, NULL))) if (!anon_ips_exclude && !(anon_ips_exclude=RegisterIpset(dp, true, NULL)))
{ {
@ -1347,11 +1351,11 @@ void parse_params(int argc, char *argv[])
break; break;
#if defined(__FreeBSD__) #if defined(__FreeBSD__)
case 68: /* enable-pf */ case 69: /* enable-pf */
params.pf_enable = true; params.pf_enable = true;
break; break;
#elif defined(__linux__) || defined(__APPLE__) #elif defined(__linux__) || defined(__APPLE__)
case 68: /* local-tcp-user-timeout */ case 69: /* local-tcp-user-timeout */
params.tcp_user_timeout_local = atoi(optarg); params.tcp_user_timeout_local = atoi(optarg);
if (params.tcp_user_timeout_local<0 || params.tcp_user_timeout_local>86400) if (params.tcp_user_timeout_local<0 || params.tcp_user_timeout_local>86400)
{ {
@ -1359,7 +1363,7 @@ void parse_params(int argc, char *argv[])
exit_clean(1); exit_clean(1);
} }
break; break;
case 69: /* remote-tcp-user-timeout */ case 70: /* remote-tcp-user-timeout */
params.tcp_user_timeout_remote = atoi(optarg); params.tcp_user_timeout_remote = atoi(optarg);
if (params.tcp_user_timeout_remote<0 || params.tcp_user_timeout_remote>86400) if (params.tcp_user_timeout_remote<0 || params.tcp_user_timeout_remote>86400)
{ {
@ -1370,7 +1374,7 @@ void parse_params(int argc, char *argv[])
#endif #endif
#if defined(__linux__) #if defined(__linux__)
case 70: /* mss */ case 71: /* mss */
// this option does not work in any BSD and MacOS. OS may accept but it changes nothing // this option does not work in any BSD and MacOS. OS may accept but it changes nothing
dp->mss = atoi(optarg); dp->mss = atoi(optarg);
if (dp->mss<88 || dp->mss>32767) if (dp->mss<88 || dp->mss>32767)
@ -1379,7 +1383,7 @@ void parse_params(int argc, char *argv[])
exit_clean(1); exit_clean(1);
} }
break; break;
case 71: /* fix-seg */ case 72: /* fix-seg */
if (!params.fix_seg_avail) if (!params.fix_seg_avail)
{ {
DLOG_ERR("--fix-seg is supported since kernel 4.6\n"); DLOG_ERR("--fix-seg is supported since kernel 4.6\n");
@ -1399,7 +1403,7 @@ void parse_params(int argc, char *argv[])
params.fix_seg = FIX_SEG_DEFAULT_MAX_WAIT; params.fix_seg = FIX_SEG_DEFAULT_MAX_WAIT;
break; break;
#ifdef SPLICE_PRESENT #ifdef SPLICE_PRESENT
case 72: /* nosplice */ case 73: /* nosplice */
params.nosplice = true; params.nosplice = true;
break; break;
#endif #endif