From 0b51905c4f26dfe2cdcc684c1c4a1b218a8c2841 Mon Sep 17 00:00:00 2001
From: slguan <slguan@taosdata.com>
Date: Thu, 26 Mar 2020 13:39:56 +0800
Subject: [PATCH] revert some code

---
 src/rpc/src/trpc.c | 4 ++--
 src/rpc/src/tudp.c | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/rpc/src/trpc.c b/src/rpc/src/trpc.c
index 9e0b5dab0f..87506861b1 100755
--- a/src/rpc/src/trpc.c
+++ b/src/rpc/src/trpc.c
@@ -239,8 +239,8 @@ char *taosBuildReqHeader(void *param, char type, char *msg) {
   pHeader->spi = 0;
   pHeader->tcp = 0;
   pHeader->encrypt = 0;
-  pHeader->tranId = atomic_add_fetch_32(&pConn->tranId, 1);
-  if (pHeader->tranId == 0) pHeader->tranId = atomic_add_fetch_32(&pConn->tranId, 1);
+  pHeader->tranId = atomic_add_fetch_16(&pConn->tranId, 1);
+  if (pHeader->tranId == 0) pHeader->tranId = atomic_add_fetch_16(&pConn->tranId, 1);
 
   pHeader->sourceId = pConn->ownId;
   pHeader->destId = pConn->peerId;
diff --git a/src/rpc/src/tudp.c b/src/rpc/src/tudp.c
index a782f5eb10..2de42e2359 100644
--- a/src/rpc/src/tudp.c
+++ b/src/rpc/src/tudp.c
@@ -481,7 +481,8 @@ void *taosInitUdpConnection(char *ip, uint16_t port, char *label, int threads, v
   sprintf(udplabel, "%s.b", label);
   pSet->tmrCtrl = taosTmrInit(RPC_MAX_UDP_CONNS * threads, 5, 5000, udplabel);
   if (pSet->tmrCtrl == NULL) {
-    tError("%s failed to initialize tmrCtrl") taosCleanUpUdpConnection(pSet);
+    tError("%s failed to initialize tmrCtrl", label);
+    taosCleanUpUdpConnection(pSet);
     return NULL;
   }
   //  }
@@ -708,7 +709,7 @@ int taosSendPacketViaTcp(uint32_t ip, uint16_t port, char *data, int dataLen, vo
     pHead->msgLen = (int32_t)htonl(msgLen);
     code = taosSendUdpData(ip, port, buffer, msgLen, chandle);
 
-    pHead = (STaosHeader *)data;
+    //pHead = (STaosHeader *)data;
 
     tinet_ntoa(ipstr, ip);
     int fd = taosOpenTcpClientSocket(ipstr, pConn->port, tsLocalIp);
-- 
GitLab