signalling cmdid defination move to longlink_packer

shockcao · shockcao · commit 6c9290cc582a · 2017-01-04T18:53:24.000+08:00
diff --git a/mars/libraries/mars_android_sdk/jni/longlink_packer.cc b/mars/libraries/mars_android_sdk/jni/longlink_packer.cc
@@ -100,7 +100,9 @@ int longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq,
  * nooping param
  */
 #define NOOP_CMDID 6
+#define SIGNALKEEP_CMDID 243
 uint32_t longlink_noop_cmdid() {return NOOP_CMDID;}
 uint32_t longlink_noop_resp_cmdid() {return NOOP_CMDID;}
+uint32_t signal_keep_cmdid() {return SIGNALKEEP_CMDID;}
 void longlink_noop_req_body(AutoBuffer& _body) {}
 void longlink_noop_resp_body(AutoBuffer& _body) {}
diff --git a/mars/libraries/mars_android_sdk/jni/longlink_packer.cc.rewriteme b/mars/libraries/mars_android_sdk/jni/longlink_packer.cc.rewriteme
@@ -112,7 +112,9 @@ int longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq,
  * nooping param
  */
 #define NOOP_CMDID 6
+#define SIGNALKEEP_CMDID 243
 uint32_t longlink_noop_cmdid() {return NOOP_CMDID;}
 uint32_t longlink_noop_resp_cmdid() {return NOOP_CMDID;}
+uint32_t signal_keep_cmdid() {return SIGNALKEEP_CMDID;}
 void longlink_noop_req_body(AutoBuffer& _body) {}
 void longlink_noop_resp_body(AutoBuffer& _body) {}
diff --git a/mars/libraries/mars_android_sdk/jni/longlink_packer.h b/mars/libraries/mars_android_sdk/jni/longlink_packer.h
@@ -39,6 +39,7 @@ int  longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq
 //heartbeat signal to keep longlink network alive
 uint32_t longlink_noop_cmdid();
 uint32_t longlink_noop_resp_cmdid();
+uint32_t signal_keep_cmdid();
 void longlink_noop_req_body(AutoBuffer& _body);
 void longlink_noop_resp_body(AutoBuffer& _body);
 
diff --git a/mars/stn/proto/longlink_packer.cc b/mars/stn/proto/longlink_packer.cc
@@ -112,7 +112,9 @@ int longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq,
  * nooping param
  */
 #define NOOP_CMDID 6
+#define SIGNALKEEP_CMDID 243
 uint32_t longlink_noop_cmdid() {return NOOP_CMDID;}
 uint32_t longlink_noop_resp_cmdid() {return NOOP_CMDID;}
+uint32_t signal_keep_cmdid() {return SIGNALKEEP_CMDID;}
 void longlink_noop_req_body(AutoBuffer& _body) {}
 void longlink_noop_resp_body(AutoBuffer& _body) {}
diff --git a/mars/stn/proto/longlink_packer.h b/mars/stn/proto/longlink_packer.h
@@ -39,6 +39,7 @@ int  longlink_unpack(const AutoBuffer& _packed, uint32_t& _cmdid, uint32_t& _seq
 //heartbeat signal to keep longlink network alive
 uint32_t longlink_noop_cmdid();
 uint32_t longlink_noop_resp_cmdid();
+uint32_t signal_keep_cmdid();
 void longlink_noop_req_body(AutoBuffer& _body);
 void longlink_noop_resp_body(AutoBuffer& _body);
 
diff --git a/mars/stn/src/signalling_keeper.cc b/mars/stn/src/signalling_keeper.cc
@@ -35,8 +35,6 @@ using namespace mars::stn;
 static unsigned int g_period = 5 * 1000;  // ms
 static unsigned int g_keepTime = 20 *1000;  // ms
 
-static const unsigned int kSignallingCmdId = 243;
-
 
 SignallingKeeper::SignallingKeeper(const LongLink& _longlink, MessageQueue::MessageQueue_t _messagequeue_id, bool _use_UDP)
 :msgreg_(MessageQueue::InstallAsyncHandler(_messagequeue_id))
@@ -132,13 +130,13 @@ void SignallingKeeper::__SendSignallingBuffer()
         {
             udp_client_.SetIpPort(ip_, port_);
             AutoBuffer buffer;
-            longlink_pack(kSignallingCmdId, 0, NULL, 0, buffer);
+            longlink_pack(signal_keep_cmdid(), 0, NULL, 0, buffer);
             udp_client_.SendAsync(buffer.Ptr(), buffer.Length());
         }
     } else {
         if (fun_send_signalling_buffer_)
         {
-            fun_send_signalling_buffer_(NULL, 0, kSignallingCmdId);
+            fun_send_signalling_buffer_(NULL, 0, signal_keep_cmdid());
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@ using namespace mars::stn;`
`35`	`35`	`static unsigned int g_period = 5 * 1000; // ms`
`36`	`36`	`static unsigned int g_keepTime = 20 *1000; // ms`
`37`	`37`
`38`		`-static const unsigned int kSignallingCmdId = 243;`
`39`		`-`
`40`	`38`
`41`	`39`	`SignallingKeeper::SignallingKeeper(const LongLink& _longlink, MessageQueue::MessageQueue_t _messagequeue_id, bool _use_UDP)`
`42`	`40`	`:msgreg_(MessageQueue::InstallAsyncHandler(_messagequeue_id))`
`@@ -132,13 +130,13 @@ void SignallingKeeper::__SendSignallingBuffer()`
`132`	`130`	`{`
`133`	`131`	`udp_client_.SetIpPort(ip_, port_);`
`134`	`132`	`AutoBuffer buffer;`
`135`		`- longlink_pack(kSignallingCmdId, 0, NULL, 0, buffer);`
	`133`	`+ longlink_pack(signal_keep_cmdid(), 0, NULL, 0, buffer);`
`136`	`134`	`udp_client_.SendAsync(buffer.Ptr(), buffer.Length());`
`137`	`135`	`}`
`138`	`136`	`} else {`
`139`	`137`	`if (fun_send_signalling_buffer_)`
`140`	`138`	`{`
`141`		`- fun_send_signalling_buffer_(NULL, 0, kSignallingCmdId);`
	`139`	`+ fun_send_signalling_buffer_(NULL, 0, signal_keep_cmdid());`
`142`	`140`	`}`
`143`	`141`	`}`
`144`	`142`	`}`