drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2024-11-26 12:10:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: drygdryg:cc38472e32a2a6060be040510b7beb24a2f31d2b
Branches Tags
drygdryg:master
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64
...
compare: drygdryg:7abf10577741845079f6f102c52fd9e570a844e2
Branches Tags
drygdryg:master
drygdryg:v69.3
drygdryg:v69.2
drygdryg:v69.1
drygdryg:v69
drygdryg:v68
drygdryg:v67
drygdryg:v66
drygdryg:v65
drygdryg:v64

2 Commits
cc38472e32 ... 7abf105777

Author SHA1 Message Date
bol-van
7abf105777 init.d: display why bad options are bad 2024-11-01 17:16:57 +03:00
bol-van
db7078dcca nfqws,tpws: use alternate $ sign to indicate file config 2024-11-01 16:51:32 +03:00
3 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

4
common/base.sh
View File

@ -400,6 +400,7 @@ check_bad_ws_options()
# $2 - nfqws/tpws options
if [ "$1" = 1 ] && has_bad_ws_options "$2"; then
echo "!!! REFUSING TO USE BAD OPTIONS : $2"
help_bad_ws_options
return 1
else
return 0
@ -408,8 +409,7 @@ check_bad_ws_options()
help_bad_ws_options()
{
echo "WARNING ! you have specified --ipset option"
echo "WARNING ! it would work but on $UNAME it's not the best option"
echo "WARNING ! it would work but on ${UNAME:-$(uname)} it's not the best option"
echo "WARNING ! you should use kernel mode sets. they are much more efficient."
echo "WARNING ! to use ipsets you have to write your own custom script"
echo "WARNING ! installer will stop here to prevent distribution of easy to use but bad copy-paste solutions"
}

4
nfq/nfqws.c
View File

@ -851,7 +851,7 @@ static unsigned int hash_jen(const void *data,unsigned int len)
static void exithelp(void)
{
printf(
" @<config_file>\t\t\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"
" --debug=0|1|syslog|@<filename>\n"
#ifdef __linux__
" --qnum=<nfqueue_number>\n"
@ -1070,7 +1070,7 @@ int main(int argc, char **argv)
}
#endif
if (argc>=2 && argv[1][0]=='@')
if (argc>=2 && (argv[1][0]=='@' || argv[1][0]=='$'))
{
config_from_file(argv[1]+1);
argv=params.wexp.we_wordv;

4
tpws/tpws.c
View File

@ -122,7 +122,7 @@ static int get_default_ttl(void)
static void exithelp(void)
{
printf(
" @<config_file>\t\t\t\t; read file for options. must be the only argument. other options are ignored.\n\n"
" @<config_file>|$<config_file>\t\t; read file for options. must be the only argument. other options are ignored.\n\n"
" --bind-addr=<v4_addr>|<v6_addr>\t; for v6 link locals append %%interface_name\n"
" --bind-iface4=<interface_name>\t\t; bind to the first ipv4 addr of interface\n"
" --bind-iface6=<interface_name>\t\t; bind to the first ipv6 addr of interface\n"
@ -426,7 +426,7 @@ void parse_params(int argc, char *argv[])
dp = &dpl->dp;
dp->n = ++desync_profile_count;
if (argc>=2 && argv[1][0]=='@')
if (argc>=2 && (argv[1][0]=='@' || argv[1][0]=='$'))
{
config_from_file(argv[1]+1);
argv=params.wexp.we_wordv;