xymon

Check-in [f6f74c080c]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix inverted sense of case-sensitivity + old libpcre building (oops, 7481) git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7499 44351d6e-118b-4698-b696-ce33095ecaa4
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | origin/4.3.19
Files: files | file ages | folders
SHA3-256: f6f74c080c81024fc2a6462614bd14dd35e0783695583d799930fab283ac9f74
User & Date: jccleaver@users.sf.net 2015-02-07 10:10:23
Context
2015-02-07
10:22
Add missing msg types in xymond statistics git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7500 44351d6e-118b-4698-b696-ce33095ecaa4 check-in: 1651e911ab user: jccleaver@users.sf.net tags: trunk, origin/4.3.19
10:10
Fix inverted sense of case-sensitivity + old libpcre building (oops, 7481) git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7499 44351d6e-118b-4698-b696-ce33095ecaa4 check-in: f6f74c080c user: jccleaver@users.sf.net tags: trunk, origin/4.3.19
10:00
Fix client local mode seen as duplicate report, from Guillaume Chane git-svn-id: http://svn.code.sf.net/p/xymon/code/branches/4.3.19@7498 44351d6e-118b-4698-b696-ce33095ecaa4 check-in: 1f428c6104 user: jccleaver@users.sf.net tags: trunk, origin/4.3.19
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to lib/matching.h.

18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

extern pcre *compileregex(const char *pattern);
extern pcre *compileregex_opts(const char *pattern, int flags);
#ifdef PCRE_FIRSTLINE
#define firstlineregex(P) compileregex_opts(P, PCRE_FIRSTLINE);
#define firstlineregexnocase(P) compileregex_opts(P, PCRE_CASELESS|PCRE_FIRSTLINE);
#else
#define firstlineregex(P) compileregex_opts(P);
#define firstlineregexnocase(P) compileregex_opts(P, PCRE_CASELESS);
#endif
extern pcre *multilineregex(const char *pattern);
extern int matchregex(char *needle, pcre *pcrecode);
extern void freeregex(pcre *pcrecode);
extern int namematch(char *needle, char *haystack, pcre *pcrecode);
extern int patternmatch(char *datatosearch, char *pattern, pcre *pcrecode);
extern pcre **compile_exprs(char *id, const char **patterns, int count);
extern int pickdata(char *buf, pcre *expr, int dupok, ...);
extern int timematch(char *holidaykey, char *tspec);
#endif

#endif







|













18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38

extern pcre *compileregex(const char *pattern);
extern pcre *compileregex_opts(const char *pattern, int flags);
#ifdef PCRE_FIRSTLINE
#define firstlineregex(P) compileregex_opts(P, PCRE_FIRSTLINE);
#define firstlineregexnocase(P) compileregex_opts(P, PCRE_CASELESS|PCRE_FIRSTLINE);
#else
#define firstlineregex(P) compileregex_opts(P, 0);
#define firstlineregexnocase(P) compileregex_opts(P, PCRE_CASELESS);
#endif
extern pcre *multilineregex(const char *pattern);
extern int matchregex(char *needle, pcre *pcrecode);
extern void freeregex(pcre *pcrecode);
extern int namematch(char *needle, char *haystack, pcre *pcrecode);
extern int patternmatch(char *datatosearch, char *pattern, pcre *pcrecode);
extern pcre **compile_exprs(char *id, const char **patterns, int count);
extern int pickdata(char *buf, pcre *expr, int dupok, ...);
extern int timematch(char *holidaykey, char *tspec);
#endif

#endif

Changes to xymond/xymond_channel.c.

488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
		else if (argnmatch(argv[argi], "--filter=")) {
			char *p = strchr(argv[argi], '=');
			msgfilter = compileregex(p+1);
			if (!msgfilter) {
				errprintf("Invalid filter (bad expression): %s\n", p+1);
			}
			else {
				stdfilter = firstlineregexnocase("^@@(logrotate|shutdown|drophost|droptest|renamehost|renametest)");
			}
		}
		else if (argnmatch(argv[argi], "--md5")) {
			checksumsize = 33;
		}
		else if (argnmatch(argv[argi], "--no-md5")) {
			checksumsize = 0;







|







488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
		else if (argnmatch(argv[argi], "--filter=")) {
			char *p = strchr(argv[argi], '=');
			msgfilter = compileregex(p+1);
			if (!msgfilter) {
				errprintf("Invalid filter (bad expression): %s\n", p+1);
			}
			else {
				stdfilter = firstlineregex("^@@(logrotate|shutdown|drophost|droptest|renamehost|renametest)");
			}
		}
		else if (argnmatch(argv[argi], "--md5")) {
			checksumsize = 33;
		}
		else if (argnmatch(argv[argi], "--no-md5")) {
			checksumsize = 0;