From 2e4c70c26984c6c844380d1f27a2023900502f9e Mon Sep 17 00:00:00 2001 From: Pierre Chifflier Date: Thu, 17 Sep 2009 21:28:20 +0200 Subject: Fix wrong definition of views in flat DB schema Create views using the ip_protocol field (and not the oob_family). Signed-off-by: Pierre Chifflier --- doc/mysql-ulogd2-flat.sql | 12 ++++++------ doc/pgsql-ulogd2-flat.sql | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/mysql-ulogd2-flat.sql b/doc/mysql-ulogd2-flat.sql index 11474c0..acac6aa 100644 --- a/doc/mysql-ulogd2-flat.sql +++ b/doc/mysql-ulogd2-flat.sql @@ -107,19 +107,19 @@ ALTER TABLE ulog2 ADD KEY `sctp_dport` (`sctp_dport`); DROP VIEW IF EXISTS `view_tcp`; CREATE SQL SECURITY INVOKER VIEW `view_tcp` AS - SELECT * FROM ulog2 WHERE ulog2.oob_family = 6; + SELECT * FROM ulog2 WHERE ulog2.ip_protocol = 6; DROP VIEW IF EXISTS `view_udp`; CREATE SQL SECURITY INVOKER VIEW `view_udp` AS - SELECT * FROM ulog2 WHERE ulog2.oob_family = 17; + SELECT * FROM ulog2 WHERE ulog2.ip_protocol = 17; DROP VIEW IF EXISTS `view_icmp`; CREATE SQL SECURITY INVOKER VIEW `view_icmp` AS - SELECT * FROM ulog2 WHERE ulog2.oob_family = 1; + SELECT * FROM ulog2 WHERE ulog2.ip_protocol = 1; DROP VIEW IF EXISTS `view_icmpv6`; CREATE SQL SECURITY INVOKER VIEW `view_icmpv6` AS - SELECT * FROM ulog2 WHERE ulog2.oob_family = 58; + SELECT * FROM ulog2 WHERE ulog2.ip_protocol = 58; -- ulog view DROP VIEW IF EXISTS `ulog`; @@ -222,11 +222,11 @@ delimiter ; DROP VIEW IF EXISTS `view_tcp_quad`; CREATE SQL SECURITY INVOKER VIEW `view_tcp_quad` AS - SELECT _id,BIN_TO_IPV6(ip_saddr_bin) AS ip_saddr_str,tcp_sport,BIN_TO_IPV6(ip_daddr_bin) AS ip_daddr_str,tcp_dport FROM ulog2 WHERE ulog2.oob_family = 6; + SELECT _id,BIN_TO_IPV6(ip_saddr_bin) AS ip_saddr_str,tcp_sport,BIN_TO_IPV6(ip_daddr_bin) AS ip_daddr_str,tcp_dport FROM ulog2 WHERE ulog2.ip_protocol = 6; DROP VIEW IF EXISTS `view_udp_quad`; CREATE SQL SECURITY INVOKER VIEW `view_udp_quad` AS - SELECT _id,BIN_TO_IPV6(ip_saddr_bin) AS ip_saddr_str,udp_sport,BIN_TO_IPV6(ip_daddr_bin) AS ip_daddr_str,udp_dport FROM ulog2 WHERE ulog2.oob_family = 17; + SELECT _id,BIN_TO_IPV6(ip_saddr_bin) AS ip_saddr_str,udp_sport,BIN_TO_IPV6(ip_daddr_bin) AS ip_daddr_str,udp_dport FROM ulog2 WHERE ulog2.ip_protocol = 17; diff --git a/doc/pgsql-ulogd2-flat.sql b/doc/pgsql-ulogd2-flat.sql index cf1a07f..9ff0ec6 100644 --- a/doc/pgsql-ulogd2-flat.sql +++ b/doc/pgsql-ulogd2-flat.sql @@ -108,16 +108,16 @@ CREATE INDEX sctp_dport ON ulog2(sctp_dport); -- CREATE OR REPLACE VIEW view_tcp AS - SELECT * FROM ulog2 WHERE ulog2.oob_family = 6; + SELECT * FROM ulog2 WHERE ulog2.ip_protocol = 6; CREATE OR REPLACE VIEW view_udp AS - SELECT * FROM ulog2 WHERE ulog2.oob_family = 17; + SELECT * FROM ulog2 WHERE ulog2.ip_protocol = 17; CREATE OR REPLACE VIEW view_icmp AS - SELECT * FROM ulog2 WHERE ulog2.oob_family = 1; + SELECT * FROM ulog2 WHERE ulog2.ip_protocol = 1; CREATE OR REPLACE VIEW view_icmpv6 AS - SELECT * FROM ulog2 WHERE ulog2.oob_family = 58; + SELECT * FROM ulog2 WHERE ulog2.ip_protocol = 58; -- complete view CREATE OR REPLACE VIEW ulog AS @@ -179,10 +179,10 @@ CREATE OR REPLACE VIEW ulog AS -- shortcuts CREATE OR REPLACE VIEW view_tcp_quad AS - SELECT _id,ip_saddr_str,tcp_sport,ip_daddr_str,tcp_dport FROM ulog2 WHERE ulog2.oob_family = 6; + SELECT _id,ip_saddr_str,tcp_sport,ip_daddr_str,tcp_dport FROM ulog2 WHERE ulog2.ip_protocol = 6; CREATE OR REPLACE VIEW view_udp_quad AS - SELECT _id,ip_saddr_str,udp_sport,ip_daddr_str,udp_dport FROM ulog2 WHERE ulog2.oob_family = 17; + SELECT _id,ip_saddr_str,udp_sport,ip_daddr_str,udp_dport FROM ulog2 WHERE ulog2.ip_protocol = 17; -- -- conntrack -- cgit v1.2.3