libosdp 3.2.0__tar.gz → 3.2.3__tar.gz

{libosdp-3.2.0 → libosdp-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libosdp
-Version: 3.2.0
+Version: 3.2.3
 Summary: Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)
 Home-page: https://github.com/goToMain/libosdp
 Author: Siddharth Chandrasekaran
@@ -8,7 +8,7 @@ Author-email: sidcha.dev@gmail.com
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Dynamic: author
 Dynamic: author-email

{libosdp-3.2.0 → libosdp-3.2.3}/libosdp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libosdp
-Version: 3.2.0
+Version: 3.2.3
 Summary: Library implementation of IEC 60839-11-5 OSDP (Open Supervised Device Protocol)
 Home-page: https://github.com/goToMain/libosdp
 Author: Siddharth Chandrasekaran
@@ -8,7 +8,7 @@ Author-email: sidcha.dev@gmail.com
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Dynamic: author
 Dynamic: author-email

{libosdp-3.2.0 → libosdp-3.2.3}/setup.py

@@ -6,12 +6,13 @@
 
 import os
 import re
+import sys
 from setuptools import setup, Extension
 import shutil
 import subprocess
 
 project_name = "libosdp"
-project_version = "3.2.0"
+project_version = "3.2.3"
 current_dir = os.path.dirname(os.path.realpath(__file__))
 repo_root = os.path.realpath(os.path.join(current_dir, ".."))
 
@@ -210,6 +211,12 @@ compile_args = (
     [ "-D" + define + "=1" for define in definitions ]
 )
 
+# PyPI Windows wheels are built with MSVC via cibuildwheel. Its legacy
+# preprocessor breaks the IS_ENABLED() macro in utils/include/utils/utils.h;
+# /Zc:preprocessor switches to the C99/C11-conformant preprocessor.
+if sys.platform == "win32":
+    compile_args.append("/Zc:preprocessor")
+
 if os.path.exists("README.md"):
     with open("README.md", "r") as f:
         long_description = f.read()
@@ -241,6 +248,6 @@ setup(
     ],
     long_description              = long_description,
     long_description_content_type = "text/markdown",
-    python_requires               = ">=3.8",
+    python_requires               = ">=3.10",
     package_data = { project_name : other_files }
 )

{libosdp-3.2.0 → libosdp-3.2.3}/vendor/include/osdp_export.h

@@ -48,6 +48,16 @@
 
 /* ---------- Deprecation (with message) ---------- */
 
+/*
+ * Undefine API_DEPRECATED before redefining it. On macOS the SDK header
+ * <os/availability.h> defines API_DEPRECATED with a different signature
+ * (platform/version specifiers, not a plain string), which causes macro
+ * expansion errors when osdp.h uses OSDP_DEPRECATED_EXPORT("msg").
+ */
+#ifdef API_DEPRECATED
+#undef API_DEPRECATED
+#endif
+
 /* Prefer C++ [[deprecated("msg")]] if available, otherwise compiler specifics. */
 #if defined(__cplusplus) && API_HAS_CPP_ATTR(deprecated)
   /* [[deprecated("msg")]] supported */

{libosdp-3.2.0 → libosdp-3.2.3}/vendor/python/osdp_sys/utils.c

@@ -7,25 +7,35 @@
 #include <stdarg.h>
 #include "module.h"
 
-#if PY_VERSION_HEX < 0x030c0000
+#if PY_VERSION_HEX < 0x030C0000
+/*
+ * PyErr_GetRaisedException() / PyErr_SetRaisedException() were added in
+ * Python 3.12. Back-fill them with the legacy fetch/restore API (matching
+ * reference-stealing semantics) so this file compiles on 3.8 - 3.11.
+ */
 static PyObject *PyErr_GetRaisedException(void)
 {
 	PyObject *type, *value, *tb;
-	PyErr_Fetch(&type, &value, &tb);
+
+	PyErr_Fetch(&type, &value, &tb);	/* clears the error indicator */
+	if (type == NULL)
+		return NULL;			/* no active exception */
 	PyErr_NormalizeException(&type, &value, &tb);
 	if (tb != NULL) {
 		PyException_SetTraceback(value, tb);
 		Py_DECREF(tb);
 	}
-	Py_XDECREF(type);
-	return value;
+	Py_DECREF(type);
+	return value;				/* strong ref (normalized instance) */
 }
 
 static void PyErr_SetRaisedException(PyObject *exc)
 {
 	PyObject *type = (PyObject *)Py_TYPE(exc);
+	PyObject *tb = PyException_GetTraceback(exc);	/* new ref or NULL */
+
 	Py_INCREF(type);
-	PyErr_Restore(type, exc, NULL);
+	PyErr_Restore(type, exc, tb);		/* steals type, exc, tb */
 }
 #endif
 
