OBP support 'auto', 'force-bypass' and 'force-pass'; Optimize the signal handling function.

1 files changed, 33 insertions, 27 deletions

diff --git a/service/test/TestOLP.cc b/service/test/TestOLP.cc
index c00c68c..77b5bc9 100644
--- a/service/test/TestOLP.cc
+++ b/service/test/TestOLP.cc
@@ -39,11 +39,10 @@ uint8_t g_ctrlzone_id = 0;
 
 extern "C"
 {
-extern int olp6500_construct_packet(struct olp_channel * channel, int type, char *buff);
+extern int olp6500_packet_construct(struct olp_channel * channel, int type, char *buff);
 extern int olp6500_check_recv_data(char * buff, uint16_t object);
 extern int olp6500_apply_control_command_to_peer(struct olp_dev_desc * dev_desc, uint32_t channel_id);
 extern int olp6500_destroy_timer(struct olp_device * olp_dev);
-extern int olp6500_device_deinit(struct olp_device * olp_dev);
 }
 
 void olp_dev_desc_init(struct olp_dev_desc *dev_desc, struct olp_channel *channel)
@@ -52,7 +51,7 @@ void olp_dev_desc_init(struct olp_dev_desc *dev_desc, struct olp_channel *channe
     dev_desc->type = OLP_DEVICE_TYPE_OLP_6500;
     
     channel->olp_channel_id = 1;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -75,7 +74,7 @@ TEST(OLP_PACKET, OLP_SET_HEARTBEAT_SWITCH)
 
     olp_dev_desc_init(&dev_desc, &dev_channel);
 
-    pkt_len = olp6500_construct_packet(&dev_desc.channels[0], OLP_SET_HEARTBEAT_SWITCH, buff);
+    pkt_len = olp6500_packet_construct(&dev_desc.channels[0], OLP_SET_HEARTBEAT_SWITCH, buff);
     EXPECT_TRUE(pkt_len == 10);
     EXPECT_TRUE(buff[0] == 0x01);
     EXPECT_TRUE(buff[1] == 0x01);
@@ -101,7 +100,7 @@ TEST(OLP_PACKET, OLP_SET_WORK_MODE)
 
     olp_dev_desc_init(&dev_desc, &dev_channel);
 
-    pkt_len = olp6500_construct_packet(&dev_desc.channels[0], OLP_SET_WORK_MODE, buff);
+    pkt_len = olp6500_packet_construct(&dev_desc.channels[0], OLP_SET_WORK_MODE, buff);
     EXPECT_TRUE(pkt_len == 7);
     EXPECT_TRUE(buff[0] == 0x01);
     EXPECT_TRUE(buff[1] == 0x01);
@@ -109,7 +108,7 @@ TEST(OLP_PACKET, OLP_SET_WORK_MODE)
     EXPECT_TRUE(buff[3] == 0x10);
     EXPECT_TRUE(buff[4] == 0x00);
     EXPECT_TRUE(buff[5] == 0x01);
-    EXPECT_TRUE(buff[6] == 0x02);
+    EXPECT_TRUE(buff[6] == 0x01);
 }
 
 TEST(OLP_PACKET, OLP_SET_WORK_LINE)
@@ -124,8 +123,15 @@ TEST(OLP_PACKET, OLP_SET_WORK_LINE)
 
     olp_dev_desc_init(&dev_desc, &dev_channel);
 
-    pkt_len = olp6500_construct_packet(&dev_desc.channels[0], OLP_SET_WORK_LINE, buff);
-    EXPECT_TRUE(pkt_len == 0);
+    pkt_len = olp6500_packet_construct(&dev_desc.channels[0], OLP_SET_WORK_LINE, buff);
+    EXPECT_TRUE(pkt_len == 7);
+    EXPECT_TRUE(buff[0] == 0x01);
+    EXPECT_TRUE(buff[1] == 0x01);
+    EXPECT_TRUE(buff[2] == 0x10);
+    EXPECT_TRUE(buff[3] == 0x70);
+    EXPECT_TRUE(buff[4] == 0x00);
+    EXPECT_TRUE(buff[5] == 0x01);
+    EXPECT_TRUE(buff[6] == 0x30);
 }
 
 TEST(OLP_PACKET, OLP_SET_SWITCHBACK_MODE)
