From e2d3d3b800d77c951435a040087dbc6d75bad782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=9F=E5=AE=89?= <azhong@linx-info.com>
Date: Wed, 23 Dec 2015 17:22:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9C=A8=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=B8=AD=E6=A3=80=E6=9F=A5=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E6=97=B6=EF=BC=88=E5=9C=A8=E5=87=BD=E6=95=B0create=5Fdir?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=89=EF=BC=8C=E7=94=B1=E4=BA=8E=E9=87=87=E7=94=A8?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E8=BF=9B=E8=A1=8C=E6=97=A5=E5=BF=97=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C>=E5=A4=9A=E6=AC=A1=E8=B0=83=E7=94=A8get=5Fni?=
 =?UTF-8?q?c=5Finfo=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E5=B0=86=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E5=90=8D=E5=8F=98=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
 =?UTF-8?q?=E5=9C=A8get=5Fnic=5Finfo=E4=B8=AD>=E5=88=A4=E6=96=ADlog=5Fpath?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=A2=AB=E5=88=9D=E5=A7=8B=E5=8C=96=E8=BF=87?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E8=BF=87=E6=9C=AA=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E5=88=99=E5=88=B0=E5=85=B1=E4=BA=AB=E5=86=85=E5=AD=98?=
 =?UTF-8?q?=E4=B8=AD=E8=AF=BB=E5=8F=96=E3=80=82=E5=90=A6=E5=88=99=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=BA=E5=88=9D=E5=A7=8B=E5=8C=96>=E8=BF=87=EF=BC=8C?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BD=BF=E7=94=A8=E8=AF=A5=E5=80=BC,?=
 =?UTF-8?q?=E5=B9=B6=E5=9C=A8create=5Fdir=E4=B8=AD=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=B1=80=E9=83=A8=E5=8F=98=E9=87=8F=E4=BF=9D=E5=AD=98=E8=AF=A5?=
 =?UTF-8?q?=E5=80=BC=EF=BC=8C=E5=9C=A8create=5Fdir=E4=B8=AD=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=93=8D=E4=BD=9C=20=E8=AF=A5=E5=B1=80=E9=83=A8?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=EF=BC=8C=E8=80=8C=E4=B8=8D=E5=8E=BB=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98=E8=AF=A5=E5=85=A8=E5=B1=80=E5=8F=98=E9=87=8F=E7=9A=84?=
 =?UTF-8?q?=E5=80=BC=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/README                       |  6 +++++-
 src/sys_nicmonitor/README        |  6 +++++-
 src/sys_nicmonitor/common.c      | 16 ++++++++++------
 src/sys_nicmonitor/nicinfo_shm.c | 33 ++++++++++++++++----------------
 src/sys_nicmonitor/version.h     |  4 ++--
 5 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/src/README b/src/README
index 84360b2..0e4df39 100644
--- a/src/README
+++ b/src/README
@@ -1,4 +1,8 @@
---V1.12 --
+--V1.13 --
+2015－12－23
+修正在记录日志中检查目录时（在函数create_dir中），由于采用线程进行日志记录，多次调用get_nic_info可能会导致的将日志文件路径名变错的问题。在get_nic_info中判断log_path是否被初始化过，如过未初始化，则到共享内存中读取。否则，为初始化过，直接使用该值,并在create_dir中使用局部变量保存该值，在create_dir中使用操作该局部变量，而不去改变该全局变量的值。
+
+-V1.12 --
 2015－12－23
 修正在程序开始时对IPC变量删除的错误函数调用。
 添加配置项crazyping,当其不为零时，会在每次取网卡信息时进行ping操作。
diff --git a/src/sys_nicmonitor/README b/src/sys_nicmonitor/README
index 84360b2..0e4df39 100644
--- a/src/sys_nicmonitor/README
+++ b/src/sys_nicmonitor/README
@@ -1,4 +1,8 @@
---V1.12 --
+--V1.13 --
+2015－12－23
+修正在记录日志中检查目录时（在函数create_dir中），由于采用线程进行日志记录，多次调用get_nic_info可能会导致的将日志文件路径名变错的问题。在get_nic_info中判断log_path是否被初始化过，如过未初始化，则到共享内存中读取。否则，为初始化过，直接使用该值,并在create_dir中使用局部变量保存该值，在create_dir中使用操作该局部变量，而不去改变该全局变量的值。
+
+-V1.12 --
 2015－12－23
 修正在程序开始时对IPC变量删除的错误函数调用。
 添加配置项crazyping,当其不为零时，会在每次取网卡信息时进行ping操作。
