[PACKET_IO]format code style

src/common/global_var.cpp

@@ -8,26 +8,6 @@
 ***********************************************************************************************
 */
 
-#include <string.h>
-
 #include "global_var.h"
 
-struct stellar_engine g_engine_instance;
-
-int strncpy_safe(char *dst, const char *src, size_t dst_size)
-{
-	if (nullptr == dst || nullptr == src || dst_size == 0) {
-        return -1;
-    }
-    
-    size_t slen = strlen(src);
-    if (slen >= dst_size) {
-        strncpy(dst, src, dst_size);
-        dst[dst_size - 1] = '\0';
-    } else {
-        strcpy(dst, src);
-        dst[slen - 1] = '\0';
-    }
-    
-    return 0;
-}
+struct stellar_engine g_engine_instance;

src/common/global_var.h

@@ -87,13 +87,6 @@ struct stellar_engine {
 
 extern struct stellar_engine g_engine_instance;
 
-/**
- * @brief string copy safely, 
- * 
- * @retval  -1(failed), 0(success)
- */
-int strncpy_safe(char *dst, const char *src, size_t dst_size);
-
 #ifdef __cpluscplus
 }
 #endif

src/packet_io/CMakeLists.txt

@@ -1,9 +1,9 @@
 
 add_library(packet_io
 	../common/global_var.cpp
-	../common/pio_packet_queue.cpp
 	../common/time_helper.cpp
 	packet_io.cpp
+	packet_io_util.cpp
 	pcap_live_mode/pio_pcap_live.cpp
 	pcap_file_mode/pio_pcap_file.cpp
 	marsio_mode/pio_marsio.cpp

src/packet_io/marsio_mode/pio_marsio.cpp

@@ -11,12 +11,12 @@
 #include <dlfcn.h>
 #include <string.h>
 
+#include "global_var.h"
+#include "logger.h"
+#include "utils.h"
+#include "util_errors.h"
 #include "pio_marsio.h"
-#include "../packet_io.h"
-#include "../../common/global_var.h"
-#include "../../sdk/include/logger.h"
-#include "../../sdk/include/utils.h"
-#include "../../sdk/include/util_errors.h"
+#include "packet_io.h"
 
 #define MARSIO_BURST_PKT_MAX (256)
 

src/packet_io/packet_io.cpp

@@ -10,10 +10,10 @@
 
 #include <string.h>
 
+#include "logger.h"
+#include "utils.h"
+#include "util_errors.h"
 #include "packet_io.h"
-#include "../../sdk/include/logger.h"
-#include "../../sdk/include/utils.h"
-#include "../../sdk/include/util_errors.h"
 
 struct pio_device_operations pio_device_ops_array[PACKET_IO_RUN_MODE_MAX] = 
 {

src/packet_io/packet_io.h

@@ -20,13 +20,13 @@ extern "C"
 #include <limits.h>
 #include <sys/queue.h>
 
-#include "../common/global_var.h"
+#include "global_var.h"
 #include "./pcap_live_mode/pio_pcap_live.h"
 #include "./pcap_file_mode/pio_pcap_file.h"
 #include "./marsio_mode/pio_marsio.h"
 
 /**
- * note: 
+ * note:
  *	1. packet_io_XXX function is supported by packet_io.h
  *	2. pio_XXX function is supported by pio_pcap_live.h/pio_pcap_file.h/pio_marsio.h
  */

src/packet_io/packet_io_util.cpp

@@ -1,6 +1,6 @@
 /*
 **********************************************************************************************
-*	File: pio_packet_queue.cpp
+*	File: packet_io_util.cpp
 *   Description:
 *	Authors: Liu WenTan <liuwentan@geedgenetworks.com>
 *	Date:    2022-07-15
@@ -10,8 +10,8 @@
 
 #include <string.h>
 
-#include "../../sdk/include/utils.h"
-#include "pio_packet_queue.h"
+#include "utils.h"
+#include "packet_io_util.h"
 
 static int packet_copy_data_offset(uint8_t *ptr, uint32_t offset, const uint8_t *data, uint32_t data_len)
 {
@@ -88,3 +88,21 @@ void release_pio_packet_queue(struct pio_packet_queue *q)
         FREE(p);
     }
 }
+
+int strncpy_safe(char *dst, const char *src, size_t dst_size)
+{
+	if (nullptr == dst || nullptr == src || dst_size == 0) {
+        return -1;
+    }
+    
+    size_t slen = strlen(src);
+    if (slen >= dst_size) {
+        strncpy(dst, src, dst_size);
+        dst[dst_size - 1] = '\0';
+    } else {
+        strcpy(dst, src);
+        dst[slen - 1] = '\0';
+    }
+    
+    return 0;
+}

src/packet_io/packet_io_util.h

@@ -1,15 +1,15 @@
 /*
 **********************************************************************************************
-*	File: pio_packet_queue.h
-*   Description: pio packet queue structure and api
+*	File: packet_io_util.h
+*   Description: packet_io internal utils
 *	Authors: Liu WenTan <liuwentan@geedgenetworks.com>
 *	Date:    2022-07-15
 *   Copyright: (c) 2018-2022 Geedge Networks, Inc. All rights reserved.
 ***********************************************************************************************
 */
 
-#ifndef _PIO_PACKET_QUEUE_H_
-#define _PIO_PACKET_QUEUE_H_
+#ifndef _PACKET_IO_UTIL_H_
+#define _PACKET_IO_UTIL_H_
 
 #ifdef __cpluscplus
 extern "C"
@@ -17,6 +17,7 @@ extern "C"
 #endif
 
 #include <stdint.h>
+#include <pthread.h>
 
 #define PKT_QUEUE_MAX_NUM 256
 
@@ -66,11 +67,20 @@ struct pio_packet_queue {
 int packet_copy_data(uint8_t *ptr, const uint8_t *pkt_data, uint32_t pkt_len);
 
 void pio_packet_enqueue(struct pio_packet_queue *, struct pio_packet *);
+
 struct pio_packet *pio_packet_dequeue(struct pio_packet_queue *);
+
 void release_pio_packet_queue(struct pio_packet_queue *);
 
+/**
+ * @brief string copy safely, 
+ * 
+ * @retval  -1(failed), 0(success)
+ */
+int strncpy_safe(char *dst, const char *src, size_t dst_size);
+
 #ifdef __cpluscplus
 }
 #endif
 
-#endif /* _PIO_PACKET_QUEUE_H_ */
+#endif /* _PACKET_IO_UTIL_H_ */

src/packet_io/pcap_file_mode/pio_pcap_file.cpp

@@ -15,12 +15,12 @@
 #include <pthread.h>
 #include <sys/stat.h>
 
+#include "utils.h"
+#include "util_errors.h"
+#include "logger.h"
+#include "time_helper.h"
 #include "pio_pcap_file.h"
-#include "../packet_io.h"
-#include "../../../sdk/include/utils.h"
-#include "../../../sdk/include/util_errors.h"
-#include "../../../sdk/include/logger.h"
-#include "../../common/time_helper.h"
+#include "packet_io.h"
 
 /**
  * @brief validate path is a valid plain file or directory

src/packet_io/pcap_file_mode/pio_pcap_file.h

@@ -21,8 +21,8 @@ extern "C"
 #include <pcap/pcap.h>
 #include <sys/queue.h>
 
-#include "../../common/global_var.h"
-#include "../../common/pio_packet_queue.h"
+#include "global_var.h"
+#include "packet_io_util.h"
 
 struct pio_pcap_file_instance_context {
     

src/packet_io/pcap_live_mode/pio_pcap_live.cpp

@@ -12,11 +12,11 @@
 #include <string.h>
 #include <pthread.h>
 
+#include "logger.h"
+#include "utils.h"
+#include "util_errors.h"
 #include "pio_pcap_live.h"
-#include "../packet_io.h"
-#include "../../../sdk/include/logger.h"
-#include "../../../sdk/include/utils.h"
-#include "../../../sdk/include/util_errors.h"
+#include "packet_io.h"
 
 #define DEFAULT_MAX_PACKET_SIZE 65535
 #define TIMEOUT_MS 500

src/packet_io/pcap_live_mode/pio_pcap_live.h

@@ -19,8 +19,8 @@ extern "C"
 #include <stdint.h>
 #include <pcap/pcap.h>
 
-#include "../../common/global_var.h"
-#include "../../common/pio_packet_queue.h"
+#include "global_var.h"
+#include "packet_io_util.h"
 
 #define PCAP_STATE_UP 1
 #define PCAP_STATE_DOWN 0

version.txt

@@ -3,16 +3,16 @@
 VCS_TYPE="git"
 VCS_BASENAME="stellar"
 VCS_UUID="4ca8c002ee6c7ebcbb5bc7360b82a391a12d4a63"
-VCS_NUM="37"
-VCS_DATE="2022-08-11T02:50:41Z"
+VCS_NUM="38"
+VCS_DATE="2022-08-11T02:57:46Z"
 VCS_BRANCH="dev-liuwentan"
 VCS_TAG=""
-VCS_TICK="37"
+VCS_TICK="38"
 VCS_EXTRA=""
 
-VCS_ACTION_STAMP="2022-08-11T02:50:41Z!liuwentan@geedgenetworks.com"
-VCS_FULL_HASH="85c28ff17e37de4ac9489d79f2c87e63de156d87"
-VCS_SHORT_HASH="85c28ff"
+VCS_ACTION_STAMP="2022-08-11T02:57:46Z!liuwentan@geedgenetworks.com"
+VCS_FULL_HASH="b471a6eac4bd2c6786e1cf2c8eba45496f19cf66"
+VCS_SHORT_HASH="b471a6e"
 
 VCS_WC_MODIFIED="1"