more optimization

src/inc/trpc.h

@@ -34,38 +34,46 @@ extern "C" {
 
 extern int tsRpcHeadSize;
 
+typedef struct {
+  int8_t    index; 
+  int8_t    numOfIps;
+  uint16_t  port;
+  uint32_t  ip[TSDB_MAX_MPEERS];
+} SRpcIpSet;
+
 typedef struct {
   char *localIp;      // local IP used
   uint16_t localPort; // local port
   char *label;        // for debug purpose
   int   numOfThreads; // number of threads to handle connections
-  void *(*fp)(char type, void *pCont, int contLen, void *handle, int index);  // function to process the incoming msg
   int   sessions;     // number of sessions allowed
   int   connType;     // TAOS_CONN_UDP, TAOS_CONN_TCPC, TAOS_CONN_TCPS
   int   idleTime;     // milliseconds, 0 means idle timer is disabled
+
+  // the following is for client security only
   char *meterId;      // meter ID
   char  spi;          // security parameter index
   char  encrypt;      // encrypt algorithm
   char *secret;       // key for authentication
   char *ckey;         // ciphering key
-  int   (*afp) (char *meterId, char *spi, char *encrypt, uint8_t *secret, uint8_t *ckey); // call back to retrieve auth info
-} SRpcInit;
 
-typedef struct {
-  int16_t   index; 
-  int16_t   numOfIps;
-  uint16_t  port;
-  uint32_t  ip[TSDB_MAX_MPEERS];
-  char      ipStr[TSDB_MAX_MPEERS][TSDB_IPv4ADDR_LEN];
-} SRpcIpSet;
+  // call back to process incoming msg
+  void (*cfp)(char type, void *pCont, int contLen, void *ahandle, int32_t code);  
+
+  // call back to process notify the ipSet changes
+  void (*ufp)(void *ahandle, SRpcIpSet ipSet);
+
+  // call back to retrieve the client auth info 
+  int  (*afp)(char *meterId, char *spi, char *encrypt, uint8_t *secret, uint8_t *ckey); 
+} SRpcInit;
 
 void *rpcOpen(SRpcInit *pRpc);
 void  rpcClose(void *);
 void *rpcMallocCont(int contLen);
 void  rpcFreeCont(void *pCont);
 void  rpcSendRequest(void *thandle, SRpcIpSet ipSet, char msgType, void *pCont, int contLen, void *ahandle);
-void  rpcSendResponse(void *pConn, void *pCont, int contLen);
-void  rpcSendSimpleRsp(void *pConn, int32_t code);
+void  rpcSendResponse(void *pConn, int32_t code, void *pCont, int contLen);
+void  rpcSendRedirectRsp(void *pConn, SRpcIpSet ipSet); 
 
 
 #ifdef __cplusplus