From 6dfc958cf4a36dcf07f042aaf559b38437eb6763 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Wed, 11 Dec 2019 16:30:40 +0800
Subject: [PATCH] [TBASE-1241]

---
 src/inc/trpc.h                    |  2 --
 src/rpc/src/trpc.c                |  5 -----
 src/system/detail/src/mgmtShell.c | 10 +++-------
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/inc/trpc.h b/src/inc/trpc.h
index 6554d0d201..97a0c905f8 100644
--- a/src/inc/trpc.h
+++ b/src/inc/trpc.h
@@ -109,8 +109,6 @@ int taosSetSecurityInfo(int cid, int sid, char *id, int spi, int encrypt, char *
 
 void taosGetRpcConnInfo(void *thandle, uint32_t *peerId, uint32_t *peerIp, uint16_t *peerPort, int *cid, int *sid);
 
-uint32_t taosGetRpcLocalIp(void *thandle);
-
 int taosGetOutType(void *thandle);
 
 #ifdef __cplusplus
diff --git a/src/rpc/src/trpc.c b/src/rpc/src/trpc.c
index 21f2ae4dc0..88bfbc2c2d 100755
--- a/src/rpc/src/trpc.c
+++ b/src/rpc/src/trpc.c
@@ -1411,11 +1411,6 @@ void taosGetRpcConnInfo(void *thandle, uint32_t *peerId, uint32_t *peerIp, uint1
   *sid = pConn->sid;
 }
 
-uint32_t taosGetRpcLocalIp(void *thandle) {
-  SRpcConn *pConn = (SRpcConn *)thandle;
-  return pConn->peerIp;
-}
-
 int taosGetOutType(void *thandle) {
   SRpcConn *pConn = (SRpcConn *)thandle;
   if (pConn == NULL) return -1;
diff --git a/src/system/detail/src/mgmtShell.c b/src/system/detail/src/mgmtShell.c
index c5fb87bcdb..b738c0dab3 100644
--- a/src/system/detail/src/mgmtShell.c
+++ b/src/system/detail/src/mgmtShell.c
@@ -1220,11 +1220,8 @@ int mgmtProcessConnectMsg(char *pMsg, int msgLen, SConnObj *pConn) {
   pConn->pAcct = pAcct;
   pConn->pDb = pDb;
   pConn->pUser = pUser;
-
-  uint32_t peerIp = taosGetRpcLocalIp(pConn->thandle);
-  pConn->usePublicIp = (peerIp == tsPublicIpInt ? 1 : 0);
   mgmtEstablishConn(pConn);
-
+  
 _rsp:
   pStart = taosBuildRspMsgWithSize(pConn->thandle, TSDB_MSG_TYPE_CONNECT_RSP, 128);
   if (pStart == NULL) return 0;
@@ -1298,10 +1295,9 @@ void *mgmtProcessMsgFromShell(char *msg, void *ahandle, void *thandle) {
     pConn = connList + pMsg->destId;
     pConn->thandle = thandle;
     strcpy(pConn->user, pMsg->meterId);
-
     pConn->usePublicIp = (pMsg->destIp == tsPublicIpInt ? 1 : 0);
-    mPrint("pConn:%p is rebuild, destIp:%s publicIp:%s usePublicIp:%u",
-           pConn, taosIpStr(pMsg->destIp), taosIpStr(tsPublicIpInt), pConn->usePublicIp);
+    mTrace("pConn:%p is rebuild, destIp:%s publicIp:%s usePublicIp:%u",
+            pConn, taosIpStr(pMsg->destIp), taosIpStr(tsPublicIpInt), pConn->usePublicIp);
   }
 
   if (pMsg->msgType == TSDB_MSG_TYPE_CONNECT) {