Remove ``pptpalias'' since this is now done transparently by libalias(3).
This commit is contained in:
parent
86c5e1ea4d
commit
dc1a022582
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=61864
@ -42,7 +42,6 @@ Network Address Translation Daemon
|
|||||||
.Op Fl reverse
|
.Op Fl reverse
|
||||||
.Op Fl proxy_only
|
.Op Fl proxy_only
|
||||||
.Op Fl proxy_rule Ar proxyspec
|
.Op Fl proxy_rule Ar proxyspec
|
||||||
.Op Fl pptpalias Ar localIP
|
|
||||||
|
|
||||||
.Sh DESCRIPTION
|
.Sh DESCRIPTION
|
||||||
This program provides a Network Address Translation facility for use
|
This program provides a Network Address Translation facility for use
|
||||||
@ -377,22 +376,6 @@ Use
|
|||||||
to put this information into the IP option field or
|
to put this information into the IP option field or
|
||||||
.Dq encode_tcp_stream
|
.Dq encode_tcp_stream
|
||||||
to inject the data into the beginning of the TCP stream.
|
to inject the data into the beginning of the TCP stream.
|
||||||
|
|
||||||
.It Fl pptpalias Ar localIP
|
|
||||||
Allow PPTP packets to go to the defined localIP address.
|
|
||||||
PPTP is a VPN or secure
|
|
||||||
IP tunneling technology being developed primarily by Microsoft.
|
|
||||||
For its encrypted traffic,
|
|
||||||
it uses an old IP encapsulation protocol called GRE (47).
|
|
||||||
This natd option will translate any traffic of this protocol to a
|
|
||||||
single, specified IP address.
|
|
||||||
This would allow either one client or one server
|
|
||||||
to be serviced with natd.
|
|
||||||
If you are setting up a server, don't forget to allow the TCP traffic
|
|
||||||
for the PPTP setup.
|
|
||||||
For a client or server,
|
|
||||||
you must allow GRE (protocol 47) if you have firewall lists active.
|
|
||||||
|
|
||||||
.El
|
.El
|
||||||
|
|
||||||
.Sh RUNNING NATD
|
.Sh RUNNING NATD
|
||||||
@ -529,6 +512,6 @@ times:
|
|||||||
.An Ari Suutari Aq suutari@iki.fi
|
.An Ari Suutari Aq suutari@iki.fi
|
||||||
(natd)
|
(natd)
|
||||||
.An Dru Nelson Aq dnelson@redwoodsoft.com
|
.An Dru Nelson Aq dnelson@redwoodsoft.com
|
||||||
(PPTP support)
|
(early PPTP support)
|
||||||
.An Brian Somers Aq brian@awfulhak.org
|
.An Brian Somers Aq brian@awfulhak.org
|
||||||
(glue)
|
(glue)
|
||||||
|
@ -91,7 +91,6 @@ static void ReadConfigFile (const char* fileName);
|
|||||||
static void SetupPortRedirect (const char* parms);
|
static void SetupPortRedirect (const char* parms);
|
||||||
static void SetupProtoRedirect(const char* parms);
|
static void SetupProtoRedirect(const char* parms);
|
||||||
static void SetupAddressRedirect (const char* parms);
|
static void SetupAddressRedirect (const char* parms);
|
||||||
static void SetupPptpAlias (const char* parms);
|
|
||||||
static void StrToAddr (const char* str, struct in_addr* addr);
|
static void StrToAddr (const char* str, struct in_addr* addr);
|
||||||
static u_short StrToPort (const char* str, const char* proto);
|
static u_short StrToPort (const char* str, const char* proto);
|
||||||
static int StrToPortRange (const char* str, const char* proto, port_range *portRange);
|
static int StrToPortRange (const char* str, const char* proto, port_range *portRange);
|
||||||
@ -867,7 +866,6 @@ enum Option {
|
|||||||
RedirectAddress,
|
RedirectAddress,
|
||||||
ConfigFile,
|
ConfigFile,
|
||||||
DynamicMode,
|
DynamicMode,
|
||||||
PptpAlias,
|
|
||||||
ProxyRule,
|
ProxyRule,
|
||||||
LogDenied,
|
LogDenied,
|
||||||
LogFacility
|
LogFacility
|
||||||
@ -1058,14 +1056,6 @@ static struct OptionInfo optionTable[] = {
|
|||||||
"redirect_address",
|
"redirect_address",
|
||||||
NULL },
|
NULL },
|
||||||
|
|
||||||
{ PptpAlias,
|
|
||||||
0,
|
|
||||||
String,
|
|
||||||
"src",
|
|
||||||
"define inside machine for PPTP traffic",
|
|
||||||
"pptpalias",
|
|
||||||
NULL },
|
|
||||||
|
|
||||||
{ ConfigFile,
|
{ ConfigFile,
|
||||||
0,
|
0,
|
||||||
String,
|
String,
|
||||||
@ -1231,10 +1221,6 @@ static void ParseOption (const char* option, const char* parms)
|
|||||||
SetupAddressRedirect (strValue);
|
SetupAddressRedirect (strValue);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case PptpAlias:
|
|
||||||
SetupPptpAlias (strValue);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case ProxyRule:
|
case ProxyRule:
|
||||||
PacketAliasProxyRule (strValue);
|
PacketAliasProxyRule (strValue);
|
||||||
break;
|
break;
|
||||||
@ -1356,25 +1342,6 @@ static void Usage ()
|
|||||||
exit (1);
|
exit (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetupPptpAlias (const char* parms)
|
|
||||||
{
|
|
||||||
char buf[128];
|
|
||||||
char* ptr;
|
|
||||||
struct in_addr srcAddr;
|
|
||||||
|
|
||||||
strcpy (buf, parms);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Extract source address.
|
|
||||||
*/
|
|
||||||
ptr = strtok (buf, " \t");
|
|
||||||
if (!ptr)
|
|
||||||
errx(1, "pptpalias: missing src address");
|
|
||||||
|
|
||||||
StrToAddr (ptr, &srcAddr);
|
|
||||||
PacketAliasPptp (srcAddr);
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetupPortRedirect (const char* parms)
|
void SetupPortRedirect (const char* parms)
|
||||||
{
|
{
|
||||||
char buf[128];
|
char buf[128];
|
||||||
|
Loading…
Reference in New Issue
Block a user