Add function INSERT_CT for conntrack

diff --git a/doc/mysql-ulogd2.sql b/doc/mysql-ulogd2.sql
index ed8d982b2be1f7c62da0b01838aba089eef6cd03..00017be9bc082bc593c1e24045a873830e7e7f75 100644 (file)
--- a/doc/mysql-ulogd2.sql
+++ b/doc/mysql-ulogd2.sql
@@ -672,46 +672,48 @@ END
 $$
 
 delimiter $$
-DROP PROCEDURE IF EXISTS INSERT_CT;
-CREATE PROCEDURE INSERT_CT(
-               IN `_orig_ip_saddr` binary(16),
-               IN `_orig_ip_daddr` binary(16),
-               IN `_orig_ip_protocol` tinyint(3) unsigned,
-               IN `_orig_l4_sport` int(5),
-               IN `_orig_l4_dport` int(5),
-               IN `_orig_bytes` bigint,
-               IN `_orig_packets` bigint,
-               IN `_reply_ip_saddr` binary(16),
-               IN `_reply_ip_daddr` binary(16),
-               IN `_reply_ip_protocol` tinyint(3) unsigned,
-               IN `_reply_l4_sport` int(5),
-               IN `_reply_l4_dport` int(5),
-               IN `_reply_bytes` bigint,
-               IN `_reply_packets` bigint,
-               IN `_icmp_code` tinyint(3),
-               IN `_icmp_type` tinyint(3),
-               IN `_ct_mark` bigint,
-               IN `_flow_start_sec` int(10),
-               IN `_flow_start_usec` int(10),
-               IN `_flow_end_sec` int(10),
-               IN `_flow_end_usec` int(10)
-               )
+DROP FUNCTION IF EXISTS INSERT_CT;
+CREATE FUNCTION INSERT_CT(
+               `_oob_family` bigint,
+               `_orig_ip_saddr` binary(16),
+               `_orig_ip_daddr` binary(16),
+               `_orig_ip_protocol` tinyint(3) unsigned,
+               `_orig_l4_sport` int(5),
+               `_orig_l4_dport` int(5),
+               `_orig_bytes` bigint,
+               `_orig_packets` bigint,
+               `_reply_ip_saddr` binary(16),
+               `_reply_ip_daddr` binary(16),
+               `_reply_ip_protocol` tinyint(3) unsigned,
+               `_reply_l4_sport` int(5),
+               `_reply_l4_dport` int(5),
+               `_reply_bytes` bigint,
+               `_reply_packets` bigint,
+               `_icmp_code` tinyint(3),
+               `_icmp_type` tinyint(3),
+               `_ct_mark` bigint,
+               `_flow_start_sec` int(10),
+               `_flow_start_usec` int(10),
+               `_flow_end_sec` int(10),
+               `_flow_end_usec` int(10)
+               ) RETURNS bigint unsigned
+READS SQL DATA
 BEGIN
-       INSERT INTO ulog2_ct (orig_ip_saddr, orig_ip_daddr, orig_ip_protocol,
+       INSERT INTO ulog2_ct (oob_family, orig_ip_saddr, orig_ip_daddr, orig_ip_protocol,
                orig_l4_sport, orig_l4_dport, orig_bytes, orig_packets,
                reply_ip_saddr, reply_ip_daddr, reply_ip_protocol,
                reply_l4_sport, reply_l4_dport, reply_bytes, reply_packets,
                icmp_code, icmp_type, ct_mark, 
                flow_start_sec, flow_start_usec,
                flow_end_sec, flow_end_usec)
-       VALUES (_orig_ip_saddr, _orig_ip_daddr, _orig_ip_protocol,
+       VALUES (_oob_family, _orig_ip_saddr, _orig_ip_daddr, _orig_ip_protocol,
                _orig_l4_sport, _orig_l4_dport, _orig_bytes, _orig_packets,
                _reply_ip_saddr, _reply_ip_daddr, _reply_ip_protocol,
                _reply_l4_sport, _reply_l4_dport, _reply_bytes, _reply_packets,
                _icmp_code, _icmp_type, _ct_mark,
                _flow_start_sec, _flow_start_usec,
                _flow_end_sec, _flow_end_usec);
-
+       RETURN LAST_INSERT_ID();
 END
 $$