pcap: Replace ':' with '_' in pcap file name timestamp

It turns out scp misinteprets the ':' in file name to be the begining of the path name after the host. Although this can be fixed with some quote magic, it's too much to expect our users to know about it. Signed-off-by: Siddharth Chandrasekaran <[email protected]>
goToMain · Feb 21, 2024 · c08e7c0 · c08e7c0
1 parent 17a56c2
commit c08e7c0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/src/osdp_pcap.c b/src/osdp_pcap.c
@@ -8,16 +8,27 @@
 
 #include "osdp_common.h"
 
+static void pcap_file_name(struct osdp_pd *pd, char *buf, size_t size)
+{
+	int n;
+	char *p;
+
+	n = snprintf(buf, size, "osdp-trace-%spd-%d-",
+		     is_pd_mode(pd) ? "" : "cp-", pd->address);
+	n += add_iso8601_utc_datetime(buf + n, size - n);
+	strcpy(buf + n, ".pcap");
+
+	while ((p = strchr(buf, ":")) == NULL) {
+		*p = "_";
+	}
+}
+
 void osdp_packet_capture_init(struct osdp_pd *pd)
 {
 	pcap_t *cap;
-	int n;
 	char path[128];
 
-	n = snprintf(path, sizeof(path), "osdp-trace-%spd-%d-",
-		     is_pd_mode(pd) ? "" : "cp-", pd->address);
-	n += add_iso8601_utc_datetime(path + n, sizeof(path) - n);
-	strcpy(path + n, ".pcap");
+	pcap_file_name(pd, path, sizeof(path));
 	cap = pcap_start(path, OSDP_PACKET_BUF_SIZE, OSDP_PCAP_LINK_TYPE);
 	if (cap) {
 		LOG_WRN("Capturing packets to '%s'", path);

diff --git a/src/osdp_phy.c b/src/osdp_phy.c
@@ -490,7 +490,7 @@ static int phy_check_packet(struct osdp_pd *pd, uint8_t *buf, int pkt_len)
 	}
 	cur = osdp_phy_get_seq_number(pd, is_pd_mode(pd));
 	if (cur != comp && !ISSET_FLAG(pd, PD_FLAG_SKIP_SEQ_CHECK)) {
-		LOG_ERR("packet seq mismatch %d/%d", cur, comp);
+		LOG_ERR("Packet sequence mismatch %d/%d", cur, comp);
 		pd->reply_id = REPLY_NAK;
 		pd->ephemeral_data[0] = OSDP_PD_NAK_SEQ_NUM;
 		return OSDP_ERR_PKT_NACK;