Rainer Gerhards
07e296703b
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
action.c
queue.c (some code moved from action.c --> queue.c)
2013-03-12 11:32:53 +01:00
Rainer Gerhards
d028915752
logsig: support dynafiles
2013-03-11 12:35:15 +01:00
Rainer Gerhards
171482ee70
some cleanup
2013-03-08 17:24:09 +01:00
Rainer Gerhards
c29b6b6415
logsig: fix subroot forest handling
2013-03-08 17:15:18 +01:00
Rainer Gerhards
39b91ca4e7
logsig: add capability to write interim hash records
2013-03-08 15:13:22 +01:00
Rainer Gerhards
febd1c619d
logsig: add capability to write log signature records
2013-03-08 14:32:06 +01:00
Rainer Gerhards
e34de52833
logsig: update implementation to new concatenation rules from paper
...
- when concatenting hashes, the hash ID must be included
(actually the imprint, not just the hash is concatenated)
- when concatenting integers, the smallest number of octets
must be used (actually, we have just level currently, which
always is one octet)
2013-03-08 10:34:04 +01:00
Rainer Gerhards
e01e726950
logsig: update hash chain algorithm to match updated paper
2013-03-08 09:38:26 +01:00
Rainer Gerhards
b19a3072bd
logsig: write integers in most compact from to tlv file
2013-03-08 09:03:08 +01:00
Rainer Gerhards
80f2b9f0cb
logsig: implement sig.block.sizelimit parameter
2013-03-08 08:34:57 +01:00
Rainer Gerhards
212d4e4fe6
logsig: add config parameters (for omfile)
2013-03-07 19:00:51 +01:00
Rainer Gerhards
85dd75a54c
logsig: preserve necessary state during file closed time
2013-03-07 17:19:45 +01:00
Rainer Gerhards
4786aa9e9c
logsig: add support to read signature files
...
... still incomplete ...
2013-03-07 15:45:13 +01:00
Rainer Gerhards
497d1e0963
logsig: write block-sig record
...
also some general improvements, e.g. random data is now gathered
correctly
2013-03-06 15:44:11 +01:00
Rainer Gerhards
027441b337
logsig: first PoC of actually writing to signature file
2013-03-05 15:10:11 +01:00
Rainer Gerhards
8f32f09d7e
logsig: more interface plumbing
2013-03-05 12:52:28 +01:00
Rainer Gerhards
3a68c5cda8
logsig: build base plumbing for signature multi-provider interface
2013-03-05 11:55:02 +01:00
Rainer Gerhards
6867887a42
logsig: PoC for some TLV support functions
...
also first steps at integrating them into rest of PoC
2013-03-04 18:32:49 +01:00
Rainer Gerhards
a6aa2b75ee
mmanon: complete ipv4 functionality
2013-03-04 12:59:53 +01:00
Rainer Gerhards
e17c0267db
mmanon: add ability to specify number of bits to be anonymized
2013-03-04 09:45:25 +01:00
Rainer Gerhards
84d9283b9f
Merge branch 'master' into master-omjournal
2013-02-27 17:38:36 +01:00
Rainer Gerhards
8700672c76
added ability to configure debug system via rsyslog.conf
2013-02-27 17:37:56 +01:00
Rainer Gerhards
8aad93c582
imuxsock: add capability to ignore messages from ourselfes
...
This helps prevent message routing loops, and is vital to have
if omjournal is used together with traditional syslog.
2013-02-26 09:58:17 +01:00
Rainer Gerhards
212af67757
logsigner: sign via merkle tree approach (still PoC, non production)
2013-02-21 11:29:22 +01:00
Rainer Gerhards
3a62484067
logsig: add pseudocodish C skeleton for signature algo
2013-02-18 16:52:45 +01:00
Rainer Gerhards
35bec820b6
optimze: reduce memory operations during dns resolution/hostname setting
...
previously, hostname and ip strings were shuffled to the msg object, which
created a property out of them. Now the cache holds the property, and it
is resused (almost) everywhere, what saves a lot of memory operations.
The only exception is imtcp session setup, where different handling
of the hostname is done, which we need to sort out (but that's another
story).
2013-01-22 16:55:21 +01:00
Rainer Gerhards
45d11af0b9
some fixes to commit 440aaff114607e82aefee56336846611a2e35c9c
...
extended testbench run brought up some issues...
2013-01-22 14:52:34 +01:00
Rainer Gerhards
440aaff114
optimize: move lowercasing of hostnames to cache
...
so we save this on each name lookup!
2013-01-24 09:59:26 +01:00
Rainer Gerhards
3668e0085b
refactor cvthname() for cleaner code
2013-01-24 09:06:27 +01:00
Rainer Gerhards
9ca63ee532
fix: gtls stream driver must support new interface
2013-01-24 07:17:09 +01:00
Rainer Gerhards
076a648d33
Merge branch 'master' into master-dns-props
2013-01-24 06:37:22 +01:00
Rainer Gerhards
2cde5ec476
regression fix: programname was not properly handled
...
Regression from recent refactoring - never released.
2013-01-24 06:36:42 +01:00
Rainer Gerhards
0d71694fb3
optimize: have dns cache pre-create rsyslog prop_t's
2013-01-24 06:19:13 +01:00
Rainer Gerhards
b69da427eb
fix memory leak (regression from batch optimization work - unreleased)
2013-01-18 16:17:40 +01:00
Rainer Gerhards
c0743225e8
refactor / simplify
2013-01-18 16:17:28 +01:00
Rainer Gerhards
eb5c7a0419
optimize: reduce nbr of strcpy() in FROMHOST processing
2013-01-18 14:40:41 +01:00
Rainer Gerhards
947cc0a45d
dnscache: switch to use hashtable instead of linked list
2013-01-18 13:47:43 +01:00
Rainer Gerhards
9273b4bb4d
optimize memory layout for much better cache hits
...
Moave element status out of batch_obj_t because we
get a *much* better cache hit ratio this way.
Note that this is really a HUGE saving, even if it
doesn't look so (both profiler data as well as
practical tests indicate that!).
2013-01-15 15:01:16 +01:00
Rainer Gerhards
c3cc001a4f
bugfix: regression from textpri() optimization
2013-01-15 12:30:03 +01:00
Rainer Gerhards
62b5ae05d6
optimize: use fixed size (8 bits) instead of enum
...
looks like GCC, even if optimizing, uses 32 bits - at least this
is suggested by the profiler results (both in terms of runtime and
cache misses).
2013-01-15 10:11:38 +01:00
Rainer Gerhards
855b68e1be
optimize: re-use already computed value!
2013-01-14 17:14:31 +01:00
Rainer Gerhards
eb97d25219
optimize: use built-in str comparison, as this is optimized in assembly
...
do only when possible. However, the profiler only shows as *very* minimal
effect.
2013-01-14 16:57:04 +01:00
Rainer Gerhards
beed1bda69
optimize: save inspection of already-inspected data
...
this is just a small improvement, but let's get the benefit ;)
2013-01-14 16:35:38 +01:00
Rainer Gerhards
227d8faed2
optimize: slight improvement due to isdigit() replacement
2013-01-14 16:18:46 +01:00
Rainer Gerhards
49d1203b35
optimize: iscntrl() seems to be surprisingly slow
...
at least so tells the profiler...
2013-01-14 15:52:42 +01:00
Rainer Gerhards
47e11d68b2
optimize: obtaining programname
...
included some additional refactoring for cleaner code
2013-01-14 13:44:36 +01:00
Rainer Gerhards
e5b8c02621
optimzize: msg/getNow() - remove snprintf
...
instead, we use a lookup table for the values.
2013-01-14 12:08:32 +01:00
Rainer Gerhards
55d222543f
optimize: permit cancel during object destruction
...
1) usually, no cancellation happens
2) even if so, there is no cancellation point inside the
destructors, so disabeling cancellation was mood in the first
place...
2013-01-14 11:50:13 +01:00
Rainer Gerhards
262d059990
optimize msg.c/textpri
...
remove snprintf() in favor for quicker code
2013-01-14 11:49:27 +01:00
Rainer Gerhards
4db33436f6
omfile: improved async writing, finally enabled full async write
...
also fixed a couple of smaller issues along that way
2013-01-14 09:43:46 +01:00
