remove old mysql and pgsql definitions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 1f2ad90d04385aaa7addae53f1fc171708886802..a80373a7a0d3ea1318cf87ea81f86e0e5174e6da 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,6 @@
 
 EXTRA_DIST = ulogd.txt ulogd.html ulogd.ps \
-       mysql.table pgsql.table sqlite3.table mysql.table.ipaddr-as-string
+            sqlite3.table pgsql-ulogd2.sql mysql-ulogd2.sql
 
 dist-hook:
        sgml2txt ulogd.sgml

diff --git a/doc/mysql.table b/doc/mysql.table
deleted file mode 100644 (file)
index bdfee71..0000000
--- a/doc/mysql.table
+++ /dev/null
@@ -1,55 +0,0 @@
-CREATE TABLE ulog (    id              INT UNSIGNED AUTO_INCREMENT UNIQUE,
-
-                       raw_mac         VARCHAR(80),
-
-                       oob_time_sec    INT UNSIGNED,
-                       oob_time_usec   INT UNSIGNED,
-                       oob_prefix      VARCHAR(32),
-                       oob_mark        INT UNSIGNED,
-                       oob_in          VARCHAR(32),
-                       oob_out         VARCHAR(32),
-
-                       ip_saddr        INT UNSIGNED,
-                       ip_daddr        INT UNSIGNED,
-                       ip_protocol     TINYINT UNSIGNED,
-                       ip_tos          TINYINT UNSIGNED,
-                       ip_ttl          TINYINT UNSIGNED,
-                       ip_totlen       SMALLINT UNSIGNED,
-                       ip_ihl          TINYINT UNSIGNED,
-                       ip_csum         SMALLINT UNSIGNED,
-                       ip_id           SMALLINT UNSIGNED,
-                       ip_fragoff      SMALLINT UNSIGNED,
-
-                       tcp_sport       SMALLINT UNSIGNED,
-                       tcp_dport       SMALLINT UNSIGNED,
-                       tcp_seq         INT UNSIGNED,
-                       tcp_ackseq      INT UNSIGNED,
-                       tcp_window      SMALLINT UNSIGNED,
-                       tcp_urg         TINYINT,
-                       tcp_urgp        SMALLINT UNSIGNED,
-                       tcp_ack         TINYINT,
-                       tcp_psh         TINYINT,
-                       tcp_rst         TINYINT,
-                       tcp_syn         TINYINT,
-                       tcp_fin         TINYINT,
-
-                       udp_sport       SMALLINT UNSIGNED,
-                       udp_dport       SMALLINT UNSIGNED,
-                       udp_len         SMALLINT UNSIGNED,
-                       
-                       icmp_type       TINYINT UNSIGNED,
-                       icmp_code       TINYINT UNSIGNED,
-                       icmp_echoid     SMALLINT UNSIGNED,
-                       icmp_echoseq    SMALLINT UNSIGNED,
-                       icmp_gateway    INT UNSIGNED,
-                       icmp_fragmtu    SMALLINT UNSIGNED,
-                       
-                       pwsniff_user    VARCHAR(30),
-                       pwsniff_pass    VARCHAR(30),
-                       
-                       ahesp_spi       INT UNSIGNED,                   
-
-                       KEY index_id    (id)
-               );
-
-                       

