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

Add NO_USE_SOCKETS knob, which cuts off functionality socket binding.

Browse Source
This commit is contained in:
Gleb Smirnoff 2005-05-05 20:25:12 +00:00
parent 40106c140f
commit 00fc9a5bb9
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/netinet/libalias/alias.h
View File

@ -210,8 +210,9 @@ int LibAliasProxyRule(struct libalias *, const char *_cmd);
* require this. This bit is set after a call to PacketAliasInit(), so it is * require this. This bit is set after a call to PacketAliasInit(), so it is
* a default mode of operation. * a default mode of operation.
*/ */
#ifndef NO_USE_SOCKETS
#define PKT_ALIAS_USE_SOCKETS 0x08 #define PKT_ALIAS_USE_SOCKETS 0x08
#endif
/*- /*-
* If PKT_ALIAS_UNREGISTERED_ONLY is set, then only packets with * If PKT_ALIAS_UNREGISTERED_ONLY is set, then only packets with
* unregistered source addresses will be aliased. Private * unregistered source addresses will be aliased. Private

23
sys/netinet/libalias/alias_db.c
View File

@ -326,9 +326,9 @@ struct alias_link { /* Main data structure */
int timestamp; /* Time link was last accessed */ int timestamp; /* Time link was last accessed */
int expire_time; /* Expire time for link */ int expire_time; /* Expire time for link */
#ifndef NO_USE_SOCKETS
int sockfd; /* socket descriptor */ int sockfd; /* socket descriptor */
#endif
LIST_ENTRY (alias_link) list_out; /* Linked list of LIST_ENTRY (alias_link) list_out; /* Linked list of
* pointers for */ * pointers for */
LIST_ENTRY (alias_link) list_in; /* input and output LIST_ENTRY (alias_link) list_in; /* input and output
@ -480,9 +480,9 @@ Port search:
/* Local prototypes */ /* Local prototypes */
static int GetNewPort(struct libalias *, struct alias_link *, int); static int GetNewPort(struct libalias *, struct alias_link *, int);
#ifndef NO_USE_SOCKETS
static u_short GetSocket(struct libalias *, u_short, int *, int); static u_short GetSocket(struct libalias *, u_short, int *, int);
#endif
static void CleanupAliasData(struct libalias *); static void CleanupAliasData(struct libalias *);
static void IncrementalCleanup(struct libalias *); static void IncrementalCleanup(struct libalias *);
@ -590,6 +590,7 @@ GetNewPort(struct libalias *la, struct alias_link *lnk, int alias_port_param)
go_ahead = 0; go_ahead = 0;
if (go_ahead) { if (go_ahead) {
#ifndef NO_USE_SOCKETS
if ((la->packetAliasMode & PKT_ALIAS_USE_SOCKETS) if ((la->packetAliasMode & PKT_ALIAS_USE_SOCKETS)
&& (lnk->flags & LINK_PARTIALLY_SPECIFIED) && (lnk->flags & LINK_PARTIALLY_SPECIFIED)
&& ((lnk->link_type == LINK_TCP) || && ((lnk->link_type == LINK_TCP) ||
@ -599,9 +600,12 @@ GetNewPort(struct libalias *la, struct alias_link *lnk, int alias_port_param)
return (0); return (0);
} }
} else { } else {
#endif
lnk->alias_port = port_net; lnk->alias_port = port_net;
return (0); return (0);
#ifndef NO_USE_SOCKETS
} }
#endif
} }
port_sys = random() & ALIAS_PORT_MASK; port_sys = random() & ALIAS_PORT_MASK;
port_sys += ALIAS_PORT_BASE; port_sys += ALIAS_PORT_BASE;
@ -616,7 +620,7 @@ GetNewPort(struct libalias *la, struct alias_link *lnk, int alias_port_param)
return (-1); return (-1);
} }
#ifndef NO_USE_SOCKETS
static u_short static u_short
GetSocket(struct libalias *la, u_short port_net, int *sockfd, int link_type) GetSocket(struct libalias *la, u_short port_net, int *sockfd, int link_type)
{ {
@ -659,7 +663,7 @@ GetSocket(struct libalias *la, u_short port_net, int *sockfd, int link_type)
return (0); return (0);
} }
} }
#endif
/* FindNewPortGroup() returns a base port number for an available /* FindNewPortGroup() returns a base port number for an available
range of contiguous port numbers. Note that if a port number range of contiguous port numbers. Note that if a port number
@ -848,12 +852,13 @@ DeleteLink(struct alias_link *lnk)
/* Adjust input table pointers */ /* Adjust input table pointers */
LIST_REMOVE(lnk, list_in); LIST_REMOVE(lnk, list_in);
#ifndef NO_USE_SOCKETS
/* Close socket, if one has been allocated */ /* Close socket, if one has been allocated */
if (lnk->sockfd != -1) { if (lnk->sockfd != -1) {
la->sockCount--; la->sockCount--;
close(lnk->sockfd); close(lnk->sockfd);
} }
#endif
/* Link-type dependent cleanup */ /* Link-type dependent cleanup */
switch (lnk->link_type) { switch (lnk->link_type) {
case LINK_ICMP: case LINK_ICMP:
@ -922,7 +927,9 @@ AddLink(struct libalias *la, struct in_addr src_addr,
lnk->proxy_port = 0; lnk->proxy_port = 0;
lnk->server = NULL; lnk->server = NULL;
lnk->link_type = link_type; lnk->link_type = link_type;
#ifndef NO_USE_SOCKETS
lnk->sockfd = -1; lnk->sockfd = -1;
#endif
lnk->flags = 0; lnk->flags = 0;
lnk->pflags = 0; lnk->pflags = 0;
lnk->timestamp = la->timeStamp; lnk->timestamp = la->timeStamp;
@ -2414,7 +2421,9 @@ LibAliasInit(struct libalias *la)
la->cleanupIndex = 0; la->cleanupIndex = 0;
la->packetAliasMode = PKT_ALIAS_SAME_PORTS la->packetAliasMode = PKT_ALIAS_SAME_PORTS
#ifndef NO_USE_SOCKETS
| PKT_ALIAS_USE_SOCKETS | PKT_ALIAS_USE_SOCKETS
#endif
| PKT_ALIAS_RESET_ON_ADDR_CHANGE; | PKT_ALIAS_RESET_ON_ADDR_CHANGE;
#ifndef NO_FW_PUNCH #ifndef NO_FW_PUNCH
la->fireWallFD = -1; la->fireWallFD = -1;