@@ -140,7 +146,7 @@ TEST(OLP_PACKET, OLP_SET_SWITCHBACK_MODE)
 
     olp_dev_desc_init(&dev_desc, &dev_channel);
 
-    pkt_len = olp6500_construct_packet(&dev_desc.channels[0], OLP_SET_SWITCHBACK_MODE, buff);
+    pkt_len = olp6500_packet_construct(&dev_desc.channels[0], OLP_SET_SWITCHBACK_MODE, buff);
     EXPECT_TRUE(pkt_len == 7);
     EXPECT_TRUE(buff[0] == 0x01);
     EXPECT_TRUE(buff[1] == 0x01);
@@ -163,7 +169,7 @@ TEST(OLP_PACKET, OLP_HEARTBEAT_PACKET)
 
     olp_dev_desc_init(&dev_desc, &dev_channel);
 
-    pkt_len = olp6500_construct_packet(&dev_desc.channels[0], OLP_HEARTBEAT_PACKET, buff);
+    pkt_len = olp6500_packet_construct(&dev_desc.channels[0], OLP_HEARTBEAT_PACKET, buff);
     EXPECT_TRUE(pkt_len == 6);
     EXPECT_TRUE(buff[0] == 0x00);
     EXPECT_TRUE(buff[1] == 0x01);
@@ -185,7 +191,7 @@ TEST(OLP_PACKET, OLP_GET_CHANNEL_INFO)
 
     olp_dev_desc_init(&dev_desc, &dev_channel);
 
-    pkt_len = olp6500_construct_packet(&dev_desc.channels[0], OLP_GET_CHANNEL_INFO, buff);
+    pkt_len = olp6500_packet_construct(&dev_desc.channels[0], OLP_GET_CHANNEL_INFO, buff);
     EXPECT_TRUE(pkt_len == 6);
     EXPECT_TRUE(buff[0] == 0x00);
     EXPECT_TRUE(buff[1] == 0x01);
@@ -207,7 +213,7 @@ TEST(OLP_PACKET, OLP_GET_CHANNEL_CONF)
 
     olp_dev_desc_init(&dev_desc, &dev_channel);
 
-    pkt_len = olp6500_construct_packet(&dev_desc.channels[0], OLP_GET_CHANNEL_CONF, buff);
+    pkt_len = olp6500_packet_construct(&dev_desc.channels[0], OLP_GET_CHANNEL_CONF, buff);
     EXPECT_TRUE(pkt_len == 6);
     EXPECT_TRUE(buff[0] == 0x00);
     EXPECT_TRUE(buff[1] == 0x01);
@@ -344,7 +350,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_1)
 
     channel->olp_channel_id = 1;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -387,7 +393,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_2)
 
     channel->olp_channel_id = 2;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -430,7 +436,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_3)
 
     channel->olp_channel_id = 3;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -473,7 +479,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_4)
 
     channel->olp_channel_id = 4;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 0;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -559,7 +565,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_6)
 
     channel->olp_channel_id = 6;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -602,7 +608,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_7)
 
     channel->olp_channel_id = 7;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -645,7 +651,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_8)
 
     channel->olp_channel_id = 8;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -688,7 +694,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_9)
 
     channel->olp_channel_id = 9;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -731,7 +737,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_10)
 
     channel->olp_channel_id = 10;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -774,7 +780,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_11)
 
     channel->olp_channel_id = 11;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -817,7 +823,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_12)
 
     channel->olp_channel_id = 12;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -860,7 +866,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_13)
 
     channel->olp_channel_id = 13;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -903,7 +909,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_14)
 
     channel->olp_channel_id = 14;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -946,7 +952,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_15)
 
     channel->olp_channel_id = 15;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;
@@ -989,7 +995,7 @@ TEST(OLP_CONTROL_COMMAND, CHANNEL_16)
 
     channel->olp_channel_id = 16;
     channel->used = OLP_STATE_USED;
-    channel->state = OLP_CHANNEL_STATE_FORCE_INLINE;
+    channel->state = OLP_CHANNEL_STATE_FORCE_PASS;
     channel->en_heartbeat = 1;
     channel->heartbeat_timeout_interval_in_ms = 60;
     channel->heartbeat_send_interval_in_ms = 60;