From e644d1e74ed843de4ed46bd0571f767cff619f51 Mon Sep 17 00:00:00 2001
From: zhanglianghy <zhanglianghy@cmhi.chinamobile.com>
Date: Wed, 28 Aug 2019 15:30:15 +0800
Subject: [PATCH] =?UTF-8?q?MOD=20aaa-12=20=E5=A2=9E=E5=8A=A0configm?=
 =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF=E7=A0=81=EF=BC=8C=E8=AE=A9=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=9B=B4=E5=8A=A0=E6=B8=85=E6=99=B0=20SOL=20=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0configm=E7=9A=84=E9=94=99=E8=AF=AF=E7=A0=81?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=A9=E9=94=99=E8=AF=AF=E6=9B=B4=E5=8A=A0=E6=B8=85?=
 =?UTF-8?q?=E6=99=B0=20=E4=BF=AE=E6=94=B9=E4=BA=BA=EF=BC=9Azhangliang=20?=
 =?UTF-8?q?=E6=A3=80=E8=A7=86=E4=BA=BA=EF=BC=9Azhangliang?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Common/ret_errno.h                                 | 4 ++++
 Platform/user/configm/config-server/configserver.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Common/ret_errno.h b/Common/ret_errno.h
index 7ef6ed927..bf9688cb8 100644
--- a/Common/ret_errno.h
+++ b/Common/ret_errno.h
@@ -26,6 +26,8 @@ typedef uint ret_code;
 #define    RET_EXIST       11
 #define    RET_FULL        12
 #define    RET_SENDERR     13
+#define    RET_NOCMID      14
+#define    RET_SRCERR      15
 
 /* NETCONFIG_MODULE 0x00010000 ~ 0x0001ffff*/
 #define RET_IPINVALID         (uint)((uint)NETCONFIG_MODULE<<16|1)
@@ -50,6 +52,8 @@ typedef uint ret_code;
     { RET_EXIST,      "AlreadyExist"},\
     { RET_FULL,       "Full"},\
     { RET_SENDERR,    "SendErr"},\
+    { RET_NOCMID,     "CanNotFindConfig"},\
+    { RET_SRCERR,     "ConfigSourceErr"},\
 \
     { RET_IPINVALID,  "IpInvalid"},\
     { RET_BRNAMEERR,  "BrNameInvalid"}\
diff --git a/Platform/user/configm/config-server/configserver.c b/Platform/user/configm/config-server/configserver.c
index ac1b14ed0..80fb09014 100644
--- a/Platform/user/configm/config-server/configserver.c
+++ b/Platform/user/configm/config-server/configserver.c
@@ -327,14 +327,14 @@ void cm_config_process(rpc_conn *conn, pointer input, int input_len, void* data)
     config_svr = cm_config_service_get(config_msg->config_id);
     if(config_svr == NULL)
     {
-        cm_return(conn, RET_NULLP, "NULL pointer");
+        cm_return(conn, RET_NOCMID, "can not find config id");
         return;
     }
     
     /*source check*/
     if(!(config_svr->config_src & config_msg->source))
     {
-        cm_return(conn, RET_CHKERR, "source check error!\r\n");
+        cm_return(conn, RET_SRCERR, "source check error!\r\n");
         return;
     }