Merged in changes from master, tagged as alpha_0.7alpha_0.7

1 files changed, 26 insertions, 16 deletions

diff --git a/database/sqlite/sql-schema.sql b/database/sqlite/sql-schema.sql
index a8f9168..b677554 100644
--- a/database/sqlite/sql-schema.sql
+++ b/database/sqlite/sql-schema.sql
@@ -36,25 +36,35 @@ CREATE TABLE openvpn_accesses (
 );
 
 CREATE TABLE openvpn_lastlog (
-       uid            integer      ,
-       certid         integer      ,
-       protocol       varchar(4)   NOT NULL,
-       remotehost     varchar(128) NOT NULL,
-       remoteport     integer      NOT NULL,
-       macaddr        varchar(20)  ,
-       vpnipaddr      varchar(32)  NOT NULL,
-       vpnipmask      varchar(32)  NOT NULL,
-       sessionstatus  integer      NOT NULL DEFAULT 0,
-       sessionkey     varchar(128) ,
-       login          timestamp    ,
-       logout         timestamp    ,
-       session_del    timestamp    ,
-       bytes_sent     integer      ,
-       bytes_received integer      ,
-       llid           integer      PRIMARY KEY AUTOINCREMENT
+       uid              integer      ,
+       certid           integer      ,
+       protocol         varchar(4)   NOT NULL,
+       remotehost       varchar(128) NOT NULL,
+       remoteport       integer      NOT NULL,
+       macaddr          varchar(20)  ,
+       vpnipaddr        varchar(32)  NOT NULL,
+       vpnipmask        varchar(32)  NOT NULL,
+       sessionstatus    integer      NOT NULL DEFAULT 0,
+       sessionkey       varchar(128) ,
+       login            timestamp    ,
+       logout           timestamp    ,
+       session_deleted  timestamp    ,
+       session_duration timestamp,
+       bytes_sent       integer      ,
+       bytes_received   integer      ,
+       llid             integer      PRIMARY KEY AUTOINCREMENT
 );
 CREATE UNIQUE INDEX openvpn_lastlog_sessionkey ON openvpn_lastlog(sessionkey);
 
+CREATE TABLE openvpn_macaddr_history (
+       sessionkey     varchar(64)  NOT NULL,
+       macaddr        varchar(20)  NOT NULL,
+       registered     timestamp    DEFAULT CURRENT_TIMESTAMP,
+       semaid         integer      PRIMARY KEY AUTOINCREMENT
+);
+CREATE INDEX openvpn_macaddr_hist_sessionkey ON openvpn_macaddr_history(sessionkey);
+CREATE INDEX openvpn_macaddr_hist_macaddr ON openvpn_macaddr_history(macaddr);
+
 CREATE TABLE openvpn_sessions (
        sessionkey     varchar(128) NOT NULL,
        datakey        varchar(256) NOT NULL,