svn commit: trunk/uClibc/libc/inet
andersen at uclibc.org
andersen at uclibc.org
Fri Feb 2 01:01:52 UTC 2007
Author: andersen
Date: 2007-02-01 17:01:51 -0800 (Thu, 01 Feb 2007)
New Revision: 17706
Log:
use the correct lock for access to __nameserver[]
Modified:
trunk/uClibc/libc/inet/resolv.c
Changeset:
Modified: trunk/uClibc/libc/inet/resolv.c
===================================================================
--- trunk/uClibc/libc/inet/resolv.c 2007-02-02 00:37:06 UTC (rev 17705)
+++ trunk/uClibc/libc/inet/resolv.c 2007-02-02 01:01:51 UTC (rev 17706)
@@ -753,11 +753,11 @@
++local_id;
local_id &= 0xffff;
h.id = local_id;
- __UCLIBC_MUTEX_LOCK(mylock);
+ __UCLIBC_MUTEX_LOCK(__resolv_lock);
/* this is really __nameserver[] which is a global that
- needs a lock!! */
+ needs to hold __resolv_lock before access!! */
dns = nsip[local_ns];
- __UCLIBC_MUTEX_UNLOCK(mylock);
+ __UCLIBC_MUTEX_UNLOCK(__resolv_lock);
h.qdcount = 1;
h.rd = 1;
@@ -792,11 +792,11 @@
retries+1, NAMESERVER_PORT, dns);
#ifdef __UCLIBC_HAS_IPV6__
- __UCLIBC_MUTEX_LOCK(mylock);
+ __UCLIBC_MUTEX_LOCK(__resolv_lock);
/* 'dns' is really __nameserver[] which is a global that
- needs a lock!! */
+ needs to hold __resolv_lock before access!! */
v6 = inet_pton(AF_INET6, dns, &sa6.sin6_addr) > 0;
- __UCLIBC_MUTEX_UNLOCK(mylock);
+ __UCLIBC_MUTEX_UNLOCK(__resolv_lock);
fd = socket(v6 ? AF_INET6 : AF_INET, SOCK_DGRAM, IPPROTO_UDP);
#else
fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
@@ -817,11 +817,11 @@
#endif
sa.sin_family = AF_INET;
sa.sin_port = htons(NAMESERVER_PORT);
- __UCLIBC_MUTEX_LOCK(mylock);
+ __UCLIBC_MUTEX_LOCK(__resolv_lock);
/* 'dns' is really __nameserver[] which is a global that
- needs a lock!! */
+ needs to hold __resolv_lock before access!! */
sa.sin_addr.s_addr = inet_addr(dns);
- __UCLIBC_MUTEX_UNLOCK(mylock);
+ __UCLIBC_MUTEX_UNLOCK(__resolv_lock);
rc = connect(fd, (struct sockaddr *) &sa, sizeof(sa));
#ifdef __UCLIBC_HAS_IPV6__
}
More information about the uClibc-cvs
mailing list