summaryrefslogtreecommitdiffstats
path: root/tcpsrv.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v5-stable' into masterRainer Gerhards2012-01-181-16/+19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.h configure.ac doc/manual.html plugins/immark/immark.c plugins/impstats/impstats.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c runtime/cfsysline.c runtime/cfsysline.h runtime/conf.c runtime/ctok.c runtime/ctok.h runtime/ctok_token.c runtime/ctok_token.h runtime/dnscache.h runtime/expr.c runtime/expr.h runtime/rule.c runtime/rule.h runtime/ruleset.h runtime/sysvar.c runtime/vm.h runtime/vmop.c runtime/vmop.h runtime/vmprg.c runtime/vmprg.h runtime/vmstk.c runtime/vmstk.h tools/omusrmsg.c
| * Merge branch 'v4-stable' into v5-stableRainer Gerhards2012-01-141-16/+19
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imfile/imfile.c plugins/omtesting/omtesting.c tcpsrv.c threads.c
| | * some more files to ASL 2.0Rainer Gerhards2012-01-111-16/+16
| | |
* | | Merge branch 'v5-devel'Rainer Gerhards2011-12-201-1/+14
|\ \ \
| * \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2011-12-201-1/+14
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imuxsock/imuxsock.c
| | * | | imtcp: added stats countersRainer Gerhards2011-12-201-1/+14
| | |/ / | | | | | | | | | | | | | | | | | | | | also adds counters to other users of tcpsrv.c method, but these do not work if default submit method is overwritten (currently only the case for imdiag, what we don't consider a problem)
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-06-271-0/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/imfile/imfile.c plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imuxsock/imuxsock.c plugins/mmsnmptrapd/mmsnmptrapd.c tools/omfile.c
| * | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-06-141-2/+3
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog tcpsrv.c
| | * | bugfix: memory leak in imtcp & subsystems under some circumstancesRainer Gerhards2011-06-101-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This leak is tied to error conditions which lead to incorrect cleanup of some data structures. Note: this is a backport from v6. In v5, we currently do not have the toolchain to verify the original problem and that it is solved. So this patch is preliminary and subject to change as work progresses.
| * | | Merge branch 'v4-devel' into v5-develRainer Gerhards2011-06-141-1/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: tcpsrv.c
| | * | bugfix: memory leak in imtcp & subsystems under some circumstancesRainer Gerhards2011-06-141-4/+6
| | | | | | | | | | | | | | | | | | | | This leak is tied to error conditions which lead to incorrect cleanup of some data structures. [backport from v6, limited testing under v4]
| * | | added capability for imtcp to activate keep-alive packetsRainer Gerhards2011-05-091-0/+14
| | | | | | | | | | | | | | | | | | | | at the socket layer. reference: http://kb.monitorware.com/post20791.html
| * | | Merge branch 'v5-stable' into v5-develRainer Gerhards2011-05-031-1/+2
| |\ \ \ | | | |/ | | |/|
* | | | bugfix: memory leak in imtcp & subsystems under some circumstancesRainer Gerhards2011-06-101-6/+11
| | | | | | | | | | | | | | | | | | | | This leak is tied to error conditions which lead to incorrect cleanup of some data structures.
* | | | step: imtcp did not properly handle privilege dropRainer Gerhards2011-05-061-1/+0
| | | |
* | | | Merge branch 'v5-stable'Rainer Gerhards2011-05-021-1/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'v4-stable' into v5-stableRainer Gerhards2011-05-021-1/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: tcpsrv.c
| | * | bugfix: TCP connection invalidly aborted when messages needed to be discardedRainer Gerhards2011-05-021-1/+1
| | | | | | | | | | | | | | | | due to QUEUE_FULL or similar problem
| | * | slightly more informative errmsg when TCP connection is abortedRainer Gerhards2011-05-021-3/+5
| | | |
* | | | cosmetic cleanupRainer Gerhards2011-05-021-2/+0
| | | |
* | | | minor: some better debug instrumentationRainer Gerhards2011-04-271-0/+1
| | | |
* | | | renaming conf.* wasn't a good idea -- undoingRainer Gerhards2011-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | too many dependencies, things get cluttered (and merging probably gets problematic). Now new config will be "conf2".
* | | | renamed conf.c to legacyconf.c to make room for new config systemRainer Gerhards2011-04-191-1/+1
| | | |
* | | | Merge branch 'v5-devel'Rainer Gerhards2011-04-121-0/+14
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: configure.ac doc/manual.html plugins/imtcp/imtcp.c
| * | | added new config directive $InputTCPFlowControl...Rainer Gerhards2011-04-011-0/+14
| |/ / | | | | | | | | | | | | ... to select if tcp received messages shall be flagged as light delayable or not.
* | | Merge branch 'v5-beta'Rainer Gerhards2011-03-111-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html plugins/omlibdbi/omlibdbi.c tests/Makefile.am tests/diag.sh
| * | added work-around for bug in gtls, which causes fd leak when using TLSBojan Smojver2011-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | The capability has been added for module to specify that they do not like being unloaded. related bug tracker: http://bugzilla.adiscon.com/show_bug.cgi?id=222 Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
* | | some cleanupRainer Gerhards2011-02-281-32/+0
| | |
* | | fixed very recent regression in tcpsrv.c & some cleanupRainer Gerhards2011-02-021-7/+6
| | | | | | | | | | | | forgot a debugging abort() ;)
* | | (somewhat) improved TLS subsystemRainer Gerhards2011-02-011-4/+8
| | | | | | | | | | | | | | | | | | - improved TLS error reporting - improved TLS startup (Diffie-Hellman bits do not need to be generated, as we do not support full anon key exchange -- we always need certs)
* | | tcpsrv select-handler experimentally moved to multi-threading as wellRainer Gerhards2011-01-311-13/+44
| | | | | | | | | | | | | | | first tests done with plain tcp, TLS subsystems tests need to be carried out. No serious lab testing done so far.
* | | fixing regression: multi-threading had racesRainer Gerhards2011-01-311-11/+19
| | |
* | | interim commit: current debug state of new imptcpRainer Gerhards2011-01-281-0/+14
| | | | | | | | | | | | | | | | | | I need to verify the concept used in a simpler environment, and this means I probably need to freeze the (non-working) state here for a couple of days.
* | | resolved problem with intermixing requestsRainer Gerhards2011-01-271-4/+23
| | |
* | | experimental: added thread pool to tcpsrv epoll handlerRainer Gerhards2011-01-271-25/+124
| | | | | | | | | | | | | | | this seems to work in lab, but is brand-new code. needs practice drill.
* | | interim commit: refactored epoll processingRainer Gerhards2011-01-261-10/+58
| | | | | | | | | | | | this is a perquisite for multi-threading the input handler
* | | tcpflood: time display was invalid due to wrong formatRainer Gerhards2011-01-261-0/+2
| | | | | | | | | | | | | | | | | | there was a systematic error in that decimals were 1/10th to small. No problem if you knew that, but otherwise a biggie... This is a bug in a recently introduced non-released feature.
* | | improved tcpsrv performance by enabling multiple-entry epollRainer Gerhards2011-01-251-13/+21
|/ / | | | | | | | | | | so far, we always pulled a single event from the epoll interface. Now 128, what should result in performance improvement (less API calls) on busy systems. Most importantly affects imtcp.
* | added capability to turn off standard LF delimiter in TCP serverRainer Gerhards2010-03-011-1/+15
| | | | | | | | via new directive "$InputTCPServerDisableLFDelimiter on"
* | fixing some potential segfault conditionsRainer Gerhards2009-11-251-12/+21
| |
* | milestone commit: first working version with epoll/tcpRainer Gerhards2009-11-231-69/+37
| | | | | | | | ... but not well-tested, so there may be many hidden bugs.
* | milestone: working towards utilizing epoll interfaceRainer Gerhards2009-11-191-9/+24
| | | | | | | | NOTE: this version does NOT run - tcp-based servers are defunct.
* | milestone commit: first driver layer call doneRainer Gerhards2009-11-181-4/+114
| | | | | | | | | | ... does not really run. We can now call into the epoll driver, but not handle epoll(). The driver also needs more modifications.
* | added a bit of doc and improved an error messageRainer Gerhards2009-11-111-2/+3
| |
* | enhanced test environment (including testbench)Rainer Gerhards2009-10-221-1/+1
| | | | | | | | | | | | | | | | support for enhancing probability of memory addressing failure by using non-NULL default value for malloced memory (optional, only if requested by configure option). This helps to track down some otherwise undetected issues within the testbench and is expected to be very useful in the future.
* | improved input thread termination for imtcp and imuxsockRainer Gerhards2009-10-161-0/+4
| |
* | Merge branch 'v4-devel' into tmpRainer Gerhards2009-10-021-0/+19
|\| | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac doc/manual.html runtime/rsyslog.h tcpsrv.c
| * bumped version number, corrected error message code (minor nit)Rainer Gerhards2009-10-011-1/+1
| |
| * added $InputTCPServerNotifyOnConnectionClose config directiveRainer Gerhards2009-10-011-0/+19
| |
* | Merge branch 'beta'Rainer Gerhards2009-08-181-12/+32
|\|