denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attest: output trusted flag and device description

Browse Source
This commit is contained in:
Andreas Steffen
2015-03-08 17:17:11 +01:00
parent 00cd79b678
commit 20f90d7160
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libimcv/plugins/imv_attestation/attest_db.c
+10 -8
View File
@@ -849,29 +849,31 @@ METHOD(attest_db_t, list_devices, void,
{ {
enumerator_t *e, *e_ar; enumerator_t *e, *e_ar;
chunk_t ar_id_value = chunk_empty; chunk_t ar_id_value = chunk_empty;
char *product, *device; char *product, *device, *description;
time_t timestamp; time_t timestamp;
int id, last_id = 0, ar_id = 0, last_ar_id = 0, device_count = 0; int id, last_id = 0, ar_id = 0, last_ar_id = 0, device_count = 0, trusted;
int session_id, rec; int session_id, rec;
u_int32_t ar_id_type; u_int32_t ar_id_type;
u_int tstamp; u_int tstamp;
e = this->db->query(this->db, e = this->db->query(this->db,
"SELECT d.id, d.value, s.id, s.time, s.identity, s.rec, p.name " "SELECT d.id, d.value, d.trusted, d.description, "
"s.id, s.time, s.identity, s.rec, p.name "
"FROM devices AS d " "FROM devices AS d "
"JOIN sessions AS s ON d.id = s.device " "JOIN sessions AS s ON d.id = s.device "
"JOIN products AS p ON p.id = s.product " "JOIN products AS p ON p.id = s.product "
"ORDER BY d.value, s.time DESC", DB_INT, DB_TEXT, DB_INT, DB_UINT, "ORDER BY d.value, s.time DESC", DB_INT, DB_TEXT, DB_INT, DB_TEXT,
DB_INT, DB_INT, DB_TEXT); DB_INT, DB_UINT, DB_INT, DB_INT, DB_TEXT);
if (e) if (e)
{ {
while (e->enumerate(e, &id, &device, &session_id, &tstamp, &ar_id, &rec, while (e->enumerate(e, &id, &device, &trusted, &description,
&product)) &session_id, &tstamp, &ar_id, &rec, &product))
{ {
if (id != last_id) if (id != last_id)
{ {
printf("%4d: %s - %s\n", id, device, product); printf("%4d: %s %s - %s - %s\n", id, trusted ? "+" : "-",
device, product, description);
device_count++; device_count++;
last_id = id; last_id = id;
} }