@@ -391,8 +401,18 @@ void pyosdp_get_channel(PyObject *channel, struct osdp_channel *ops)
 	PyObject *id_obj;
 
 	id_obj = PyObject_GetAttrString(channel, "id");
-	if (id_obj && PyLong_Check(id_obj)) {
-		id = (int)PyLong_AsLong(id_obj);
+	if (id_obj) {
+		if (PyLong_Check(id_obj)) {
+			id = (int)PyLong_AsLong(id_obj);
+		}
+		Py_DECREF(id_obj);
+	} else {
+		/* "id" is optional on the channel object; GetAttrString raises
+		 * AttributeError when it's absent. Clear it so the exception
+		 * doesn't linger and get flagged as "ignored" by the next
+		 * unrelated C-API call (seen under CPython 3.13+).
+		 */
+		PyErr_Clear();
 	}
 
 	ops->id = id;

{libosdp-3.2.0 → libosdp-3.2.3}/vendor/src/osdp_config.h

@@ -11,10 +11,10 @@
  * @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.0"
+#define PROJECT_VERSION                "3.2.3"
 #define PROJECT_NAME                   "libosdp"
-#define GIT_BRANCH                     "master"
-#define GIT_REV                        "b07d9ff"
+#define GIT_BRANCH                     "release_v3.2"
+#define GIT_REV                        "a4079c9"
 #define GIT_TAG                        ""
 #define GIT_DIFF                       ""
 #define REPO_ROOT                      "/home/runner/work/libosdp/libosdp"

{libosdp-3.2.0 → libosdp-3.2.3}/vendor/utils/include/utils/assert.h

@@ -18,7 +18,24 @@ extern "C" {
 
 #include <zephyr/sys/__assert.h>
 
-#else /* __ZEPHYR__ */
+#elif defined(__BARE_METAL__)
+
+/*
+ * Bare-metal: avoid exit()/atexit cleanup (pulls in newlib stdio teardown).
+ * printf is expected to be provided by the platform; on failure, halt.
+ */
+#define __ASSERT_PRINT(fmt, ...) printf(fmt, ##__VA_ARGS__)
+#define __ASSERT(test, fmt, ...)                                          \
+	do {                                                              \
+		if (!(test)) {                                            \
+			__ASSERT_PRINT("ASSERTION FAIL [%s] @ %s:%d\n\t" fmt "\n", \
+				       STR(test), __FILE__, __LINE__,     \
+				       ##__VA_ARGS__);                    \
+			for (;;) { }                                      \
+		}                                                         \
+	} while (0)
+
+#else /* everything else expects libc */
 
 #define __ASSERT_PRINT(fmt, ...) printf(fmt, ##__VA_ARGS__)
 

{libosdp-3.2.0 → libosdp-3.2.3}/vendor/utils/include/utils/utils.h

@@ -51,7 +51,9 @@ extern "C" {
 #define STRINGIFY(x) #x
 #endif
 
+#ifndef ROUND_UP
 #define ROUND_UP(x, y) ((x + y - 1) & ~ (y - 1))
+#endif
 
 #define MATH_MOD(a, b)                 (((a % b) + b) % b)
 
@@ -65,20 +67,26 @@ extern "C" {
 
 #define OFFSET_OF(type, field) (size_t)(&((type *)(0))->field)
 
+#ifndef CONTAINER_OF
 #define CONTAINER_OF(ptr, type, field) \
         ((type *)(((char *)(ptr)) - OFFSET_OF(type, field)))
+#endif
 
+#ifndef MAX
 #define MAX(a,b) ({ \
 		__typeof__ (a) _a = (a); \
 		__typeof__ (b) _b = (b); \
 		_a > _b ? _a : _b; \
 	})
+#endif
 
+#ifndef MIN
 #define MIN(a,b) ({ \
 		__typeof__ (a) _a = (a); \
 		__typeof__ (b) _b = (b); \
 		_a > _b ? _b : _a; \
 	})
+#endif
 
 #define SWAP(a,b) { \
 		__typeof__ (a) _tmp; \
@@ -102,12 +110,14 @@ extern "C" {
 #define ABS(x)		((x) >= 0  ? (x) : -(x))
 
 /* config_enabled() from the kernel */
+#ifndef IS_ENABLED
 #define __IS_ENABLED1(x)             __IS_ENABLED2(__XXXX ## x)
 #define __XXXX1                       __YYYY,
 #define __IS_ENABLED2(y)             __IS_ENABLED3(y 1, 0)
 #define __IS_ENABLED3(_i, val, ...)   val
 
 #define IS_ENABLED(x)                 __IS_ENABLED1(x)
+#endif
 
 /* gcc attribute shorthands */
 #ifndef __fallthrough
@@ -142,7 +152,11 @@ extern "C" {
 #define __format_printf(x, y)
 #define __noreturn              __declspec(noreturn)
 #define __weak
+#if defined(_MSC_VER)
 #define __unreachable()         __assume(0)
+#else
+#define __unreachable()         __builtin_unreachable()
+#endif
 #define likely(p)               (p)
 #define unlikely(p)             (p)
 #define PATH_SEPARATOR          '\\'
@@ -151,9 +165,21 @@ extern "C" {
 
 #include <zephyr/toolchain.h>  // __weak, __builtin_xxx() etc.,
 
+/*
+ * The #undef __weak above unconditionally drops any prior definition. When
+ * <zephyr/toolchain.h> was already pulled in (e.g. via <zephyr/kernel.h>),
+ * its include guard makes the re-include a no-op and __weak stays undefined.
+ * Restore it so header-level __weak declarations below still parse.
+ */
+#ifndef __weak
+#define __weak                  __attribute__((weak))
+#endif
 #define PATH_SEPARATOR          '/'
 #define __unreachable()         __builtin_unreachable()
 #define __format_printf(x, y)   __attribute__((format(printf, x, y)))
+#ifndef __noreturn
+#define __noreturn              __attribute__((noreturn))
+#endif
 
 #else
 
@@ -166,10 +192,39 @@ extern "C" {
 #define PATH_SEPARATOR          '/'
 #endif
 
+#if defined(__BARE_METAL__) && defined(USE_32BIT_TICK_T)
+/*
+ * Bare-metal timing note:
+ *
+ * When __BARE_METAL__ and USE_32BIT_TICK_T are both enabled, tick_t uses
+ * 32-bit storage. The selected tick source and tick width together define the
+ * maximum delay interval that can be measured safely in the project.
+ *
+ * Example: with a 1 kHz tick source, uint32_t spans about 49.7 days.
+ * Make sure your largest required delay/timeout remains safe for your chosen
+ * tick source and counter width.
+ */
+typedef uint32_t tick_t;
+#else
+typedef uint64_t tick_t;
+#endif
+
+/**
+ * @brief Return a non-cryptographic random uint32.
+ *
+ * Bare-metal builds use an internal xorshift; hosted builds forward to
+ * libc rand(). Cryptographic callers must NOT use this.
+ *
+ * Defined as __weak: platforms that can do better (e.g. an STM32 RNG
+ * peripheral, an mbedTLS DRBG, /dev/urandom) should provide their own
+ * strong override.
+ */
+__weak uint32_t rand_u32(void);
+
 /**
  * @brief Return random number between 0 and `limit` both inclusive.
  *
- * Note: the random number generator must be pre-seeded.
+ * Backed by rand_u32(). Non-cryptographic.
  */
 int randint(int limit);
 
@@ -199,18 +254,18 @@ void hexdump(const void *data, size_t len, const char *fmt, ...);
 /**
  * @brief Get the time in micro seconds.
  */
-int64_t usec_now();
+tick_t usec_now();
 
 /**
  * @brief Get time elapsed in micro seconds since `last`. Used along with
  * usec_now().
  */
-int64_t usec_since(int64_t last);
+tick_t usec_since(tick_t last);
 
 /**
  * @brief Get the time in milli seconds.
  */
-int64_t millis_now();
+tick_t millis_now();
 
 /**
  * @brief Get time in seconds and micro_seconds
@@ -228,7 +283,7 @@ int add_iso8601_utc_datetime(char *buf, size_t size);
  * @brief Get time elapsed in milli seconds since `last`. Used along with
  * millis_now().
  */
-int64_t millis_since(int64_t last);
+tick_t millis_since(tick_t last);
 
 /**
  * @brief Print the stack trace

{libosdp-3.2.0 → libosdp-3.2.3}/vendor/utils/src/logger.c

@@ -59,7 +59,7 @@ static const char *log_level_names[LOG_MAX_LEVEL] = {
 
 static inline void logger_log_set_color(logger_t *ctx, const char *color)
 {
-#if !defined(__BARE_METAL__)
+#if !defined(__BARE_METAL__) && !defined(__ZEPHYR__) && !defined(MYNEWT)
 	size_t ret, len;
 
 	if (ctx->flags & LOGGER_FLAG_NO_COLORS)
@@ -95,7 +95,7 @@ static int terminate_log_line(char *buf, int len)
 
 #define LOG_BUF_LEN 192
 
-__format_printf(5, 6)
+__weak __format_printf(5, 6)
 int __logger_log(logger_t *ctx, int log_level, const char *file, unsigned long line,
 		 const char *fmt, ...)
 {
@@ -111,7 +111,7 @@ int __logger_log(logger_t *ctx, int log_level, const char *file, unsigned long l
 	{
 		file = filename + 1;
 	}
-	
+
 	if (!ctx->cb) {
 		if (log_level < LOG_EMERG ||
 		    log_level >= LOG_MAX_LEVEL ||

{libosdp-3.2.0 → libosdp-3.2.3}/vendor/utils/src/utils.c

@@ -12,15 +12,50 @@
 
 #include <utils/utils.h>
 
+/*
+ * _Static_assert is C11. Pre-C11 compilers reject it at file scope (notably
+ * MSVC's default C mode, which Python's setuptools uses to build the wheel).
+ * Gate the self-test on C11; the IS_ENABLED() macro itself needs only a
+ * standard preprocessor, so skipping the assert loses nothing on those builds.
+ */
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+#define _IS_ENABLED_SELFTEST_ON 1
+_Static_assert(IS_ENABLED(_IS_ENABLED_SELFTEST_ON) == 1,
+	       "IS_ENABLED(): defined-as-1 flag must evaluate to 1");
+_Static_assert(IS_ENABLED(_IS_ENABLED_SELFTEST_OFF) == 0,
+	       "IS_ENABLED(): undefined flag must evaluate to 0");
+#undef _IS_ENABLED_SELFTEST_ON
+#endif
+
+__weak uint32_t rand_u32(void)
+{
+#ifdef __BARE_METAL__
+	/*
+	 * libc's rand() references _impure_ptr, which pulls newlib's
+	 * default FILE table (__sf) and the stdio teardown chain
+	 * (_close_r/_lseek_r/_read_r/_write_r) into the link even when
+	 * nothing else uses stdio. Replace it with a self-contained
+	 * xorshift — same non-cryptographic quality as rand(), zero libc
+	 * dependency.
+	 */
+	static uint32_t s_state = 0x9E3779B9u;
+	uint32_t x = s_state;
+
+	x ^= x << 13;
+	x ^= x >> 17;
+	x ^= x << 5;
+	s_state = x ? x : 1u;
+	return x;
+#else
+	return (uint32_t)rand();
+#endif
+}
+
 int randint(int limit)
 {
-	int r;
-	int divisor = RAND_MAX / (limit + 1);
+	uint32_t span = (uint32_t)limit + 1u;
 
-	do {
-		r = rand() / divisor;
-	} while (r > limit);
-	return r;
+	return (int)(rand_u32() % span);
 }
 
 uint32_t round_up_pow2(uint32_t v)
@@ -47,6 +82,18 @@ int num_digits_in_number(int num)
 	return digits;
 }
 
+#ifdef __BARE_METAL__
+
+__format_printf(3, 4)
+void hexdump(const void *p, size_t len, const char *fmt, ...)
+{
+	ARG_UNUSED(p);
+	ARG_UNUSED(len);
+	ARG_UNUSED(fmt);
+}
+
+#else
+
 __format_printf(3, 4)
 void hexdump(const void *p, size_t len, const char *fmt, ...)
 {
@@ -85,6 +132,8 @@ void hexdump(const void *p, size_t len, const char *fmt, ...)
 	printf("\n");
 }
 
+#endif /* __BARE_METAL__ */
+
 #if (defined(_WIN32) || defined(_WIN64))
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
@@ -131,7 +180,7 @@ int add_iso8601_utc_datetime(char* buf, size_t size)
 	return r;
 }
 
-#elif defined(__linux__) || defined(__APPLE__)
+#elif defined(__linux__) || defined(__APPLE__) || defined(ESP_PLATFORM)
 
 #include <sys/time.h>
 #include <time.h>
@@ -182,6 +231,13 @@ int add_iso8601_utc_datetime(char* buf, size_t size) {
 
 #include <sys/time.h>
 
+int add_iso8601_utc_datetime(char *buf, size_t size)
+{
+	ARG_UNUSED(buf);
+	ARG_UNUSED(size);
+	return 0;
+}
+
 #elif defined(__BARE_METAL__)
 
 #ifndef _TIMEVAL_DEFINED
@@ -211,22 +267,61 @@ int add_iso8601_utc_datetime(char* buf, size_t size) {
 	ARG_UNUSED(size);
 	return 0;
 }
+#elif defined(MYNEWT)
+
+#include <os/os_time.h>
+
+#ifndef _TIMEVAL_DEFINED
+struct timeval {
+	long tv_sec;  // seconds since epoch
+	long tv_usec; // microseconds
+};
+#endif
+
+#ifndef _TIMEZONE_DEFINED
+struct timezone {
+	int tz_minuteswest; // minutes west of UTC
+	int tz_dsttime;     // daylight saving time flag
+};
+#endif
+
+int gettimeofday(struct timeval * tp, struct timezone * tzp)
+{
+	struct os_timeval tv;
+	struct os_timezone tz;
+
+	os_gettimeofday(&tv, &tz);
+
+	tp->tv_sec = (long)tv.tv_sec;
+	tp->tv_usec = (long)tv.tv_usec;
+
+	tzp->tz_minuteswest = (int)tz.tz_minuteswest;
+	tzp->tz_dsttime = (int)tz.tz_dsttime;
+
+	return 0;
+}
 
+int add_iso8601_utc_datetime(char *buf, size_t size)
+{
+	ARG_UNUSED(buf);
+	ARG_UNUSED(size);
+	return 0;
+}
 #else
 
 #error Platform test failed
 
 #endif
 
-int64_t usec_now()
+tick_t usec_now()
 {
-	int64_t usec;
+	uint64_t usec;
 	struct timeval tv;
 
 	gettimeofday(&tv, NULL);
 	usec = tv.tv_sec * 1000LL * 1000LL + tv.tv_usec;
 
-	return usec;
+	return (tick_t)usec;
 }
 
 void get_time(uint32_t *seconds, uint32_t *micro_seconds)
@@ -238,17 +333,17 @@ void get_time(uint32_t *seconds, uint32_t *micro_seconds)
 	*micro_seconds = tv.tv_usec;
 }
 
-int64_t usec_since(int64_t last)
+tick_t usec_since(tick_t last)
 {
 	return usec_now() - last;
 }
 
-int64_t millis_now()
+tick_t millis_now()
 {
-	return (int64_t)(usec_now() / 1000LL);
+	return (tick_t)(usec_now() / 1000U);
 }
 
-int64_t millis_since(int64_t last)
+tick_t millis_since(tick_t last)
 {
 	return millis_now() - last;
 }
@@ -269,6 +364,8 @@ void dump_trace(void)
 	puts("");
 	free(strings);
 }
+#elif defined(__BARE_METAL__)
+void dump_trace(void) { }
 #else
 void dump_trace(void)
 {