Skip to content

Commit

Permalink
update patches
Browse files Browse the repository at this point in the history
  • Loading branch information
aa65535 committed Nov 14, 2015
1 parent 083207f commit d3e75dd
Show file tree
Hide file tree
Showing 6 changed files with 527 additions and 302 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=ChinaDNS
PKG_VERSION:=1.3.2
PKG_RELEASE:=2
PKG_RELEASE:=3

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/aa65535/openwrt-chinadns/releases/download/v$(PKG_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ChinaDNS for OpenWrt
---

本项目是 [ChinaDNS][1] 在 OpenWrt 上的移植
当前版本: 1.3.2-1
当前版本: 1.3.2-3
[预编译 IPK 下载][2]

编译
Expand Down
39 changes: 7 additions & 32 deletions patches/0001-shorten-timeout.patch
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
From 404c424fa8dbc34a4273b5ad54b15091efa5d4b4 Mon Sep 17 00:00:00 2001
From aae68815b58e9dadb2627c3dd268cf81ed53d41d Mon Sep 17 00:00:00 2001
From: Jian Chang <[email protected]>
Date: Sat, 7 Nov 2015 10:07:14 +0800
Subject: [PATCH 1/2] shorten timeout
Date: Thu, 12 Nov 2015 14:30:22 +0800
Subject: [PATCH 1/3] shorten timeout

---
src/chinadns.c | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
src/chinadns.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/chinadns.c b/src/chinadns.c
index 6716554..930e6de 100644
index 6716554..cab6bdd 100644
--- a/src/chinadns.c
+++ b/src/chinadns.c
@@ -159,8 +159,7 @@ static void usage(void);
#ifdef DEBUG
#define DLOG(s...) LOG(s)
void __gcov_flush(void);
-static void gcov_handler(int signum)
-{
+static void gcov_handler(int signum) {
__gcov_flush();
exit(1);
}
@@ -199,8 +198,8 @@ int main(int argc, char **argv) {
@@ -199,8 +199,8 @@ int main(int argc, char **argv) {
FD_SET(remote_sock, &readset);
FD_SET(remote_sock, &errorset);
struct timeval timeout = {
Expand All @@ -32,21 +22,6 @@ index 6716554..930e6de 100644
};
if (-1 == select(max_fd, &readset, NULL, &errorset, &timeout)) {
ERR("select");
@@ -628,7 +627,7 @@ static void dns_handle_local() {
dns_server_addrs[i].addrlen))
ERR("sendto");
}
- for (i = has_chn_dns; i < dns_servers_len; i++) {
+ for (i = has_chn_dns; i < dns_servers_len; i++) {
if (-1 == sendto(remote_sock, compression_buf, len + 1, 0,
dns_server_addrs[i].addr,
dns_server_addrs[i].addrlen))
@@ -914,5 +913,3 @@ Forward DNS requests.\n\
\n\
Online help: <https://github.com/clowwindy/ChinaDNS>\n");
}
-
-
--
2.6.2.windows.1

268 changes: 0 additions & 268 deletions patches/0002-Use-to-define-trusted-DNS.patch

This file was deleted.

Loading

0 comments on commit d3e75dd

Please sign in to comment.