From 01e8b507c63439f9abb35930b7e798ff68e2d54f Mon Sep 17 00:00:00 2001
From: "Wei, Jing" <jwei@linx-info.com>
Date: Mon, 13 Dec 2021 11:23:52 +0800
Subject: [PATCH] =?UTF-8?q?[=20issues=20#6=20]=20=E5=8D=8E=E4=B8=BA5885V3?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E6=9C=8D=E5=8A=A1=E5=99=A8=E7=A7=91=E4=B8=9C?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=90=AF=E5=8A=A8=E7=BD=91=E5=8D=A1=E7=9B=91?=
 =?UTF-8?q?=E8=A7=86=E7=A8=8B=E5=BA=8F=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

提交的变更：
	修改：     code/sys_nicmonitor/README
	修改：     code/sys_nicmonitor/mnic.c
	修改：     code/sys_nicmonitor/version.h

Signed-off-by: Wei, Jing <jwei@linx-info.com>
---
 code/sys_nicmonitor/README    |  7 +++++++
 code/sys_nicmonitor/mnic.c    | 11 ++++++-----
 code/sys_nicmonitor/version.h |  4 ++--
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/code/sys_nicmonitor/README b/code/sys_nicmonitor/README
index 5f208ab..672f1a5 100644
--- a/code/sys_nicmonitor/README
+++ b/code/sys_nicmonitor/README
@@ -74,6 +74,13 @@ make runtest
 
 =======＝
 
+版本说明：
+--V1.22 --
+  2021-12-13
+  1）修复问题：华为5885V3型号服务器科东应用启动网卡监视程序检测到失败
+    问题描述：使用科东应用启动工具启动网卡监视程序失败
+    解决办法：修改调用科东注册接口函数位置，提升优先级优先调用。
+
 版本说明：
 --V1.21 --
   2019-09-05
diff --git a/code/sys_nicmonitor/mnic.c b/code/sys_nicmonitor/mnic.c
index e6aec95..700c545 100644
--- a/code/sys_nicmonitor/mnic.c
+++ b/code/sys_nicmonitor/mnic.c
@@ -1544,11 +1544,6 @@ int main(int argc, char ** argv)
 		sys_nic_debug = 1;
 	}
 
-	memset(&conf, 0, sizeof(CONFIG_FILE_ST));
-	if(isrun(argv[0]) == 1){
-		printf("the program is already started!\n");
-		exit(0);
-	}
 	//process register
 #ifndef TESTINTERVAL
 	if((proc_stat=prcm.proc_init("sys","base_srv","sys_nicmonitor"))==-1){
@@ -1557,6 +1552,12 @@ int main(int argc, char ** argv)
 	}
 #endif
 
+	memset(&conf, 0, sizeof(CONFIG_FILE_ST));
+	if(isrun(argv[0]) == 1){
+		printf("the program is already started!\n");
+		exit(0);
+	}
+
 	sig.sa_handler = sig_handler;
 	sigemptyset(&sig.sa_mask);
 	sigaddset(&sig.sa_mask, SIGINT);
diff --git a/code/sys_nicmonitor/version.h b/code/sys_nicmonitor/version.h
index 256feb1..f81b995 100644
--- a/code/sys_nicmonitor/version.h
+++ b/code/sys_nicmonitor/version.h
@@ -1,5 +1,5 @@
-// version=1.20
+// version=1.22
 #ifndef MNIC_VERSION
-	#define MNIC_VERSION "1.21"
+	#define MNIC_VERSION "1.22"
 #endif