X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/0a49a7a4f1090b6f1ce1d0f9d969804c9226b53e..bd4ece7debfe8926fe99608da6cfe5aaac6a550b:/src/src/exim_dbutil.c diff --git a/src/src/exim_dbutil.c b/src/src/exim_dbutil.c index 1e94f33e6..72eee42e8 100644 --- a/src/src/exim_dbutil.c +++ b/src/src/exim_dbutil.c @@ -1,5 +1,3 @@ -/* $Cambridge: exim/src/src/exim_dbutil.c,v 1.12 2009/11/16 19:50:36 nm4 Exp $ */ - /************************************************* * Exim - an Internet mail transport agent * *************************************************/ @@ -27,38 +25,7 @@ There are a number of common subroutines, followed by three main programs, whose inclusion is controlled by -D on the compilation command. */ -/* Standard C headers and Unix headers */ - -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - - -/* These are two values from macros.h which should perhaps be accessible in -some better way than just repeating them here. */ - -#define WAIT_NAME_MAX 50 -#define MESSAGE_ID_LENGTH 16 - - -/* This selection of Exim headers contains exactly what we need, and hopefully -not too much extra baggage. */ - -#include "config.h" /* Needed to get the DB type */ -#include "mytypes.h" -#include "macros.h" -#include "dbstuff.h" -#include "osfunctions.h" -#include "store.h" +#include "exim.h" /* Identifiers for the different database types. */ @@ -70,6 +37,10 @@ not too much extra baggage. */ #define type_ratelimit 5 +/* This is used by our cut-down dbfn_open(). */ + +uschar *spool_directory; + /************************************************* @@ -101,7 +72,7 @@ printf("Berkeley DB error: %s\n", msg); * SIGALRM handler * *************************************************/ -static int sigalrm_seen; +SIGNAL_BOOL sigalrm_seen; void sigalrm_handler(int sig) @@ -169,7 +140,7 @@ Returns: nothing */ void -log_write(unsigned int selector, int flags, char *format, ...) +log_write(unsigned int selector, int flags, const char *format, ...) { va_list ap; va_start(ap, format); @@ -266,18 +237,18 @@ uses. We assume the database exists, and therefore give up if we cannot open the lock file. Arguments: - spool The spool directory name The single-component name of one of Exim's database files. flags O_RDONLY or O_RDWR dbblock Points to an open_db block to be filled in. + lof Unused. Returns: NULL if the open failed, or the locking failed. On success, dbblock is returned. This contains the dbm pointer and the fd of the locked lock file. */ -static open_db * -dbfn_open(uschar *spool, uschar *name, int flags, open_db *dbblock) +open_db * +dbfn_open(uschar *name, int flags, open_db *dbblock, BOOL lof) { int rc; struct flock lock_data; @@ -288,7 +259,7 @@ uschar buffer[256]; ensures that Exim has exclusive use of the database before it even tries to open it. If there is a database, there should be a lock file in existence. */ -sprintf(CS buffer, "%s/db/%s.lockfile", spool, name); +sprintf(CS buffer, "%s/db/%s.lockfile", spool_directory, name); dbblock->lockfd = Uopen(buffer, flags, 0); if (dbblock->lockfd < 0) @@ -323,7 +294,7 @@ if (rc < 0) /* At this point we have an opened and locked separate lock file, that is, exclusive access to the database, so we can go ahead and open it. */ -sprintf(CS buffer, "%s/db/%s", spool, name); +sprintf(CS buffer, "%s/db/%s", spool_directory, name); EXIM_DBOPEN(buffer, flags, 0, &(dbblock->dbptr)); if (dbblock->dbptr == NULL) @@ -357,7 +328,7 @@ Argument: a pointer to an open database block Returns: nothing */ -static void +void dbfn_close(open_db *dbblock) { EXIM_DBCLOSE(dbblock->dbptr); @@ -384,16 +355,20 @@ Returns: a pointer to the retrieved record, or NULL if the record is not found */ -static void * -dbfn_read_with_length(open_db *dbblock, uschar *key, int *length) +void * +dbfn_read_with_length(open_db *dbblock, const uschar *key, int *length) { void *yield; EXIM_DATUM key_datum, result_datum; +int klen = Ustrlen(key) + 1; +uschar * key_copy = store_get(klen); + +memcpy(key_copy, key, klen); EXIM_DATUM_INIT(key_datum); /* Some DBM libraries require the datum */ EXIM_DATUM_INIT(result_datum); /* to be cleared before use. */ -EXIM_DATUM_DATA(key_datum) = CS key; -EXIM_DATUM_SIZE(key_datum) = Ustrlen(key) + 1; +EXIM_DATUM_DATA(key_datum) = CS key_copy; +EXIM_DATUM_SIZE(key_datum) = klen; if (!EXIM_DBGET(dbblock->dbptr, key_datum, result_datum)) return NULL; @@ -424,17 +399,21 @@ Returns: the yield of the underlying dbm or db "write" function. If this is dbm, the value is zero for OK. */ -static int -dbfn_write(open_db *dbblock, uschar *key, void *ptr, int length) +int +dbfn_write(open_db *dbblock, const uschar *key, void *ptr, int length) { EXIM_DATUM key_datum, value_datum; dbdata_generic *gptr = (dbdata_generic *)ptr; +int klen = Ustrlen(key) + 1; +uschar * key_copy = store_get(klen); + +memcpy(key_copy, key, klen); gptr->time_stamp = time(NULL); EXIM_DATUM_INIT(key_datum); /* Some DBM libraries require the datum */ EXIM_DATUM_INIT(value_datum); /* to be cleared before use. */ -EXIM_DATUM_DATA(key_datum) = CS key; -EXIM_DATUM_SIZE(key_datum) = Ustrlen(key) + 1; +EXIM_DATUM_DATA(key_datum) = CS key_copy; +EXIM_DATUM_SIZE(key_datum) = klen; EXIM_DATUM_DATA(value_datum) = CS ptr; EXIM_DATUM_SIZE(value_datum) = length; return EXIM_DBPUT(dbblock->dbptr, key_datum, value_datum); @@ -454,13 +433,17 @@ Arguments: Returns: the yield of the underlying dbm or db "delete" function. */ -static int -dbfn_delete(open_db *dbblock, uschar *key) +int +dbfn_delete(open_db *dbblock, const uschar *key) { +int klen = Ustrlen(key) + 1; +uschar * key_copy = store_get(klen); + +memcpy(key_copy, key, klen); EXIM_DATUM key_datum; EXIM_DATUM_INIT(key_datum); /* Some DBM libraries require clearing */ -EXIM_DATUM_DATA(key_datum) = CS key; -EXIM_DATUM_SIZE(key_datum) = Ustrlen(key) + 1; +EXIM_DATUM_DATA(key_datum) = CS key_copy; +EXIM_DATUM_SIZE(key_datum) = klen; return EXIM_DBDEL(dbblock->dbptr, key_datum); } @@ -485,7 +468,7 @@ Returns: the next record from the file, or NULL if there are no more */ -static uschar * +uschar * dbfn_scan(open_db *dbblock, BOOL start, EXIM_CURSOR **cursor) { EXIM_DATUM key_datum, value_datum; @@ -531,7 +514,8 @@ uschar keybuffer[1024]; /* Check the arguments, and open the database */ dbdata_type = check_args(argc, argv, US"dumpdb", US""); -dbm = dbfn_open(argv[1], argv[2], O_RDONLY, &dbblock); +spool_directory = argv[1]; +dbm = dbfn_open(argv[2], O_RDONLY, &dbblock, FALSE); if (dbm == NULL) exit(1); /* Scan the file, formatting the information for each entry. Note @@ -545,6 +529,7 @@ while (key != NULL) dbdata_wait *wait; dbdata_callout_cache *callout; dbdata_ratelimit *ratelimit; + dbdata_ratelimit_unique *rate_unique; int count_bad = 0; int i, length; uschar *t; @@ -657,28 +642,27 @@ while (key != NULL) printf("\n"); } - /* Old-style domain record, without separate timestamps. This code can - eventually be thrown away, say in 5 years' time (it's now Feb 2003). */ + break; + case type_ratelimit: + if (Ustrstr(key, "/unique/") != NULL && length >= sizeof(*rate_unique)) + { + ratelimit = (dbdata_ratelimit *)value; + rate_unique = (dbdata_ratelimit_unique *)value; + printf("%s.%06d rate: %10.3f epoch: %s size: %u key: %s\n", + print_time(ratelimit->time_stamp), + ratelimit->time_usec, ratelimit->rate, + print_time(rate_unique->bloom_epoch), rate_unique->bloom_size, + keybuffer); + } else { - printf("%s %s callout=%s postmaster=%s random=%s\n", - print_time(((dbdata_generic *)value)->time_stamp), - keybuffer, - print_cache(callout->result), - print_cache(callout->postmaster_result), - print_cache(callout->random_result)); + ratelimit = (dbdata_ratelimit *)value; + printf("%s.%06d rate: %10.3f key: %s\n", + print_time(ratelimit->time_stamp), + ratelimit->time_usec, ratelimit->rate, + keybuffer); } - - break; - - case type_ratelimit: - ratelimit = (dbdata_ratelimit *)value; - - printf("%s.%06d rate: %10.3f key: %s\n", - print_time(ratelimit->time_stamp), ratelimit->time_usec, - ratelimit->rate, keybuffer); - break; } store_reset(value); @@ -752,6 +736,7 @@ for(;;) dbdata_wait *wait; dbdata_callout_cache *callout; dbdata_ratelimit *ratelimit; + dbdata_ratelimit_unique *rate_unique; int i, oldlength; uschar *t; uschar field[256], value[256]; @@ -788,7 +773,8 @@ for(;;) if (field[0] != 0) { int verify = 1; - dbm = dbfn_open(argv[1], argv[2], O_RDWR, &dbblock); + spool_directory = argv[1]; + dbm = dbfn_open(argv[2], O_RDWR, &dbblock, FALSE); if (dbm == NULL) continue; if (Ustrcmp(field, "d") == 0) @@ -895,7 +881,6 @@ for(;;) case type_ratelimit: ratelimit = (dbdata_ratelimit *)record; - length = sizeof(dbdata_ratelimit); switch(fieldno) { case 0: @@ -911,6 +896,51 @@ for(;;) ratelimit->rate = Ustrtod(value, NULL); break; + case 3: + if (Ustrstr(name, "/unique/") != NULL + && oldlength >= sizeof(dbdata_ratelimit_unique)) + { + rate_unique = (dbdata_ratelimit_unique *)record; + if ((tt = read_time(value)) > 0) rate_unique->bloom_epoch = tt; + else printf("bad time value\n"); + break; + } + /* else fall through */ + + case 4: + case 5: + if (Ustrstr(name, "/unique/") != NULL + && oldlength >= sizeof(dbdata_ratelimit_unique)) + { + /* see acl.c */ + BOOL seen; + unsigned n, hash, hinc; + uschar md5sum[16]; + md5 md5info; + md5_start(&md5info); + md5_end(&md5info, value, Ustrlen(value), md5sum); + hash = md5sum[0] << 0 | md5sum[1] << 8 + | md5sum[2] << 16 | md5sum[3] << 24; + hinc = md5sum[4] << 0 | md5sum[5] << 8 + | md5sum[6] << 16 | md5sum[7] << 24; + rate_unique = (dbdata_ratelimit_unique *)record; + seen = TRUE; + for (n = 0; n < 8; n++, hash += hinc) + { + int bit = 1 << (hash % 8); + int byte = (hash / 8) % rate_unique->bloom_size; + if ((rate_unique->bloom[byte] & bit) == 0) + { + seen = FALSE; + if (fieldno == 5) rate_unique->bloom[byte] |= bit; + } + } + printf("%s %s\n", + seen ? "seen" : fieldno == 5 ? "added" : "unseen", value); + break; + } + /* else fall through */ + default: printf("unknown field number\n"); verify = 0; @@ -919,7 +949,7 @@ for(;;) break; } - dbfn_write(dbm, name, record, length); + dbfn_write(dbm, name, record, oldlength); } } } @@ -940,7 +970,8 @@ for(;;) /* Handle a read request, or verify after an update. */ - dbm = dbfn_open(argv[1], argv[2], O_RDONLY, &dbblock); + spool_directory = argv[1]; + dbm = dbfn_open(argv[2], O_RDONLY, &dbblock, FALSE); if (dbm == NULL) continue; record = dbfn_read_with_length(dbm, name, &oldlength); @@ -1020,6 +1051,14 @@ for(;;) printf("0 time stamp: %s\n", print_time(ratelimit->time_stamp)); printf("1 fract. time: .%06d\n", ratelimit->time_usec); printf("2 sender rate: % .3f\n", ratelimit->rate); + if (Ustrstr(name, "/unique/") != NULL + && oldlength >= sizeof(dbdata_ratelimit_unique)) + { + rate_unique = (dbdata_ratelimit_unique *)record; + printf("3 filter epoch: %s\n", print_time(rate_unique->bloom_epoch)); + printf("4 test filter membership\n"); + printf("5 add element to filter\n"); + } break; } } @@ -1118,7 +1157,8 @@ database */ oldest = time(NULL) - maxkeep; printf("Tidying Exim hints database %s/db/%s\n", argv[1], argv[2]); -dbm = dbfn_open(argv[1], argv[2], O_RDWR, &dbblock); +spool_directory = argv[1]; +dbm = dbfn_open(argv[2], O_RDWR, &dbblock, FALSE); if (dbm == NULL) exit(1); /* Prepare for building file names */