id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
pool INTEGER NOT NULL,
address BLOB NOT NULL,
- identity INTEGER NOT NULL,
- acquired INTEGER NOT NULL,
- released INTEGER NOT NULL
+ identity INTEGER NOT NULL DEFAULT 0,
+ acquired INTEGER NOT NULL DEFAULT 0,
+ released INTEGER NOT NULL DEFAULT 1
);
DROP INDEX IF EXISTS addresses_pool;
CREATE INDEX addresses_pool ON addresses (
dave::ipsec status::home.*INSTALLED::YES
dave::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES
moon::cat /var/log/daemon.log::peer requested virtual IP %any::YES
-moon::cat /var/log/daemon.log::assigning lease with new address from pool.*bigpool::YES
+moon::cat /var/log/daemon.log::acquired new lease for address.*in pool.*bigpool::YES
moon::cat /var/log/daemon.log::assigning virtual IP::YES
moon::ipsec pool --status::bigpool.*10.3.0.1.*10.3.255.254.*static.*2::YES
moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.1,id=carol@strongswan.org::online::YES
dave::ipsec status::home.*INSTALLED::YES
dave::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES
moon::cat /var/log/daemon.log::peer requested virtual IP %any::YES
-moon::cat /var/log/daemon.log::reassigning address from expired lease from pool.*bigpool::YES
+moon::cat /var/log/daemon.log::acquired new lease for address.*in pool.*bigpool::YES
moon::cat /var/log/daemon.log::assigning virtual IP::YES
-moon::ipsec pool --status::bigpool.*10.3.0.1.*10.3.255.254.*1h.*2::YES
+moon::ipsec pool --status::bigpool.*10.3.0.1.*10.3.0.6.*1h.*2::YES
moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.1,id=carol@strongswan.org::online::YES
moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.2,id=dave@strongswan.org::online::YES
moon::ipsec status::rw.*ESTABLISHED.*carol@strongswan.org::YES
3, X'64617665407374726f6e677377616e2e6f7267'
);
+INSERT INTO identities (
+ type, data
+) VALUES ( /* alice@strongswan.org */
+ 3, X'616c696365407374726f6e677377616e2e6f7267'
+ );
+
/* Certificates */
INSERT INTO certificates (
/* Pools */
INSERT INTO pools (
- name, start, end, next, timeout
+ name, start, end, timeout
) VALUES (
- 'bigpool', X'0a030001', X'0a03fffe', X'0a030003', 3600
+ 'bigpool', X'0a030001', X'0a030006', 3600
);
-INSERT INTO leases (
+INSERT INTO addresses (
pool, address, identity, acquired, released
) VALUES (
1, X'0a030001', 7, 1211299013 , 1211299205
);
-INSERT INTO leases (
+INSERT INTO addresses (
pool, address, identity, acquired, released
) VALUES (
- 1, X'0a030002', 6, 1211299031, 1211299187
+ 1, X'0a030002', 8, 1211299031, 1211299187
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030003'
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030004'
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030005'
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030006'
+);
+
+INSERT INTO leases (
+ address, identity, acquired, released
+) VALUES (
+ 1, 7, 1211299013 , 1211299205
+);
+
+INSERT INTO leases (
+ address, identity, acquired, released
+) VALUES (
+ 2, 8, 1211299031, 1211299187
);
dave::ipsec status::home.*INSTALLED::YES
dave::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES
moon::cat /var/log/daemon.log::peer requested virtual IP %any::YES
-moon::cat /var/log/daemon.log::reassigning address from valid lease from pool.*bigpool::YES
+moon::cat /var/log/daemon.log::acquired existing lease for address.*in pool.*bigpool::YES
moon::cat /var/log/daemon.log::assigning virtual IP::YES
-moon::ipsec pool --status::bigpool.*10.3.0.1.*10.3.255.254.*static.*2::YES
+moon::ipsec pool --status::bigpool.*10.3.0.1.*10.3.0.6.*static.*2::YES
moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.1,id=carol@strongswan.org::online::YES
moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.2,id=dave@strongswan.org::online::YES
moon::ipsec status::rw.*ESTABLISHED.*carol@strongswan.org::YES
/* Pools */
INSERT INTO pools (
- name, start, end, next, timeout
+ name, start, end, timeout
) VALUES (
- 'bigpool', X'0a030001', X'0a03fffe', X'0a030003', 0
+ 'bigpool', X'0a030001', X'0a030006', 0
);
-INSERT INTO leases (
+INSERT INTO addresses (
pool, address, identity, acquired, released
) VALUES (
1, X'0a030001', 6, 1211299013 , 1211299205
);
-INSERT INTO leases (
+INSERT INTO addresses (
pool, address, identity, acquired, released
) VALUES (
1, X'0a030002', 7, 1211299031, 1211299187
);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030003'
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030004'
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030005'
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030006'
+);
+
+INSERT INTO leases (
+ address, identity, acquired, released
+) VALUES (
+ 1, 6, 1211299013 , 1211299205
+);
+
+INSERT INTO leases (
+ address, identity, acquired, released
+) VALUES (
+ 2, 7, 1211299031, 1211299187
+);
dave::ipsec status::home.*INSTALLED::YES
dave::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES
moon::cat /var/log/daemon.log::peer requested virtual IP %any::YES
-moon::cat /var/log/daemon.log::assigning lease with new address from pool.*bigpool::YES
+moon::cat /var/log/daemon.log::acquired new lease for address.*in pool.*bigpool::YES
moon::cat /var/log/daemon.log::assigning virtual IP::YES
-moon::ipsec pool --status::bigpool.*10.3.0.1.*10.3.255.254.*static.*2::YES
+moon::ipsec pool --status::bigpool.*10.3.0.1.*10.3.0.6.*static.*2::YES
moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.1,id=carol@strongswan.org::online::YES
moon::ipsec pool --leases --filter pool=bigpool,addr=10.3.0.2,id=dave@strongswan.org::online::YES
moon::ipsec status::rw.*ESTABLISHED.*carol@strongswan.org::YES
/* Pools */
INSERT INTO pools (
- name, start, end, next, timeout
+ name, start, end, timeout
) VALUES (
- 'bigpool', X'0a030001', X'0a03fffe', X'0a030001', 0
+ 'bigpool', X'0a030001', X'0a030006', 0
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030001'
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030002'
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030003'
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030004'
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030005'
+);
+
+INSERT INTO addresses (
+ pool, address
+) VALUES (
+ 1, X'0a030006'
);