From 26c975beb8ad6281714f1b63f699665488cb6a35 Mon Sep 17 00:00:00 2001
From: 0-14N <0x00000454@gmail.com>
Date: Fri, 10 Oct 2014 01:14:07 +0800
Subject: [PATCH] Redirect console out to file "NDroid.log".

---
 .../DroidScope/NDroid/ND_instrument.c         | 23 ++++++++-----------
 DECAF_shared/DroidScope/NDroid/ND_manager.c   |  2 ++
 .../NDroid/hook/sys_libraries/lib_c2.c        |  2 ++
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/DECAF_shared/DroidScope/NDroid/ND_instrument.c b/DECAF_shared/DroidScope/NDroid/ND_instrument.c
index 7d76a3c..42e56fd 100644
--- a/DECAF_shared/DroidScope/NDroid/ND_instrument.c
+++ b/DECAF_shared/DroidScope/NDroid/ND_instrument.c
@@ -36,14 +36,14 @@ gva_t DVM_END_ADDR = -1;
 //	call ...
 //}
 //the modules are not updated immediately, the start/end address of the "libnet.so" 
-//has to be given.
+//has to be given. (0x4a3cd000 0x4a3d0000)
 gva_t GIVEN_LIB_START_ADDR = -1;
 gva_t GIVEN_LIB_END_ADDR = -1;
 
 //last call JNI API address
-gva_t lastCallJNIAddr = -1;
+gva_t lastCallJNIAddrRet = -1;
 //last call system library address
-gva_t lastCallSysLibAddr = -1;
+gva_t lastCallSysLibAddrRet = -1;
 //last JNI call hooking handler
 jniHookHandler lastJniHandler = NULL;
 //last system library call hooking handler
@@ -151,21 +151,19 @@ void nd_instruction_begin_callback(DECAF_Callback_Params* params){
 	}
 
 	//return from JNI API calls/system library calls
-	if((cur_pc_even == lastCallJNIAddr + 2) 
-			|| (cur_pc_even == lastCallJNIAddr + 4)){
+	if(cur_pc_even == lastCallJNIAddrRet){
 		if(lastJniHandler != NULL){
 			lastJniHandler(env, 0);
 			lastJniHandler = NULL;
-			lastCallJNIAddr = -1;
+			lastCallJNIAddrRet = -1;
 		}
 	}
 	
-	if((cur_pc_even == lastCallSysLibAddr + 2)
-			|| (cur_pc_even == lastCallSysLibAddr + 4)){
+	if(cur_pc_even == lastCallSysLibAddrRet){
 		if(lastSysLibHandler != NULL){
 			lastSysLibHandler(env, 0);
 			lastSysLibHandler = NULL;
-			lastCallSysLibAddr = -1;
+			lastCallSysLibAddrRet = -1;
 		}
 	}
 	
@@ -227,7 +225,6 @@ int nd_block_end_callback_cond(DECAF_callback_type_t cbType, gva_t curPC, gva_t
 	gva_t tmpNextPC = nextPC & 0xfffffffe;
 	gva_t tmpCurPC = curPC & 0xfffffffe;
 
-	//DECAF_printf("=================JUMP FROM %x TO %x\n", tmpCurPC, tmpNextPC);
 	//JNI API call/system library call
 	if(nd_in_blacklist(tmpCurPC) && !nd_in_blacklist(tmpNextPC)){
 		return (1);
@@ -255,15 +252,15 @@ void nd_block_end_callback(DECAF_Callback_Params* params){
 
 	//JNI API/system library call
 	if(nd_in_blacklist(cur_pc) && !nd_in_blacklist(next_pc)){
-		DECAF_printf("=================JUMP FROM %x TO %x\n", cur_pc, next_pc);
+		//DECAF_printf("=================JUMP FROM %x TO %x\n", cur_pc, next_pc);
 		lastJniHandler = hookJniApis(next_pc, DVM_START_ADDR, env);
 		if(lastJniHandler != NULL){
-			lastCallJNIAddr = cur_pc;
+			lastCallJNIAddrRet = env->regs[14];
 			return;
 		}
 		lastSysLibHandler = hookSysLibCalls(next_pc, env);
 		if(lastSysLibHandler != NULL){
-			lastCallSysLibAddr = cur_pc;
+			lastCallSysLibAddrRet = env->regs[14];
 			return;
 		}
 	}
diff --git a/DECAF_shared/DroidScope/NDroid/ND_manager.c b/DECAF_shared/DroidScope/NDroid/ND_manager.c
index d219c43..24319db 100644
--- a/DECAF_shared/DroidScope/NDroid/ND_manager.c
+++ b/DECAF_shared/DroidScope/NDroid/ND_manager.c
@@ -41,6 +41,7 @@ void nd_reset(){
 }
 
 void nd_manager_trace_pid(Monitor* mon, gpid_t pid){
+	DECAF_set_output_file("NDroid.log");
 	if(pid <= 0 || ND_TRACING_STATE != ND_STOP){
 		DECAF_printf("A process with pid <%d> uid <%d> is being traced, please stop tracing it first:-)\n", 
 				ND_GLOBAL_TRACING_PID, ND_GLOBAL_TRACING_UID);
@@ -88,6 +89,7 @@ void nd_manager_trace_uid(Monitor* mon, target_ulong uid){
 
 void nd_manager_wait_and_trace_uid(Monitor* mon, target_ulong uid, 
 		gva_t libStartAddr, gva_t libEndAddr){
+	DECAF_set_output_file("NDroid.log");
 	if(uid <= 0 || ND_TRACING_STATE != ND_STOP){
 		if(ND_GLOBAL_TRACING_PID != -1){
 			DECAF_printf("A process with pid <%d> is being traced, please stop tracing it first:-)\n", 
diff --git a/DECAF_shared/DroidScope/NDroid/hook/sys_libraries/lib_c2.c b/DECAF_shared/DroidScope/NDroid/hook/sys_libraries/lib_c2.c
index 04f8785..c30931b 100644
--- a/DECAF_shared/DroidScope/NDroid/hook/sys_libraries/lib_c2.c
+++ b/DECAF_shared/DroidScope/NDroid/hook/sys_libraries/lib_c2.c
@@ -2116,9 +2116,11 @@ sysLibHookHandler hookLibCCalls(int curPC, int libCStartAddr, CPUState* env){
 		case FGETWS_OFFSET_C:
 			sysLibCFgetwsHookHandler(env, 1);
 			return sysLibCFgetwsHookHandler;
+		*/
 		case STRNCMP_OFFSET_C:
 			sysLibCStrncmpHookHandler(env, 1);
 			return sysLibCStrncmpHookHandler;
+		/*
 		case MKDTEMP_OFFSET_C:
 			sysLibCMkdtempHookHandler(env, 1);
 			return sysLibCMkdtempHookHandler;