diff --git a/src/sys_nicmonitor/common.c b/src/sys_nicmonitor/common.c
index 8c36348..d7cecfd 100644
--- a/src/sys_nicmonitor/common.c
+++ b/src/sys_nicmonitor/common.c
@@ -16,21 +16,25 @@ static int log_idx = 0;
 
 void create_dir(char *create_path)
 {
-	int  i,len   =   strlen(create_path);
+	char tmp_path[256];
+
+	strcpy(tmp_path,create_path);
+
+	int  i,len   =   strlen(tmp_path);
 
 	for(i=1;   i<len;   i++)
 	{
-		if(create_path[i]=='/')
+		if(tmp_path[i]=='/')
 		{
-			create_path[i]   =   0;
-			if(   access(create_path,   F_OK)!=0   )
+			tmp[i]   =   0;
+			if(   access(tmp_path,   F_OK)!=0   )
 			{
-				if(mkdir(create_path,   0755)==-1)
+				if(mkdir(tmp_path,   0755)==-1)
 				{
 					perror("mkdir   error");
 				}
 			}
-			create_path[i]   =   '/';
+			tmp_path[i]   =   '/';
 		}
 	}
 
diff --git a/src/sys_nicmonitor/nicinfo_shm.c b/src/sys_nicmonitor/nicinfo_shm.c
index 35a7ee6..297ccec 100644
--- a/src/sys_nicmonitor/nicinfo_shm.c
+++ b/src/sys_nicmonitor/nicinfo_shm.c
@@ -26,9 +26,9 @@ typedef struct net_info{
 }SHM;
 
 static int semid = 0;
-static char log_path[1024];
-static char shm_path[1024];
-static char sem_path[1024];
+char log_path[1024];
+char shm_path[1024];
+char sem_path[1024];
 SHM *ptr = NULL;
 static char process_name[32] = "get_nic_info";
 
@@ -304,21 +304,20 @@ int get_nic_info(char *nic_name, NETCARD_INFO *net_info)
 #endif
 	tamp = time(NULL);
 	localtime_r(&tamp, &tmptr);
-
-	shm_id = shmget(shm_key,128,0666);
-	if(shm_id < 0)	return -1;
-	shm_buf = (char *)shmat(shm_id,NULL,0);
-	if(shm_buf == (void *) -1) return -1;
-
-	sprintf(log_path,"%s",shm_buf);
-	sprintf(shm_path,"%s",shm_buf);
-	sprintf(sem_path,"%s",shm_buf);
-
-	shmdt(shm_buf);
 	
-	strcat(log_path,LOG_PATH);
-	strcat(shm_path,SHM_PATH);
-	strcat(sem_path,SEM_PATH);
+	if(log_path[0]==0){
+		shm_id = shmget(shm_key,128,0666);
+		if(shm_id < 0)	return -1;
+		shm_buf = (char *)shmat(shm_id,NULL,0);
+		if(shm_buf == (void *) -1) return -1;
+		sprintf(log_path,"%s",shm_buf);
+		sprintf(shm_path,"%s",shm_buf);
+		sprintf(sem_path,"%s",shm_buf);
+		shmdt(shm_buf);
+		strcat(log_path,LOG_PATH);
+		strcat(shm_path,SHM_PATH);
+		strcat(sem_path,SEM_PATH);
+	}
 #if 0
 	//remove
 	if((dir = opendir(log_path)) == NULL){
diff --git a/src/sys_nicmonitor/version.h b/src/sys_nicmonitor/version.h
index bcb3351..d3c5107 100644
--- a/src/sys_nicmonitor/version.h
+++ b/src/sys_nicmonitor/version.h
@@ -1,5 +1,5 @@
-// version=1.12
+// version=1.13
 #ifndef MNIC_VERSION
-	#define MNIC_VERSION "1.12"
+	#define MNIC_VERSION "1.13"
 #endif