Remove ``nat pptp'' as this is now done transparently by libalias.
This commit is contained in:
parent
8f921b5c5e
commit
86c5e1ea4d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=61863
@ -101,3 +101,4 @@ o Unbalanced quotes in commands are now warned about and the entire command
|
||||
o It is now only necessary to escape the `-' character in chat scripts twice.
|
||||
See the example files for details.
|
||||
o Environment variables and ~ are expanded on in commands
|
||||
o ``nat pptp'' is no longer necessary as this is now done transparently
|
||||
|
@ -597,7 +597,6 @@ static struct cmdtab const NatCommands[] =
|
||||
(const void *) PKT_ALIAS_LOG},
|
||||
{"port", NULL, nat_RedirectPort, LOCAL_AUTH, "port redirection",
|
||||
"nat port proto localaddr:port[-port] aliasport[-aliasport]"},
|
||||
{"pptp", NULL, nat_Pptp, LOCAL_AUTH, "Set the PPTP address", "nat pptp IP"},
|
||||
{"proxy", NULL, nat_ProxyRule, LOCAL_AUTH,
|
||||
"proxy control", "nat proxy server host[:port] ..."},
|
||||
{"same_ports", NULL, NatOption, LOCAL_AUTH,
|
||||
|
@ -315,30 +315,6 @@ nat_ProxyRule(struct cmdargs const *arg)
|
||||
return PacketAliasProxyRule(cmd);
|
||||
}
|
||||
|
||||
int
|
||||
nat_Pptp(struct cmdargs const *arg)
|
||||
{
|
||||
struct in_addr addr;
|
||||
|
||||
if (arg->argc == arg->argn) {
|
||||
addr.s_addr = INADDR_NONE;
|
||||
PacketAliasPptp(addr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (arg->argc != arg->argn + 1)
|
||||
return -1;
|
||||
|
||||
addr = GetIpAddr(arg->argv[arg->argn]);
|
||||
if (addr.s_addr == INADDR_NONE) {
|
||||
log_Printf(LogWARN, "%s: invalid address\n", arg->argv[arg->argn]);
|
||||
return 1;
|
||||
}
|
||||
|
||||
PacketAliasPptp(addr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
nat_SetTarget(struct cmdargs const *arg)
|
||||
{
|
||||
|
@ -10,7 +10,6 @@ struct cmdargs;
|
||||
extern int nat_RedirectPort(struct cmdargs const *);
|
||||
extern int nat_RedirectAddr(struct cmdargs const *);
|
||||
extern int nat_ProxyRule(struct cmdargs const *);
|
||||
extern int nat_Pptp(struct cmdargs const *);
|
||||
extern int nat_SetTarget(struct cmdargs const *);
|
||||
|
||||
extern struct layer natlayer;
|
||||
|
@ -3145,30 +3145,6 @@ or a range of ports the same size as the other ranges.
|
||||
This option is useful if you wish to run things like Internet phone on
|
||||
machines behind your gateway, but is limited in that connections to only
|
||||
one interior machine per source machine and target port are possible.
|
||||
.It nat pptp Op Ar addr
|
||||
This tells
|
||||
.Nm
|
||||
to translate any
|
||||
.Em G Ns No eneral
|
||||
.Em R Ns No outing
|
||||
.Em E Ns No encapsulated
|
||||
.Pq Dv IPPROTO_GRE
|
||||
packets using
|
||||
.Ar addr
|
||||
rather than the local interface address.
|
||||
This allows the uses of the
|
||||
.Em P Ns No oint
|
||||
to
|
||||
.Em P Ns No oint
|
||||
.Em T Ns No unneling
|
||||
.Em P Ns No rotocol
|
||||
on a machine on the internal network.
|
||||
.Pp
|
||||
If
|
||||
.Ar addr
|
||||
is not specified,
|
||||
.Dv PPTP
|
||||
address translation is disabled.
|
||||
.It "nat proxy cmd" Ar arg Ns No ...
|
||||
This command tells
|
||||
.Nm
|
||||
|
@ -3145,30 +3145,6 @@ or a range of ports the same size as the other ranges.
|
||||
This option is useful if you wish to run things like Internet phone on
|
||||
machines behind your gateway, but is limited in that connections to only
|
||||
one interior machine per source machine and target port are possible.
|
||||
.It nat pptp Op Ar addr
|
||||
This tells
|
||||
.Nm
|
||||
to translate any
|
||||
.Em G Ns No eneral
|
||||
.Em R Ns No outing
|
||||
.Em E Ns No encapsulated
|
||||
.Pq Dv IPPROTO_GRE
|
||||
packets using
|
||||
.Ar addr
|
||||
rather than the local interface address.
|
||||
This allows the uses of the
|
||||
.Em P Ns No oint
|
||||
to
|
||||
.Em P Ns No oint
|
||||
.Em T Ns No unneling
|
||||
.Em P Ns No rotocol
|
||||
on a machine on the internal network.
|
||||
.Pp
|
||||
If
|
||||
.Ar addr
|
||||
is not specified,
|
||||
.Dv PPTP
|
||||
address translation is disabled.
|
||||
.It "nat proxy cmd" Ar arg Ns No ...
|
||||
This command tells
|
||||
.Nm
|
||||
|
Loading…
Reference in New Issue
Block a user