70753281c6
git-svn-id: svn://svn.openwrt.org/openwrt/packages@25784 3c298f89-4303-0410-b956-a3cf2f4a3e73
57 lines
1.6 KiB
Diff
57 lines
1.6 KiB
Diff
--- a/dns.c
|
|
+++ b/dns.c
|
|
@@ -309,17 +309,17 @@ char nullstring[] = "";
|
|
|
|
int use_dns = 1;
|
|
|
|
-#ifdef res_ninit
|
|
-#define MY_RES_INIT() res_ninit(&myres);
|
|
-#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \
|
|
- res_nmkquery(&myres, a, b, c, d, e, f, g, h, i)
|
|
-struct __res_state myres;
|
|
-#else
|
|
+//#ifdef res_ninit
|
|
+//#define MY_RES_INIT() res_ninit(&myres);
|
|
+//#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \
|
|
+// res_nmkquery(&myres, a, b, c, d, e, f, g, h, i)
|
|
+//struct __res_state myres;
|
|
+//#else
|
|
#define MY_RES_INIT() res_init();
|
|
#define RES_MKQUERY(a, b, c, d, e, f, g, h, i) \
|
|
res_mkquery(a, b, c, d, e, f, g, h, i)
|
|
#define myres _res
|
|
-#endif
|
|
+//#endif
|
|
|
|
/* Code */
|
|
#ifdef CorruptCheck
|
|
@@ -1267,28 +1267,6 @@ res_nmkquery(res_state statp,
|
|
return (-1);
|
|
memset(buf, 0, HFIXEDSZ);
|
|
hp = (HEADER *) buf;
|
|
- /* We randomize the IDs every time. The old code just
|
|
- incremented by one after the initial randomization which
|
|
- still predictable if the application does multiple
|
|
- requests. */
|
|
-#if 0
|
|
- hp->id = htons(++statp->id);
|
|
-#else
|
|
- hp->id = htons(statp->id);
|
|
- int randombits;
|
|
- do
|
|
- {
|
|
-#ifdef RANDOM_BITS
|
|
- RANDOM_BITS (randombits);
|
|
-#else
|
|
- struct timeval tv;
|
|
- gettimeofday (&tv, NULL);
|
|
- randombits = (tv.tv_sec << 8) ^ tv.tv_usec;
|
|
-#endif
|
|
- }
|
|
- while ((randombits & 0xffff) == 0);
|
|
- statp->id = (statp->id + randombits) & 0xffff;
|
|
-#endif
|
|
hp->opcode = op;
|
|
hp->rd = (statp->options & RES_RECURSE) != 0;
|
|
hp->rcode = NOERROR;
|