backup/ipxwrapper
1
0
Fork 0
mirror of https://github.com/solemnwarning/ipxwrapper synced 2024-12-30 16:45:37 +01:00
Code Issues Projects Releases Activity

Fix use of sockets in address cache.

Browse Source
This commit is contained in:
Daniel Collins 2014-06-19 00:57:50 +01:00
parent 043ce1495e
commit d9a82081da
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/addrcache.c
View File

@ -31,6 +31,7 @@
struct host_table_key { struct host_table_key {
addr32_t netnum; addr32_t netnum;
addr48_t nodenum; addr48_t nodenum;
uint16_t socket;
}; };
struct host_table { struct host_table {
@ -64,13 +65,14 @@ static void host_table_unlock(void)
/* Search the host table for a node with the given net/node pair. /* Search the host table for a node with the given net/node pair.
* Returns NULL on failure. * Returns NULL on failure.
*/ */
static host_table_t *host_table_find(addr32_t net, addr48_t node) static host_table_t *host_table_find(addr32_t net, addr48_t node, uint16_t sock)
{ {
host_table_key_t key; host_table_key_t key;
memset(&key, 0, sizeof(key)); memset(&key, 0, sizeof(key));
key.netnum = net; key.netnum = net;
key.nodenum = node; key.nodenum = node;
key.socket = sock;
host_table_t *host; host_table_t *host;
@ -123,7 +125,7 @@ int addr_cache_get(SOCKADDR_STORAGE *addr, size_t *addrlen, addr32_t net, addr48
{ {
host_table_lock(); host_table_lock();
host_table_t *host = host_table_find(net, node); host_table_t *host = host_table_find(net, node, sock);
if(host && time(NULL) < host->time + ADDR_CACHE_TTL) if(host && time(NULL) < host->time + ADDR_CACHE_TTL)
{ {
@ -151,7 +153,7 @@ void addr_cache_set(const struct sockaddr *addr, size_t addrlen, addr32_t net, a
{ {
host_table_lock(); host_table_lock();
host_table_t *host = host_table_find(net, node); host_table_t *host = host_table_find(net, node, sock);
if(!host) if(!host)
{ {
@ -171,6 +173,7 @@ void addr_cache_set(const struct sockaddr *addr, size_t addrlen, addr32_t net, a
host->key.netnum = net; host->key.netnum = net;
host->key.nodenum = node; host->key.nodenum = node;
host->key.socket = sock;
HASH_ADD(hh, host_table, key, sizeof(host->key), host); HASH_ADD(hh, host_table, key, sizeof(host->key), host);
} }