libosdp 3.2.5__tar.gz → 3.2.7__tar.gz

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

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: libosdp
-Version: 3.2.5
+Version: 3.2.7
 Summary: Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)
-Home-page: https://github.com/goToMain/libosdp
+Home-page: https://github.com/osdp-dev/libosdp
 Author: Siddharth Chandrasekaran
 Author-email: sidcha.dev@gmail.com
 Classifier: Programming Language :: Python :: 3
@@ -42,13 +42,13 @@ pip install libosdp
 Or, from github,
 
 ```sh
-pip install -e "git+https://github.com/goToMain/libosdp#egg=libosdp&subdirectory=python"
+pip install -e "git+https://github.com/osdp-dev/libosdp#egg=libosdp&subdirectory=python"
 ```
 
 Or, from source using,
 
 ```sh
-git clone https://github.com/goToMain/libosdp --recurse-submodules
+git clone https://github.com/osdp-dev/libosdp --recurse-submodules
 cd libosdp/python
 python3 setup.py install
 ```
@@ -141,5 +141,5 @@ pd.set_event_completion_handler(on_event_complete)
 ```
 
 [1]: https://doc.osdp.dev/api/
-[2]: https://github.com/goToMain/libosdp/blob/master/examples/python/cp_app.py
-[3]: https://github.com/goToMain/libosdp/blob/master/examples/python/pd_app.py
+[2]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/cp_app.py
+[3]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/pd_app.py

{libosdp-3.2.5 → libosdp-3.2.7}/README.md

@@ -21,13 +21,13 @@ pip install libosdp
 Or, from github,
 
 ```sh
-pip install -e "git+https://github.com/goToMain/libosdp#egg=libosdp&subdirectory=python"
+pip install -e "git+https://github.com/osdp-dev/libosdp#egg=libosdp&subdirectory=python"
 ```
 
 Or, from source using,
 
 ```sh
-git clone https://github.com/goToMain/libosdp --recurse-submodules
+git clone https://github.com/osdp-dev/libosdp --recurse-submodules
 cd libosdp/python
 python3 setup.py install
 ```
@@ -120,5 +120,5 @@ pd.set_event_completion_handler(on_event_complete)
 ```
 
 [1]: https://doc.osdp.dev/api/
-[2]: https://github.com/goToMain/libosdp/blob/master/examples/python/cp_app.py
-[3]: https://github.com/goToMain/libosdp/blob/master/examples/python/pd_app.py
+[2]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/cp_app.py
+[3]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/pd_app.py

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

@@ -1,8 +1,8 @@
 Metadata-Version: 2.4
 Name: libosdp
-Version: 3.2.5
+Version: 3.2.7
 Summary: Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)
-Home-page: https://github.com/goToMain/libosdp
+Home-page: https://github.com/osdp-dev/libosdp
 Author: Siddharth Chandrasekaran
 Author-email: sidcha.dev@gmail.com
 Classifier: Programming Language :: Python :: 3
@@ -42,13 +42,13 @@ pip install libosdp
 Or, from github,
 
 ```sh
-pip install -e "git+https://github.com/goToMain/libosdp#egg=libosdp&subdirectory=python"
+pip install -e "git+https://github.com/osdp-dev/libosdp#egg=libosdp&subdirectory=python"
 ```
 
 Or, from source using,
 
 ```sh
-git clone https://github.com/goToMain/libosdp --recurse-submodules
+git clone https://github.com/osdp-dev/libosdp --recurse-submodules
 cd libosdp/python
 python3 setup.py install
 ```
