Merge pull request #2387 from liqiuhua/patch-1

Update dns.c
2025-11-16 04:24:33 +00:00 · 2019-03-13 21:29:28 +08:00 · 2019-03-13 17:19:41 +08:00 · 2019-03-06 16:52:30 +08:00 · 2018-09-04 19:19:45 +08:00 · 2018-06-04 20:58:49 +08:00
3 changed files with 6 additions and 6 deletions
--- a/bsp/hifive1/drivers/board.c
+++ b/bsp/hifive1/drivers/board.c
@@ -28,7 +28,6 @@
 #include <platform.h>
 #include <encoding.h>
 #include <interrupt.h>
-#include <drv_led.h>

 extern void use_default_clocks(void);
 extern void use_pll(int refsel, int bypass, int r, int f, int q);
--- a/components/net/lwip-1.4.1/src/core/dns.c
+++ b/components/net/lwip-1.4.1/src/core/dns.c
@@ -666,7 +666,6 @@ dns_check_entry(u8_t i)
            pEntry->numdns++;
            pEntry->tmr     = 1;
            pEntry->retries = 0;
-            break;
          } else {
            LWIP_DEBUGF(DNS_DEBUG, ("dns_check_entry: \"%s\": timeout\n", pEntry->name));
            /* call specified callback function if provided */
@@ -678,9 +677,10 @@ dns_check_entry(u8_t i)
            break;
          }
        }
-
-        /* wait longer for the next retry */
-        pEntry->tmr = pEntry->retries;
+        else {
+          /* wait longer for the next retry */
+          pEntry->tmr = pEntry->retries;
+        }

        /* send DNS packet for this entry */
        err = dns_send(pEntry->numdns, pEntry->name, i);
--- a/include/rtdef.h
+++ b/include/rtdef.h
@@ -35,6 +35,7 @@
 * 2017-12-27     Bernard      change version number to v3.0.2
 * 2018-02-24     Bernard      change version number to v3.0.3
 * 2018-04-25     Bernard      change version number to v3.0.4
+ * 2018-09-04     Bernard      change version number to v3.0.5
 */

 #ifndef __RT_DEF_H__
@@ -56,7 +57,7 @@ extern "C" {
 /* RT-Thread version information */
 #define RT_VERSION                      3L              /**< major version number */
 #define RT_SUBVERSION                   0L              /**< minor version number */
-#define RT_REVISION                     4L              /**< revise version number */
+#define RT_REVISION                     5L              /**< revise version number */

 /* RT-Thread version */
 #define RTTHREAD_VERSION                ((RT_VERSION * 10000) + \
Author	SHA1	Message	Date
Bernard Xiong	e1d519af82	Merge pull request #2387 from liqiuhua/patch-1 Update dns.c	2019-03-13 21:29:28 +08:00
Bernard Xiong	436d9d931d	Update dns.c	2019-03-13 17:19:41 +08:00
LeoQ	f089a6ce96	Update dns.c DNS_MAX_RETRIES定义的数值无效，因为被669行的break；屏蔽掉了	2019-03-06 16:52:30 +08:00
Bernard Xiong	60265d9cde	Update rtdef.h	2018-09-04 19:19:45 +08:00
Bernard Xiong	e9f074662d	Merge pull request #1503 from TanekLiang/hifive1-fixed-3.0.4 [bsp][hifive1] remove unused code	2018-06-04 20:58:49 +08:00
liang yongxiang	3cbec094a7	[bsp][hifive1] remove unused code	2018-06-04 20:12:29 +08:00