nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-09 09:27:59 +00:00
Code Issues Projects Releases Wiki Activity

Implement sk_addr_dup().

Browse Source 
[originally from svn r8294]
This commit is contained in:
Simon Tatham 2008-11-08 16:58:55 +00:00
parent 6e2501be77
commit 59691d28a3
3 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
network.h
View File

@ -120,6 +120,12 @@ int sk_address_is_local(SockAddr addr);
int sk_addrtype(SockAddr addr);
void sk_addrcopy(SockAddr addr, char *buf);
void sk_addr_free(SockAddr addr);
/* sk_addr_dup generates another SockAddr which contains the same data
* as the original one and can be freed independently. May not actually
* physically _duplicate_ it: incrementing a reference count so that
* one more free is required before it disappears is an acceptable
* implementation. */
SockAddr sk_addr_dup(SockAddr addr);
/* NB, control of 'addr' is passed via sk_new, which takes responsibility
* for freeing it, as for new_connection() */

13
unix/uxnet.c
View File

@ -88,6 +88,7 @@ struct Socket_tag {
};
struct SockAddr_tag {
int refcount;
const char *error;
enum { UNRESOLVED, UNIX, IP } superfamily;
#ifndef NO_IPV6
@ -193,6 +194,7 @@ SockAddr sk_namelookup(const char *host, char **canonicalname, int address_famil
ret->superfamily = UNRESOLVED;
*realhost = '\0';
ret->error = NULL;
ret->refcount = 1;
#ifndef NO_IPV6
hints.ai_flags = AI_CANONNAME;
@ -275,6 +277,7 @@ SockAddr sk_nonamelookup(const char *host)
#else
ret->addresses = NULL;
#endif
ret->refcount = 1;
return ret;
}
@ -412,7 +415,8 @@ void sk_addrcopy(SockAddr addr, char *buf)
void sk_addr_free(SockAddr addr)
{
if (--addr->refcount > 0)
return;
#ifndef NO_IPV6
if (addr->ais != NULL)
freeaddrinfo(addr->ais);
@ -422,6 +426,12 @@ void sk_addr_free(SockAddr addr)
sfree(addr);
}
SockAddr sk_addr_dup(SockAddr addr)
{
addr->refcount++;
return addr;
}
static Plug sk_tcp_plug(Socket sock, Plug p)
{
Actual_Socket s = (Actual_Socket) sock;
@ -1415,5 +1425,6 @@ SockAddr platform_get_x11_unix_address(const char *display, int displaynum,
ret->addresses = NULL;
ret->naddresses = 0;
#endif
ret->refcount = 1;
return ret;
}

12
windows/winnet.c
View File

@ -78,6 +78,7 @@ struct Socket_tag {
};
struct SockAddr_tag {
int refcount;
char *error;
int resolved;
#ifndef NO_IPV6
@ -444,6 +445,7 @@ SockAddr sk_namelookup(const char *host, char **canonicalname,
#endif
ret->addresses = NULL;
ret->resolved = FALSE;
ret->refcount = 1;
*realhost = '\0';
if ((a = p_inet_addr(host)) == (unsigned long) INADDR_NONE) {
@ -547,6 +549,7 @@ SockAddr sk_nonamelookup(const char *host)
#endif
ret->addresses = NULL;
ret->naddresses = 0;
ret->refcount = 1;
strncpy(ret->hostname, host, lenof(ret->hostname));
ret->hostname[lenof(ret->hostname)-1] = '\0';
return ret;
@ -708,6 +711,8 @@ void sk_addrcopy(SockAddr addr, char *buf)
void sk_addr_free(SockAddr addr)
{
if (--addr->refcount > 0)
return;
#ifndef NO_IPV6
if (addr->ais && p_freeaddrinfo)
p_freeaddrinfo(addr->ais);
@ -717,6 +722,12 @@ void sk_addr_free(SockAddr addr)
sfree(addr);
}
SockAddr sk_addr_dup(SockAddr addr)
{
addr->refcount++;
return addr;
}
static Plug sk_tcp_plug(Socket sock, Plug p)
{
Actual_Socket s = (Actual_Socket) sock;
@ -1677,5 +1688,6 @@ SockAddr platform_get_x11_unix_address(const char *display, int displaynum,
SockAddr ret = snew(struct SockAddr_tag);
memset(ret, 0, sizeof(struct SockAddr_tag));
ret->error = "unix sockets not supported on this platform";
ret->refcount = 1;
return ret;
}