libosdp 3.2.6__tar.gz → 3.2.7__tar.gz

{libosdp-3.2.6 → libosdp-3.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libosdp
-Version: 3.2.6
+Version: 3.2.7
 Summary: Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)
 Home-page: https://github.com/osdp-dev/libosdp
 Author: Siddharth Chandrasekaran

{libosdp-3.2.6 → libosdp-3.2.7}/libosdp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libosdp
-Version: 3.2.6
+Version: 3.2.7
 Summary: Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)
 Home-page: https://github.com/osdp-dev/libosdp
 Author: Siddharth Chandrasekaran

{libosdp-3.2.6 → libosdp-3.2.7}/setup.py

@@ -12,7 +12,7 @@ import shutil
 import subprocess
 
 project_name = "libosdp"
-project_version = "3.2.6"
+project_version = "3.2.7"
 current_dir = os.path.dirname(os.path.realpath(__file__))
 repo_root = os.path.realpath(os.path.join(current_dir, ".."))
 

{libosdp-3.2.6 → libosdp-3.2.7}/vendor/src/osdp_common.c

@@ -174,6 +174,11 @@ int osdp_rb_pop_buf(struct osdp_rb *p, uint8_t *buf, int max_len)
 	return i;
 }
 
+void osdp_rb_reset(struct osdp_rb *p)
+{
+	p->head = p->tail = 0;
+}
+
 /* --- Exported Methods --- */
 
 void osdp_logger_init(const char *name, int log_level,

{libosdp-3.2.6 → libosdp-3.2.7}/vendor/src/osdp_common.h

@@ -372,6 +372,7 @@ struct osdp_pd {
 	int state;             /* FSM state (CP mode only) */
 	int phy_state;         /* phy layer FSM state (CP mode only) */
 	int phy_retry_count;   /* command retry counter */
+	int phy_tx_seq;        /* seq number embedded in last TX packet */
 	uint32_t wait_ms;      /* wait time in MS to retry communication */
 	int64_t tstamp;        /* Last POLL command issued time in ticks */
 	int64_t sc_tstamp;     /* Last received secure reply time in ticks */
@@ -466,6 +467,7 @@ int osdp_rb_push(struct osdp_rb *p, uint8_t data);
 int osdp_rb_push_buf(struct osdp_rb *p, uint8_t *buf, int len);
 int osdp_rb_pop(struct osdp_rb *p, uint8_t *data);
 int osdp_rb_pop_buf(struct osdp_rb *p, uint8_t *buf, int max_len);
+void osdp_rb_reset(struct osdp_rb *p);
 
 void osdp_crypt_setup();
 void osdp_encrypt(uint8_t *key, uint8_t *iv, uint8_t *data, int len);

{libosdp-3.2.6 → libosdp-3.2.7}/vendor/src/osdp_config.h

@@ -11,11 +11,11 @@
  * @brief The following macros are defined defined from the variable in cmake
  * files. All @XXX@ are replaced by the value of XXX as resolved by cmake.
  */
-#define PROJECT_VERSION                "3.2.6"
+#define PROJECT_VERSION                "3.2.7"
 #define PROJECT_NAME                   "libosdp"
 #define GIT_BRANCH                     "detached"
-#define GIT_REV                        "v3.2.6-0-g9ff9013"
-#define GIT_TAG                        "v3.2.6"
+#define GIT_REV                        "v3.2.7-0-gb284aa2"
+#define GIT_TAG                        "v3.2.7"
 #define GIT_DIFF                       ""
 #define REPO_ROOT                      "/home/runner/work/libosdp/libosdp"
 

{libosdp-3.2.6 → libosdp-3.2.7}/vendor/src/osdp_cp.c

@@ -744,6 +744,21 @@ static int cp_process_reply(struct osdp_pd *pd)
 		return OSDP_CP_ERR_NO_DATA;
 	case OSDP_ERR_PKT_BUSY:
 		return OSDP_CP_ERR_RETRY_CMD;
+	case OSDP_ERR_PKT_SKIP: {
+		/*
+		 * A command-direction frame reached us: either a second CP is
+		 * contending for the bus or we heard our own transmission echo
+		 * back. Drop the frame and keep waiting for the real reply.
+		 * The buffered header must be discarded or phy_check_header()
+		 * re-validates it forever, but osdp_phy_state_reset() also
+		 * clears phy_state, which the CP owns; preserve it.
+		 */
+		int saved_phy_state = pd->phy_state;
+
+		osdp_phy_state_reset(pd, false);
+		pd->phy_state = saved_phy_state;
+		return OSDP_CP_ERR_NO_DATA;
+	}
 	case OSDP_ERR_PKT_NACK:
 		if (pd->ephemeral_data[0] == OSDP_PD_NAK_SEQ_NUM) {
 			LOG_WRN("NAK(SEQ_NUM); restarting communication");
@@ -878,7 +893,12 @@ static int cp_phy_state_update(struct osdp_pd *pd)
 		pd->phy_state = OSDP_CP_PHY_STATE_SEND_CMD;
 		__fallthrough;
 	case OSDP_CP_PHY_STATE_SEND_CMD:
-		/* Check if we have any commands in the queue */
+		if (pd->phy_retry_count > 0) {
+			struct osdp_channel *channel = &pd->channel;
+			if (channel->flush)
+				channel->flush(channel->data);
+			pd->seq_number = pd->phy_tx_seq - 1;
+		}
 		if (cp_build_and_send_packet(pd)) {
 			LOG_ERR("Failed to build/send packet for CMD: %s(%02x)",
 				osdp_cmd_name(pd->cmd_id), pd->cmd_id);

{libosdp-3.2.6 → libosdp-3.2.7}/vendor/src/osdp_phy.c

@@ -230,6 +230,7 @@ int osdp_phy_packet_init(struct osdp_pd *pd, uint8_t *buf, int max_len)
 		id = pd->cmd_id;
 	}
 	pkt->control = phy_get_next_seq_number(pd);
+	pd->phy_tx_seq = pkt->control & PKT_CONTROL_SQN;
 	if (is_pd_mode(pd) ||
 	    (is_cp_mode(pd) && ISSET_FLAG(pd, PD_FLAG_CP_USE_CRC))) {
 		pkt->control |= PKT_CONTROL_CRC;
@@ -422,13 +423,30 @@ static int phy_validate_header(struct osdp_pd *pd, uint8_t *buf,
 	}
 
 	pkt_len = ((uint32_t)pkt->len_msb << 8) | pkt->len_lsb;
-	if (pkt_len > max_len ||
+	/**
+	 * The mark byte is not counted in the packet's length field but it is
+	 * buffered along with the packet, so it must be charged against the
+	 * space the packet has to fit into. Validating pkt_len alone lets a
+	 * peer declare a full-capacity packet behind a mark byte and overrun
+	 * the buffer by one byte.
+	 */
+	if (pkt_len + mark > max_len ||
 	    pkt_len < sizeof(struct osdp_packet_header) + 1 ||
 	    (is_cp_mode(pd) && !(pkt->pd_address & 0x80)) ||
-	    (is_pd_mode(pd) &&  (pkt->pd_address & 0x80))) {
+	    (is_pd_mode(pd) && (pkt->pd_address & 0x80))) {
 		return OSDP_ERR_PKT_FMT;
 	}
 
+	/**
+	 * Wrong-direction packets must be silently skipped; on a multi-drop
+	 * bus, every PD sees every other PD's replies (along with commands to
+	 * other PDs).
+	 */
+	if ((is_cp_mode(pd) && !(pkt->pd_address & 0x80)) ||
+	    (is_pd_mode(pd) &&  (pkt->pd_address & 0x80))) {
+		return OSDP_ERR_PKT_SKIP;
+	}
+
 	return (int)(pkt_len + mark);
 }
 
@@ -898,10 +916,14 @@ void osdp_phy_state_reset(struct osdp_pd *pd, bool is_error)
 	pd->packet_buf = pd->packet_buf_store;
 	if (is_error) {
 		pd->phy_retry_count = 0;
+		pd->phy_tx_seq = 0;
 		phy_reset_seq_number(pd);
 		if (pd->channel.flush) {
 			pd->channel.flush(pd->channel.data);
 		}
+#ifndef OPT_OSDP_RX_ZERO_COPY
+		osdp_rb_reset(pd->rx.rb);
+#endif
 	}
 }