diff --git a/doc/mysql.table.ipaddr-as-string b/doc/mysql.table.ipaddr-as-string
deleted file mode 100644 (file)
index c9bd508..0000000
--- a/doc/mysql.table.ipaddr-as-string
+++ /dev/null
@@ -1,58 +0,0 @@
-# MySQL dump 7.1
-#
-# Host: localhost    Database: ulogd
-#--------------------------------------------------------
-# Server version       3.22.32
-
-# This table is intended for use with older MySQL-Servers and
-# the --with-mysql-log-ip-as-string feature. It will not work
-# without that feature.
-#
-# Table structure for table 'ulog'
-#
-CREATE TABLE ulog (
-  id int(10) unsigned DEFAULT '0' NOT NULL auto_increment,
-  raw_mac varchar(80),
-  oob_time_sec int(10) unsigned,
-  oob_time_usec int(10) unsigned,
-  oob_prefix varchar(32),
-  oob_mark int(10) unsigned,
-  oob_in varchar(32),
-  oob_out varchar(32),
-  ip_saddr varchar(16),
-  ip_daddr varchar(16),
-  ip_protocol tinyint(3) unsigned,
-  ip_tos tinyint(3) unsigned,
-  ip_ttl tinyint(3) unsigned,
-  ip_totlen smallint(5) unsigned,
-  ip_ihl tinyint(3) unsigned,
-  ip_csum smallint(5) unsigned,
-  ip_id smallint(5) unsigned,
-  ip_fragoff smallint(5) unsigned,
-  tcp_sport smallint(5) unsigned,
-  tcp_dport smallint(5) unsigned,
-  tcp_seq int(10) unsigned,
-  tcp_ackseq int(10) unsigned,
-  tcp_window smallint(5) unsigned,
-  tcp_urg tinyint(4),
-  tcp_urgp smallint(5) unsigned,
-  tcp_ack tinyint(4),
-  tcp_psh tinyint(4),
-  tcp_rst tinyint(4),
-  tcp_syn tinyint(4),
-  tcp_fin tinyint(4),
-  udp_sport smallint(5) unsigned,
-  udp_dport smallint(5) unsigned,
-  udp_len smallint(5) unsigned,
-  icmp_type tinyint(3) unsigned,
-  icmp_code tinyint(3) unsigned,
-  icmp_echoid smallint(5) unsigned,
-  icmp_echoseq smallint(5) unsigned,
-  icmp_gateway int(10) unsigned,
-  icmp_fragmtu smallint(5) unsigned,
-  pwsniff_user varchar(30),
-  pwsniff_pass varchar(30),
-  ahesp_spi int(10) unsigned,
-  PRIMARY KEY (id)
-);
-

diff --git a/doc/pgsql.table b/doc/pgsql.table
deleted file mode 100644 (file)
index 193f747..0000000
--- a/doc/pgsql.table
+++ /dev/null
@@ -1,81 +0,0 @@
-/*  ulogd.pgsql.table, Version 0.1
- *
- *  sample of a postgres table for ulogd
- *
- *  All columns except "id" are optional!  Comment all unwanted
- *  columns out, e.g. by prefixing them with '--'
- *
- *  "raw_pkt" is not supported by ulogd_PGSQL
- */
-
-CREATE SEQUENCE "seq_ulog";
-
-CREATE TABLE "ulog" (
-        "id"             integer DEFAULT nextval('seq_ulog') NOT NULL,
-
-        "oob_prefix"     character varying(32),
-        "oob_time_sec"   integer,
-        "oob_time_usec"  integer,
-        "oob_mark"       bigint,
-        "oob_in"         character varying(32),
-        "oob_out"        character varying(32),
-
-        "raw_mac"        character varying(80),
-        "raw_pktlen"     bigint,
-
-        "ip_ihl"         smallint,
-        "ip_tos"         smallint,
-        "ip_totlen"      integer,
-        "ip_id"          integer,
-        "ip_fragoff"     integer,
-        "ip_ttl"         smallint,
-        "ip_protocol"    smallint,
-        "ip_csum"        integer,
-
-/* log IPs as unsigned int32 (default)                */
-        "ip_saddr"       bigint,
-        "ip_daddr"       bigint,
-
-/* log IPs as string (--with-pgsql-log-ip-as-string)  */
---      "ip_saddr"       character varying(40),
---      "ip_daddr"       character varying(40),
-
-/* log IPs as inet   (--with-pgsql-log-ip-as-string)  */
---      "ip_saddr"       inet,
---      "ip_daddr"       inet,
-
-
-        "tcp_sport"      integer,
-        "tcp_dport"      integer,
-        "tcp_seq"        bigint,
-        "tcp_ackseq"     bigint,
-        "tcp_urg"        boolean,
-        "tcp_ack"        boolean,
-        "tcp_psh"        boolean,
-        "tcp_rst"        boolean,
-        "tcp_syn"        boolean,
-        "tcp_fin"        boolean,
-        "tcp_window"     integer,
-        "tcp_urgp"       integer,
-
-        "udp_sport"      integer,
-        "udp_dport"      integer,
-        "udp_len"        integer,
-
-        "icmp_type"      smallint,
-        "icmp_code"      smallint,
-        "icmp_echoid"    integer,
-        "icmp_echoseq"   integer,
-        "icmp_gateway"   bigint,
-        "icmp_fragmtu"   integer,
-
-        "pwsniff_user"   character varying(30),
-        "pwsniff_pass"   character varying(30),
-
-        "ahesp_spi"      smallint,
-
-        "local_time"     bigint,
-        "local_hostname" character varying(40)
-);
-
-