From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 28 Feb 2011 01:17:20 +0000 (+0000)
Subject: mtr: remove some dead code
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=6cc4964505fadcc02bb1b7e5166093a044ae2de1;p=openwrt%2Fsvn-archive%2Farchive.git

mtr: remove some dead code

SVN-Revision: 25784
---

diff --git a/net/mtr/patches/502-fix-res_ninit.patch b/net/mtr/patches/502-fix-res_ninit.patch
index 8965751204..efece774fd 100644
--- a/net/mtr/patches/502-fix-res_ninit.patch
+++ b/net/mtr/patches/502-fix-res_ninit.patch
@@ -25,21 +25,32 @@
  
  /* Code */
  #ifdef CorruptCheck
-@@ -1274,7 +1274,7 @@ res_nmkquery(res_state statp,
- #if 0
-         hp->id = htons(++statp->id);
- #else
+@@ -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);
-+//        hp->id = htons(statp->id);
-         int randombits;
-         do
-           {
-@@ -1287,7 +1287,7 @@ res_nmkquery(res_state statp,
- #endif
-           }
-         while ((randombits & 0xffff) == 0);
+-        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;
-+//        statp->id = (statp->id + randombits) & 0xffff;
- #endif
+-#endif
          hp->opcode = op;
          hp->rd = (statp->options & RES_RECURSE) != 0;
+         hp->rcode = NOERROR;