Репозитории ALT
S: | 2.0.7-alt1 |
5.1: | 1.24-alt13 |
4.1: | 1.24-alt11.M41.1 |
4.0: | 1.24-alt11.M40.1 |
3.0: | 1.02-alt0.1 |
Группа :: Система/Серверы
Пакет: ulogd
Главная Изменения Спек Патчи Sources Загрузить Gear Bugs and FR Repocop
Патч: ulogd-1.24-sqlite.patch
Скачать
Скачать
diff --git a/ulogd/doc/sqlite3.table b/ulogd/doc/sqlite3.table
index 7b5e99a..a78b42e 100644
--- a/ulogd/doc/sqlite3.table
+++ b/ulogd/doc/sqlite3.table
@@ -1,9 +1,12 @@ CREATE TABLE ulog (
-CREATE TABLE ulog (
+CREATE TABLE IF NOT EXISTS ulog (
raw_mac VARCHAR(80),
oob_time_sec INT UNSIGNED,
oob_time_usec INT UNSIGNED,
- ip_saddr INT UNSIGNED,
- ip_daddr INT UNSIGNED,
+ oob_prefix VARCHAR(32),
+ oob_in VARCHAR(32),
+ oob_out VARCHAR(32),
+ ip_saddr VARCHAR(16),
+ ip_daddr VARCHAR(16),
ip_protocol TINYINT UNSIGNED,
ip_totlen SMALLINT UNSIGNED,
tcp_sport SMALLINT UNSIGNED,
diff --git a/ulogd/sqlite3/ulogd_SQLITE3.c b/ulogd/sqlite3/ulogd_SQLITE3.c
index 4c9caeb..b8a870c 100644
--- a/ulogd/sqlite3/ulogd_SQLITE3.c
+++ b/ulogd/sqlite3/ulogd_SQLITE3.c
@@ -136,7 +136,7 @@ static int _sqlite3_output(ulog_iret_t *result)
memset(&addr, 0, sizeof(addr));
addr.s_addr = ntohl(res->value.ui32);
ipaddr = inet_ntoa(addr);
- sqlite3_bind_text(p_stmt,col_counter,ipaddr,strlen(ipaddr),SQLITE_STATIC);
+ sqlite3_bind_text(p_stmt,col_counter,ipaddr,strlen(ipaddr),SQLITE_TRANSIENT);
break;
#endif /* IP_AS_STRING */
/* EVIL: fallthrough when logging IP as u_int32_t */
diff --git a/ulogd/ulogd.conf.in b/ulogd/ulogd.conf.in
index 38540d2..16b1c7c 100644
--- a/ulogd/ulogd.conf.in
+++ b/ulogd/ulogd.conf.in
@@ -73,7 +73,7 @@ host="localhost"
[SQLITE3]
table="ulog"
-db="/path/to/sqlite/db"
+db="/var/lib/ulogd/sqlite3.db"
buffer=200
[PCAP]