diff --git a/internal/db/edit.go b/internal/db/edit.go index 13f1c99..fc8742b 100644 --- a/internal/db/edit.go +++ b/internal/db/edit.go @@ -10,30 +10,32 @@ import ( func Create() { sqlStatement := `CREATE TABLE IF NOT EXISTS "now" ( - "ID" ` + currentDB.PrimaryKey + `, - "NAME" TEXT NOT NULL, - "DNS" TEXT NOT NULL, - "IFACE" TEXT, - "IP" TEXT, - "MAC" TEXT, - "HW" TEXT, - "DATE" TEXT, - "KNOWN" INTEGER DEFAULT 0, - "NOW" INTEGER DEFAULT 0 + "ID" ` + currentDB.PrimaryKey + `, + "NAME" TEXT NOT NULL, + "DNS" TEXT NOT NULL, + "IFACE" TEXT, + "IP" TEXT, + "MAC" TEXT, + "HW" TEXT, + "DATE" TEXT, + "FIRSTSEEN" TEXT, + "KNOWN" INTEGER DEFAULT 0, + "NOW" INTEGER DEFAULT 0 );` dbExec(sqlStatement) sqlStatement = `CREATE TABLE IF NOT EXISTS "history" ( - "ID" ` + currentDB.PrimaryKey + `, - "NAME" TEXT NOT NULL, - "DNS" TEXT NOT NULL, - "IFACE" TEXT, - "IP" TEXT, - "MAC" TEXT, - "HW" TEXT, - "DATE" TEXT, - "KNOWN" INTEGER DEFAULT 0, - "NOW" INTEGER DEFAULT 0 + "ID" ` + currentDB.PrimaryKey + `, + "NAME" TEXT NOT NULL, + "DNS" TEXT NOT NULL, + "IFACE" TEXT, + "IP" TEXT, + "MAC" TEXT, + "HW" TEXT, + "DATE" TEXT, + "FIRSTSEEN" TEXT, + "KNOWN" INTEGER DEFAULT 0, + "NOW" INTEGER DEFAULT 0 );` dbExec(sqlStatement) } @@ -42,8 +44,8 @@ func Create() { func Insert(table string, oneHost models.Host) { oneHost.Name = quoteStr(oneHost.Name) oneHost.Hw = quoteStr(oneHost.Hw) - sqlStatement := `INSERT INTO %s ("NAME", "DNS", "IFACE", "IP", "MAC", "HW", "DATE", "KNOWN", "NOW") VALUES ('%s','%s','%s','%s','%s','%s','%s','%d','%d');` - sqlStatement = fmt.Sprintf(sqlStatement, table, oneHost.Name, oneHost.DNS, oneHost.Iface, oneHost.IP, oneHost.Mac, oneHost.Hw, oneHost.Date, oneHost.Known, oneHost.Now) + sqlStatement := `INSERT INTO %s ("NAME", "DNS", "IFACE", "IP", "MAC", "HW", "DATE", "FIRSTSEEN", "KNOWN", "NOW") VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%d','%d');` + sqlStatement = fmt.Sprintf(sqlStatement, table, oneHost.Name, oneHost.DNS, oneHost.Iface, oneHost.IP, oneHost.Mac, oneHost.Hw, oneHost.Date, oneHost.FirstSeen, oneHost.Known, oneHost.Now) dbExec(sqlStatement) } diff --git a/internal/models/models.go b/internal/models/models.go index a89c946..93df02f 100644 --- a/internal/models/models.go +++ b/internal/models/models.go @@ -32,16 +32,17 @@ type Conf struct { // Host - one host type Host struct { - ID int `db:"ID"` - Name string `db:"NAME"` - DNS string `db:"DNS"` - Iface string `db:"IFACE"` - IP string `db:"IP"` - Mac string `db:"MAC"` - Hw string `db:"HW"` - Date string `db:"DATE"` - Known int `db:"KNOWN"` - Now int `db:"NOW"` + ID int `db:"ID"` + Name string `db:"NAME"` + DNS string `db:"DNS"` + Iface string `db:"IFACE"` + IP string `db:"IP"` + Mac string `db:"MAC"` + Hw string `db:"HW"` + Date string `db:"DATE"` + FirstSeen string `db:"FIRSTSEEN"` + Known int `db:"KNOWN"` + Now int `db:"NOW"` } // Stat - status diff --git a/internal/web/public/js/index.js b/internal/web/public/js/index.js index 09f3fed..181f0f6 100644 --- a/internal/web/public/js/index.js +++ b/internal/web/public/js/index.js @@ -31,6 +31,7 @@ function createHTML(addr, i) {