d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

natd 1_10 => 1_11

Browse Source 
Cosmetic style changes
  Use u_short for port values.
Submitted by:	Ari Suutari <ari@suutari.iki.fi>
This commit is contained in:
Brian Somers 1997-12-10 02:14:57 +00:00
parent c55f0f1425
commit 67a886fb97
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=31660
4 changed files with 140 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sbin/natd/HISTORY
View File

@ -117,3 +117,8 @@
- Ignored incoming packets are now dropped when - Ignored incoming packets are now dropped when
deny_incoming option is set to yes. deny_incoming option is set to yes.
- Packet aliasing library upgraded to 2.4. - Packet aliasing library upgraded to 2.4.
* Version 1.11
- Code cleanup work done in FreeBSD-current development merged.
- Port numbers are now unsigned as they should always have been.

126
sbin/natd/natd.c
View File

@ -36,6 +36,7 @@
#include <string.h> #include <string.h>
#include <syslog.h> #include <syslog.h>
#include <unistd.h> #include <unistd.h>
#include "natd.h" #include "natd.h"
/* /*
@ -49,26 +50,26 @@
* Function prototypes. * Function prototypes.
*/ */
static void DoAliasing (int fd); static void DoAliasing (int fd);
static void DaemonMode (); static void DaemonMode ();
static void HandleRoutingInfo (int fd); static void HandleRoutingInfo (int fd);
static void Usage (); static void Usage ();
static void PrintPacket (struct ip*); static void PrintPacket (struct ip*);
static void SetAliasAddressFromIfName (char* ifName); static void SetAliasAddressFromIfName (char* ifName);
static void InitiateShutdown (); static void InitiateShutdown ();
static void Shutdown (); static void Shutdown ();
static void RefreshAddr (); static void RefreshAddr ();
static void ParseOption (char* option, char* parms, int cmdLine); static void ParseOption (char* option, char* parms, int cmdLine);
static void ReadConfigFile (char* fileName); static void ReadConfigFile (char* fileName);
static void SetupPermanentLink (char* parms); static void SetupPermanentLink (char* parms);
static void SetupPortRedirect (char* parms); static void SetupPortRedirect (char* parms);
static void SetupAddressRedirect (char* parms); static void SetupAddressRedirect (char* parms);
static void StrToAddr (char* str, struct in_addr* addr); static void StrToAddr (char* str, struct in_addr* addr);
static int StrToPort (char* str, char* proto); static u_short StrToPort (char* str, char* proto);
static int StrToProto (char* str); static int StrToProto (char* str);
static int StrToAddrAndPort (char* str, struct in_addr* addr, char* proto); static u_short StrToAddrAndPort (char* str, struct in_addr* addr, char* proto);
static void ParseArgs (int argc, char** argv); static void ParseArgs (int argc, char** argv);
static void FlushPacketBuffer (int fd); static void FlushPacketBuffer (int fd);
/* /*
* Globals. * Globals.
@ -80,9 +81,9 @@ static int running;
static int assignAliasAddr; static int assignAliasAddr;
static char* ifName; static char* ifName;
static int ifIndex; static int ifIndex;
static int inPort; static u_short inPort;
static int outPort; static u_short outPort;
static int inOutPort; static u_short inOutPort;
static struct in_addr aliasAddr; static struct in_addr aliasAddr;
static int dynamicMode; static int dynamicMode;
static int ifMTU; static int ifMTU;
@ -135,17 +136,17 @@ int main (int argc, char** argv)
* Check that valid aliasing address has been given. * Check that valid aliasing address has been given.
*/ */
if (aliasAddr.s_addr == INADDR_NONE && ifName == NULL) if (aliasAddr.s_addr == INADDR_NONE && ifName == NULL)
errx(1, "aliasing address not given"); errx (1, "aliasing address not given");
if (aliasAddr.s_addr != INADDR_NONE && ifName != NULL) if (aliasAddr.s_addr != INADDR_NONE && ifName != NULL)
errx(1, errx (1, "both alias address and interface "
"both alias address and interface name are not allowed"); "name are not allowed");
/* /*
* Check that valid port number is known. * Check that valid port number is known.
*/ */
if (inPort != 0 || outPort != 0) if (inPort != 0 || outPort != 0)
if (inPort == 0 || outPort == 0) if (inPort == 0 || outPort == 0)
errx(1, "both input and output ports are required"); errx (1, "both input and output ports are required");
if (inPort == 0 && outPort == 0 && inOutPort == 0) if (inPort == 0 && outPort == 0 && inOutPort == 0)
ParseOption ("port", DEFAULT_SERVICE, 0); ParseOption ("port", DEFAULT_SERVICE, 0);
@ -930,6 +931,7 @@ static void ParseOption (char* option, char* parms, int cmdLine)
int yesNoValue; int yesNoValue;
int aliasValue; int aliasValue;
int numValue; int numValue;
u_short uNumValue;
char* strValue; char* strValue;
struct in_addr addrValue; struct in_addr addrValue;
int max; int max;
@ -954,6 +956,7 @@ static void ParseOption (char* option, char* parms, int cmdLine)
Usage (); Usage ();
} }
uNumValue = 0;
yesNoValue = 0; yesNoValue = 0;
numValue = 0; numValue = 0;
strValue = NULL; strValue = NULL;
@ -971,15 +974,16 @@ static void ParseOption (char* option, char* parms, int cmdLine)
if (!strcmp (parms, "no")) if (!strcmp (parms, "no"))
yesNoValue = 0; yesNoValue = 0;
else else
errx(1, "%s needs yes/no parameter", option); errx (1, "%s needs yes/no parameter", option);
break; break;
case Service: case Service:
if (!parms) if (!parms)
errx(1, errx (1, "%s needs service name or "
"%s needs service name or port number parameter", option); "port number parameter",
option);
numValue = StrToPort (parms, "divert"); uNumValue = StrToPort (parms, "divert");
break; break;
case Numeric: case Numeric:
@ -989,23 +993,23 @@ static void ParseOption (char* option, char* parms, int cmdLine)
end = parms; end = parms;
if (end == parms) if (end == parms)
errx(1, "%s needs numeric parameter", option); errx (1, "%s needs numeric parameter", option);
break; break;
case String: case String:
strValue = parms; strValue = parms;
if (!strValue) if (!strValue)
errx(1, "%s needs parameter", option); errx (1, "%s needs parameter", option);
break; break;
case None: case None:
if (parms) if (parms)
errx(1, "%s does not take parameters", option); errx (1, "%s does not take parameters", option);
break; break;
case Address: case Address:
if (!parms) if (!parms)
errx(1, "%s needs address/host parameter", option); errx (1, "%s needs address/host parameter", option);
StrToAddr (parms, &addrValue); StrToAddr (parms, &addrValue);
break; break;
@ -1027,15 +1031,15 @@ static void ParseOption (char* option, char* parms, int cmdLine)
break; break;
case InPort: case InPort:
inPort = numValue; inPort = uNumValue;
break; break;
case OutPort: case OutPort:
outPort = numValue; outPort = uNumValue;
break; break;
case Port: case Port:
inOutPort = numValue; inOutPort = uNumValue;
break; break;
case AliasAddress: case AliasAddress:
@ -1086,7 +1090,7 @@ void ReadConfigFile (char* fileName)
ptr = strchr (buf, '\n'); ptr = strchr (buf, '\n');
if (!ptr) if (!ptr)
errx(1, "config line too link: %s", buf); errx (1, "config line too long: %s", buf);
*ptr = '\0'; *ptr = '\0';
if (buf[0] == '#') if (buf[0] == '#')
@ -1155,9 +1159,9 @@ void SetupPermanentLink (char* parms)
char* ptr; char* ptr;
struct in_addr srcAddr; struct in_addr srcAddr;
struct in_addr dstAddr; struct in_addr dstAddr;
int srcPort; u_short srcPort;
int dstPort; u_short dstPort;
int aliasPort; u_short aliasPort;
int proto; int proto;
char* protoName; char* protoName;
@ -1167,7 +1171,7 @@ void SetupPermanentLink (char* parms)
*/ */
protoName = strtok (buf, " \t"); protoName = strtok (buf, " \t");
if (!protoName) if (!protoName)
errx(1, "permanent_link: missing protocol"); errx (1, "permanent_link: missing protocol");
proto = StrToProto (protoName); proto = StrToProto (protoName);
/* /*
@ -1175,7 +1179,7 @@ void SetupPermanentLink (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "permanent_link: missing src address"); errx (1, "permanent_link: missing src address");
srcPort = StrToAddrAndPort (ptr, &srcAddr, protoName); srcPort = StrToAddrAndPort (ptr, &srcAddr, protoName);
/* /*
@ -1183,7 +1187,7 @@ void SetupPermanentLink (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "permanent_link: missing dst address"); errx (1, "permanent_link: missing dst address");
dstPort = StrToAddrAndPort (ptr, &dstAddr, protoName); dstPort = StrToAddrAndPort (ptr, &dstAddr, protoName);
/* /*
@ -1191,7 +1195,7 @@ void SetupPermanentLink (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "permanent_link: missing alias port"); errx (1, "permanent_link: missing alias port");
aliasPort = StrToPort (ptr, protoName); aliasPort = StrToPort (ptr, protoName);
@ -1210,9 +1214,9 @@ void SetupPortRedirect (char* parms)
struct in_addr localAddr; struct in_addr localAddr;
struct in_addr publicAddr; struct in_addr publicAddr;
struct in_addr remoteAddr; struct in_addr remoteAddr;
int localPort; u_short localPort;
int publicPort; u_short publicPort;
int remotePort; u_short remotePort;
int proto; int proto;
char* protoName; char* protoName;
char* separator; char* separator;
@ -1223,7 +1227,7 @@ void SetupPortRedirect (char* parms)
*/ */
protoName = strtok (buf, " \t"); protoName = strtok (buf, " \t");
if (!protoName) if (!protoName)
errx(1, "redirect_port: missing protocol"); errx (1, "redirect_port: missing protocol");
proto = StrToProto (protoName); proto = StrToProto (protoName);
/* /*
@ -1231,7 +1235,7 @@ void SetupPortRedirect (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "redirect_port: missing local address"); errx (1, "redirect_port: missing local address");
localPort = StrToAddrAndPort (ptr, &localAddr, protoName); localPort = StrToAddrAndPort (ptr, &localAddr, protoName);
/* /*
@ -1239,7 +1243,7 @@ void SetupPortRedirect (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "redirect_port: missing public port"); errx (1, "redirect_port: missing public port");
separator = strchr (ptr, ':'); separator = strchr (ptr, ':');
if (separator) if (separator)
@ -1296,7 +1300,7 @@ void SetupAddressRedirect (char* parms)
*/ */
ptr = strtok (buf, " \t"); ptr = strtok (buf, " \t");
if (!ptr) if (!ptr)
errx(1, "redirect_address: missing local address"); errx (1, "redirect_address: missing local address");
StrToAddr (ptr, &localAddr); StrToAddr (ptr, &localAddr);
/* /*
@ -1304,7 +1308,7 @@ void SetupAddressRedirect (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "redirect_address: missing public address"); errx (1, "redirect_address: missing public address");
StrToAddr (ptr, &publicAddr); StrToAddr (ptr, &publicAddr);
PacketAliasRedirectAddr (localAddr, publicAddr); PacketAliasRedirectAddr (localAddr, publicAddr);
@ -1319,14 +1323,14 @@ void StrToAddr (char* str, struct in_addr* addr)
hp = gethostbyname (str); hp = gethostbyname (str);
if (!hp) if (!hp)
errx(1, "unknown host %s", str); errx (1, "unknown host %s", str);
memcpy (addr, hp->h_addr, sizeof (struct in_addr)); memcpy (addr, hp->h_addr, sizeof (struct in_addr));
} }
int StrToPort (char* str, char* proto) u_short StrToPort (char* str, char* proto)
{ {
int port; u_short port;
struct servent* sp; struct servent* sp;
char* end; char* end;
@ -1336,7 +1340,7 @@ int StrToPort (char* str, char* proto)
sp = getservbyname (str, proto); sp = getservbyname (str, proto);
if (!sp) if (!sp)
errx(1, "unknown service %s/%s", str, proto); errx (1, "unknown service %s/%s", str, proto);
return sp->s_port; return sp->s_port;
} }
@ -1349,16 +1353,16 @@ int StrToProto (char* str)
if (!strcmp (str, "udp")) if (!strcmp (str, "udp"))
return IPPROTO_UDP; return IPPROTO_UDP;
errx(1, "unknown protocol %s. Expected tcp or udp", str); errx (1, "unknown protocol %s. Expected tcp or udp", str);
} }
int StrToAddrAndPort (char* str, struct in_addr* addr, char* proto) u_short StrToAddrAndPort (char* str, struct in_addr* addr, char* proto)
{ {
char* ptr; char* ptr;
ptr = strchr (str, ':'); ptr = strchr (str, ':');
if (!ptr) if (!ptr)
errx(1, "%s is missing port number", str); errx (1, "%s is missing port number", str);
*ptr = '\0'; *ptr = '\0';
++ptr; ++ptr;

5
usr.sbin/natd/HISTORY
View File

@ -117,3 +117,8 @@
- Ignored incoming packets are now dropped when - Ignored incoming packets are now dropped when
deny_incoming option is set to yes. deny_incoming option is set to yes.
- Packet aliasing library upgraded to 2.4. - Packet aliasing library upgraded to 2.4.
* Version 1.11
- Code cleanup work done in FreeBSD-current development merged.
- Port numbers are now unsigned as they should always have been.

126
usr.sbin/natd/natd.c
View File

@ -36,6 +36,7 @@
#include <string.h> #include <string.h>
#include <syslog.h> #include <syslog.h>
#include <unistd.h> #include <unistd.h>
#include "natd.h" #include "natd.h"
/* /*
@ -49,26 +50,26 @@
* Function prototypes. * Function prototypes.
*/ */
static void DoAliasing (int fd); static void DoAliasing (int fd);
static void DaemonMode (); static void DaemonMode ();
static void HandleRoutingInfo (int fd); static void HandleRoutingInfo (int fd);
static void Usage (); static void Usage ();
static void PrintPacket (struct ip*); static void PrintPacket (struct ip*);
static void SetAliasAddressFromIfName (char* ifName); static void SetAliasAddressFromIfName (char* ifName);
static void InitiateShutdown (); static void InitiateShutdown ();
static void Shutdown (); static void Shutdown ();
static void RefreshAddr (); static void RefreshAddr ();
static void ParseOption (char* option, char* parms, int cmdLine); static void ParseOption (char* option, char* parms, int cmdLine);
static void ReadConfigFile (char* fileName); static void ReadConfigFile (char* fileName);
static void SetupPermanentLink (char* parms); static void SetupPermanentLink (char* parms);
static void SetupPortRedirect (char* parms); static void SetupPortRedirect (char* parms);
static void SetupAddressRedirect (char* parms); static void SetupAddressRedirect (char* parms);
static void StrToAddr (char* str, struct in_addr* addr); static void StrToAddr (char* str, struct in_addr* addr);
static int StrToPort (char* str, char* proto); static u_short StrToPort (char* str, char* proto);
static int StrToProto (char* str); static int StrToProto (char* str);
static int StrToAddrAndPort (char* str, struct in_addr* addr, char* proto); static u_short StrToAddrAndPort (char* str, struct in_addr* addr, char* proto);
static void ParseArgs (int argc, char** argv); static void ParseArgs (int argc, char** argv);
static void FlushPacketBuffer (int fd); static void FlushPacketBuffer (int fd);
/* /*
* Globals. * Globals.
@ -80,9 +81,9 @@ static int running;
static int assignAliasAddr; static int assignAliasAddr;
static char* ifName; static char* ifName;
static int ifIndex; static int ifIndex;
static int inPort; static u_short inPort;
static int outPort; static u_short outPort;
static int inOutPort; static u_short inOutPort;
static struct in_addr aliasAddr; static struct in_addr aliasAddr;
static int dynamicMode; static int dynamicMode;
static int ifMTU; static int ifMTU;
@ -135,17 +136,17 @@ int main (int argc, char** argv)
* Check that valid aliasing address has been given. * Check that valid aliasing address has been given.
*/ */
if (aliasAddr.s_addr == INADDR_NONE && ifName == NULL) if (aliasAddr.s_addr == INADDR_NONE && ifName == NULL)
errx(1, "aliasing address not given"); errx (1, "aliasing address not given");
if (aliasAddr.s_addr != INADDR_NONE && ifName != NULL) if (aliasAddr.s_addr != INADDR_NONE && ifName != NULL)
errx(1, errx (1, "both alias address and interface "
"both alias address and interface name are not allowed"); "name are not allowed");
/* /*
* Check that valid port number is known. * Check that valid port number is known.
*/ */
if (inPort != 0 || outPort != 0) if (inPort != 0 || outPort != 0)
if (inPort == 0 || outPort == 0) if (inPort == 0 || outPort == 0)
errx(1, "both input and output ports are required"); errx (1, "both input and output ports are required");
if (inPort == 0 && outPort == 0 && inOutPort == 0) if (inPort == 0 && outPort == 0 && inOutPort == 0)
ParseOption ("port", DEFAULT_SERVICE, 0); ParseOption ("port", DEFAULT_SERVICE, 0);
@ -930,6 +931,7 @@ static void ParseOption (char* option, char* parms, int cmdLine)
int yesNoValue; int yesNoValue;
int aliasValue; int aliasValue;
int numValue; int numValue;
u_short uNumValue;
char* strValue; char* strValue;
struct in_addr addrValue; struct in_addr addrValue;
int max; int max;
@ -954,6 +956,7 @@ static void ParseOption (char* option, char* parms, int cmdLine)
Usage (); Usage ();
} }
uNumValue = 0;
yesNoValue = 0; yesNoValue = 0;
numValue = 0; numValue = 0;
strValue = NULL; strValue = NULL;
@ -971,15 +974,16 @@ static void ParseOption (char* option, char* parms, int cmdLine)
if (!strcmp (parms, "no")) if (!strcmp (parms, "no"))
yesNoValue = 0; yesNoValue = 0;
else else
errx(1, "%s needs yes/no parameter", option); errx (1, "%s needs yes/no parameter", option);
break; break;
case Service: case Service:
if (!parms) if (!parms)
errx(1, errx (1, "%s needs service name or "
"%s needs service name or port number parameter", option); "port number parameter",
option);
numValue = StrToPort (parms, "divert"); uNumValue = StrToPort (parms, "divert");
break; break;
case Numeric: case Numeric:
@ -989,23 +993,23 @@ static void ParseOption (char* option, char* parms, int cmdLine)
end = parms; end = parms;
if (end == parms) if (end == parms)
errx(1, "%s needs numeric parameter", option); errx (1, "%s needs numeric parameter", option);
break; break;
case String: case String:
strValue = parms; strValue = parms;
if (!strValue) if (!strValue)
errx(1, "%s needs parameter", option); errx (1, "%s needs parameter", option);
break; break;
case None: case None:
if (parms) if (parms)
errx(1, "%s does not take parameters", option); errx (1, "%s does not take parameters", option);
break; break;
case Address: case Address:
if (!parms) if (!parms)
errx(1, "%s needs address/host parameter", option); errx (1, "%s needs address/host parameter", option);
StrToAddr (parms, &addrValue); StrToAddr (parms, &addrValue);
break; break;
@ -1027,15 +1031,15 @@ static void ParseOption (char* option, char* parms, int cmdLine)
break; break;
case InPort: case InPort:
inPort = numValue; inPort = uNumValue;
break; break;
case OutPort: case OutPort:
outPort = numValue; outPort = uNumValue;
break; break;
case Port: case Port:
inOutPort = numValue; inOutPort = uNumValue;
break; break;
case AliasAddress: case AliasAddress:
@ -1086,7 +1090,7 @@ void ReadConfigFile (char* fileName)
ptr = strchr (buf, '\n'); ptr = strchr (buf, '\n');
if (!ptr) if (!ptr)
errx(1, "config line too link: %s", buf); errx (1, "config line too long: %s", buf);
*ptr = '\0'; *ptr = '\0';
if (buf[0] == '#') if (buf[0] == '#')
@ -1155,9 +1159,9 @@ void SetupPermanentLink (char* parms)
char* ptr; char* ptr;
struct in_addr srcAddr; struct in_addr srcAddr;
struct in_addr dstAddr; struct in_addr dstAddr;
int srcPort; u_short srcPort;
int dstPort; u_short dstPort;
int aliasPort; u_short aliasPort;
int proto; int proto;
char* protoName; char* protoName;
@ -1167,7 +1171,7 @@ void SetupPermanentLink (char* parms)
*/ */
protoName = strtok (buf, " \t"); protoName = strtok (buf, " \t");
if (!protoName) if (!protoName)
errx(1, "permanent_link: missing protocol"); errx (1, "permanent_link: missing protocol");
proto = StrToProto (protoName); proto = StrToProto (protoName);
/* /*
@ -1175,7 +1179,7 @@ void SetupPermanentLink (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "permanent_link: missing src address"); errx (1, "permanent_link: missing src address");
srcPort = StrToAddrAndPort (ptr, &srcAddr, protoName); srcPort = StrToAddrAndPort (ptr, &srcAddr, protoName);
/* /*
@ -1183,7 +1187,7 @@ void SetupPermanentLink (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "permanent_link: missing dst address"); errx (1, "permanent_link: missing dst address");
dstPort = StrToAddrAndPort (ptr, &dstAddr, protoName); dstPort = StrToAddrAndPort (ptr, &dstAddr, protoName);
/* /*
@ -1191,7 +1195,7 @@ void SetupPermanentLink (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "permanent_link: missing alias port"); errx (1, "permanent_link: missing alias port");
aliasPort = StrToPort (ptr, protoName); aliasPort = StrToPort (ptr, protoName);
@ -1210,9 +1214,9 @@ void SetupPortRedirect (char* parms)
struct in_addr localAddr; struct in_addr localAddr;
struct in_addr publicAddr; struct in_addr publicAddr;
struct in_addr remoteAddr; struct in_addr remoteAddr;
int localPort; u_short localPort;
int publicPort; u_short publicPort;
int remotePort; u_short remotePort;
int proto; int proto;
char* protoName; char* protoName;
char* separator; char* separator;
@ -1223,7 +1227,7 @@ void SetupPortRedirect (char* parms)
*/ */
protoName = strtok (buf, " \t"); protoName = strtok (buf, " \t");
if (!protoName) if (!protoName)
errx(1, "redirect_port: missing protocol"); errx (1, "redirect_port: missing protocol");
proto = StrToProto (protoName); proto = StrToProto (protoName);
/* /*
@ -1231,7 +1235,7 @@ void SetupPortRedirect (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "redirect_port: missing local address"); errx (1, "redirect_port: missing local address");
localPort = StrToAddrAndPort (ptr, &localAddr, protoName); localPort = StrToAddrAndPort (ptr, &localAddr, protoName);
/* /*
@ -1239,7 +1243,7 @@ void SetupPortRedirect (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "redirect_port: missing public port"); errx (1, "redirect_port: missing public port");
separator = strchr (ptr, ':'); separator = strchr (ptr, ':');
if (separator) if (separator)
@ -1296,7 +1300,7 @@ void SetupAddressRedirect (char* parms)
*/ */
ptr = strtok (buf, " \t"); ptr = strtok (buf, " \t");
if (!ptr) if (!ptr)
errx(1, "redirect_address: missing local address"); errx (1, "redirect_address: missing local address");
StrToAddr (ptr, &localAddr); StrToAddr (ptr, &localAddr);
/* /*
@ -1304,7 +1308,7 @@ void SetupAddressRedirect (char* parms)
*/ */
ptr = strtok (NULL, " \t"); ptr = strtok (NULL, " \t");
if (!ptr) if (!ptr)
errx(1, "redirect_address: missing public address"); errx (1, "redirect_address: missing public address");
StrToAddr (ptr, &publicAddr); StrToAddr (ptr, &publicAddr);
PacketAliasRedirectAddr (localAddr, publicAddr); PacketAliasRedirectAddr (localAddr, publicAddr);
@ -1319,14 +1323,14 @@ void StrToAddr (char* str, struct in_addr* addr)
hp = gethostbyname (str); hp = gethostbyname (str);
if (!hp) if (!hp)
errx(1, "unknown host %s", str); errx (1, "unknown host %s", str);
memcpy (addr, hp->h_addr, sizeof (struct in_addr)); memcpy (addr, hp->h_addr, sizeof (struct in_addr));
} }
int StrToPort (char* str, char* proto) u_short StrToPort (char* str, char* proto)
{ {
int port; u_short port;
struct servent* sp; struct servent* sp;
char* end; char* end;
@ -1336,7 +1340,7 @@ int StrToPort (char* str, char* proto)
sp = getservbyname (str, proto); sp = getservbyname (str, proto);
if (!sp) if (!sp)
errx(1, "unknown service %s/%s", str, proto); errx (1, "unknown service %s/%s", str, proto);
return sp->s_port; return sp->s_port;
} }
@ -1349,16 +1353,16 @@ int StrToProto (char* str)
if (!strcmp (str, "udp")) if (!strcmp (str, "udp"))
return IPPROTO_UDP; return IPPROTO_UDP;
errx(1, "unknown protocol %s. Expected tcp or udp", str); errx (1, "unknown protocol %s. Expected tcp or udp", str);
} }
int StrToAddrAndPort (char* str, struct in_addr* addr, char* proto) u_short StrToAddrAndPort (char* str, struct in_addr* addr, char* proto)
{ {
char* ptr; char* ptr;
ptr = strchr (str, ':'); ptr = strchr (str, ':');
if (!ptr) if (!ptr)
errx(1, "%s is missing port number", str); errx (1, "%s is missing port number", str);
*ptr = '\0'; *ptr = '\0';
++ptr; ++ptr;