pytest: Fix crash due to missing baud rate handling in python layers

Signed-off-by: Siddharth Chandrasekaran <sidcha.dev@gmail.com>

Author: sidcha

python/osdp/helpers.py

@@ -18,10 +18,11 @@ def __init__(self, version: int, model: int, vendor_code: int,
 
 class PDInfo:
     def __init__(self, address: int, channel: Channel, scbk: bytes=None,
-                 name: str=None, flags=[], id: PdId=None):
+                 name: str=None, flags=[], id: PdId=None, baud_rate: int=9600):
         self.address = address
         self.flags = flags
         self.scbk = scbk
+        self.baud_rate = baud_rate
         if name:
             self.name = name
         else:
@@ -41,6 +42,7 @@ def get_flags(self) -> int:
     def get(self) -> dict:
         return {
             'name': self.name,
+            'baud_rate': self.baud_rate,
             'address': self.address,
             'flags': self.get_flags(),
             'scbk': self.scbk,

python/osdp_sys/cp.c

@@ -472,7 +472,7 @@ static void pyosdp_cp_tp_dealloc(pyosdp_cp_t *self)
 	"@return None"
 static int pyosdp_cp_tp_init(pyosdp_cp_t *self, PyObject *args, PyObject *kwargs)
 {
-	int i, len;
+	int i, len, baud_rate;
 	uint8_t *scbk = NULL;
 	PyObject *py_info_list, *py_info, *channel;
 	static char *kwlist[] = { "", NULL };
@@ -529,6 +529,17 @@ static int pyosdp_cp_tp_init(pyosdp_cp_t *self, PyObject *args, PyObject *kwargs
 			goto error;
 		}
 
+		if (pyosdp_dict_get_int(py_info, "baud_rate", &baud_rate)) {
+			PyErr_Clear();
+			baud_rate = 9600;
+		}
+		if (baud_rate <= 0) {
+			PyErr_Format(PyExc_ValueError,
+				     "Invalid baud_rate in pd_info at index %d", i);
+			goto error;
+		}
+		info->baud_rate = baud_rate;
+
 			if (i == 0) {
 				channel = PyDict_GetItemString(py_info, "channel");
 				if (channel == NULL) {

python/osdp_sys/pd.c

@@ -345,7 +345,7 @@ static int pyosdp_add_pd_cap(PyObject *obj, osdp_pd_info_t *info)
 	"@return None"
 static int pyosdp_pd_tp_init(pyosdp_pd_t *self, PyObject *args, PyObject *kwargs)
 {
-	int scbk_length;
+	int scbk_length, baud_rate;
 	osdp_t *ctx;
 	osdp_pd_info_t info = { 0 };
 	struct osdp_channel osdp_channel = { 0 };
@@ -379,6 +379,16 @@ static int pyosdp_pd_tp_init(pyosdp_pd_t *self, PyObject *args, PyObject *kwargs
 	if (pyosdp_dict_get_int(py_info, "flags", &info.flags))
 		goto error;
 
+	if (pyosdp_dict_get_int(py_info, "baud_rate", &baud_rate)) {
+		PyErr_Clear();
+		baud_rate = 9600;
+	}
+	if (baud_rate <= 0) {
+		PyErr_SetString(PyExc_ValueError, "Invalid baud_rate");
+		goto error;
+	}
+	info.baud_rate = baud_rate;
+
 	channel = PyDict_GetItemString(py_info, "channel");
 	if (channel == NULL) {
 		PyErr_Format(PyExc_KeyError, "channel object missing");

tests/pytest/test_status.py

@@ -142,3 +142,7 @@ def test_metrics_access_and_reset():
     next_pd_metrics = pd.get_metrics()
     assert sum(next_cp_metrics.values()) <= sum(cp_metrics.values())
     assert sum(next_pd_metrics.values()) <= sum(pd_metrics.values())
+
+def test_pd_info_default_baud_rate():
+    info = PDInfo(101, f1, scbk=key).get()
+    assert info["baud_rate"] == 9600