Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/include/common/uthash.h b/include/common/uthash.h
- new file mode 100644
- index 0000000..b6cec34
- --- /dev/null
- +++ b/include/common/uthash.h
- @@ -0,0 +1,912 @@
- +/*
- +Copyright (c) 2003-2011, Troy D. Hanson http://uthash.sourceforge.net
- +All rights reserved.
- +
- +Redistribution and use in source and binary forms, with or without
- +modification, are permitted provided that the following conditions are met:
- +
- + * Redistributions of source code must retain the above copyright
- + notice, this list of conditions and the following disclaimer.
- +
- +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- +IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- +TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- +OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- +*/
- +
- +#ifndef UTHASH_H
- +#define UTHASH_H
- +
- +#include <string.h> /* memcmp,strlen */
- +#include <stddef.h> /* ptrdiff_t */
- +#include <stdlib.h> /* exit() */
- +
- +/* These macros use decltype or the earlier __typeof GNU extension.
- + As decltype is only available in newer compilers (VS2010 or gcc 4.3+
- + when compiling c++ source) this code uses whatever method is needed
- + or, for VS2008 where neither is available, uses casting workarounds. */
- +#ifdef _MSC_VER /* MS compiler */
- +#if _MSC_VER >= 1600 && defined(__cplusplus) /* VS2010 or newer in C++ mode */
- +#define DECLTYPE(x) (decltype(x))
- +#else /* VS2008 or older (or VS2010 in C mode) */
- +#define NO_DECLTYPE
- +#define DECLTYPE(x)
- +#endif
- +#else /* GNU, Sun and other compilers */
- +#define DECLTYPE(x) (__typeof(x))
- +#endif
- +
- +#ifdef NO_DECLTYPE
- +#define DECLTYPE_ASSIGN(dst,src) \
- +do { \
- + char **_da_dst = (char**)(&(dst)); \
- + *_da_dst = (char*)(src); \
- +} while(0)
- +#else
- +#define DECLTYPE_ASSIGN(dst,src) \
- +do { \
- + (dst) = DECLTYPE(dst)(src); \
- +} while(0)
- +#endif
- +
- +/* a number of the hash function use uint32_t which isn't defined on win32 */
- +#ifdef _MSC_VER
- +typedef unsigned int uint32_t;
- +typedef unsigned char uint8_t;
- +#else
- +#include <inttypes.h> /* uint32_t */
- +#endif
- +
- +#define UTHASH_VERSION 1.9.4
- +
- +/* #define uthash_fatal(msg) exit(-1) */ /* fatal error (out of memory,etc) */
- +
- +/* ha-proxy incursion */
- +#define uthash_fatal do { \
- + Alert(msg); \
- + exit(1); \
- +} while(0)
- +
- +#define uthash_malloc(sz) malloc(sz) /* malloc fcn */
- +#define uthash_free(ptr,sz) free(ptr) /* free fcn */
- +
- +#define uthash_noexpand_fyi(tbl) /* can be defined to log noexpand */
- +#define uthash_expand_fyi(tbl) /* can be defined to log expands */
- +
- +/* initial number of buckets */
- +#define HASH_INITIAL_NUM_BUCKETS 32 /* initial number of buckets */
- +#define HASH_INITIAL_NUM_BUCKETS_LOG2 5 /* lg2 of initial number of buckets */
- +#define HASH_BKT_CAPACITY_THRESH 10 /* expand when bucket count reaches */
- +
- +/* calculate the element whose hash handle address is hhe */
- +#define ELMT_FROM_HH(tbl,hhp) ((void*)(((char*)(hhp)) - ((tbl)->hho)))
- +
- +#define HASH_FIND(hh,head,keyptr,keylen,out) \
- +do { \
- + unsigned _hf_bkt,_hf_hashv; \
- + out=NULL; \
- + if (head) { \
- + HASH_FCN(keyptr,keylen, (head)->hh.tbl->num_buckets, _hf_hashv, _hf_bkt); \
- + if (HASH_BLOOM_TEST((head)->hh.tbl, _hf_hashv)) { \
- + HASH_FIND_IN_BKT((head)->hh.tbl, hh, (head)->hh.tbl->buckets[ _hf_bkt ], \
- + keyptr,keylen,out); \
- + } \
- + } \
- +} while (0)
- +
- +#ifdef HASH_BLOOM
- +#define HASH_BLOOM_BITLEN (1ULL << HASH_BLOOM)
- +#define HASH_BLOOM_BYTELEN (HASH_BLOOM_BITLEN/8) + ((HASH_BLOOM_BITLEN%8) ? 1:0)
- +#define HASH_BLOOM_MAKE(tbl) \
- +do { \
- + (tbl)->bloom_nbits = HASH_BLOOM; \
- + (tbl)->bloom_bv = (uint8_t*)uthash_malloc(HASH_BLOOM_BYTELEN); \
- + if (!((tbl)->bloom_bv)) { uthash_fatal( "out of memory"); } \
- + memset((tbl)->bloom_bv, 0, HASH_BLOOM_BYTELEN); \
- + (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE; \
- +} while (0);
- +
- +#define HASH_BLOOM_FREE(tbl) \
- +do { \
- + uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN); \
- +} while (0);
- +
- +#define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8] |= (1U << ((idx)%8)))
- +#define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8] & (1U << ((idx)%8)))
- +
- +#define HASH_BLOOM_ADD(tbl,hashv) \
- + HASH_BLOOM_BITSET((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1)))
- +
- +#define HASH_BLOOM_TEST(tbl,hashv) \
- + HASH_BLOOM_BITTEST((tbl)->bloom_bv, (hashv & (uint32_t)((1ULL << (tbl)->bloom_nbits) - 1)))
- +
- +#else
- +#define HASH_BLOOM_MAKE(tbl)
- +#define HASH_BLOOM_FREE(tbl)
- +#define HASH_BLOOM_ADD(tbl,hashv)
- +#define HASH_BLOOM_TEST(tbl,hashv) (1)
- +#endif
- +
- +#define HASH_MAKE_TABLE(hh,head) \
- +do { \
- + (head)->hh.tbl = (UT_hash_table*)uthash_malloc( \
- + sizeof(UT_hash_table)); \
- + if (!((head)->hh.tbl)) { uthash_fatal( "out of memory"); } \
- + memset((head)->hh.tbl, 0, sizeof(UT_hash_table)); \
- + (head)->hh.tbl->tail = &((head)->hh); \
- + (head)->hh.tbl->num_buckets = HASH_INITIAL_NUM_BUCKETS; \
- + (head)->hh.tbl->log2_num_buckets = HASH_INITIAL_NUM_BUCKETS_LOG2; \
- + (head)->hh.tbl->hho = (char*)(&(head)->hh) - (char*)(head); \
- + (head)->hh.tbl->buckets = (UT_hash_bucket*)uthash_malloc( \
- + HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \
- + if (! (head)->hh.tbl->buckets) { uthash_fatal( "out of memory"); } \
- + memset((head)->hh.tbl->buckets, 0, \
- + HASH_INITIAL_NUM_BUCKETS*sizeof(struct UT_hash_bucket)); \
- + HASH_BLOOM_MAKE((head)->hh.tbl); \
- + (head)->hh.tbl->signature = HASH_SIGNATURE; \
- +} while(0)
- +
- +#define HASH_ADD(hh,head,fieldname,keylen_in,add) \
- + HASH_ADD_KEYPTR(hh,head,&((add)->fieldname),keylen_in,add)
- +
- +#define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) \
- +do { \
- + unsigned _ha_bkt; \
- + (add)->hh.next = NULL; \
- + (add)->hh.key = (char*)keyptr; \
- + (add)->hh.keylen = keylen_in; \
- + if (!(head)) { \
- + head = (add); \
- + (head)->hh.prev = NULL; \
- + HASH_MAKE_TABLE(hh,head); \
- + } else { \
- + (head)->hh.tbl->tail->next = (add); \
- + (add)->hh.prev = ELMT_FROM_HH((head)->hh.tbl, (head)->hh.tbl->tail); \
- + (head)->hh.tbl->tail = &((add)->hh); \
- + } \
- + (head)->hh.tbl->num_items++; \
- + (add)->hh.tbl = (head)->hh.tbl; \
- + HASH_FCN(keyptr,keylen_in, (head)->hh.tbl->num_buckets, \
- + (add)->hh.hashv, _ha_bkt); \
- + HASH_ADD_TO_BKT((head)->hh.tbl->buckets[_ha_bkt],&(add)->hh); \
- + HASH_BLOOM_ADD((head)->hh.tbl,(add)->hh.hashv); \
- + HASH_EMIT_KEY(hh,head,keyptr,keylen_in); \
- + HASH_FSCK(hh,head); \
- +} while(0)
- +
- +#define HASH_TO_BKT( hashv, num_bkts, bkt ) \
- +do { \
- + bkt = ((hashv) & ((num_bkts) - 1)); \
- +} while(0)
- +
- +/* delete "delptr" from the hash table.
- + * "the usual" patch-up process for the app-order doubly-linked-list.
- + * The use of _hd_hh_del below deserves special explanation.
- + * These used to be expressed using (delptr) but that led to a bug
- + * if someone used the same symbol for the head and deletee, like
- + * HASH_DELETE(hh,users,users);
- + * We want that to work, but by changing the head (users) below
- + * we were forfeiting our ability to further refer to the deletee (users)
- + * in the patch-up process. Solution: use scratch space to
- + * copy the deletee pointer, then the latter references are via that
- + * scratch pointer rather than through the repointed (users) symbol.
- + */
- +#define HASH_DELETE(hh,head,delptr) \
- +do { \
- + unsigned _hd_bkt; \
- + struct UT_hash_handle *_hd_hh_del; \
- + if ( ((delptr)->hh.prev == NULL) && ((delptr)->hh.next == NULL) ) { \
- + uthash_free((head)->hh.tbl->buckets, \
- + (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \
- + HASH_BLOOM_FREE((head)->hh.tbl); \
- + uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \
- + head = NULL; \
- + } else { \
- + _hd_hh_del = &((delptr)->hh); \
- + if ((delptr) == ELMT_FROM_HH((head)->hh.tbl,(head)->hh.tbl->tail)) { \
- + (head)->hh.tbl->tail = \
- + (UT_hash_handle*)((char*)((delptr)->hh.prev) + \
- + (head)->hh.tbl->hho); \
- + } \
- + if ((delptr)->hh.prev) { \
- + ((UT_hash_handle*)((char*)((delptr)->hh.prev) + \
- + (head)->hh.tbl->hho))->next = (delptr)->hh.next; \
- + } else { \
- + DECLTYPE_ASSIGN(head,(delptr)->hh.next); \
- + } \
- + if (_hd_hh_del->next) { \
- + ((UT_hash_handle*)((char*)_hd_hh_del->next + \
- + (head)->hh.tbl->hho))->prev = \
- + _hd_hh_del->prev; \
- + } \
- + HASH_TO_BKT( _hd_hh_del->hashv, (head)->hh.tbl->num_buckets, _hd_bkt); \
- + HASH_DEL_IN_BKT(hh,(head)->hh.tbl->buckets[_hd_bkt], _hd_hh_del); \
- + (head)->hh.tbl->num_items--; \
- + } \
- + HASH_FSCK(hh,head); \
- +} while (0)
- +
- +
- +/* convenience forms of HASH_FIND/HASH_ADD/HASH_DEL */
- +#define HASH_FIND_STR(head,findstr,out) \
- + HASH_FIND(hh,head,findstr,strlen(findstr),out)
- +#define HASH_ADD_STR(head,strfield,add) \
- + HASH_ADD(hh,head,strfield,strlen(add->strfield),add)
- +#define HASH_FIND_INT(head,findint,out) \
- + HASH_FIND(hh,head,findint,sizeof(int),out)
- +#define HASH_ADD_INT(head,intfield,add) \
- + HASH_ADD(hh,head,intfield,sizeof(int),add)
- +#define HASH_FIND_PTR(head,findptr,out) \
- + HASH_FIND(hh,head,findptr,sizeof(void *),out)
- +#define HASH_ADD_PTR(head,ptrfield,add) \
- + HASH_ADD(hh,head,ptrfield,sizeof(void *),add)
- +#define HASH_DEL(head,delptr) \
- + HASH_DELETE(hh,head,delptr)
- +
- +/* HASH_FSCK checks hash integrity on every add/delete when HASH_DEBUG is defined.
- + * This is for uthash developer only; it compiles away if HASH_DEBUG isn't defined.
- + */
- +#ifdef HASH_DEBUG
- +#define HASH_OOPS(...) do { fprintf(stderr,__VA_ARGS__); exit(-1); } while (0)
- +#define HASH_FSCK(hh,head) \
- +do { \
- + unsigned _bkt_i; \
- + unsigned _count, _bkt_count; \
- + char *_prev; \
- + struct UT_hash_handle *_thh; \
- + if (head) { \
- + _count = 0; \
- + for( _bkt_i = 0; _bkt_i < (head)->hh.tbl->num_buckets; _bkt_i++) { \
- + _bkt_count = 0; \
- + _thh = (head)->hh.tbl->buckets[_bkt_i].hh_head; \
- + _prev = NULL; \
- + while (_thh) { \
- + if (_prev != (char*)(_thh->hh_prev)) { \
- + HASH_OOPS("invalid hh_prev %p, actual %p\n", \
- + _thh->hh_prev, _prev ); \
- + } \
- + _bkt_count++; \
- + _prev = (char*)(_thh); \
- + _thh = _thh->hh_next; \
- + } \
- + _count += _bkt_count; \
- + if ((head)->hh.tbl->buckets[_bkt_i].count != _bkt_count) { \
- + HASH_OOPS("invalid bucket count %d, actual %d\n", \
- + (head)->hh.tbl->buckets[_bkt_i].count, _bkt_count); \
- + } \
- + } \
- + if (_count != (head)->hh.tbl->num_items) { \
- + HASH_OOPS("invalid hh item count %d, actual %d\n", \
- + (head)->hh.tbl->num_items, _count ); \
- + } \
- + /* traverse hh in app order; check next/prev integrity, count */ \
- + _count = 0; \
- + _prev = NULL; \
- + _thh = &(head)->hh; \
- + while (_thh) { \
- + _count++; \
- + if (_prev !=(char*)(_thh->prev)) { \
- + HASH_OOPS("invalid prev %p, actual %p\n", \
- + _thh->prev, _prev ); \
- + } \
- + _prev = (char*)ELMT_FROM_HH((head)->hh.tbl, _thh); \
- + _thh = ( _thh->next ? (UT_hash_handle*)((char*)(_thh->next) + \
- + (head)->hh.tbl->hho) : NULL ); \
- + } \
- + if (_count != (head)->hh.tbl->num_items) { \
- + HASH_OOPS("invalid app item count %d, actual %d\n", \
- + (head)->hh.tbl->num_items, _count ); \
- + } \
- + } \
- +} while (0)
- +#else
- +#define HASH_FSCK(hh,head)
- +#endif
- +
- +/* When compiled with -DHASH_EMIT_KEYS, length-prefixed keys are emitted to
- + * the descriptor to which this macro is defined for tuning the hash function.
- + * The app can #include <unistd.h> to get the prototype for write(2). */
- +#ifdef HASH_EMIT_KEYS
- +#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen) \
- +do { \
- + unsigned _klen = fieldlen; \
- + write(HASH_EMIT_KEYS, &_klen, sizeof(_klen)); \
- + write(HASH_EMIT_KEYS, keyptr, fieldlen); \
- +} while (0)
- +#else
- +#define HASH_EMIT_KEY(hh,head,keyptr,fieldlen)
- +#endif
- +
- +/* default to Jenkin's hash unless overridden e.g. DHASH_FUNCTION=HASH_SAX */
- +#ifdef HASH_FUNCTION
- +#define HASH_FCN HASH_FUNCTION
- +#else
- +#define HASH_FCN HASH_JEN
- +#endif
- +
- +/* The Bernstein hash function, used in Perl prior to v5.6 */
- +#define HASH_BER(key,keylen,num_bkts,hashv,bkt) \
- +do { \
- + unsigned _hb_keylen=keylen; \
- + char *_hb_key=(char*)(key); \
- + (hashv) = 0; \
- + while (_hb_keylen--) { (hashv) = ((hashv) * 33) + *_hb_key++; } \
- + bkt = (hashv) & (num_bkts-1); \
- +} while (0)
- +
- +
- +/* SAX/FNV/OAT/JEN hash functions are macro variants of those listed at
- + * http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx */
- +#define HASH_SAX(key,keylen,num_bkts,hashv,bkt) \
- +do { \
- + unsigned _sx_i; \
- + char *_hs_key=(char*)(key); \
- + hashv = 0; \
- + for(_sx_i=0; _sx_i < keylen; _sx_i++) \
- + hashv ^= (hashv << 5) + (hashv >> 2) + _hs_key[_sx_i]; \
- + bkt = hashv & (num_bkts-1); \
- +} while (0)
- +
- +#define HASH_FNV(key,keylen,num_bkts,hashv,bkt) \
- +do { \
- + unsigned _fn_i; \
- + char *_hf_key=(char*)(key); \
- + hashv = 2166136261UL; \
- + for(_fn_i=0; _fn_i < keylen; _fn_i++) \
- + hashv = (hashv * 16777619) ^ _hf_key[_fn_i]; \
- + bkt = hashv & (num_bkts-1); \
- +} while(0);
- +
- +#define HASH_OAT(key,keylen,num_bkts,hashv,bkt) \
- +do { \
- + unsigned _ho_i; \
- + char *_ho_key=(char*)(key); \
- + hashv = 0; \
- + for(_ho_i=0; _ho_i < keylen; _ho_i++) { \
- + hashv += _ho_key[_ho_i]; \
- + hashv += (hashv << 10); \
- + hashv ^= (hashv >> 6); \
- + } \
- + hashv += (hashv << 3); \
- + hashv ^= (hashv >> 11); \
- + hashv += (hashv << 15); \
- + bkt = hashv & (num_bkts-1); \
- +} while(0)
- +
- +#define HASH_JEN_MIX(a,b,c) \
- +do { \
- + a -= b; a -= c; a ^= ( c >> 13 ); \
- + b -= c; b -= a; b ^= ( a << 8 ); \
- + c -= a; c -= b; c ^= ( b >> 13 ); \
- + a -= b; a -= c; a ^= ( c >> 12 ); \
- + b -= c; b -= a; b ^= ( a << 16 ); \
- + c -= a; c -= b; c ^= ( b >> 5 ); \
- + a -= b; a -= c; a ^= ( c >> 3 ); \
- + b -= c; b -= a; b ^= ( a << 10 ); \
- + c -= a; c -= b; c ^= ( b >> 15 ); \
- +} while (0)
- +
- +#define HASH_JEN(key,keylen,num_bkts,hashv,bkt) \
- +do { \
- + unsigned _hj_i,_hj_j,_hj_k; \
- + char *_hj_key=(char*)(key); \
- + hashv = 0xfeedbeef; \
- + _hj_i = _hj_j = 0x9e3779b9; \
- + _hj_k = keylen; \
- + while (_hj_k >= 12) { \
- + _hj_i += (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 ) \
- + + ( (unsigned)_hj_key[2] << 16 ) \
- + + ( (unsigned)_hj_key[3] << 24 ) ); \
- + _hj_j += (_hj_key[4] + ( (unsigned)_hj_key[5] << 8 ) \
- + + ( (unsigned)_hj_key[6] << 16 ) \
- + + ( (unsigned)_hj_key[7] << 24 ) ); \
- + hashv += (_hj_key[8] + ( (unsigned)_hj_key[9] << 8 ) \
- + + ( (unsigned)_hj_key[10] << 16 ) \
- + + ( (unsigned)_hj_key[11] << 24 ) ); \
- + \
- + HASH_JEN_MIX(_hj_i, _hj_j, hashv); \
- + \
- + _hj_key += 12; \
- + _hj_k -= 12; \
- + } \
- + hashv += keylen; \
- + switch ( _hj_k ) { \
- + case 11: hashv += ( (unsigned)_hj_key[10] << 24 ); \
- + case 10: hashv += ( (unsigned)_hj_key[9] << 16 ); \
- + case 9: hashv += ( (unsigned)_hj_key[8] << 8 ); \
- + case 8: _hj_j += ( (unsigned)_hj_key[7] << 24 ); \
- + case 7: _hj_j += ( (unsigned)_hj_key[6] << 16 ); \
- + case 6: _hj_j += ( (unsigned)_hj_key[5] << 8 ); \
- + case 5: _hj_j += _hj_key[4]; \
- + case 4: _hj_i += ( (unsigned)_hj_key[3] << 24 ); \
- + case 3: _hj_i += ( (unsigned)_hj_key[2] << 16 ); \
- + case 2: _hj_i += ( (unsigned)_hj_key[1] << 8 ); \
- + case 1: _hj_i += _hj_key[0]; \
- + } \
- + HASH_JEN_MIX(_hj_i, _hj_j, hashv); \
- + bkt = hashv & (num_bkts-1); \
- +} while(0)
- +
- +/* The Paul Hsieh hash function */
- +#undef get16bits
- +#if (defined(__GNUC__) && defined(__i386__)) || defined(__WATCOMC__) \
- + || defined(_MSC_VER) || defined (__BORLANDC__) || defined (__TURBOC__)
- +#define get16bits(d) (*((const uint16_t *) (d)))
- +#endif
- +
- +#if !defined (get16bits)
- +#define get16bits(d) ((((uint32_t)(((const uint8_t *)(d))[1])) << 8) \
- + +(uint32_t)(((const uint8_t *)(d))[0]) )
- +#endif
- +#define HASH_SFH(key,keylen,num_bkts,hashv,bkt) \
- +do { \
- + char *_sfh_key=(char*)(key); \
- + uint32_t _sfh_tmp, _sfh_len = keylen; \
- + \
- + int _sfh_rem = _sfh_len & 3; \
- + _sfh_len >>= 2; \
- + hashv = 0xcafebabe; \
- + \
- + /* Main loop */ \
- + for (;_sfh_len > 0; _sfh_len--) { \
- + hashv += get16bits (_sfh_key); \
- + _sfh_tmp = (get16bits (_sfh_key+2) << 11) ^ hashv; \
- + hashv = (hashv << 16) ^ _sfh_tmp; \
- + _sfh_key += 2*sizeof (uint16_t); \
- + hashv += hashv >> 11; \
- + } \
- + \
- + /* Handle end cases */ \
- + switch (_sfh_rem) { \
- + case 3: hashv += get16bits (_sfh_key); \
- + hashv ^= hashv << 16; \
- + hashv ^= _sfh_key[sizeof (uint16_t)] << 18; \
- + hashv += hashv >> 11; \
- + break; \
- + case 2: hashv += get16bits (_sfh_key); \
- + hashv ^= hashv << 11; \
- + hashv += hashv >> 17; \
- + break; \
- + case 1: hashv += *_sfh_key; \
- + hashv ^= hashv << 10; \
- + hashv += hashv >> 1; \
- + } \
- + \
- + /* Force "avalanching" of final 127 bits */ \
- + hashv ^= hashv << 3; \
- + hashv += hashv >> 5; \
- + hashv ^= hashv << 4; \
- + hashv += hashv >> 17; \
- + hashv ^= hashv << 25; \
- + hashv += hashv >> 6; \
- + bkt = hashv & (num_bkts-1); \
- +} while(0);
- +
- +#ifdef HASH_USING_NO_STRICT_ALIASING
- +/* The MurmurHash exploits some CPU's (x86,x86_64) tolerance for unaligned reads.
- + * For other types of CPU's (e.g. Sparc) an unaligned read causes a bus error.
- + * MurmurHash uses the faster approach only on CPU's where we know it's safe.
- + *
- + * Note the preprocessor built-in defines can be emitted using:
- + *
- + * gcc -m64 -dM -E - < /dev/null (on gcc)
- + * cc -## a.c (where a.c is a simple test file) (Sun Studio)
- + */
- +#if (defined(__i386__) || defined(__x86_64__))
- +#define MUR_GETBLOCK(p,i) p[i]
- +#else /* non intel */
- +#define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 0x3) == 0)
- +#define MUR_PLUS1_ALIGNED(p) (((unsigned long)p & 0x3) == 1)
- +#define MUR_PLUS2_ALIGNED(p) (((unsigned long)p & 0x3) == 2)
- +#define MUR_PLUS3_ALIGNED(p) (((unsigned long)p & 0x3) == 3)
- +#define WP(p) ((uint32_t*)((unsigned long)(p) & ~3UL))
- +#if (defined(__BIG_ENDIAN__) || defined(SPARC) || defined(__ppc__) || defined(__ppc64__))
- +#define MUR_THREE_ONE(p) ((((*WP(p))&0x00ffffff) << 8) | (((*(WP(p)+1))&0xff000000) >> 24))
- +#define MUR_TWO_TWO(p) ((((*WP(p))&0x0000ffff) <<16) | (((*(WP(p)+1))&0xffff0000) >> 16))
- +#define MUR_ONE_THREE(p) ((((*WP(p))&0x000000ff) <<24) | (((*(WP(p)+1))&0xffffff00) >> 8))
- +#else /* assume little endian non-intel */
- +#define MUR_THREE_ONE(p) ((((*WP(p))&0xffffff00) >> 8) | (((*(WP(p)+1))&0x000000ff) << 24))
- +#define MUR_TWO_TWO(p) ((((*WP(p))&0xffff0000) >>16) | (((*(WP(p)+1))&0x0000ffff) << 16))
- +#define MUR_ONE_THREE(p) ((((*WP(p))&0xff000000) >>24) | (((*(WP(p)+1))&0x00ffffff) << 8))
- +#endif
- +#define MUR_GETBLOCK(p,i) (MUR_PLUS0_ALIGNED(p) ? ((p)[i]) : \
- + (MUR_PLUS1_ALIGNED(p) ? MUR_THREE_ONE(p) : \
- + (MUR_PLUS2_ALIGNED(p) ? MUR_TWO_TWO(p) : \
- + MUR_ONE_THREE(p))))
- +#endif
- +#define MUR_ROTL32(x,r) (((x) << (r)) | ((x) >> (32 - (r))))
- +#define MUR_FMIX(_h) \
- +do { \
- + _h ^= _h >> 16; \
- + _h *= 0x85ebca6b; \
- + _h ^= _h >> 13; \
- + _h *= 0xc2b2ae35l; \
- + _h ^= _h >> 16; \
- +} while(0)
- +
- +#define HASH_MUR(key,keylen,num_bkts,hashv,bkt) \
- +do { \
- + const uint8_t *_mur_data = (const uint8_t*)(key); \
- + const int _mur_nblocks = (keylen) / 4; \
- + uint32_t _mur_h1 = 0xf88D5353; \
- + uint32_t _mur_c1 = 0xcc9e2d51; \
- + uint32_t _mur_c2 = 0x1b873593; \
- + const uint32_t *_mur_blocks = (const uint32_t*)(_mur_data+_mur_nblocks*4); \
- + int _mur_i; \
- + for(_mur_i = -_mur_nblocks; _mur_i; _mur_i++) { \
- + uint32_t _mur_k1 = MUR_GETBLOCK(_mur_blocks,_mur_i); \
- + _mur_k1 *= _mur_c1; \
- + _mur_k1 = MUR_ROTL32(_mur_k1,15); \
- + _mur_k1 *= _mur_c2; \
- + \
- + _mur_h1 ^= _mur_k1; \
- + _mur_h1 = MUR_ROTL32(_mur_h1,13); \
- + _mur_h1 = _mur_h1*5+0xe6546b64; \
- + } \
- + const uint8_t *_mur_tail = (const uint8_t*)(_mur_data + _mur_nblocks*4); \
- + uint32_t _mur_k1=0; \
- + switch((keylen) & 3) { \
- + case 3: _mur_k1 ^= _mur_tail[2] << 16; \
- + case 2: _mur_k1 ^= _mur_tail[1] << 8; \
- + case 1: _mur_k1 ^= _mur_tail[0]; \
- + _mur_k1 *= _mur_c1; \
- + _mur_k1 = MUR_ROTL32(_mur_k1,15); \
- + _mur_k1 *= _mur_c2; \
- + _mur_h1 ^= _mur_k1; \
- + } \
- + _mur_h1 ^= (keylen); \
- + MUR_FMIX(_mur_h1); \
- + hashv = _mur_h1; \
- + bkt = hashv & (num_bkts-1); \
- +} while(0)
- +#endif /* HASH_USING_NO_STRICT_ALIASING */
- +
- +/* key comparison function; return 0 if keys equal */
- +#define HASH_KEYCMP(a,b,len) memcmp(a,b,len)
- +
- +/* iterate over items in a known bucket to find desired item */
- +#define HASH_FIND_IN_BKT(tbl,hh,head,keyptr,keylen_in,out) \
- +do { \
- + if (head.hh_head) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,head.hh_head)); \
- + else out=NULL; \
- + while (out) { \
- + if (out->hh.keylen == keylen_in) { \
- + if ((HASH_KEYCMP(out->hh.key,keyptr,keylen_in)) == 0) break; \
- + } \
- + if (out->hh.hh_next) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,out->hh.hh_next)); \
- + else out = NULL; \
- + } \
- +} while(0)
- +
- +/* add an item to a bucket */
- +#define HASH_ADD_TO_BKT(head,addhh) \
- +do { \
- + head.count++; \
- + (addhh)->hh_next = head.hh_head; \
- + (addhh)->hh_prev = NULL; \
- + if (head.hh_head) { (head).hh_head->hh_prev = (addhh); } \
- + (head).hh_head=addhh; \
- + if (head.count >= ((head.expand_mult+1) * HASH_BKT_CAPACITY_THRESH) \
- + && (addhh)->tbl->noexpand != 1) { \
- + HASH_EXPAND_BUCKETS((addhh)->tbl); \
- + } \
- +} while(0)
- +
- +/* remove an item from a given bucket */
- +#define HASH_DEL_IN_BKT(hh,head,hh_del) \
- + (head).count--; \
- + if ((head).hh_head == hh_del) { \
- + (head).hh_head = hh_del->hh_next; \
- + } \
- + if (hh_del->hh_prev) { \
- + hh_del->hh_prev->hh_next = hh_del->hh_next; \
- + } \
- + if (hh_del->hh_next) { \
- + hh_del->hh_next->hh_prev = hh_del->hh_prev; \
- + }
- +
- +/* Bucket expansion has the effect of doubling the number of buckets
- + * and redistributing the items into the new buckets. Ideally the
- + * items will distribute more or less evenly into the new buckets
- + * (the extent to which this is true is a measure of the quality of
- + * the hash function as it applies to the key domain).
- + *
- + * With the items distributed into more buckets, the chain length
- + * (item count) in each bucket is reduced. Thus by expanding buckets
- + * the hash keeps a bound on the chain length. This bounded chain
- + * length is the essence of how a hash provides constant time lookup.
- + *
- + * The calculation of tbl->ideal_chain_maxlen below deserves some
- + * explanation. First, keep in mind that we're calculating the ideal
- + * maximum chain length based on the *new* (doubled) bucket count.
- + * In fractions this is just n/b (n=number of items,b=new num buckets).
- + * Since the ideal chain length is an integer, we want to calculate
- + * ceil(n/b). We don't depend on floating point arithmetic in this
- + * hash, so to calculate ceil(n/b) with integers we could write
- + *
- + * ceil(n/b) = (n/b) + ((n%b)?1:0)
- + *
- + * and in fact a previous version of this hash did just that.
- + * But now we have improved things a bit by recognizing that b is
- + * always a power of two. We keep its base 2 log handy (call it lb),
- + * so now we can write this with a bit shift and logical AND:
- + *
- + * ceil(n/b) = (n>>lb) + ( (n & (b-1)) ? 1:0)
- + *
- + */
- +#define HASH_EXPAND_BUCKETS(tbl) \
- +do { \
- + unsigned _he_bkt; \
- + unsigned _he_bkt_i; \
- + struct UT_hash_handle *_he_thh, *_he_hh_nxt; \
- + UT_hash_bucket *_he_new_buckets, *_he_newbkt; \
- + _he_new_buckets = (UT_hash_bucket*)uthash_malloc( \
- + 2 * tbl->num_buckets * sizeof(struct UT_hash_bucket)); \
- + if (!_he_new_buckets) { uthash_fatal( "out of memory"); } \
- + memset(_he_new_buckets, 0, \
- + 2 * tbl->num_buckets * sizeof(struct UT_hash_bucket)); \
- + tbl->ideal_chain_maxlen = \
- + (tbl->num_items >> (tbl->log2_num_buckets+1)) + \
- + ((tbl->num_items & ((tbl->num_buckets*2)-1)) ? 1 : 0); \
- + tbl->nonideal_items = 0; \
- + for(_he_bkt_i = 0; _he_bkt_i < tbl->num_buckets; _he_bkt_i++) \
- + { \
- + _he_thh = tbl->buckets[ _he_bkt_i ].hh_head; \
- + while (_he_thh) { \
- + _he_hh_nxt = _he_thh->hh_next; \
- + HASH_TO_BKT( _he_thh->hashv, tbl->num_buckets*2, _he_bkt); \
- + _he_newbkt = &(_he_new_buckets[ _he_bkt ]); \
- + if (++(_he_newbkt->count) > tbl->ideal_chain_maxlen) { \
- + tbl->nonideal_items++; \
- + _he_newbkt->expand_mult = _he_newbkt->count / \
- + tbl->ideal_chain_maxlen; \
- + } \
- + _he_thh->hh_prev = NULL; \
- + _he_thh->hh_next = _he_newbkt->hh_head; \
- + if (_he_newbkt->hh_head) _he_newbkt->hh_head->hh_prev = \
- + _he_thh; \
- + _he_newbkt->hh_head = _he_thh; \
- + _he_thh = _he_hh_nxt; \
- + } \
- + } \
- + uthash_free( tbl->buckets, tbl->num_buckets*sizeof(struct UT_hash_bucket) ); \
- + tbl->num_buckets *= 2; \
- + tbl->log2_num_buckets++; \
- + tbl->buckets = _he_new_buckets; \
- + tbl->ineff_expands = (tbl->nonideal_items > (tbl->num_items >> 1)) ? \
- + (tbl->ineff_expands+1) : 0; \
- + if (tbl->ineff_expands > 1) { \
- + tbl->noexpand=1; \
- + uthash_noexpand_fyi(tbl); \
- + } \
- + uthash_expand_fyi(tbl); \
- +} while(0)
- +
- +
- +/* This is an adaptation of Simon Tatham's O(n log(n)) mergesort */
- +/* Note that HASH_SORT assumes the hash handle name to be hh.
- + * HASH_SRT was added to allow the hash handle name to be passed in. */
- +#define HASH_SORT(head,cmpfcn) HASH_SRT(hh,head,cmpfcn)
- +#define HASH_SRT(hh,head,cmpfcn) \
- +do { \
- + unsigned _hs_i; \
- + unsigned _hs_looping,_hs_nmerges,_hs_insize,_hs_psize,_hs_qsize; \
- + struct UT_hash_handle *_hs_p, *_hs_q, *_hs_e, *_hs_list, *_hs_tail; \
- + if (head) { \
- + _hs_insize = 1; \
- + _hs_looping = 1; \
- + _hs_list = &((head)->hh); \
- + while (_hs_looping) { \
- + _hs_p = _hs_list; \
- + _hs_list = NULL; \
- + _hs_tail = NULL; \
- + _hs_nmerges = 0; \
- + while (_hs_p) { \
- + _hs_nmerges++; \
- + _hs_q = _hs_p; \
- + _hs_psize = 0; \
- + for ( _hs_i = 0; _hs_i < _hs_insize; _hs_i++ ) { \
- + _hs_psize++; \
- + _hs_q = (UT_hash_handle*)((_hs_q->next) ? \
- + ((void*)((char*)(_hs_q->next) + \
- + (head)->hh.tbl->hho)) : NULL); \
- + if (! (_hs_q) ) break; \
- + } \
- + _hs_qsize = _hs_insize; \
- + while ((_hs_psize > 0) || ((_hs_qsize > 0) && _hs_q )) { \
- + if (_hs_psize == 0) { \
- + _hs_e = _hs_q; \
- + _hs_q = (UT_hash_handle*)((_hs_q->next) ? \
- + ((void*)((char*)(_hs_q->next) + \
- + (head)->hh.tbl->hho)) : NULL); \
- + _hs_qsize--; \
- + } else if ( (_hs_qsize == 0) || !(_hs_q) ) { \
- + _hs_e = _hs_p; \
- + _hs_p = (UT_hash_handle*)((_hs_p->next) ? \
- + ((void*)((char*)(_hs_p->next) + \
- + (head)->hh.tbl->hho)) : NULL); \
- + _hs_psize--; \
- + } else if (( \
- + cmpfcn(DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_p)), \
- + DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_q))) \
- + ) <= 0) { \
- + _hs_e = _hs_p; \
- + _hs_p = (UT_hash_handle*)((_hs_p->next) ? \
- + ((void*)((char*)(_hs_p->next) + \
- + (head)->hh.tbl->hho)) : NULL); \
- + _hs_psize--; \
- + } else { \
- + _hs_e = _hs_q; \
- + _hs_q = (UT_hash_handle*)((_hs_q->next) ? \
- + ((void*)((char*)(_hs_q->next) + \
- + (head)->hh.tbl->hho)) : NULL); \
- + _hs_qsize--; \
- + } \
- + if ( _hs_tail ) { \
- + _hs_tail->next = ((_hs_e) ? \
- + ELMT_FROM_HH((head)->hh.tbl,_hs_e) : NULL); \
- + } else { \
- + _hs_list = _hs_e; \
- + } \
- + _hs_e->prev = ((_hs_tail) ? \
- + ELMT_FROM_HH((head)->hh.tbl,_hs_tail) : NULL); \
- + _hs_tail = _hs_e; \
- + } \
- + _hs_p = _hs_q; \
- + } \
- + _hs_tail->next = NULL; \
- + if ( _hs_nmerges <= 1 ) { \
- + _hs_looping=0; \
- + (head)->hh.tbl->tail = _hs_tail; \
- + DECLTYPE_ASSIGN(head,ELMT_FROM_HH((head)->hh.tbl, _hs_list)); \
- + } \
- + _hs_insize *= 2; \
- + } \
- + HASH_FSCK(hh,head); \
- + } \
- +} while (0)
- +
- +/* This function selects items from one hash into another hash.
- + * The end result is that the selected items have dual presence
- + * in both hashes. There is no copy of the items made; rather
- + * they are added into the new hash through a secondary hash
- + * hash handle that must be present in the structure. */
- +#define HASH_SELECT(hh_dst, dst, hh_src, src, cond) \
- +do { \
- + unsigned _src_bkt, _dst_bkt; \
- + void *_last_elt=NULL, *_elt; \
- + UT_hash_handle *_src_hh, *_dst_hh, *_last_elt_hh=NULL; \
- + ptrdiff_t _dst_hho = ((char*)(&(dst)->hh_dst) - (char*)(dst)); \
- + if (src) { \
- + for(_src_bkt=0; _src_bkt < (src)->hh_src.tbl->num_buckets; _src_bkt++) { \
- + for(_src_hh = (src)->hh_src.tbl->buckets[_src_bkt].hh_head; \
- + _src_hh; \
- + _src_hh = _src_hh->hh_next) { \
- + _elt = ELMT_FROM_HH((src)->hh_src.tbl, _src_hh); \
- + if (cond(_elt)) { \
- + _dst_hh = (UT_hash_handle*)(((char*)_elt) + _dst_hho); \
- + _dst_hh->key = _src_hh->key; \
- + _dst_hh->keylen = _src_hh->keylen; \
- + _dst_hh->hashv = _src_hh->hashv; \
- + _dst_hh->prev = _last_elt; \
- + _dst_hh->next = NULL; \
- + if (_last_elt_hh) { _last_elt_hh->next = _elt; } \
- + if (!dst) { \
- + DECLTYPE_ASSIGN(dst,_elt); \
- + HASH_MAKE_TABLE(hh_dst,dst); \
- + } else { \
- + _dst_hh->tbl = (dst)->hh_dst.tbl; \
- + } \
- + HASH_TO_BKT(_dst_hh->hashv, _dst_hh->tbl->num_buckets, _dst_bkt); \
- + HASH_ADD_TO_BKT(_dst_hh->tbl->buckets[_dst_bkt],_dst_hh); \
- + (dst)->hh_dst.tbl->num_items++; \
- + _last_elt = _elt; \
- + _last_elt_hh = _dst_hh; \
- + } \
- + } \
- + } \
- + } \
- + HASH_FSCK(hh_dst,dst); \
- +} while (0)
- +
- +#define HASH_CLEAR(hh,head) \
- +do { \
- + if (head) { \
- + uthash_free((head)->hh.tbl->buckets, \
- + (head)->hh.tbl->num_buckets*sizeof(struct UT_hash_bucket)); \
- + HASH_BLOOM_FREE((head)->hh.tbl); \
- + uthash_free((head)->hh.tbl, sizeof(UT_hash_table)); \
- + (head)=NULL; \
- + } \
- +} while(0)
- +
- +#ifdef NO_DECLTYPE
- +#define HASH_ITER(hh,head,el,tmp) \
- +for((el)=(head), (*(char**)(&(tmp)))=(char*)((head)?(head)->hh.next:NULL); \
- + el; (el)=(tmp),(*(char**)(&(tmp)))=(char*)((tmp)?(tmp)->hh.next:NULL))
- +#else
- +#define HASH_ITER(hh,head,el,tmp) \
- +for((el)=(head),(tmp)=DECLTYPE(el)((head)?(head)->hh.next:NULL); \
- + el; (el)=(tmp),(tmp)=DECLTYPE(el)((tmp)?(tmp)->hh.next:NULL))
- +#endif
- +
- +/* obtain a count of items in the hash */
- +#define HASH_COUNT(head) HASH_CNT(hh,head)
- +#define HASH_CNT(hh,head) ((head)?((head)->hh.tbl->num_items):0)
- +
- +typedef struct UT_hash_bucket {
- + struct UT_hash_handle *hh_head;
- + unsigned count;
- +
- + /* expand_mult is normally set to 0. In this situation, the max chain length
- + * threshold is enforced at its default value, HASH_BKT_CAPACITY_THRESH. (If
- + * the bucket's chain exceeds this length, bucket expansion is triggered).
- + * However, setting expand_mult to a non-zero value delays bucket expansion
- + * (that would be triggered by additions to this particular bucket)
- + * until its chain length reaches a *multiple* of HASH_BKT_CAPACITY_THRESH.
- + * (The multiplier is simply expand_mult+1). The whole idea of this
- + * multiplier is to reduce bucket expansions, since they are expensive, in
- + * situations where we know that a particular bucket tends to be overused.
- + * It is better to let its chain length grow to a longer yet-still-bounded
- + * value, than to do an O(n) bucket expansion too often.
- + */
- + unsigned expand_mult;
- +
- +} UT_hash_bucket;
- +
- +/* random signature used only to find hash tables in external analysis */
- +#define HASH_SIGNATURE 0xa0111fe1
- +#define HASH_BLOOM_SIGNATURE 0xb12220f2
- +
- +typedef struct UT_hash_table {
- + UT_hash_bucket *buckets;
- + unsigned num_buckets, log2_num_buckets;
- + unsigned num_items;
- + struct UT_hash_handle *tail; /* tail hh in app order, for fast append */
- + ptrdiff_t hho; /* hash handle offset (byte pos of hash handle in element */
- +
- + /* in an ideal situation (all buckets used equally), no bucket would have
- + * more than ceil(#items/#buckets) items. that's the ideal chain length. */
- + unsigned ideal_chain_maxlen;
- +
- + /* nonideal_items is the number of items in the hash whose chain position
- + * exceeds the ideal chain maxlen. these items pay the penalty for an uneven
- + * hash distribution; reaching them in a chain traversal takes >ideal steps */
- + unsigned nonideal_items;
- +
- + /* ineffective expands occur when a bucket doubling was performed, but
- + * afterward, more than half the items in the hash had nonideal chain
- + * positions. If this happens on two consecutive expansions we inhibit any
- + * further expansion, as it's not helping; this happens when the hash
- + * function isn't a good fit for the key domain. When expansion is inhibited
- + * the hash will still work, albeit no longer in constant time. */
- + unsigned ineff_expands, noexpand;
- +
- + uint32_t signature; /* used only to find hash tables in external analysis */
- +#ifdef HASH_BLOOM
- + uint32_t bloom_sig; /* used only to test bloom exists in external analysis */
- + uint8_t *bloom_bv;
- + char bloom_nbits;
- +#endif
- +
- +} UT_hash_table;
- +
- +typedef struct UT_hash_handle {
- + struct UT_hash_table *tbl;
- + void *prev; /* prev element in app order */
- + void *next; /* next element in app order */
- + struct UT_hash_handle *hh_prev; /* previous hh in bucket order */
- + struct UT_hash_handle *hh_next; /* next hh in bucket order */
- + void *key; /* ptr to enclosing struct's key */
- + unsigned keylen; /* enclosing struct's key len */
- + unsigned hashv; /* result of hash-fcn(key) */
- +} UT_hash_handle;
- +
- +#endif /* UTHASH_H */
- diff --git a/include/common/time.h b/include/common/time.h
- index c9e3641..1d3fe0e 100644
- --- a/include/common/time.h
- +++ b/include/common/time.h
- @@ -475,6 +475,17 @@ REGPRM3 static inline struct timeval *__tv_ms_add(struct timeval *tv, const stru
- return tv;
- }
- +/*
- + * adds <sec> sec to <from>, set the result to <tv> and returns a pointer <tv>
- + */
- +#define tv_sec_add _tv_sec_add
- +REGPRM3 struct timeval *_tv_sec_add(struct timeval *tv, const struct timeval *from, int sec);
- +REGPRM3 static inline struct timeval *__tv_sec_add(struct timeval *tv, const struct timeval *from, int sec)
- +{
- + tv->tv_sec = from->tv_sec + sec;
- + return tv;
- +}
- +
- /*
- * compares <tv1> and <tv2> : returns 1 if <tv1> is before <tv2>, otherwise 0.
- diff --git a/include/common/uthash.h b/include/common/uthash.h
- index b6cec34..ae9ab6d 100644
- --- a/include/common/uthash.h
- +++ b/include/common/uthash.h
- @@ -1,5 +1,5 @@
- /*
- -Copyright (c) 2003-2011, Troy D. Hanson http://uthash.sourceforge.net
- +Copyright (c) 2003-2013, Troy D. Hanson http://troydhanson.github.com/uthash/
- All rights reserved.
- Redistribution and use in source and binary forms, with or without
- @@ -28,6 +28,15 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #include <stddef.h> /* ptrdiff_t */
- #include <stdlib.h> /* exit() */
- +/* ha-proxy start */
- +#define uthash_fatal(msg) do { \
- + Alert(msg); \
- + exit(1); \
- +} while(0)
- +
- +#define uthash_malloc(sz) calloc(1, sz)
- +/* ha-proxy end */
- +
- /* These macros use decltype or the earlier __typeof GNU extension.
- As decltype is only available in newer compilers (VS2010 or gcc 4.3+
- when compiling c++ source) this code uses whatever method is needed
- @@ -64,21 +73,24 @@ typedef unsigned char uint8_t;
- #include <inttypes.h> /* uint32_t */
- #endif
- -#define UTHASH_VERSION 1.9.4
- -
- -/* #define uthash_fatal(msg) exit(-1) */ /* fatal error (out of memory,etc) */
- -
- -/* ha-proxy incursion */
- -#define uthash_fatal do { \
- - Alert(msg); \
- - exit(1); \
- -} while(0)
- +#define UTHASH_VERSION 1.9.8
- +#ifndef uthash_fatal
- +#define uthash_fatal(msg) exit(-1) /* fatal error (out of memory,etc) */
- +#endif
- +#ifndef uthash_malloc
- #define uthash_malloc(sz) malloc(sz) /* malloc fcn */
- +#endif
- +#ifndef uthash_free
- #define uthash_free(ptr,sz) free(ptr) /* free fcn */
- +#endif
- +#ifndef uthash_noexpand_fyi
- #define uthash_noexpand_fyi(tbl) /* can be defined to log noexpand */
- +#endif
- +#ifndef uthash_expand_fyi
- #define uthash_expand_fyi(tbl) /* can be defined to log expands */
- +#endif
- /* initial number of buckets */
- #define HASH_INITIAL_NUM_BUCKETS 32 /* initial number of buckets */
- @@ -111,12 +123,12 @@ do {
- if (!((tbl)->bloom_bv)) { uthash_fatal( "out of memory"); } \
- memset((tbl)->bloom_bv, 0, HASH_BLOOM_BYTELEN); \
- (tbl)->bloom_sig = HASH_BLOOM_SIGNATURE; \
- -} while (0);
- +} while (0)
- #define HASH_BLOOM_FREE(tbl) \
- do { \
- uthash_free((tbl)->bloom_bv, HASH_BLOOM_BYTELEN); \
- -} while (0);
- +} while (0)
- #define HASH_BLOOM_BITSET(bv,idx) (bv[(idx)/8] |= (1U << ((idx)%8)))
- #define HASH_BLOOM_BITTEST(bv,idx) (bv[(idx)/8] & (1U << ((idx)%8)))
- @@ -132,6 +144,7 @@ do {
- #define HASH_BLOOM_FREE(tbl)
- #define HASH_BLOOM_ADD(tbl,hashv)
- #define HASH_BLOOM_TEST(tbl,hashv) (1)
- +#define HASH_BLOOM_BYTELEN 0
- #endif
- #define HASH_MAKE_TABLE(hh,head) \
- @@ -155,13 +168,23 @@ do {
- #define HASH_ADD(hh,head,fieldname,keylen_in,add) \
- HASH_ADD_KEYPTR(hh,head,&((add)->fieldname),keylen_in,add)
- +
- +#define HASH_REPLACE(hh,head,fieldname,keylen_in,add,replaced) \
- +do { \
- + replaced=NULL; \
- + HASH_FIND(hh,head,&((add)->fieldname),keylen_in,replaced); \
- + if (replaced!=NULL) { \
- + HASH_DELETE(hh,head,replaced); \
- + }; \
- + HASH_ADD(hh,head,fieldname,keylen_in,add); \
- +} while(0)
- #define HASH_ADD_KEYPTR(hh,head,keyptr,keylen_in,add) \
- do { \
- unsigned _ha_bkt; \
- (add)->hh.next = NULL; \
- - (add)->hh.key = (char*)keyptr; \
- - (add)->hh.keylen = keylen_in; \
- + (add)->hh.key = (char*)(keyptr); \
- + (add)->hh.keylen = (unsigned)(keylen_in); \
- if (!(head)) { \
- head = (add); \
- (head)->hh.prev = NULL; \
- @@ -212,17 +235,17 @@ do {
- _hd_hh_del = &((delptr)->hh); \
- if ((delptr) == ELMT_FROM_HH((head)->hh.tbl,(head)->hh.tbl->tail)) { \
- (head)->hh.tbl->tail = \
- - (UT_hash_handle*)((char*)((delptr)->hh.prev) + \
- + (UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) + \
- (head)->hh.tbl->hho); \
- } \
- if ((delptr)->hh.prev) { \
- - ((UT_hash_handle*)((char*)((delptr)->hh.prev) + \
- + ((UT_hash_handle*)((ptrdiff_t)((delptr)->hh.prev) + \
- (head)->hh.tbl->hho))->next = (delptr)->hh.next; \
- } else { \
- DECLTYPE_ASSIGN(head,(delptr)->hh.next); \
- } \
- if (_hd_hh_del->next) { \
- - ((UT_hash_handle*)((char*)_hd_hh_del->next + \
- + ((UT_hash_handle*)((ptrdiff_t)_hd_hh_del->next + \
- (head)->hh.tbl->hho))->prev = \
- _hd_hh_del->prev; \
- } \
- @@ -239,14 +262,20 @@ do {
- HASH_FIND(hh,head,findstr,strlen(findstr),out)
- #define HASH_ADD_STR(head,strfield,add) \
- HASH_ADD(hh,head,strfield,strlen(add->strfield),add)
- +#define HASH_REPLACE_STR(head,strfield,add,replaced) \
- + HASH_REPLACE(hh,head,strfield,strlen(add->strfield),add,replaced)
- #define HASH_FIND_INT(head,findint,out) \
- HASH_FIND(hh,head,findint,sizeof(int),out)
- #define HASH_ADD_INT(head,intfield,add) \
- HASH_ADD(hh,head,intfield,sizeof(int),add)
- +#define HASH_REPLACE_INT(head,intfield,add,replaced) \
- + HASH_REPLACE(hh,head,intfield,sizeof(int),add,replaced)
- #define HASH_FIND_PTR(head,findptr,out) \
- HASH_FIND(hh,head,findptr,sizeof(void *),out)
- #define HASH_ADD_PTR(head,ptrfield,add) \
- HASH_ADD(hh,head,ptrfield,sizeof(void *),add)
- +#define HASH_REPLACE_PTR(head,ptrfield,add) \
- + HASH_REPLACE(hh,head,ptrfield,sizeof(void *),add,replaced)
- #define HASH_DEL(head,delptr) \
- HASH_DELETE(hh,head,delptr)
- @@ -362,7 +391,7 @@ do {
- for(_fn_i=0; _fn_i < keylen; _fn_i++) \
- hashv = (hashv * 16777619) ^ _hf_key[_fn_i]; \
- bkt = hashv & (num_bkts-1); \
- -} while(0);
- +} while(0)
- #define HASH_OAT(key,keylen,num_bkts,hashv,bkt) \
- do { \
- @@ -396,10 +425,10 @@ do {
- #define HASH_JEN(key,keylen,num_bkts,hashv,bkt) \
- do { \
- unsigned _hj_i,_hj_j,_hj_k; \
- - char *_hj_key=(char*)(key); \
- + unsigned char *_hj_key=(unsigned char*)(key); \
- hashv = 0xfeedbeef; \
- _hj_i = _hj_j = 0x9e3779b9; \
- - _hj_k = keylen; \
- + _hj_k = (unsigned)(keylen); \
- while (_hj_k >= 12) { \
- _hj_i += (_hj_key[0] + ( (unsigned)_hj_key[1] << 8 ) \
- + ( (unsigned)_hj_key[2] << 16 ) \
- @@ -447,7 +476,7 @@ do {
- #endif
- #define HASH_SFH(key,keylen,num_bkts,hashv,bkt) \
- do { \
- - char *_sfh_key=(char*)(key); \
- + unsigned char *_sfh_key=(unsigned char*)(key); \
- uint32_t _sfh_tmp, _sfh_len = keylen; \
- \
- int _sfh_rem = _sfh_len & 3; \
- @@ -457,7 +486,7 @@ do {
- /* Main loop */ \
- for (;_sfh_len > 0; _sfh_len--) { \
- hashv += get16bits (_sfh_key); \
- - _sfh_tmp = (get16bits (_sfh_key+2) << 11) ^ hashv; \
- + _sfh_tmp = (uint32_t)(get16bits (_sfh_key+2)) << 11 ^ hashv; \
- hashv = (hashv << 16) ^ _sfh_tmp; \
- _sfh_key += 2*sizeof (uint16_t); \
- hashv += hashv >> 11; \
- @@ -467,7 +496,7 @@ do {
- switch (_sfh_rem) { \
- case 3: hashv += get16bits (_sfh_key); \
- hashv ^= hashv << 16; \
- - hashv ^= _sfh_key[sizeof (uint16_t)] << 18; \
- + hashv ^= (uint32_t)(_sfh_key[sizeof (uint16_t)] << 18); \
- hashv += hashv >> 11; \
- break; \
- case 2: hashv += get16bits (_sfh_key); \
- @@ -487,7 +516,7 @@ do {
- hashv ^= hashv << 25; \
- hashv += hashv >> 6; \
- bkt = hashv & (num_bkts-1); \
- -} while(0);
- +} while(0)
- #ifdef HASH_USING_NO_STRICT_ALIASING
- /* The MurmurHash exploits some CPU's (x86,x86_64) tolerance for unaligned reads.
- @@ -499,7 +528,7 @@ do {
- * gcc -m64 -dM -E - < /dev/null (on gcc)
- * cc -## a.c (where a.c is a simple test file) (Sun Studio)
- */
- -#if (defined(__i386__) || defined(__x86_64__))
- +#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86))
- #define MUR_GETBLOCK(p,i) p[i]
- #else /* non intel */
- #define MUR_PLUS0_ALIGNED(p) (((unsigned long)p & 0x3) == 0)
- @@ -538,10 +567,12 @@ do { \
- uint32_t _mur_h1 = 0xf88D5353; \
- uint32_t _mur_c1 = 0xcc9e2d51; \
- uint32_t _mur_c2 = 0x1b873593; \
- + uint32_t _mur_k1 = 0; \
- + const uint8_t *_mur_tail; \
- const uint32_t *_mur_blocks = (const uint32_t*)(_mur_data+_mur_nblocks*4); \
- int _mur_i; \
- for(_mur_i = -_mur_nblocks; _mur_i; _mur_i++) { \
- - uint32_t _mur_k1 = MUR_GETBLOCK(_mur_blocks,_mur_i); \
- + _mur_k1 = MUR_GETBLOCK(_mur_blocks,_mur_i); \
- _mur_k1 *= _mur_c1; \
- _mur_k1 = MUR_ROTL32(_mur_k1,15); \
- _mur_k1 *= _mur_c2; \
- @@ -550,8 +581,8 @@ do { \
- _mur_h1 = MUR_ROTL32(_mur_h1,13); \
- _mur_h1 = _mur_h1*5+0xe6546b64; \
- } \
- - const uint8_t *_mur_tail = (const uint8_t*)(_mur_data + _mur_nblocks*4); \
- - uint32_t _mur_k1=0; \
- + _mur_tail = (const uint8_t*)(_mur_data + _mur_nblocks*4); \
- + _mur_k1=0; \
- switch((keylen) & 3) { \
- case 3: _mur_k1 ^= _mur_tail[2] << 16; \
- case 2: _mur_k1 ^= _mur_tail[1] << 8; \
- @@ -577,10 +608,10 @@ do {
- if (head.hh_head) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,head.hh_head)); \
- else out=NULL; \
- while (out) { \
- - if (out->hh.keylen == keylen_in) { \
- - if ((HASH_KEYCMP(out->hh.key,keyptr,keylen_in)) == 0) break; \
- + if ((out)->hh.keylen == keylen_in) { \
- + if ((HASH_KEYCMP((out)->hh.key,keyptr,keylen_in)) == 0) break; \
- } \
- - if (out->hh.hh_next) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,out->hh.hh_next)); \
- + if ((out)->hh.hh_next) DECLTYPE_ASSIGN(out,ELMT_FROM_HH(tbl,(out)->hh.hh_next)); \
- else out = NULL; \
- } \
- } while(0)
- @@ -729,18 +760,22 @@ do {
- _hs_qsize--; \
- } else if ( (_hs_qsize == 0) || !(_hs_q) ) { \
- _hs_e = _hs_p; \
- - _hs_p = (UT_hash_handle*)((_hs_p->next) ? \
- - ((void*)((char*)(_hs_p->next) + \
- - (head)->hh.tbl->hho)) : NULL); \
- + if (_hs_p){ \
- + _hs_p = (UT_hash_handle*)((_hs_p->next) ? \
- + ((void*)((char*)(_hs_p->next) + \
- + (head)->hh.tbl->hho)) : NULL); \
- + } \
- _hs_psize--; \
- } else if (( \
- cmpfcn(DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_p)), \
- DECLTYPE(head)(ELMT_FROM_HH((head)->hh.tbl,_hs_q))) \
- ) <= 0) { \
- _hs_e = _hs_p; \
- - _hs_p = (UT_hash_handle*)((_hs_p->next) ? \
- - ((void*)((char*)(_hs_p->next) + \
- - (head)->hh.tbl->hho)) : NULL); \
- + if (_hs_p){ \
- + _hs_p = (UT_hash_handle*)((_hs_p->next) ? \
- + ((void*)((char*)(_hs_p->next) + \
- + (head)->hh.tbl->hho)) : NULL); \
- + } \
- _hs_psize--; \
- } else { \
- _hs_e = _hs_q; \
- @@ -755,13 +790,17 @@ do {
- } else { \
- _hs_list = _hs_e; \
- } \
- + if (_hs_e) { \
- _hs_e->prev = ((_hs_tail) ? \
- ELMT_FROM_HH((head)->hh.tbl,_hs_tail) : NULL); \
- + } \
- _hs_tail = _hs_e; \
- } \
- _hs_p = _hs_q; \
- } \
- - _hs_tail->next = NULL; \
- + if (_hs_tail){ \
- + _hs_tail->next = NULL; \
- + } \
- if ( _hs_nmerges <= 1 ) { \
- _hs_looping=0; \
- (head)->hh.tbl->tail = _hs_tail; \
- @@ -827,6 +866,12 @@ do {
- } \
- } while(0)
- +#define HASH_OVERHEAD(hh,head) \
- + (size_t)((((head)->hh.tbl->num_items * sizeof(UT_hash_handle)) + \
- + ((head)->hh.tbl->num_buckets * sizeof(UT_hash_bucket)) + \
- + (sizeof(UT_hash_table)) + \
- + (HASH_BLOOM_BYTELEN)))
- +
- #ifdef NO_DECLTYPE
- #define HASH_ITER(hh,head,el,tmp) \
- for((el)=(head), (*(char**)(&(tmp)))=(char*)((head)?(head)->hh.next:NULL); \
- diff --git a/include/proto/checks.h b/include/proto/checks.h
- index cee6dda..40f545d 100644
- --- a/include/proto/checks.h
- +++ b/include/proto/checks.h
- @@ -33,6 +33,10 @@ struct task *process_chk(struct task *t);
- int start_checks();
- void health_adjust(struct server *s, short status);
- +int dns_socket_write(int);
- +int dns_socket_read(int);
- +void resolve_server(struct server*, char *);
- +
- #endif /* _PROTO_CHECKS_H */
- /*
- diff --git a/include/types/global.h b/include/types/global.h
- index 7c5346b..a4fee7d 100644
- --- a/include/types/global.h
- +++ b/include/types/global.h
- @@ -97,6 +97,8 @@ struct global {
- } tune;
- struct listener stats_sock; /* unix socket listener for statistics */
- struct proxy *stats_fe; /* the frontend holding the stats settings */
- + int use_dns; /* whether we are doing DNS look-ups */
- + int dns_fd; /* socket for DNS lookups */
- };
- extern struct global global;
- diff --git a/include/types/server.h b/include/types/server.h
- index 9fbd290..b89c4a2 100644
- --- a/include/types/server.h
- +++ b/include/types/server.h
- @@ -38,6 +38,8 @@
- #include <types/task.h>
- #include <types/checks.h>
- +#include <common/uthash.h>
- +
- /* server flags */
- #define SRV_RUNNING 0x0001 /* the server is UP */
- @@ -111,6 +113,13 @@ struct server {
- int bind_hdr_len; /* length of the name of the header above */
- int bind_hdr_occ; /* occurrence number of header above: >0 = from first, <0 = from end, 0=disabled */
- #endif
- +
- + char * hostname; /* if !0, should be resolved at run-time */
- + struct timeval dns_next_check; /* when should the next DNS check be performed */
- + int dns_id; /* last DNS query ID used for this server */
- + UT_hash_handle hh; /* for being included in dns hash */
- + int dns_ttl_sec; /* DNS TTL in m/s. Defaults to 10,000 */
- +
- int iface_len; /* bind interface name length */
- char *iface_name; /* bind interface name or NULL */
- struct port_range *sport_range; /* optional per-server TCP source ports */
- diff --git a/src/cfgparse.c b/src/cfgparse.c
- index 09ffcd3..55a1382 100644
- --- a/src/cfgparse.c
- +++ b/src/cfgparse.c
- @@ -3463,6 +3463,28 @@ stats_error_parsing:
- } else
- newsrv->state |= SRV_MAPPORTS;
- + {
- + char * dns = strstr(raddr, "@ar");
- + while (dns) {
- + char * n = strstr(dns+1, "@ar");
- + if (!n) { break; }
- + dns = n;
- + }
- +
- + if (dns) {
- + *dns = 0;
- + newsrv->hostname = strdup(raddr);
- + /* default DNS time out is 5 sec, man resolve.conf */
- + newsrv->dns_ttl_sec = 5;
- + if (!newsrv->hostname) {
- + Alert("parsing [%s:%d] : out of memory.\n", file, linenum);
- + err_code |= ERR_ALERT | ERR_ABORT;
- + goto out;
- + }
- + global.use_dns = 1;
- + }
- + }
- +
- sk = str2sa(raddr);
- free(raddr);
- if (!sk) {
- diff --git a/src/checks.c b/src/checks.c
- index 021d025..66c524f 100644
- --- a/src/checks.c
- +++ b/src/checks.c
- @@ -47,7 +47,55 @@
- #include <proto/server.h>
- #include <proto/task.h>
- +#include <common/uthash.h>
- +
- +typedef struct dns_out_t {
- + struct dns_out_t * next;
- + struct sockaddr_in to;
- + int len;
- + char * data;
- +} dns_out_t;
- +
- +static dns_out_t * last_chunk;
- +static dns_out_t * first_chunk;
- +
- +struct server * dns_server_hash = 0;
- +
- +#define RESOLV_CONF "/etc/resolv.conf"
- +
- +/* we believe 512 bytes is enough for any particular
- + * DNS response, if it's more than that then there is likely
- + * stuff in there we don't care about anyway.
- + * RFC-1035 states that UDP messages must be 512 bytes or less.
- + */
- +static unsigned char dns_read[512];
- +
- +static int last_id = 0;
- +
- +static time_t last_rc_mod = 0;
- +
- +static char * dns_error [] = {
- + "ok",
- + "Format error (REPORT BUG)",
- + "Server failure",
- + "Name error (check your hostname)",
- + "Not implemented (REPORT BUG?)",
- + "Query refused"
- +};
- +
- +static struct sockaddr_in dns_server;
- +
- +__attribute__((constructor))
- +static void __dns_init(void) {
- + dns_server.sin_port = htons(53);
- +}
- +
- +#define DNS_HEADER_SIZE_BYTES 12
- +
- static int httpchk_expect(struct server *s, int done);
- +static char * build_full_name(int, int);
- +static int skip_name(int *, int *);
- +static int dns_socket_try_write(void *, int, struct sockaddr_in *, dns_out_t *);
- const struct check_status check_statuses[HCHK_STATUS_SIZE] = {
- [HCHK_STATUS_UNKNOWN] = { SRV_CHK_UNKNOWN, "UNK", "Unknown" },
- @@ -1243,6 +1291,11 @@ struct task *process_chk(struct task *t)
- int fd;
- int rv;
- + if (s->hostname && tv_islt(&s->dns_next_check, &now)) {
- + resolve_server(s, 0);
- + tv_sec_add(&s->dns_next_check, &now, s->dns_ttl_sec);
- + }
- +
- new_chk:
- if (attempts++ > 0) {
- /* we always fail to create a server, let's stop insisting... */
- @@ -1741,6 +1794,612 @@ static int httpchk_expect(struct server *s, int done)
- }
- /*
- + * This function is called on a write event from the DNS socket.
- + * It returns 0 if the caller needs to poll before calling it again, otherwise
- + * non-zero.
- + */
- +int dns_socket_write(int s) {
- +
- + assert(s == global.dns_fd);
- +
- + while (first_chunk) {
- +
- + dns_out_t * next = first_chunk->next;
- +
- + if (!dns_socket_try_write(0, 0, 0, first_chunk)) {
- + break;
- + }
- +
- + if (first_chunk == last_chunk) {
- + last_chunk = 0;
- + }
- +
- + free(first_chunk->data);
- + free(first_chunk);
- + first_chunk = next;
- +
- + }
- +
- + if (!first_chunk) {
- + EV_FD_CLR(s, DIR_WR);
- + return 1;
- + } else {
- + return 0;
- + }
- +
- +}
- +
- +/*
- + * Try to write DNS message, either from a buffer, or from a chunk.
- + * For buffer writes, chunk must be 0, otherwise chunk will be used.
- + * If data can't be written out for a buffered data, a new chunk will
- + * be created, and added to the list.
- + * Returns 0 if data has to be queued (and for buffer, if chunk was created),
- + * otherwise returns !0
- + */
- +int dns_socket_try_write(void * data, int len, struct sockaddr_in * to, dns_out_t * chunk) {
- +
- + int rc;
- +
- + if (chunk) {
- + data = chunk->data;
- + len = chunk->len;
- + to = &chunk->to;
- + }
- +
- + rc = sendto(global.dns_fd, data, len, 0,
- + (struct sockaddr*)to, sizeof(struct sockaddr_in));
- +
- + if (rc == -1) {
- + int e = errno;
- + if (e == EAGAIN || e == EWOULDBLOCK) {
- + if (!chunk) {
- + chunk = calloc(1, sizeof(dns_out_t));
- + if (!chunk) {
- + Alert("Out of memory\n");
- + exit(1);
- + }
- + if (!last_chunk) {
- + last_chunk = chunk;
- + first_chunk = chunk;
- + EV_FD_SET(global.dns_fd, DIR_WR);
- + } else {
- + last_chunk->next = chunk;
- + last_chunk = chunk;
- + }
- + chunk->data = data;
- + chunk->len = len;
- + memcpy(&chunk->to, to, sizeof(struct sockaddr_in));
- + }
- + return 0;
- + }
- + Warning("Failed to send DNS request : %s\n", strerror(e));
- + }
- +
- + // we either wrote the data out, or it's a fatal error,
- + // we'll need to skip.
- + return 1;
- +
- +}
- +
- +/*
- + * Skip over a name construct,
- + * returning 0 if OK, or !0 if ran out of space
- + * If !0 is returned, values of *ptr and *rem can
- + * no longer be trusted, otherwise they are adjusted
- + * to represent position after the construct, and
- + * remainder of available bytes.
- + */
- +int skip_name(int * ptr, int * rem) {
- +
- + while (1) {
- +
- + int len;
- + int cc = 0;
- +
- + if (*rem < 1) { return 1; }
- +
- + len = dns_read[*ptr];
- + if ((len&0xc0) == 0xc0) {
- + len = 2;
- + cc = 1;
- + } else {
- + len++;
- + }
- +
- + *rem -= len;
- + *ptr += len;
- +
- + if (*rem < 0) { return 1; }
- + /* if we ran into 0 or cc, we are done */
- + if (len == 1 || cc) { return 0; }
- +
- + }
- +
- +}
- +
- +char * build_full_name(int mlen, int host) {
- +
- +#define MAX_REC 10 /* may be more? I don't think more is necessary here */
- +#define MAX_OUT 256
- +
- +#define FAIL_IF(a) do { \
- + if (a) { \
- + free(out); \
- + return 0; \
- + } \
- +} while(0)
- +
- +#define ENOUGH(ptr,a) do { \
- + if (((ptr) + (a)) >= mlen) { \
- + free(out); \
- + return 0; \
- + } \
- +} while(0)
- +
- +#define ADD_OUT(sz, str) do { \
- + FAIL_IF((out_at + (sz)) >= MAX_OUT); \
- + memcpy(out+out_at, str, sz); \
- + out_at += sz; \
- +} while(0)
- +
- + int used_addr[MAX_REC];
- + int used_addr_len;
- +
- + char * out = calloc(1, MAX_OUT+1);
- + int out_at = 0;
- + int ptr;
- +
- + if (!out) {
- + Alert("Out of memory\n");
- + exit(1);
- + }
- +
- + assert(host < mlen);
- +
- + used_addr_len = 0;
- +
- + ptr = host;
- +
- + while (1) {
- +
- + int size;
- +
- + ENOUGH(ptr, 1);
- +
- + size = dns_read[ptr];
- +
- + if (size == 0) {
- + break;
- + }
- +
- + ptr++;
- +
- + if ((size & 0xc0) == 0xc0) {
- +
- + int j;
- +
- + ENOUGH(ptr, 1);
- + ptr = ((size&0x3f) << 8) | dns_read[ptr];
- +
- + FAIL_IF(used_addr_len == MAX_REC);
- +
- + for (j=0; j<used_addr_len; j++) {
- + FAIL_IF(used_addr[j] == ptr);
- + }
- +
- + used_addr[used_addr_len++] = ptr;
- +
- + continue;
- + }
- +
- + if (*out) {
- + ADD_OUT(1, ".");
- + }
- +
- + ENOUGH(ptr, size);
- + ADD_OUT(size, dns_read + ptr);
- + ptr += size;
- + }
- +
- + return out;
- +
- +#undef FAIL_IF
- +#undef ENOUGH
- +#undef MAX_REC
- +#undef ADD_OUT
- +#undef MAX_OUT
- +
- +}
- +
- +/*
- + * this function is called on a read event from the DNS socket.
- + * It returns 0 if we have a high confidence that we will not be
- + * able to read more data without polling first. Returns non-zero
- + * otherwise.
- + */
- +int dns_socket_read(int s) {
- +
- +/* this is to get WORD on BYTE boundary <n> */
- +#define D_WORD(n) \
- + ((((int)dns_read[n])<<8) | ((int)dns_read[(n)+1]))
- +
- + assert(s == global.dns_fd);
- +
- + while (1) {
- +
- + int rc = recv(s, dns_read, sizeof(dns_read), 0);
- + int id;
- + struct server * for_server;
- + int aux;
- + int answer_at = DNS_HEADER_SIZE_BYTES;
- + char * cname = 0;
- + int mlen = rc;
- + int addr_ok = 0;
- +
- + if (rc < 0) {
- + int e = errno;
- + if (e == EAGAIN || e == EWOULDBLOCK) {
- + return 0;
- + } else {
- + Warning("Failed to read DNS response : %s\n", strerror(e));
- + continue;
- + }
- + }
- +
- + if ((rc -= DNS_HEADER_SIZE_BYTES) < 0) {
- + Warning("DNS response is too small : %d\n", rc);
- + continue;
- + }
- +
- + id = D_WORD(0);
- +
- + HASH_FIND_INT(dns_server_hash, &id, for_server);
- + if (!for_server) {
- + Warning("Received DNS response ID %d, no matching request found\n", id);
- + continue;
- + }
- +
- + HASH_DEL(dns_server_hash, for_server);
- + for_server->dns_id = 0;
- +
- + aux = D_WORD(2);
- +
- + if (!(aux&0x8000)) {
- + Warning("Received DNS message is not a response\n");
- + continue;
- + }
- +
- + aux &= 0xf;
- + if (aux > 5) {
- + Warning("Received unknown reply code from DNS : %d\n", aux);
- + continue;
- + }
- +
- + if (aux > 0) {
- + Warning("DNS server returned error : %s\n", dns_error[aux]);
- + continue;
- + }
- +
- + aux = D_WORD(4); /* QDCOUNT */
- + while (aux) {
- +
- + if (skip_name(&answer_at, &rc)) {
- + break;
- + }
- +
- + rc -= 4;
- + answer_at += 4;
- +
- + if (rc < 0) { break; }
- +
- + aux--;
- +
- + }
- +
- + if (aux) {
- + Warning("Malformed DNS answer\n");
- + continue;
- + }
- +
- + aux = D_WORD(6); /* ANCOUNT */
- +
- + while (aux) {
- +
- + int type;
- + int class;
- + int rdlen;
- + int ttl;
- +
- + /* skip over domain for now, we don't need it at all? */
- +
- + if (skip_name(&answer_at, &rc)) {
- + break;
- + }
- +
- + /* we need at least 8 bytes available, for:
- + * TYPE,CLASS,TTL,RDLENGTH
- + */
- + if (rc < 8) {
- + break;
- + }
- +
- + type = D_WORD(answer_at);
- + class = D_WORD(answer_at + 2);
- + ttl = (D_WORD(answer_at + 4) << 16) | D_WORD(answer_at + 6);
- + rdlen = D_WORD(answer_at + 8);
- +
- + /* this is a hack, but that would mean that TTL is so huge, it
- + * won't matter much anyway */
- + if (ttl < 0) {
- + ttl = ((unsigned int)ttl) >> 1;
- + }
- +
- + rc -= 10;
- + answer_at += 10;
- +
- + if (rc < rdlen) {
- + break;
- + }
- +
- + if (type == 5 && !cname) {
- + /* CNAME */
- + cname = build_full_name(mlen, answer_at);
- + if (cname) {
- + Warning("Got cname %s\n", cname);
- + }
- + } else if (type == 1 && class == 1 && rdlen >= 4) {
- + /* type A and class IN */
- +
- + tv_sec_add(&for_server->dns_next_check, &now,
- + for_server->dns_ttl_sec = ttl);
- + in_addr_t addr = (D_WORD(answer_at) << 16) | D_WORD(answer_at+2);
- + for_server->addr.sin_addr.s_addr = htonl(addr);
- + addr_ok = 1;
- + break;
- + }
- +
- + /* otherwise we don't recognize what's there */
- + rc -= rdlen;
- + answer_at += rdlen;
- +
- + if (rc < 0) { break; }
- +
- + aux--;
- +
- + }
- +
- + if (cname && !addr_ok) {
- + /* we need to resolve cname */
- + resolve_server(for_server, cname);
- + }
- +
- + if (!cname && !addr_ok) {
- + Warning("Received useless or malformed DNS response for server %s\n", for_server->id);
- + }
- +
- + if (cname) { free(cname); }
- +
- + }
- +
- +#undef D_WORD
- +
- +}
- +
- +void resolve_server(struct server * srv, char * hostname) {
- +
- + struct stat rc_stat;
- + int no_resolver = 0;
- + unsigned char * query;
- + unsigned char * ptr;
- + char * cname;
- + int rem;
- +
- + if (!hostname) {
- + hostname = srv->hostname;
- + }
- +
- + if (!hostname) {
- + /* I should not be even called in this case */
- + return;
- + }
- +
- + /* default DNS time out is 5 sec, man resolve.conf */
- + tv_sec_add(&srv->dns_next_check, &now, 5);
- +
- + if (srv->dns_id) {
- + struct server * aux;
- + HASH_FIND_INT(dns_server_hash, &srv->dns_id, aux);
- + assert(aux == srv);
- + srv->dns_id = 0; /* redundant */
- + HASH_DEL(dns_server_hash, aux);
- + }
- +
- + last_id = (last_id + 1) & 0xffff;
- + /* avoid dns_id being 0 */
- + if (!last_id) { last_id++; }
- +
- + srv->dns_id = last_id;
- + HASH_ADD_INT(dns_server_hash, dns_id, srv);
- +
- + if (stat(RESOLV_CONF, &rc_stat)) {
- + /* We shouldn't complain about it missing, as supposedly that just
- + * means to try localhost */
- + /* Warning("Can't stat " RESOLV_CONF " : %s\n", strerror(errno)); */
- + no_resolver = 1;
- + }
- +
- + if (!no_resolver && last_rc_mod < rc_stat.st_mtime) {
- +
- + do {
- +
- + rem = rc_stat.st_size;
- + unsigned char buf[rem];
- + ptr = buf;
- + int fd;
- +
- + no_resolver = 1;
- +
- + last_rc_mod = rc_stat.st_mtime;
- +
- + fd = open(RESOLV_CONF, O_RDONLY);
- + if (fd < 0) {
- + Warning("Can't open " RESOLV_CONF " : %s\n", strerror(errno));
- + break;
- + }
- +
- + while (rem) {
- + int rc = read(fd, ptr, rem);
- + if (rc < 0) {
- + Warning("Failed reading " RESOLV_CONF " : %s\n", strerror(errno));
- + close(fd);
- + break;
- + }
- +
- + rem -= rc;
- + ptr += rc;
- + }
- +
- + close(fd);
- +
- + ptr = buf;
- + rem = rc_stat.st_size;
- +
- + while (1) {
- +
- + void * next;
- +
- + /* if we have left than 12 chars left, there
- + * is no way we can fit namesever configuration */
- + if (rem < 12) { break; }
- +
- + if (!strncmp("nameserver", (char*)ptr, 10)) {
- +
- + int has_space = 0;
- +
- + /* 10 : length of "nameserver" */
- + rem -= 10;
- + ptr += 10;
- +
- + while (rem && isspace(*ptr)) {
- + ptr++;
- + rem--;
- + has_space = 1;
- + }
- +
- + if (has_space) {
- +
- + char buf[16];
- + int i;
- + struct in_addr addr;
- +
- + memset(buf, 16, 0);
- +
- + for (i=0; i<16; i++) {
- + if (!rem || isspace(*ptr) || (*ptr == '\r') || (*ptr=='\n')) {
- + break;
- + }
- + buf[i] = *(ptr++);
- + rem--;
- + }
- +
- + if (inet_pton(AF_INET, buf, &addr)) {
- + no_resolver = 0;
- + dns_server.sin_addr = addr;
- + break;
- + }
- +
- + }
- +
- + }
- +
- + next = memchr(ptr, '\n', rem);
- + if (!next) { break; }
- +
- + rem -= (next+1-(void*)ptr);
- + ptr = next + 1;
- +
- + if (rem <= 0) { break; }
- +
- + }
- +
- + } while (0);
- +
- + }
- +
- + if (no_resolver) {
- + dns_server.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
- + }
- +
- + /* create the query */
- +
- + /* name can pretty much fit into its strlen,
- + * then 12 bytes for header, 1 byte for final 0,
- + * 4 bytes for qtype/qclass, rounded as 20 */
- + rem = strlen(hostname) + 20;
- +
- + query = calloc(1, rem);
- + if (!query) {
- + Alert("Out of memory\n");
- + exit(1);
- + }
- +
- + query[0] = (srv->dns_id >> 8) & 0xff;
- + query[1] = srv->dns_id & 0xff;
- + query[2] = 0x01; /* opcode=query(0),rd=1 */
- +
- + query[5] = 1; /* QDCOUNT = 1 */
- +
- + ptr = query + 12;
- + cname = hostname;
- +
- + /* rest of header is 0 */
- + /* write out name */
- +
- + while (1) {
- +
- + char * to;
- + int len;
- + int end = 0;
- + if (!*cname || ((*cname) == '.' && !*(cname+1))) {
- + /* we are at root */
- + *ptr = 0;
- + break;
- + }
- +
- + to = strchr(cname, '.');
- + if (!to) {
- + to = cname + strlen(cname);
- + end = 1;
- + }
- + /* we need to take characters between cname(inclusive) and to(exclusive) */
- + len = to - cname;
- +
- + if (!len) { continue; } /* multiple dots? */
- +
- + *(ptr++) = len;
- + memcpy(ptr, cname, len);
- + ptr += len;
- + if (end) { break; }
- + cname = to + 1;
- +
- + }
- +
- + *(ptr + 2) = 1; /* qtype=A */
- + *(ptr + 4) = 1; /* qclass=IN */
- +
- + EV_FD_COND_S(global.dns_fd, DIR_RD);
- +
- + if (dns_socket_try_write(query, rem, &dns_server, 0)) {
- + /* the data was written out if !0 was returned */
- + free(query);
- + }
- +
- +
- +
- +}
- +
- +/*
- * Local variables:
- * c-indent-level: 8
- * c-basic-offset: 8
- diff --git a/src/haproxy.c b/src/haproxy.c
- index c163743..35dec8b 100644
- --- a/src/haproxy.c
- +++ b/src/haproxy.c
- @@ -631,6 +631,10 @@ void init(int argc, char **argv)
- global.maxsock += global.maxconn * 2; /* each connection needs two sockets */
- global.maxsock += global.maxpipes * 2; /* each pipe needs two FDs */
- + if (global.use_dns) {
- + global.maxsock++;
- + }
- +
- if (global.tune.maxpollevents <= 0)
- global.tune.maxpollevents = MAX_POLL_EVENTS;
- @@ -681,10 +685,67 @@ void init(int argc, char **argv)
- sizeof(struct fdinfo) * (global.maxsock));
- fdtab = (struct fdtab *)calloc(1,
- sizeof(struct fdtab) * (global.maxsock));
- +
- + if (!swap_buffer || !fdinfo || !fdtab) {
- + Alert("Out of memory!\n");
- + exit(1);
- + }
- +
- for (i = 0; i < global.maxsock; i++) {
- fdtab[i].state = FD_STCLOSE;
- }
- + if (global.use_dns) {
- +
- + int ok = 0;
- +
- + do {
- +
- + int s = socket(AF_INET, SOCK_DGRAM, 0);
- + struct sockaddr_in l;
- + int f;
- +
- + l.sin_family = AF_INET;
- + l.sin_addr.s_addr = INADDR_ANY;
- + l.sin_port = 0;
- +
- + if (s<0) {
- + Alert("New inet/dgram socket : %s\n", strerror(errno));
- + break;
- + }
- +
- + if (bind(s, (struct sockaddr*)&l, sizeof(struct sockaddr_in))) {
- + Alert("Binding inet/dgram socket : %s\n", strerror(errno));
- + break;
- + }
- +
- + f = fcntl(s, F_GETFL);
- + if (f == -1) {
- + Alert("Can't get flags for %d: %s\n", s, strerror(errno));
- + break;
- + }
- +
- + if (fcntl(s, F_SETFL, f|O_NONBLOCK)) {
- + Alert("Can't set NON_BLK for %d: %s\n", s, strerror(errno));
- + break;
- + }
- +
- + global.dns_fd = s;
- + fdtab[s].state = FD_STREADY;
- + fdtab[s].cb[DIR_WR].f = dns_socket_write;
- + fdtab[s].cb[DIR_RD].f = dns_socket_read;
- +
- + ok = 1;
- +
- + } while(0);
- +
- + if (!ok) {
- + Alert("Failed to establish DNS reply socket\n");
- + exit(1);
- + }
- +
- + }
- +
- /*
- * Note: we could register external pollers here.
- * Built-in pollers have been registered before main().
- diff --git a/src/time.c b/src/time.c
- index 342be9d..d938928 100644
- --- a/src/time.c
- +++ b/src/time.c
- @@ -38,6 +38,15 @@ REGPRM3 struct timeval *_tv_ms_add(struct timeval *tv, const struct timeval *fro
- }
- /*
- + * adds <sec> sec to <from>, set the result to <tv> and returns a pointer <tv>
- + */
- +REGPRM3 struct timeval *_tv_sec_add(struct timeval *tv, const struct timeval *from, int sec)
- +{
- + tv->tv_sec = from->tv_sec + sec;
- + return tv;
- +}
- +
- +/*
- * compares <tv1> and <tv2> modulo 1ms: returns 0 if equal, -1 if tv1 < tv2, 1 if tv1 > tv2
- * Must not be used when either argument is eternity. Use tv_ms_cmp2() for that.
- */
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
