From 837de123b2627f9fe305bdce63e70d7e740cf465 Mon Sep 17 00:00:00 2001
From: wangyu <wangyu.cn@gmail.com>
Date: Wed, 16 Aug 2017 19:44:19 +0800
Subject: [PATCH] added android target to makefile,fixed some log

---
 common.cpp  |  6 ++++--
 common.h    |  3 +--
 encrypt.cpp |  2 +-
 main.cpp    |  6 ++++--
 makefile    | 14 ++++++++++----
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/common.cpp b/common.cpp
index d6ec31e..6e030fd 100644
--- a/common.cpp
+++ b/common.cpp
@@ -62,6 +62,7 @@ int add_iptables_rule(char * s)
 	else
 	{
 		mylog(log_fatal,"auto added iptables failed by: %s\n",buf);
+		mylog(log_fatal,"reason : %s\n",strerror(errno));
 		myexit(-1);
 	}
 	return 0;
@@ -80,6 +81,7 @@ int clear_iptables_rule()
 		else
 		{
 			mylog(log_error,"clear iptables failed by: %s\n",buf);
+			mylog(log_error,"reason : %s\n",strerror(errno));
 		}
 
 	}
@@ -135,7 +137,7 @@ u64_t ntoh64(u64_t a)
 {
 	if(__BYTE_ORDER == __LITTLE_ENDIAN)
 	{
-		return __bswap_64( a);
+		return bswap_64( a);
 	}
 	else return a;
 
@@ -144,7 +146,7 @@ u64_t hton64(u64_t a)
 {
 	if(__BYTE_ORDER == __LITTLE_ENDIAN)
 	{
-		return __bswap_64( a);
+		return bswap_64( a);
 	}
 	else return a;
 
diff --git a/common.h b/common.h
index 0436cf9..fcd1f93 100644
--- a/common.h
+++ b/common.h
@@ -43,8 +43,7 @@
 #include <stdarg.h>
 #include <assert.h>
 #include <linux/if_packet.h>
-
-
+#include <byteswap.h>
 
 
 #include<unordered_map>
diff --git a/encrypt.cpp b/encrypt.cpp
index b2e0af7..517a057 100755
--- a/encrypt.cpp
+++ b/encrypt.cpp
@@ -216,7 +216,7 @@ int auth_crc32_verify(const char *data,int &len)
 {
 	if(len<int(sizeof(unsigned int)))
 	{
-		mylog(log_debug,"auth_crc32_verify len<16\n");
+		mylog(log_debug,"auth_crc32_verify len<%d\n",int(sizeof(unsigned int)));
 		return -1;
 	}
 	unsigned int  ret=crc32h((unsigned char *)data,len-sizeof(unsigned int));
diff --git a/main.cpp b/main.cpp
index 29d4113..ebce9b4 100755
--- a/main.cpp
+++ b/main.cpp
@@ -1889,7 +1889,7 @@ int get_src_adress(u32_t &ip)
 	}
 
 	struct sockaddr_in my_addr={0};
-	unsigned int len=sizeof(my_addr);
+	socklen_t len=sizeof(my_addr);
 
     if(getsockname(new_udp_fd, (struct sockaddr *) &my_addr, &len)!=0) return -1;
 
@@ -2545,7 +2545,9 @@ void process_arg(int argc, char *argv[])
 			mylog(log_debug,"option_index: %d\n",option_index);
 			if(strcmp(long_options[option_index].name,"clear")==0)
 			{
-				int ret =system("iptables-save |grep udp2raw_dWRwMnJhdw|sed -n 's/^-A/iptables -D/p'|sh");
+				//int ret =system("iptables-save |grep udp2raw_dWRwMnJhdw|sed -n 's/^-A/iptables -D/p'|sh");
+				int ret =system("iptables -S|sed -n '/udp2raw_dWRwMnJhdw/p'|sed -n 's/^-A/iptables -D/p'|sh");
+
 				//system("iptables-save |grep udp2raw_dWRwMnJhdw|sed 's/^-A/iptables -D/'|sh");
 				//system("iptables-save|grep -v udp2raw_dWRwMnJhdw|iptables-restore");
 				mylog(log_info,"tried to clear all iptables rule created previously,return value %d\n",ret);
diff --git a/makefile b/makefile
index 08fd12d..118e711 100755
--- a/makefile
+++ b/makefile
@@ -1,11 +1,12 @@
-cc_cross=/home/wangyu/OpenWrt-SDK-ar71xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/bin/mips-openwrt-linux-g++
+cc_cross=/home/wangyu/Desktop/arm-2014.05/bin/arm-none-linux-gnueabi-g++
 cc_local=g++
 cc_ar71xx=/home/wangyu/OpenWrt-SDK-ar71xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2/staging_dir/toolchain-mips_34kc_gcc-4.8-linaro_uClibc-0.9.33.2/bin/mips-openwrt-linux-g++
 cc_bcm2708=/home/wangyu/raspberry/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-g++ 
+cc_arm=/home/wangyu/Desktop/arm-2014.05/bin/arm-none-linux-gnueabi-g++
 FLAGS= -std=c++11 -Wall -Wextra -Wno-unused-variable -Wno-unused-parameter -Wno-missing-field-initializers
 SOURCES=main.cpp lib/aes.c lib/md5.c encrypt.cpp log.cpp network.cpp common.cpp
 NAME=udp2raw
-TAR=${NAME}_binaries.tar.gz ${NAME}_amd64  ${NAME}_x86  ${NAME}_ar71xx ${NAME}_bcm2708
+TAR=${NAME}_binaries.tar.gz ${NAME}_amd64  ${NAME}_x86  ${NAME}_ar71xx ${NAME}_bcm2708 ${NAME}_arm
 
 all:
 	rm -f ${NAME}
@@ -24,7 +25,9 @@ bcm2708:
 amd64:
 	${cc_local}   -o ${NAME}_amd64    -I. ${SOURCES} ${FLAGS} -lrt -static -O3
 x86:
-	${cc_local}   -o ${NAME}_x86      -I. ${SOURCES} ${FLAGS} -lrt -m32 -static -O3
+	${cc_local}   -o ${NAME}_x86      -I. ${SOURCES} ${FLAGS} -lrt -static -O3 -m32
+arm:
+	${cc_cross}   -o ${NAME}_arm      -I. ${SOURCES} ${FLAGS} -lrt -static -O3
 
 cross:
 	${cc_cross}   -o ${NAME}_cross    -I. ${SOURCES} ${FLAGS} -lrt -O3
@@ -32,10 +35,13 @@ cross:
 cross2:
 	${cc_cross}   -o ${NAME}_cross    -I. ${SOURCES} ${FLAGS} -lrt -static -lgcc_eh -O3   
 
+cross3:
+	${cc_cross}   -o ${NAME}_cross    -I. ${SOURCES} ${FLAGS} -lrt -static -O3
 
-release: amd64 x86 ar71xx bcm2708
+release: amd64 x86 ar71xx bcm2708 arm
 	tar -zcvf ${TAR}
 
 clean:	
 	rm -f ${TAR}
+	rm -f udp2raw udp2raw_cross