@@ -141,5 +141,5 @@ pd.set_event_completion_handler(on_event_complete)
 ```
 
 [1]: https://doc.osdp.dev/api/
-[2]: https://github.com/goToMain/libosdp/blob/master/examples/python/cp_app.py
-[3]: https://github.com/goToMain/libosdp/blob/master/examples/python/pd_app.py
+[2]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/cp_app.py
+[3]: https://github.com/osdp-dev/libosdp/blob/master/examples/python/pd_app.py

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

@@ -12,7 +12,7 @@ import shutil
 import subprocess
 
 project_name = "libosdp"
-project_version = "3.2.5"
+project_version = "3.2.7"
 current_dir = os.path.dirname(os.path.realpath(__file__))
 repo_root = os.path.realpath(os.path.join(current_dir, ".."))
 
@@ -229,7 +229,7 @@ setup(
     author       = "Siddharth Chandrasekaran",
     author_email = "sidcha.dev@gmail.com",
     description  = "Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)",
-    url          = "https://github.com/goToMain/libosdp",
+    url          = "https://github.com/osdp-dev/libosdp",
     ext_modules  = [
         Extension(
             name               = "osdp_sys",

{libosdp-3.2.5 → 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.5 → 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);
@@ -492,9 +494,9 @@ void osdp_sc_teardown(struct osdp_pd *pd);
 
 static inline uint16_t bread_u16_le(const uint8_t *buf, int *pos)
 {
-    uint16_t v = buf[(*pos)++];
-    v |= (uint16_t)buf[(*pos)++] << 8;
-    return v;
+    uint32_t v = buf[(*pos)++];
+    v |= (uint32_t)buf[(*pos)++] << 8;
+    return (uint16_t)v;
 }
 
 static inline uint32_t bread_u24_le(const uint8_t *buf, int *pos)
@@ -546,9 +548,9 @@ static inline void bwrite_u32_le(uint32_t val, uint8_t *buf, int *len)
 
 static inline uint16_t bread_u16_be(const uint8_t *buf, int *pos)
 {
-    uint16_t v = (uint16_t)buf[(*pos)++] << 8;
+    uint32_t v = (uint32_t)buf[(*pos)++] << 8;
     v |= buf[(*pos)++];
-    return v;
+    return (uint16_t)v;
 }
 
 static inline uint32_t bread_u24_be(const uint8_t *buf, int *pos)

{libosdp-3.2.5 → 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.5"
+#define PROJECT_VERSION                "3.2.7"
 #define PROJECT_NAME                   "libosdp"
 #define GIT_BRANCH                     "detached"
-#define GIT_REV                        "v3.2.5-0-gdc4b8da"
-#define GIT_TAG                        "v3.2.5"
+#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.5 → libosdp-3.2.7}/vendor/src/osdp_cp.c

@@ -473,7 +473,7 @@ static int cp_decode_response(struct osdp_pd *pd, uint8_t *buf, int len)
 		t = OSDP_PD_CAP_RECEIVE_BUFFERSIZE;
 		if (pd->cap[t].function_code == t) {
 			pd->peer_rx_size = pd->cap[t].compliance_level;
-			pd->peer_rx_size |= pd->cap[t].num_items << 8;
+			pd->peer_rx_size |= (uint32_t)pd->cap[t].num_items << 8;
 		}
 
 		/* post-capabilities hooks */
@@ -607,7 +607,7 @@ static int cp_decode_response(struct osdp_pd *pd, uint8_t *buf, int len)
 		 * for deprecation in v2.2.2. To avoid confusions, we will just
 		 * ignore it here.
 		 *
-		 * See: https://github.com/goToMain/libosdp/issues/206
+		 * See: https://github.com/osdp-dev/libosdp/issues/206
 		 */
 		LOG_WRN("Ignoring deprecated response osdp_FMT");
 		ret = OSDP_CP_ERR_NONE;
@@ -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.5 → libosdp-3.2.7}/vendor/src/osdp_diag.c

@@ -52,7 +52,7 @@ void osdp_packet_capture_finish(struct osdp_pd *pd)
 		LOG_ERR("Unable to stop capture (flush/close failed)");
 		return;
 	}
-	LOG_INF("Captured %d packets", num_packets);
+	LOG_INF("Captured %zu packets", num_packets);
 }
 
 void osdp_capture_packet(struct osdp_pd *pd, uint8_t *buf, int len)

{libosdp-3.2.5 → libosdp-3.2.7}/vendor/src/osdp_pd.c

@@ -170,7 +170,7 @@ static int pd_translate_event(struct osdp_pd *pd, const struct osdp_event *event
 			 * osdp_FMT was underspecified by SIA from get-go. It
 			 * was marked for deprecation in v2.2.2.
 			 *
-			 * See: https://github.com/goToMain/libosdp/issues/206
+			 * See: https://github.com/osdp-dev/libosdp/issues/206
 			 */
 			LOG_WRN("Event CardRead::format::OSDP_CARD_FMT_ASCII"
 				" is deprecated. Ignoring");
@@ -474,12 +474,14 @@ static int pd_decode_command(struct osdp_pd *pd, uint8_t *buf, int len)
 		pd->reply_id = REPLY_PDCAP;
 		ret = OSDP_PD_ERR_NONE;
 		break;
-	case CMD_OUT:
+	case CMD_OUT: {
+		int count;
 		if ((len % CMD_OUT_DATA_LEN) != 0) {
 			break;
 		}
+		count = len / CMD_OUT_DATA_LEN;
 		ret = OSDP_PD_ERR_REPLY;
-		for (i = 0; i < len / CMD_OUT_DATA_LEN; i++) {
+		for (i = 0; i < count; i++) {
 			cmd.id = OSDP_CMD_OUTPUT;
 			cmd.output.output_no = buf[pos++];
 			cmd.output.control_code = buf[pos++];
@@ -491,15 +493,20 @@ static int pd_decode_command(struct osdp_pd *pd, uint8_t *buf, int len)
 				break;
 			}
 		}
-		pd->reply_id = REPLY_ACK;
-		ret = OSDP_PD_ERR_NONE;
+		if (i == count) {
+			pd->reply_id = REPLY_ACK;
+			ret = OSDP_PD_ERR_NONE;
+		}
 		break;
-	case CMD_LED:
+	}
+	case CMD_LED: {
+		int count;
 		if ((len % CMD_LED_DATA_LEN) != 0) {
 			break;
 		}
+		count = len / CMD_LED_DATA_LEN;
 		ret = OSDP_PD_ERR_REPLY;
-		for (i = 0; i < len / CMD_LED_DATA_LEN; i++) {
+		for (i = 0; i < count; i++) {
 			cmd.id = OSDP_CMD_LED;
 			cmd.led.reader = buf[pos++];
 			cmd.led.led_number = buf[pos++];
@@ -523,15 +530,20 @@ static int pd_decode_command(struct osdp_pd *pd, uint8_t *buf, int len)
 				break;
 			}
 		}
-		pd->reply_id = REPLY_ACK;
-		ret = OSDP_PD_ERR_NONE;
+		if (i == count) {
+			pd->reply_id = REPLY_ACK;
+			ret = OSDP_PD_ERR_NONE;
+		}
 		break;
-	case CMD_BUZ:
+	}
+	case CMD_BUZ: {
+		int count;
 		if ((len % CMD_BUZ_DATA_LEN) != 0) {
 			break;
 		}
+		count = len / CMD_BUZ_DATA_LEN;
 		ret = OSDP_PD_ERR_REPLY;
-		for (i = 0; i < len / CMD_BUZ_DATA_LEN; i++) {
+		for (i = 0; i < count; i++) {
 			cmd.id = OSDP_CMD_BUZZER;
 			cmd.buzzer.reader = buf[pos++];
 			cmd.buzzer.control_code = buf[pos++];
@@ -545,9 +557,12 @@ static int pd_decode_command(struct osdp_pd *pd, uint8_t *buf, int len)
 				break;
 			}
 		}
-		pd->reply_id = REPLY_ACK;
-		ret = OSDP_PD_ERR_NONE;
+		if (i == count) {
+			pd->reply_id = REPLY_ACK;
+			ret = OSDP_PD_ERR_NONE;
+		}
 		break;
+	}
 	case CMD_TEXT:
 		if (len < CMD_TEXT_DATA_LEN) {
 			break;

{libosdp-3.2.5 → 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;
@@ -421,14 +422,31 @@ static int phy_validate_header(struct osdp_pd *pd, uint8_t *buf,
 		return OSDP_ERR_PKT_FMT;
 	}
 
-	pkt_len = (pkt->len_msb << 8) | pkt->len_lsb;
-	if (pkt_len > max_len ||
+	pkt_len = ((uint32_t)pkt->len_msb << 8) | pkt->len_lsb;
+	/**
+	 * 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);
 }
 
@@ -540,7 +558,7 @@ static int phy_check_packet(struct osdp_pd *pd, uint8_t *buf, int pkt_len)
 	/* validate CRC/checksum */
 	if (pkt->control & PKT_CONTROL_CRC) {
 		pkt_len -= 2; /* consume CRC */
-		cur = (buf[pkt_len + 1] << 8) | buf[pkt_len];
+		cur = ((uint32_t)buf[pkt_len + 1] << 8) | buf[pkt_len];
 		comp = osdp_compute_crc16(buf, pkt_len);
 		if (comp != cur) {
 			LOG_ERR("Invalid crc 0x%04x/0x%04x", comp, cur);
@@ -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
 	}
 }