Merge branch 'v4-stable' into v5-stable
authorRainer Gerhards <rgerhards@adiscon.com>
Mon, 16 Jan 2012 15:14:30 +0000 (16:14 +0100)
committerRainer Gerhards <rgerhards@adiscon.com>
Mon, 16 Jan 2012 15:14:30 +0000 (16:14 +0100)
Conflicts:
runtime/debug.h
runtime/obj.c
runtime/parser.h
runtime/wti.h

32 files changed:
1  2 
runtime/atomic.h
runtime/cfsysline.c
runtime/datetime.c
runtime/datetime.h
runtime/debug.c
runtime/debug.h
runtime/errmsg.h
runtime/expr.h
runtime/module-template.h
runtime/nsd.h
runtime/nsdsel_gtls.c
runtime/nssel.c
runtime/obj.c
runtime/objomsr.c
runtime/objomsr.h
runtime/parser.h
runtime/prop.c
runtime/regexp.c
runtime/rule.c
runtime/rule.h
runtime/ruleset.h
runtime/srUtils.h
runtime/srutils.c
runtime/stringbuf.c
runtime/strmsrv.c
runtime/sync.c
runtime/syslogd-types.h
runtime/sysvar.c
runtime/wti.c
runtime/wti.h
runtime/wtp.h
runtime/zlibw.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc runtime/debug.c
Simple merge
diff --cc runtime/debug.h
Simple merge
Simple merge
diff --cc runtime/expr.h
Simple merge
Simple merge
diff --cc runtime/nsd.h
Simple merge
Simple merge
diff --cc runtime/nssel.c
Simple merge
diff --cc runtime/obj.c
Simple merge
Simple merge
Simple merge
@@@ -1,71 -1,29 +1,70 @@@
  /* header for parser.c
 - * This is not yet an object, but contains all those code necessary to
 - * parse syslog messages.
   *
-  * Copyright 2008,2009 Rainer Gerhards and Adiscon GmbH.
+  * Copyright 2008-2012 Adiscon GmbH.
   *
   * This file is part of the rsyslog runtime library.
   *
-  * The rsyslog runtime library is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU Lesser General Public License as published by
-  * the Free Software Foundation, either version 3 of the License, or
-  * (at your option) any later version.
-  *
-  * The rsyslog runtime library is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public License
-  * along with the rsyslog runtime library.  If not, see <http://www.gnu.org/licenses/>.
-  *
-  * A copy of the LGPL can be found in the file "COPYING.LESSER" in this distribution.
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+  * You may obtain a copy of the License at
+  * 
+  *       http://www.apache.org/licenses/LICENSE-2.0
+  *       -or-
+  *       see COPYING.ASL20 in the source distribution
+  * 
+  * Unless required by applicable law or agreed to in writing, software
+  * distributed under the License is distributed on an "AS IS" BASIS,
+  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  * See the License for the specific language governing permissions and
+  * limitations under the License.
   */
 -#ifndef INCLUDED_PARSE_H
 -#define INCLUDED_PARSE_H
 +#ifndef INCLUDED_PARSER_H
 +#define INCLUDED_PARSER_H
  
 -extern rsRetVal parserClassInit(void);
 -extern rsRetVal parseMsg(msg_t*);
  
 -#endif /* #ifndef INCLUDED_PARSE_H */
 +/* we create a small helper object, a list of parsers, that we can use to
 + * build a chain of them whereever this is needed (initially thought to be
 + * used in ruleset.c as well as ourselvs).
 + */
 +struct parserList_s {
 +      parser_t *pParser;
 +      parserList_t *pNext;
 +};
 +
 +
 +/* the parser object, a dummy because we have only static methods */
 +struct parser_s {
 +      BEGINobjInstance;       /* Data to implement generic object - MUST be the first data element! */
 +      uchar *pName;           /* name of this parser */
 +      modInfo_t *pModule;     /* pointer to parser's module */
 +      sbool bDoSanitazion;    /* do standard message sanitazion before calling parser? */
 +      sbool bDoPRIParsing;    /* do standard PRI parsing before calling parser? */
 +};
 +
 +/* interfaces */
 +BEGINinterface(parser) /* name must also be changed in ENDinterface macro! */
 +      INTERFACEObjDebugPrint(var);
 +      rsRetVal (*Construct)(parser_t **ppThis);
 +      rsRetVal (*ConstructFinalize)(parser_t *pThis);
 +      rsRetVal (*Destruct)(parser_t **ppThis);
 +      rsRetVal (*SetName)(parser_t *pThis, uchar *name);
 +      rsRetVal (*SetModPtr)(parser_t *pThis, modInfo_t *pMod);
 +      rsRetVal (*SetDoSanitazion)(parser_t *pThis, int);
 +      rsRetVal (*SetDoPRIParsing)(parser_t *pThis, int);
 +      rsRetVal (*FindParser)(parser_t **ppThis, uchar*name);
 +      rsRetVal (*InitParserList)(parserList_t **pListRoot);
 +      rsRetVal (*DestructParserList)(parserList_t **pListRoot);
 +      rsRetVal (*AddParserToList)(parserList_t **pListRoot, parser_t *pParser);
 +      /* static functions */
 +      rsRetVal (*ParseMsg)(msg_t *pMsg);
 +      rsRetVal (*SanitizeMsg)(msg_t *pMsg);
 +      rsRetVal (*AddDfltParser)(uchar *);
 +ENDinterface(parser)
 +#define parserCURR_IF_VERSION 1 /* increment whenever you change the interface above! */
 +
 +
 +/* prototypes */
 +PROTOTYPEObj(parser);
 +
 +
 +#endif /* #ifndef INCLUDED_PARSER_H */
diff --cc runtime/prop.c
Simple merge
Simple merge
diff --cc runtime/rule.c
Simple merge
diff --cc runtime/rule.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc runtime/sync.c
Simple merge
Simple merge
Simple merge
diff --cc runtime/wti.c
Simple merge
diff --cc runtime/wti.h
Simple merge
diff --cc runtime/wtp.h
Simple merge
diff --cc runtime/zlibw.c
Simple merge