mirror of
https://github.com/bol-van/zapret.git
synced 2024-11-26 12:10:53 +03:00
nfqws,tpws: use alternate $ sign to indicate file config
This commit is contained in:
parent
cc38472e32
commit
db7078dcca
@ -851,7 +851,7 @@ static unsigned int hash_jen(const void *data,unsigned int len)
|
|||||||
static void exithelp(void)
|
static void exithelp(void)
|
||||||
{
|
{
|
||||||
printf(
|
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"
|
" --debug=0|1|syslog|@<filename>\n"
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
" --qnum=<nfqueue_number>\n"
|
" --qnum=<nfqueue_number>\n"
|
||||||
@ -1070,7 +1070,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (argc>=2 && argv[1][0]=='@')
|
if (argc>=2 && (argv[1][0]=='@' || argv[1][0]=='$'))
|
||||||
{
|
{
|
||||||
config_from_file(argv[1]+1);
|
config_from_file(argv[1]+1);
|
||||||
argv=params.wexp.we_wordv;
|
argv=params.wexp.we_wordv;
|
||||||
|
@ -122,7 +122,7 @@ static int get_default_ttl(void)
|
|||||||
static void exithelp(void)
|
static void exithelp(void)
|
||||||
{
|
{
|
||||||
printf(
|
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-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-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"
|
" --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 = &dpl->dp;
|
||||||
dp->n = ++desync_profile_count;
|
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);
|
config_from_file(argv[1]+1);
|
||||||
argv=params.wexp.we_wordv;
|
argv=params.wexp.we_wordv;
|
||||||
|
Loading…
Reference in New Issue
Block a user