#include <zip.h>
#include <glib.h>
#include <glib/gstdio.h>
-#include "config.h"
+#include "config.h" /* Needed for PACKAGE_VERSION and others. */
#include "libsigrok.h"
#include "libsigrok-internal.h"
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "session-file: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
+/**
+ * @file
+ *
+ * Loading and saving libsigrok session files.
+ */
+
+/**
+ * @addtogroup grp_session
+ *
+ * @{
+ */
+
extern struct sr_session *session;
extern SR_PRIV struct sr_dev_driver session_driver;
struct zip_stat zs;
struct sr_dev_inst *sdi;
struct sr_probe *probe;
- int ret, probenum, devcnt, i, j;
+ int ret, probenum, devcnt, version, i, j;
uint64_t tmp_u64, total_probes, enabled_probes, p;
- char **sections, **keys, *metafile, *val, c;
+ char **sections, **keys, *metafile, *val, s[11];
char probename[SR_MAX_PROBENAME_LEN + 1];
if (!filename) {
- sr_err("session file: %s: filename was NULL", __func__);
+ sr_err("%s: filename was NULL", __func__);
return SR_ERR_ARG;
}
if (!(archive = zip_open(filename, 0, &ret))) {
- sr_dbg("session file: Failed to open session file: zip "
- "error %d", ret);
+ sr_dbg("Failed to open session file: zip error %d", ret);
return SR_ERR;
}
/* check "version" */
+ version = 0;
if (!(zf = zip_fopen(archive, "version", 0))) {
- sr_dbg("session file: Not a sigrok session file.");
+ sr_dbg("Not a sigrok session file.");
return SR_ERR;
}
- ret = zip_fread(zf, &c, 1);
- if (ret != 1 || c != '1') {
- sr_dbg("session file: Not a valid sigrok session file.");
+ if ((ret = zip_fread(zf, s, 10)) == -1) {
+ sr_dbg("Not a valid sigrok session file.");
return SR_ERR;
}
zip_fclose(zf);
+ s[ret] = 0;
+ version = strtoull(s, NULL, 10);
+ if (version != 1) {
+ sr_dbg("Not a valid sigrok session file version.");
+ return SR_ERR;
+ }
/* read "metadata" */
if (zip_stat(archive, "metadata", 0, &zs) == -1) {
- sr_dbg("session file: Not a valid sigrok session file.");
+ sr_dbg("Not a valid sigrok session file.");
return SR_ERR;
}
if (!(metafile = g_try_malloc(zs.size))) {
- sr_err("session file: %s: metafile malloc failed", __func__);
+ sr_err("%s: metafile malloc failed", __func__);
return SR_ERR_MALLOC;
}
kf = g_key_file_new();
if (!g_key_file_load_from_data(kf, metafile, zs.size, 0, NULL)) {
- sr_dbg("session file: Failed to parse metadata.");
+ sr_dbg("Failed to parse metadata.");
return SR_ERR;
}
sdi->driver = &session_driver;
if (devcnt == 0)
/* first device, init the driver */
- sdi->driver->init();
+ sdi->driver->init(NULL);
sr_session_dev_add(sdi);
sdi->driver->dev_config_set(sdi, SR_HWCAP_SESSIONFILE, filename);
sdi->driver->dev_config_set(sdi, SR_HWCAP_CAPTUREFILE, val);
char version[1], rawname[16], metafile[32], *buf, *s;
if (!filename) {
- sr_err("session file: %s: filename was NULL", __func__);
+ sr_err("%s: filename was NULL", __func__);
return SR_ERR_ARG;
}
if (!(versrc = zip_source_buffer(zipfile, version, 1, 0)))
return SR_ERR;
if (zip_add(zipfile, "version", versrc) == -1) {
- sr_info("session file: error saving version into zipfile: %s",
+ sr_info("error saving version into zipfile: %s",
zip_strerror(zipfile));
return SR_ERR;
}
buf = g_try_malloc(ds->num_units * ds->ds_unitsize +
DATASTORE_CHUNKSIZE);
if (!buf) {
- sr_err("session file: %s: buf malloc failed",
- __func__);
+ sr_err("%s: buf malloc failed", __func__);
return SR_ERR_MALLOC;
}
return SR_ERR;
if ((ret = zip_close(zipfile)) == -1) {
- sr_info("session file: error saving zipfile: %s",
- zip_strerror(zipfile));
+ sr_info("error saving zipfile: %s", zip_strerror(zipfile));
return SR_ERR;
}
return SR_OK;
}
+
+/** @} */