summaryrefslogtreecommitdiffstats
path: root/tcpsrv.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'v6-stable'Rainer Gerhards2012-08-251-1/+1
|\ | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac runtime/ruleset.c tools/syslogd.c
| * Merge branch 'v5-stable' into v6-stableRainer Gerhards2012-08-251-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog action.c configure.ac doc/manual.html runtime/ruleset.c template.h threads.c tools/syslogd.c
| | * changed TRUE/FALSE to RSTRUE/RSFALSERainer Gerhards2012-08-221-1/+1
| | | | | | | | | | | | This is done to prevent name claches with libraries.
| | * Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-191-3/+4
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog plugins/imtcp/imtcp.c tcpsrv.h
| | * \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-03-141-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac
| | * \ \ Merge branch 'v5-stable-newstats' into v5-develRainer Gerhards2012-01-161-16/+19
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: plugins/imtcp/imtcp.c
* | | | | | Merge branch 'beta'Rainer Gerhards2012-07-241-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: ChangeLog configure.ac
| * | | | | bugfix: imtcp aborted when more than 2 connections were used.Andre Lorbach2012-07-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incremented pthread stack size to 4MB for imtcp, imptcp and imttcp closes: http://bugzilla.adiscon.com/show_bug.cgi?id=342
* | | | | | implemented freeCnf() module interface & fixed some mem leaksRainer Gerhards2012-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The interface was actually not present in older versions, even though some modules already used it. The implementation was now done, and not in 6.3/6.4 because the resulting memory leak was ultra-slim and the new interface handling has some potential to seriously break things. Not the kind of thing you want to add in late beta state, if avoidable.
* | | | | | improved support for --enable-debuglessRainer Gerhards2012-05-291-7/+6
|/ / / / / | | | | | | | | | | | | | | | Now it's probably time to prove the effect in practice...
* | | | | tcpsrv: cleaned up patch, works now with multiple users as wellRainer Gerhards2012-05-181-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Note: "users" means modules, like imtcp and imdiag. NOT real users or devices.
* | | | | regression: tcpsrv.c always activated first worker, what lead to hangRainer Gerhards2012-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | ... if more than 3 fds were to be read at the same time.
* | | | | bugfix: imtcp could cause hang during receptionRainer Gerhards2012-05-161-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this also applied to other users of core file tcpsrv.c, but imtcp was by far the most prominent and widely-used, the rest rather exotic (like imdiag) NOTE: this patch is probably not 100% correct and may cause problems if multiple tcpsrv.c users existing within a configuration. The next step is to evaluate this and probably slightly change the worker thread startup/shutdown location.
* | | | | minor issue: tcpsrv did not decrement wrkr cnt on shutdownRainer Gerhards2012-05-151-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | I am not really sure if that is an issue at all, at least it is inconsistent.
* | | | | Merge branch 'v5-stable-newstats'Rainer Gerhards2012-04-071-3/+5
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: action.c configure.ac doc/imuxsock.html plugins/imklog/imklog.c plugins/imptcp/imptcp.c plugins/imtcp/imtcp.c plugins/imudp/imudp.c plugins/imuxsock/imuxsock.c runtime/glbl.c runtime/glbl.h runtime/net.c runtime/ruleset.c tcpsrv.h tools/syslogd.c
| * | | | added configuration directive to disable octet-counted framingRainer Gerhards2012-03-191-3/+4
| | |_|/ | |/| | | | | | | | | | ... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
| * | | added missing initialization of stats countersRainer Gerhards2012-03-141-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | this was necessary due to refactoring of the stats subsystem ... but should have been done in the first place when this code was written. Thanks to Kaiwang Chen for his analysis of the stats subsystem, which ultimately lead to this patch!
| * | Merge branch 'v5-stable' into v5-stable-newstatsRainer Gerhards2012-01-161-16/+19
| |\ \ | | | | | | | | | | | | | | | | Conflicts: plugins/impstats/impstats.c
* | \ \ 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
| | |