pcap: Move declarations to a separate header

Signed-off-by: Siddharth Chandrasekaran <[email protected]>
goToMain · Feb 20, 2024 · 7750be2 · 7750be2
1 parent 231bc79
commit 7750be2
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 11 deletions.
diff --git a/python/setup.py b/python/setup.py
@@ -153,6 +153,7 @@ def try_vendor_sources(src_dir, src_files, vendor_dir):
 
     # Optional when PACKET_TRACE is enabled
     "src/osdp_pcap.c",
+    "src/osdp_pcap.h",
     "utils/include/utils/pcap_gen.h",
     "utils/src/pcap_gen.c",
 ]

diff --git a/src/osdp_common.h b/src/osdp_common.h
@@ -385,17 +385,6 @@ static inline void cp_keyset_complete(struct osdp_pd *pd, bool restart_sc) { }
 void cp_keyset_complete(struct osdp_pd *pd, bool restart_sc);
 #endif
 
-#if defined(CONFIG_OSDP_PACKET_TRACE) || defined(CONFIG_OSDP_DATA_TRACE)
-void osdp_packet_capture_init(struct osdp_pd *pd);
-void osdp_packet_capture_finish(struct osdp_pd *pd);
-void osdp_capture_packet(struct osdp_pd *pd, uint8_t *buf, int len);
-#else
-static inline void osdp_packet_capture_init(struct osdp_pd *pd) { }
-static inline void osdp_packet_capture_finish(struct osdp_pd *pd) { }
-static inline void osdp_capture_packet(struct osdp_pd *pd,
-				       uint8_t *buf, int len) { }
-#endif
-
 void osdp_keyset_complete(struct osdp_pd *pd);
 
 /* from osdp_phy.c */

diff --git a/src/osdp_cp.c b/src/osdp_cp.c
@@ -10,6 +10,7 @@
 
 #include "osdp_common.h"
 #include "osdp_file.h"
+#include "osdp_pcap.h"
 
 #define CMD_POLL_LEN                   1
 #define CMD_LSTAT_LEN                  1

diff --git a/src/osdp_pcap.h b/src/osdp_pcap.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2024 Siddharth Chandrasekaran <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#ifndef _OSDP_PCAP_H_
+#define _OSDP_PCAP_H_
+
+#include "osdp_common.h"
+
+#if defined(CONFIG_OSDP_PACKET_TRACE) || defined(CONFIG_OSDP_DATA_TRACE)
+
+void osdp_packet_capture_init(struct osdp_pd *pd);
+void osdp_packet_capture_finish(struct osdp_pd *pd);
+void osdp_capture_packet(struct osdp_pd *pd, uint8_t *buf, int len);
+
+#else
+
+static inline void osdp_packet_capture_init(struct osdp_pd *pd)
+{
+	ARG_UNUSED(pd);
+}
+
+static inline void osdp_packet_capture_finish(struct osdp_pd *pd)
+{
+	ARG_UNUSED(pd);
+}
+
+static inline void osdp_capture_packet(struct osdp_pd *pd,
+				       uint8_t *buf, int len)
+{
+	ARG_UNUSED(pd);
+	ARG_UNUSED(buf);
+	ARG_UNUSED(len);
+}
+
+#endif
+
+#endif /* _OSDP_PCAP_H_ */
+
diff --git a/src/osdp_pd.c b/src/osdp_pd.c
@@ -6,6 +6,7 @@
 
 #include "osdp_common.h"
 #include "osdp_file.h"
+#include "osdp_pcap.h"
 
 #ifndef CONFIG_OSDP_STATIC_PD
 #include <stdlib.h>

diff --git a/src/osdp_phy.c b/src/osdp_phy.c
@@ -5,6 +5,7 @@
  */
 
 #include "osdp_common.h"
+#include "osdp_pcap.h"
 
 #define OSDP_PKT_MARK                  0xFF
 #define OSDP_PKT_SOM                   0x53