From 7b7f6971446deb85b77f301c76127cbaf1c2c4e7 Mon Sep 17 00:00:00 2001 From: liu shiwei Date: Tue, 21 Jun 2022 02:05:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9C=8B=E6=9C=AA=E8=BD=AC=E5=8F=91=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=B6=EF=BC=8C=20=E6=8C=89=E7=85=A7C=E7=BD=91?= =?UTF-8?q?=E6=AE=B5=E8=BF=87=E6=BB=A4=E5=B7=B2=E7=BB=8F=E8=BD=AC=E5=8F=91?= =?UTF-8?q?=E7=9A=84ip=E5=9C=B0=E5=9D=80,=20=E8=A7=A3=E5=86=B3"ip=E5=B7=B2?= =?UTF-8?q?=E7=BB=8F=E8=BD=AC=E5=8F=91=EF=BC=8C=20=E4=BD=86=E6=98=AF?= =?UTF-8?q?=E4=BB=8D=E7=84=B6=E8=A2=AB=E5=88=97=E5=88=B0=E4=B8=BA=E8=BD=AC?= =?UTF-8?q?=E5=8F=91=E7=9A=84=E6=B8=85=E5=8D=95=E9=87=8C"=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20V1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dnsmasq_log.c | 5 ++--- openwrt/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dnsmasq_log.c b/dnsmasq_log.c index 7edbb44..e73f048 100644 --- a/dnsmasq_log.c +++ b/dnsmasq_log.c @@ -49,8 +49,7 @@ void load_ips() { if(fp) { while(!feof(fp)) { /* -29010: from all to 120.121.121.140 lookup 107 -29010: from all to 120.121.121.141 lookup 107 +29010: from all to 120.121.121.0 lookup 107 */ rc = fscanf(fp,"%10s %10s %10s %10s %hhd.%hhd.%hhd.%hhd", skip, skip, skip, skip, &ip[0],&ip[1],&ip[2],&ip[3]); fgets(skip, sizeof(skip), fp); @@ -187,7 +186,7 @@ Sun Dec 26 15:29:33 2021 daemon.info dnsmasq[11997]:xxxx strcpy(domain, cname); } if(strcmp(domain, domain0) == 0) continue; //与上次域名不同 - uint32_t sip32 = (uint32_t) (sip[0] << 24) | (sip[1] << 16) | (sip[2] << 8) | sip[3]; + uint32_t sip32 = (uint32_t) (sip[0] << 24) | (sip[1] << 16) | (sip[2] << 8) ; //忽略sip[3],因为目前目标地址改成了C网段 if(is_exists(sip32, domain)) continue; strncpy(domain0, domain, sizeof(domain)); snprintf(sipstr, sizeof(sipstr), "%d.%d.%d.%d", sip[0], sip[1] ,sip[2], sip[3]); diff --git a/openwrt/Makefile b/openwrt/Makefile index 26c0400..bb2b9d3 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq_route -PKG_VERSION:=0.20220323 -PKG_RELEASE:=V1.1 +PKG_VERSION:=0.20220621 +PKG_RELEASE:=V1.2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/lshw/dnsmasq_route.git