mirror of
https://github.com/bol-van/zapret.git
synced 2024-12-18 22:11:31 +03:00
nfqws: --dry-run
This commit is contained in:
parent
277c5f9e00
commit
b14ff9b647
337
nfq/nfqws.c
337
nfq/nfqws.c
@ -1030,6 +1030,7 @@ static void exithelp(void)
|
|||||||
" @<config_file>|$<config_file>\t\t\t; read file for options. must be the only argument. other options are ignored.\n\n"
|
" @<config_file>|$<config_file>\t\t\t; read file for options. must be the only argument. other options are ignored.\n\n"
|
||||||
#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"
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
" --qnum=<nfqueue_number>\n"
|
" --qnum=<nfqueue_number>\n"
|
||||||
#elif defined(BSD)
|
#elif defined(BSD)
|
||||||
@ -1195,7 +1196,7 @@ int main(int argc, char **argv)
|
|||||||
#endif
|
#endif
|
||||||
int result, v;
|
int result, v;
|
||||||
int option_index = 0;
|
int option_index = 0;
|
||||||
bool daemon = false, bSkip = false;
|
bool daemon = false, bSkip = false, bDry = false;
|
||||||
char pidfile[256];
|
char pidfile[256];
|
||||||
struct hostlist_file *anon_hl = NULL, *anon_hl_exclude = NULL;
|
struct hostlist_file *anon_hl = NULL, *anon_hl_exclude = NULL;
|
||||||
struct ipset_file *anon_ips = NULL, *anon_ips_exclude = NULL;
|
struct ipset_file *anon_ips = NULL, *anon_ips_exclude = NULL;
|
||||||
@ -1263,108 +1264,113 @@ 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
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
{"qnum",required_argument,0,0}, // optidx=1
|
{"qnum",required_argument,0,0}, // optidx=2
|
||||||
#elif defined(BSD)
|
#elif defined(BSD)
|
||||||
{"port",required_argument,0,0}, // optidx=1
|
{"port",required_argument,0,0}, // optidx=2
|
||||||
#else
|
#else
|
||||||
{"disabled_argument_1",no_argument,0,0},// optidx=1
|
{"disabled_argument_1",no_argument,0,0},// optidx=2
|
||||||
#endif
|
#endif
|
||||||
{"daemon",no_argument,0,0}, // optidx=2
|
{"daemon",no_argument,0,0}, // optidx=3
|
||||||
{"pidfile",required_argument,0,0}, // optidx=3
|
{"pidfile",required_argument,0,0}, // optidx=4
|
||||||
#ifndef __CYGWIN__
|
#ifndef __CYGWIN__
|
||||||
{"user",required_argument,0,0 }, // optidx=4
|
{"user",required_argument,0,0 }, // optidx=5
|
||||||
{"uid",required_argument,0,0 }, // optidx=5
|
{"uid",required_argument,0,0 }, // optidx=6
|
||||||
#else
|
#else
|
||||||
{"disabled_argument_2",no_argument,0,0}, // optidx=4
|
{"disabled_argument_2",no_argument,0,0}, // optidx=5
|
||||||
{"disabled_argument_3",no_argument,0,0}, // optidx=5
|
{"disabled_argument_3",no_argument,0,0}, // optidx=6
|
||||||
#endif
|
#endif
|
||||||
{"wsize",required_argument,0,0}, // optidx=6
|
{"wsize",required_argument,0,0}, // optidx=7
|
||||||
{"wssize",required_argument,0,0}, // optidx=7
|
{"wssize",required_argument,0,0}, // optidx=8
|
||||||
{"wssize-cutoff",required_argument,0,0},// optidx=8
|
{"wssize-cutoff",required_argument,0,0},// optidx=9
|
||||||
{"ctrack-timeouts",required_argument,0,0},// optidx=9
|
{"ctrack-timeouts",required_argument,0,0},// optidx=10
|
||||||
{"hostcase",no_argument,0,0}, // optidx=10
|
{"hostcase",no_argument,0,0}, // optidx=11
|
||||||
{"hostspell",required_argument,0,0}, // optidx=11
|
{"hostspell",required_argument,0,0}, // optidx=12
|
||||||
{"hostnospace",no_argument,0,0}, // optidx=12
|
{"hostnospace",no_argument,0,0}, // optidx=13
|
||||||
{"domcase",no_argument,0,0 }, // optidx=13
|
{"domcase",no_argument,0,0 }, // optidx=14
|
||||||
{"methodeol",no_argument,0,0 }, // optidx=14
|
{"methodeol",no_argument,0,0 }, // optidx=15
|
||||||
{"dpi-desync",required_argument,0,0}, // optidx=15
|
{"dpi-desync",required_argument,0,0}, // optidx=17
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
{"dpi-desync-fwmark",required_argument,0,0}, // optidx=16
|
{"dpi-desync-fwmark",required_argument,0,0}, // optidx=17
|
||||||
#elif defined(SO_USER_COOKIE)
|
#elif defined(SO_USER_COOKIE)
|
||||||
{"dpi-desync-sockarg",required_argument,0,0}, // optidx=16
|
{"dpi-desync-sockarg",required_argument,0,0}, // optidx=17
|
||||||
#else
|
#else
|
||||||
{"disabled_argument_4",no_argument,0,0}, // optidx=16
|
{"disabled_argument_4",no_argument,0,0}, // optidx=17
|
||||||
#endif
|
#endif
|
||||||
{"dpi-desync-ttl",required_argument,0,0}, // optidx=17
|
{"dpi-desync-ttl",required_argument,0,0}, // optidx=18
|
||||||
{"dpi-desync-ttl6",required_argument,0,0}, // optidx=18
|
{"dpi-desync-ttl6",required_argument,0,0}, // optidx=19
|
||||||
{"dpi-desync-autottl",optional_argument,0,0}, // optidx=19
|
{"dpi-desync-autottl",optional_argument,0,0}, // optidx=20
|
||||||
{"dpi-desync-autottl6",optional_argument,0,0}, // optidx=20
|
{"dpi-desync-autottl6",optional_argument,0,0}, // optidx=21
|
||||||
{"dpi-desync-fooling",required_argument,0,0}, // optidx=21
|
{"dpi-desync-fooling",required_argument,0,0}, // optidx=22
|
||||||
{"dpi-desync-repeats",required_argument,0,0}, // optidx=22
|
{"dpi-desync-repeats",required_argument,0,0}, // optidx=23
|
||||||
{"dpi-desync-skip-nosni",optional_argument,0,0},// optidx=23
|
{"dpi-desync-skip-nosni",optional_argument,0,0},// optidx=24
|
||||||
{"dpi-desync-split-pos",required_argument,0,0},// optidx=24
|
{"dpi-desync-split-pos",required_argument,0,0},// optidx=25
|
||||||
{"dpi-desync-split-http-req",required_argument,0,0 },// optidx=25
|
{"dpi-desync-split-http-req",required_argument,0,0 },// optidx=26
|
||||||
{"dpi-desync-split-tls",required_argument,0,0 },// optidx=26
|
{"dpi-desync-split-tls",required_argument,0,0 },// optidx=27
|
||||||
{"dpi-desync-split-seqovl",required_argument,0,0 },// optidx=27
|
{"dpi-desync-split-seqovl",required_argument,0,0 },// optidx=28
|
||||||
{"dpi-desync-split-seqovl-pattern",required_argument,0,0 },// optidx=28
|
{"dpi-desync-split-seqovl-pattern",required_argument,0,0 },// optidx=29
|
||||||
{"dpi-desync-fakedsplit-pattern",required_argument,0,0 },// optidx=29
|
{"dpi-desync-fakedsplit-pattern",required_argument,0,0 },// optidx=30
|
||||||
{"dpi-desync-ipfrag-pos-tcp",required_argument,0,0},// optidx=30
|
{"dpi-desync-ipfrag-pos-tcp",required_argument,0,0},// optidx=31
|
||||||
{"dpi-desync-ipfrag-pos-udp",required_argument,0,0},// optidx=31
|
{"dpi-desync-ipfrag-pos-udp",required_argument,0,0},// optidx=32
|
||||||
{"dpi-desync-badseq-increment",required_argument,0,0},// optidx=32
|
{"dpi-desync-badseq-increment",required_argument,0,0},// optidx=33
|
||||||
{"dpi-desync-badack-increment",required_argument,0,0},// optidx=33
|
{"dpi-desync-badack-increment",required_argument,0,0},// optidx=34
|
||||||
{"dpi-desync-any-protocol",optional_argument,0,0},// optidx=34
|
{"dpi-desync-any-protocol",optional_argument,0,0},// optidx=35
|
||||||
{"dpi-desync-fake-http",required_argument,0,0},// optidx=35
|
{"dpi-desync-fake-http",required_argument,0,0},// optidx=36
|
||||||
{"dpi-desync-fake-tls",required_argument,0,0},// optidx=36
|
{"dpi-desync-fake-tls",required_argument,0,0},// optidx=37
|
||||||
{"dpi-desync-fake-unknown",required_argument,0,0},// optidx=37
|
{"dpi-desync-fake-unknown",required_argument,0,0},// optidx=38
|
||||||
{"dpi-desync-fake-syndata",required_argument,0,0},// optidx=38
|
{"dpi-desync-fake-syndata",required_argument,0,0},// optidx=39
|
||||||
{"dpi-desync-fake-quic",required_argument,0,0},// optidx=39
|
{"dpi-desync-fake-quic",required_argument,0,0},// optidx=40
|
||||||
{"dpi-desync-fake-wireguard",required_argument,0,0},// optidx=40
|
{"dpi-desync-fake-wireguard",required_argument,0,0},// optidx=41
|
||||||
{"dpi-desync-fake-dht",required_argument,0,0},// optidx=41
|
{"dpi-desync-fake-dht",required_argument,0,0},// optidx=42
|
||||||
{"dpi-desync-fake-unknown-udp",required_argument,0,0},// optidx=42
|
{"dpi-desync-fake-unknown-udp",required_argument,0,0},// optidx=43
|
||||||
{"dpi-desync-udplen-increment",required_argument,0,0},// optidx=43
|
{"dpi-desync-udplen-increment",required_argument,0,0},// optidx=44
|
||||||
{"dpi-desync-udplen-pattern",required_argument,0,0},// optidx=44
|
{"dpi-desync-udplen-pattern",required_argument,0,0},// optidx=45
|
||||||
{"dpi-desync-cutoff",required_argument,0,0},// optidx=45
|
{"dpi-desync-cutoff",required_argument,0,0},// optidx=46
|
||||||
{"dpi-desync-start",required_argument,0,0},// optidx=46
|
{"dpi-desync-start",required_argument,0,0},// optidx=47
|
||||||
{"hostlist",required_argument,0,0}, // optidx=47
|
{"hostlist",required_argument,0,0}, // optidx=48
|
||||||
{"hostlist-domains",required_argument,0,0},// optidx=48
|
{"hostlist-domains",required_argument,0,0},// optidx=49
|
||||||
{"hostlist-exclude",required_argument,0,0}, // optidx=49
|
{"hostlist-exclude",required_argument,0,0}, // optidx=50
|
||||||
{"hostlist-exclude-domains",required_argument,0,0},// optidx=50
|
{"hostlist-exclude-domains",required_argument,0,0},// optidx=51
|
||||||
{"hostlist-auto",required_argument,0,0}, // optidx=51
|
{"hostlist-auto",required_argument,0,0}, // optidx=52
|
||||||
{"hostlist-auto-fail-threshold",required_argument,0,0}, // optidx=52
|
{"hostlist-auto-fail-threshold",required_argument,0,0}, // optidx=53
|
||||||
{"hostlist-auto-fail-time",required_argument,0,0}, // optidx=53
|
{"hostlist-auto-fail-time",required_argument,0,0}, // optidx=54
|
||||||
{"hostlist-auto-retrans-threshold",required_argument,0,0}, // optidx=54
|
{"hostlist-auto-retrans-threshold",required_argument,0,0}, // optidx=55
|
||||||
{"hostlist-auto-debug",required_argument,0,0}, // optidx=55
|
{"hostlist-auto-debug",required_argument,0,0}, // optidx=56
|
||||||
{"new",no_argument,0,0}, // optidx=56
|
{"new",no_argument,0,0}, // optidx=57
|
||||||
{"skip",no_argument,0,0}, // optidx=57
|
{"skip",no_argument,0,0}, // optidx=58
|
||||||
{"filter-l3",required_argument,0,0}, // optidx=58
|
{"filter-l3",required_argument,0,0}, // optidx=59
|
||||||
{"filter-tcp",required_argument,0,0}, // optidx=59
|
{"filter-tcp",required_argument,0,0}, // optidx=60
|
||||||
{"filter-udp",required_argument,0,0}, // optidx=60
|
{"filter-udp",required_argument,0,0}, // optidx=61
|
||||||
{"filter-l7",required_argument,0,0}, // optidx=61
|
{"filter-l7",required_argument,0,0}, // optidx=62
|
||||||
{"ipset",required_argument,0,0}, // optidx=62
|
{"ipset",required_argument,0,0}, // optidx=63
|
||||||
{"ipset-ip",required_argument,0,0}, // optidx=63
|
{"ipset-ip",required_argument,0,0}, // optidx=64
|
||||||
{"ipset-exclude",required_argument,0,0},// optidx=64
|
{"ipset-exclude",required_argument,0,0},// optidx=65
|
||||||
{"ipset-exclude-ip",required_argument,0,0}, // optidx=65
|
{"ipset-exclude-ip",required_argument,0,0}, // optidx=66
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
{"bind-fix4",no_argument,0,0}, // optidx=66
|
{"bind-fix4",no_argument,0,0}, // optidx=67
|
||||||
{"bind-fix6",no_argument,0,0}, // optidx=67
|
{"bind-fix6",no_argument,0,0}, // optidx=68
|
||||||
#elif defined(__CYGWIN__)
|
#elif defined(__CYGWIN__)
|
||||||
{"wf-iface",required_argument,0,0}, // optidx=66
|
{"wf-iface",required_argument,0,0}, // optidx=67
|
||||||
{"wf-l3",required_argument,0,0}, // optidx=67
|
{"wf-l3",required_argument,0,0}, // optidx=68
|
||||||
{"wf-tcp",required_argument,0,0}, // optidx=68
|
{"wf-tcp",required_argument,0,0}, // optidx=69
|
||||||
{"wf-udp",required_argument,0,0}, // optidx=69
|
{"wf-udp",required_argument,0,0}, // optidx=70
|
||||||
{"wf-raw",required_argument,0,0}, // optidx=70
|
{"wf-raw",required_argument,0,0}, // optidx=71
|
||||||
{"wf-save",required_argument,0,0}, // optidx=71
|
{"wf-save",required_argument,0,0}, // optidx=72
|
||||||
{"ssid-filter",required_argument,0,0}, // optidx=72
|
{"ssid-filter",required_argument,0,0}, // optidx=73
|
||||||
{"nlm-filter",required_argument,0,0}, // optidx=73
|
{"nlm-filter",required_argument,0,0}, // optidx=74
|
||||||
{"nlm-list",optional_argument,0,0}, // optidx=74
|
{"nlm-list",optional_argument,0,0}, // optidx=75
|
||||||
#endif
|
#endif
|
||||||
{NULL,0,NULL,0}
|
{NULL,0,NULL,0}
|
||||||
};
|
};
|
||||||
if (argc < 2) exithelp();
|
if (argc < 2) exithelp_clean();
|
||||||
while ((v = getopt_long_only(argc, argv, "", long_options, &option_index)) != -1)
|
while ((v = getopt_long_only(argc, argv, "", long_options, &option_index)) != -1)
|
||||||
{
|
{
|
||||||
if (v) exithelp();
|
if (v)
|
||||||
|
if (bDry)
|
||||||
|
exit_clean(1);
|
||||||
|
else
|
||||||
|
exithelp_clean();
|
||||||
switch (option_index)
|
switch (option_index)
|
||||||
{
|
{
|
||||||
case 0: /* debug */
|
case 0: /* debug */
|
||||||
@ -1402,7 +1408,10 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#ifndef __CYGWIN__
|
#ifndef __CYGWIN__
|
||||||
case 1: /* qnum or port */
|
case 1: /* dry-run */
|
||||||
|
bDry=true;
|
||||||
|
break;
|
||||||
|
case 2: /* 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)
|
||||||
@ -1423,15 +1432,15 @@ int main(int argc, char **argv)
|
|||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case 2: /* daemon */
|
case 3: /* daemon */
|
||||||
daemon = true;
|
daemon = true;
|
||||||
break;
|
break;
|
||||||
case 3: /* pidfile */
|
case 4: /* 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 4: /* user */
|
case 5: /* user */
|
||||||
{
|
{
|
||||||
struct passwd *pwd = getpwnam(optarg);
|
struct passwd *pwd = getpwnam(optarg);
|
||||||
if (!pwd)
|
if (!pwd)
|
||||||
@ -1444,7 +1453,7 @@ int main(int argc, char **argv)
|
|||||||
params.droproot = true;
|
params.droproot = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 5: /* uid */
|
case 6: /* 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", ¶ms.uid, ¶ms.gid)<1)
|
if (sscanf(optarg, "%u:%u", ¶ms.uid, ¶ms.gid)<1)
|
||||||
@ -1454,32 +1463,32 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case 6: /* wsize */
|
case 7: /* 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 7: /* wssize */
|
case 8: /* 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 8: /* wssize-cutoff */
|
case 9: /* 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 9: /* ctrack-timeouts */
|
case 10: /* ctrack-timeouts */
|
||||||
if (sscanf(optarg, "%u:%u:%u:%u", ¶ms.ctrack_t_syn, ¶ms.ctrack_t_est, ¶ms.ctrack_t_fin, ¶ms.ctrack_t_udp)<3)
|
if (sscanf(optarg, "%u:%u:%u:%u", ¶ms.ctrack_t_syn, ¶ms.ctrack_t_est, ¶ms.ctrack_t_fin, ¶ms.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 10: /* hostcase */
|
case 11: /* hostcase */
|
||||||
dp->hostcase = true;
|
dp->hostcase = true;
|
||||||
break;
|
break;
|
||||||
case 11: /* hostspell */
|
case 12: /* 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");
|
||||||
@ -1488,7 +1497,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 12: /* hostnospace */
|
case 13: /* hostnospace */
|
||||||
if (dp->methodeol)
|
if (dp->methodeol)
|
||||||
{
|
{
|
||||||
DLOG_ERR("--hostnospace and --methodeol are incompatible\n");
|
DLOG_ERR("--hostnospace and --methodeol are incompatible\n");
|
||||||
@ -1496,10 +1505,10 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
dp->hostnospace = true;
|
dp->hostnospace = true;
|
||||||
break;
|
break;
|
||||||
case 13: /* domcase */
|
case 14: /* domcase */
|
||||||
dp->domcase = true;
|
dp->domcase = true;
|
||||||
break;
|
break;
|
||||||
case 14: /* methodeol */
|
case 15: /* methodeol */
|
||||||
if (dp->hostnospace)
|
if (dp->hostnospace)
|
||||||
{
|
{
|
||||||
DLOG_ERR("--hostnospace and --methodeol are incompatible\n");
|
DLOG_ERR("--hostnospace and --methodeol are incompatible\n");
|
||||||
@ -1507,7 +1516,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
dp->methodeol = true;
|
dp->methodeol = true;
|
||||||
break;
|
break;
|
||||||
case 15: /* dpi-desync */
|
case 16: /* dpi-desync */
|
||||||
{
|
{
|
||||||
char *mode=optarg,*mode2,*mode3;
|
char *mode=optarg,*mode2,*mode3;
|
||||||
mode2 = mode ? strchr(mode,',') : NULL;
|
mode2 = mode ? strchr(mode,',') : NULL;
|
||||||
@ -1553,7 +1562,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#ifndef __CYGWIN__
|
#ifndef __CYGWIN__
|
||||||
case 16: /* dpi-desync-fwmark/dpi-desync-sockarg */
|
case 17: /* 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", ¶ms.desync_fwmark)<=0) sscanf(optarg, "%u", ¶ms.desync_fwmark);
|
if (sscanf(optarg, "0x%X", ¶ms.desync_fwmark)<=0) sscanf(optarg, "%u", ¶ms.desync_fwmark);
|
||||||
@ -1568,27 +1577,27 @@ int main(int argc, char **argv)
|
|||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case 17: /* dpi-desync-ttl */
|
case 18: /* dpi-desync-ttl */
|
||||||
dp->desync_ttl = (uint8_t)atoi(optarg);
|
dp->desync_ttl = (uint8_t)atoi(optarg);
|
||||||
break;
|
break;
|
||||||
case 18: /* dpi-desync-ttl6 */
|
case 19: /* dpi-desync-ttl6 */
|
||||||
dp->desync_ttl6 = (uint8_t)atoi(optarg);
|
dp->desync_ttl6 = (uint8_t)atoi(optarg);
|
||||||
break;
|
break;
|
||||||
case 19: /* dpi-desync-autottl */
|
case 20: /* 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 20: /* dpi-desync-autottl6 */
|
case 21: /* 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 21: /* dpi-desync-fooling */
|
case 22: /* dpi-desync-fooling */
|
||||||
{
|
{
|
||||||
char *e,*p = optarg;
|
char *e,*p = optarg;
|
||||||
while (p)
|
while (p)
|
||||||
@ -1623,17 +1632,17 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 22: /* dpi-desync-repeats */
|
case 23: /* 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 23: /* dpi-desync-skip-nosni */
|
case 24: /* dpi-desync-skip-nosni */
|
||||||
dp->desync_skip_nosni = !optarg || atoi(optarg);
|
dp->desync_skip_nosni = !optarg || atoi(optarg);
|
||||||
break;
|
break;
|
||||||
case 24: /* dpi-desync-split-pos */
|
case 25: /* 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))
|
||||||
@ -1644,7 +1653,7 @@ int main(int argc, char **argv)
|
|||||||
dp->split_count += ct;
|
dp->split_count += ct;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 25: /* dpi-desync-split-http-req */
|
case 26: /* 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)
|
||||||
@ -1659,7 +1668,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
dp->split_count++;
|
dp->split_count++;
|
||||||
break;
|
break;
|
||||||
case 26: /* dpi-desync-split-tls */
|
case 27: /* 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)
|
||||||
@ -1674,7 +1683,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
dp->split_count++;
|
dp->split_count++;
|
||||||
break;
|
break;
|
||||||
case 27: /* dpi-desync-split-seqovl */
|
case 28: /* dpi-desync-split-seqovl */
|
||||||
if (!strcmp(optarg,"0"))
|
if (!strcmp(optarg,"0"))
|
||||||
{
|
{
|
||||||
// allow zero = disable seqovl
|
// allow zero = disable seqovl
|
||||||
@ -1687,7 +1696,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 28: /* dpi-desync-split-seqovl-pattern */
|
case 29: /* 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);
|
||||||
@ -1695,7 +1704,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 29: /* dpi-desync-fakedsplit-pattern */
|
case 30: /* 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);
|
||||||
@ -1703,7 +1712,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 30: /* dpi-desync-ipfrag-pos-tcp */
|
case 31: /* 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);
|
||||||
@ -1715,7 +1724,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 31: /* dpi-desync-ipfrag-pos-udp */
|
case 32: /* 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);
|
||||||
@ -1727,63 +1736,63 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 32: /* dpi-desync-badseq-increments */
|
case 33: /* 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 33: /* dpi-desync-badack-increment */
|
case 34: /* 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 34: /* dpi-desync-any-protocol */
|
case 35: /* dpi-desync-any-protocol */
|
||||||
dp->desync_any_proto = !optarg || atoi(optarg);
|
dp->desync_any_proto = !optarg || atoi(optarg);
|
||||||
break;
|
break;
|
||||||
case 35: /* dpi-desync-fake-http */
|
case 36: /* 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 36: /* dpi-desync-fake-tls */
|
case 37: /* 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 37: /* dpi-desync-fake-unknown */
|
case 38: /* 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 38: /* dpi-desync-fake-syndata */
|
case 39: /* 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 39: /* dpi-desync-fake-quic */
|
case 40: /* 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 40: /* dpi-desync-fake-wireguard */
|
case 41: /* 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 41: /* dpi-desync-fake-dht */
|
case 42: /* 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 42: /* dpi-desync-fake-unknown-udp */
|
case 43: /* 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 43: /* dpi-desync-udplen-increment */
|
case 44: /* 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 44: /* dpi-desync-udplen-pattern */
|
case 45: /* 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);
|
||||||
@ -1791,21 +1800,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 45: /* desync-cutoff */
|
case 46: /* 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 46: /* desync-start */
|
case 47: /* 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 47: /* hostlist */
|
case 48: /* hostlist */
|
||||||
if (bSkip) break;
|
if (bSkip) break;
|
||||||
if (!RegisterHostlist(dp, false, optarg))
|
if (!RegisterHostlist(dp, false, optarg))
|
||||||
{
|
{
|
||||||
@ -1813,7 +1822,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 48: /* hostlist-domains */
|
case 49: /* 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)))
|
||||||
{
|
{
|
||||||
@ -1826,7 +1835,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 49: /* hostlist-exclude */
|
case 50: /* hostlist-exclude */
|
||||||
if (bSkip) break;
|
if (bSkip) break;
|
||||||
if (!RegisterHostlist(dp, true, optarg))
|
if (!RegisterHostlist(dp, true, optarg))
|
||||||
{
|
{
|
||||||
@ -1834,7 +1843,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 50: /* hostlist-exclude-domains */
|
case 51: /* 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)))
|
||||||
{
|
{
|
||||||
@ -1847,7 +1856,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 51: /* hostlist-auto */
|
case 52: /* hostlist-auto */
|
||||||
if (bSkip) break;
|
if (bSkip) break;
|
||||||
if (dp->hostlist_auto)
|
if (dp->hostlist_auto)
|
||||||
{
|
{
|
||||||
@ -1875,7 +1884,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 52: /* hostlist-auto-fail-threshold */
|
case 53: /* 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)
|
||||||
{
|
{
|
||||||
@ -1883,7 +1892,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 53: /* hostlist-auto-fail-time */
|
case 54: /* 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)
|
||||||
{
|
{
|
||||||
@ -1891,7 +1900,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 54: /* hostlist-auto-retrans-threshold */
|
case 55: /* 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)
|
||||||
{
|
{
|
||||||
@ -1899,7 +1908,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 55: /* hostlist-auto-debug */
|
case 56: /* hostlist-auto-debug */
|
||||||
{
|
{
|
||||||
FILE *F = fopen(optarg,"a+t");
|
FILE *F = fopen(optarg,"a+t");
|
||||||
if (!F)
|
if (!F)
|
||||||
@ -1913,7 +1922,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 56: /* new */
|
case 57: /* new */
|
||||||
if (bSkip)
|
if (bSkip)
|
||||||
{
|
{
|
||||||
dp_clear(dp);
|
dp_clear(dp);
|
||||||
@ -1934,18 +1943,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 57: /* skip */
|
case 58: /* skip */
|
||||||
bSkip = true;
|
bSkip = true;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 58: /* filter-l3 */
|
case 59: /* 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 59: /* filter-tcp */
|
case 60: /* 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);
|
||||||
@ -1955,7 +1964,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 60: /* filter-udp */
|
case 61: /* 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);
|
||||||
@ -1965,14 +1974,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 61: /* filter-l7 */
|
case 62: /* 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 62: /* ipset */
|
case 63: /* ipset */
|
||||||
if (bSkip) break;
|
if (bSkip) break;
|
||||||
if (!RegisterIpset(dp, false, optarg))
|
if (!RegisterIpset(dp, false, optarg))
|
||||||
{
|
{
|
||||||
@ -1980,7 +1989,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 63: /* ipset-ip */
|
case 64: /* 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)))
|
||||||
{
|
{
|
||||||
@ -1993,7 +2002,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 64: /* ipset-exclude */
|
case 65: /* ipset-exclude */
|
||||||
if (bSkip) break;
|
if (bSkip) break;
|
||||||
if (!RegisterIpset(dp, true, optarg))
|
if (!RegisterIpset(dp, true, optarg))
|
||||||
{
|
{
|
||||||
@ -2001,7 +2010,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 65: /* ipset-exclude-ip */
|
case 66: /* 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)))
|
||||||
{
|
{
|
||||||
@ -2017,28 +2026,28 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
|
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
case 66: /* bind-fix4 */
|
case 67: /* bind-fix4 */
|
||||||
params.bind_fix4 = true;
|
params.bind_fix4 = true;
|
||||||
break;
|
break;
|
||||||
case 67: /* bind-fix6 */
|
case 68: /* bind-fix6 */
|
||||||
params.bind_fix6 = true;
|
params.bind_fix6 = true;
|
||||||
break;
|
break;
|
||||||
#elif defined(__CYGWIN__)
|
#elif defined(__CYGWIN__)
|
||||||
case 66: /* wf-iface */
|
case 67: /* 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 67: /* wf-l3 */
|
case 68: /* 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 68: /* wf-tcp */
|
case 69: /* 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)))
|
||||||
@ -2047,7 +2056,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 69: /* wf-udp */
|
case 70: /* 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)))
|
||||||
@ -2056,7 +2065,7 @@ int main(int argc, char **argv)
|
|||||||
exit_clean(1);
|
exit_clean(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 70: /* wf-raw */
|
case 71: /* wf-raw */
|
||||||
hash_wf_raw=hash_jen(optarg,strlen(optarg));
|
hash_wf_raw=hash_jen(optarg,strlen(optarg));
|
||||||
if (optarg[0]=='@')
|
if (optarg[0]=='@')
|
||||||
{
|
{
|
||||||
@ -2070,11 +2079,11 @@ int main(int argc, char **argv)
|
|||||||
windivert_filter[sizeof(windivert_filter) - 1] = '\0';
|
windivert_filter[sizeof(windivert_filter) - 1] = '\0';
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 71: /* wf-save */
|
case 72: /* 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 72: /* ssid-filter */
|
case 73: /* 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;
|
||||||
@ -2092,7 +2101,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 73: /* nlm-filter */
|
case 74: /* 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;
|
||||||
@ -2110,7 +2119,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 74: /* nlm-list */
|
case 75: /* 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");
|
||||||
@ -2242,6 +2251,12 @@ int main(int argc, char **argv)
|
|||||||
SplitDebug();
|
SplitDebug();
|
||||||
DLOG("\n");
|
DLOG("\n");
|
||||||
|
|
||||||
|
if (bDry)
|
||||||
|
{
|
||||||
|
DLOG_CONDUP("command line parameters verified\n");
|
||||||
|
exit_clean(0);
|
||||||
|
}
|
||||||
|
|
||||||
if (daemon) daemonize();
|
if (daemon) daemonize();
|
||||||
|
|
||||||
if (*pidfile && !writepid(pidfile))
|
if (*pidfile && !writepid(pidfile))
|
||||||
|
Loading…
Reference in New Issue
Block a user