int i;
uint8_t chksum = 0;
uint8_t *payload;
-
+
payload = (uint8_t *)(buf + sizeof(struct brymen_header));
hdr = (void *)buf;
tail = (void *)(payload + hdr->len);
-
+
for (i = 0; i< hdr->len; i++)
chksum ^= payload[i];
-
+
if (tail->checksum != chksum) {
sr_dbg("Packet has invalid checksum 0x%.2x. Expected 0x%.2x.",
chksum, tail->checksum);
return FALSE;
}
-
+
return TRUE;
}
-static int parse_value(const char *strbuf, int len, float *floatval)
+static int parse_value(const char *txt, size_t len, float *floatval)
{
- int s, d;
- char str[32];
+ const char *txt_end;
+ char c, buf[32], *dst;
+ int ret;
- if (strstr(strbuf, "OL")) {
- sr_dbg("Overlimit.");
- *floatval = INFINITY;
- return SR_OK;
+ /*
+ * The input text is not NUL terminated, the checksum follows
+ * the value text field. Spaces may interfere with the text to
+ * number conversion, especially with exponent parsing. Copy the
+ * input data to a terminated text buffer and strip spaces in the
+ * process, before running ASCIIZ string operations.
+ */
+ if (len >= sizeof(buf)) {
+ sr_err("Insufficient text conversion buffer size.");
+ return SR_ERR_BUG;
}
+ txt_end = txt + len;
+ dst = &buf[0];
+ while (txt < txt_end && *txt) {
+ c = *txt++;
+ if (c == ' ')
+ continue;
+ *dst++ = c;
+ }
+ *dst = '\0';
- memset(str, 0, sizeof(str));
- /* Spaces may interfere with parsing the exponent. Strip them. */
- for (s = 0, d = 0; s < len; s++) {
- if (strbuf[s] != ' ')
- str[d++] = strbuf[s];
+ /* Check for overflow, or get the number value. */
+ if (strstr(buf, "+OL")) {
+ *floatval = +INFINITY;
+ return SR_OK;
}
- if (sr_atof_ascii(str, floatval) != SR_OK)
- return SR_ERR;
+ if (strstr(buf, "-OL")) {
+ *floatval = -INFINITY;
+ return SR_OK;
+ }
+ if (strstr(buf, "OL")) {
+ *floatval = INFINITY;
+ return SR_OK;
+ }
+ ret = sr_atof_ascii(buf, floatval);
+ if (ret != SR_OK)
+ return ret;
return SR_OK;
}
}
if (flags.is_diode)
- analog->meaning->mqflags |= SR_MQFLAG_DIODE;
+ analog->meaning->mqflags |= SR_MQFLAG_DIODE | SR_MQFLAG_DC;
/* We can have both AC+DC in a single measurement. */
if (flags.is_ac)
analog->meaning->mqflags |= SR_MQFLAG_AC;
analog->meaning->mqflags |= SR_MQFLAG_DC;
if (flags.is_low_batt)
- sr_info("Low battery!");
+ sr_warn("Low battery!");
return SR_OK;
}