2006-12-21 06:30:28 +00:00
|
|
|
/*
|
|
|
|
* This file is part of the Sofia-SIP package
|
|
|
|
*
|
|
|
|
* Copyright (C) 2006 Nokia Corporation.
|
|
|
|
*
|
|
|
|
* Contact: Pekka Pessi <pekka.pessi@nokia.com>
|
|
|
|
*
|
|
|
|
* This 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 2.1 of
|
|
|
|
* the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This 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 this library; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
|
|
|
* 02110-1301 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
/**@CFILE sres_cache.c
|
|
|
|
* @brief Cache for Sofia DNS Resolver.
|
|
|
|
*
|
|
|
|
* @author Pekka Pessi <Pekka.Pessi@nokia.com>
|
|
|
|
* @author Teemu Jalava <Teemu.Jalava@nokia.com>
|
|
|
|
* @author Mikko Haataja
|
|
|
|
*
|
|
|
|
* @todo The resolver should allow handling arbitrary records, too.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "config.h"
|
|
|
|
|
|
|
|
#if HAVE_STDINT_H
|
|
|
|
#include <stdint.h>
|
|
|
|
#elif HAVE_INTTYPES_H
|
|
|
|
#include <inttypes.h>
|
|
|
|
#else
|
|
|
|
#if defined(_WIN32)
|
|
|
|
typedef unsigned _int8 uint8_t;
|
|
|
|
typedef unsigned _int16 uint16_t;
|
|
|
|
typedef unsigned _int32 uint32_t;
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if HAVE_NETINET_IN_H
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/socket.h>
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if HAVE_WINSOCK2_H
|
|
|
|
#include <winsock2.h>
|
|
|
|
#include <ws2tcpip.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <time.h>
|
|
|
|
|
|
|
|
#include "sofia-resolv/sres_cache.h"
|
|
|
|
#include "sofia-resolv/sres_record.h"
|
|
|
|
|
|
|
|
#include <sofia-sip/su_alloc.h>
|
|
|
|
#include <sofia-sip/su_strlst.h>
|
|
|
|
#include <sofia-sip/htable.h>
|
2007-08-06 19:24:10 +00:00
|
|
|
#include <sofia-sip/heap.h>
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdarg.h>
|
|
|
|
#include <stddef.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <errno.h>
|
|
|
|
|
|
|
|
#include <limits.h>
|
|
|
|
|
|
|
|
#include <assert.h>
|
|
|
|
|
|
|
|
#define SU_LOG sresolv_log
|
|
|
|
|
|
|
|
#include <sofia-sip/su_debug.h>
|
|
|
|
|
|
|
|
typedef struct sres_rr_hash_entry_s sres_rr_hash_entry_t;
|
|
|
|
|
|
|
|
HTABLE_DECLARE_WITH(sres_htable, ht, sres_rr_hash_entry_t, unsigned, size_t);
|
|
|
|
|
2007-08-06 19:24:10 +00:00
|
|
|
typedef HEAP_TYPE sres_heap_t;
|
|
|
|
|
|
|
|
HEAP_DECLARE(static inline, sres_heap_t, sres_heap_, sres_rr_hash_entry_t *);
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
struct sres_rr_hash_entry_s {
|
|
|
|
sres_record_t *rr;
|
2007-08-06 19:24:10 +00:00
|
|
|
size_t rr_heap_index;
|
|
|
|
time_t rr_expires;
|
|
|
|
unsigned int rr_hash_key;
|
2006-12-21 06:30:28 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#define SRES_HENTRY_HASH(e) ((e)->rr_hash_key)
|
|
|
|
|
2007-08-06 19:24:10 +00:00
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* Heap */
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
struct sres_cache
|
|
|
|
{
|
|
|
|
su_home_t cache_home[1];
|
|
|
|
time_t cache_cleaned;
|
|
|
|
sres_htable_t cache_hash[1];
|
2007-08-06 19:24:10 +00:00
|
|
|
sres_heap_t cache_heap;
|
2006-12-21 06:30:28 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#define sr_refcount sr_record->r_refcount
|
|
|
|
#define sr_name sr_record->r_name
|
|
|
|
#define sr_status sr_record->r_status
|
|
|
|
#define sr_size sr_record->r_size
|
|
|
|
#define sr_type sr_record->r_type
|
|
|
|
#define sr_class sr_record->r_class
|
|
|
|
#define sr_ttl sr_record->r_ttl
|
|
|
|
#define sr_rdlen sr_record->r_rdlen
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* Internal prototypes */
|
|
|
|
|
|
|
|
#define LOCK(cache) (su_home_mutex_lock((cache)->cache_home) == 0)
|
|
|
|
#define UNLOCK(cache) (su_home_mutex_unlock((cache)->cache_home))
|
|
|
|
|
2007-05-08 19:14:10 +00:00
|
|
|
su_inline
|
2006-12-21 06:30:28 +00:00
|
|
|
void _sres_cache_free_one(sres_cache_t *cache, sres_record_t *answer);
|
2007-05-08 19:14:10 +00:00
|
|
|
su_inline
|
2006-12-21 06:30:28 +00:00
|
|
|
void _sres_cache_free_answers(sres_cache_t *cache, sres_record_t **answers);
|
|
|
|
|
|
|
|
static unsigned sres_hash_key(const char *string);
|
|
|
|
|
|
|
|
HTABLE_PROTOS_WITH(sres_htable, ht, sres_rr_hash_entry_t, unsigned, size_t);
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* Public functions */
|
|
|
|
|
|
|
|
/** Create a resolver cache object.
|
|
|
|
*
|
|
|
|
* @param n initial size of cache
|
|
|
|
*/
|
|
|
|
sres_cache_t *sres_cache_new(int n)
|
|
|
|
{
|
|
|
|
sres_cache_t *cache = su_home_new(sizeof *cache);
|
|
|
|
|
|
|
|
if (cache) {
|
|
|
|
su_home_threadsafe(cache->cache_home);
|
2007-08-06 19:24:10 +00:00
|
|
|
if (sres_htable_resize(cache->cache_home, cache->cache_hash, n) < 0 ||
|
|
|
|
sres_heap_resize(cache->cache_home, &cache->cache_heap, 0) < 0)
|
2006-12-21 06:30:28 +00:00
|
|
|
su_home_unref(cache->cache_home), cache = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return cache;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Increase reference count on a resolver cache object. */
|
|
|
|
sres_cache_t *sres_cache_ref(sres_cache_t *cache)
|
|
|
|
{
|
|
|
|
return su_home_ref(cache->cache_home);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Decrease the reference count on a resolver cache object. */
|
|
|
|
void sres_cache_unref(sres_cache_t *cache)
|
|
|
|
{
|
|
|
|
su_home_unref(cache->cache_home);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Get a list of matching records from cache. */
|
|
|
|
int sres_cache_get(sres_cache_t *cache,
|
|
|
|
uint16_t type,
|
|
|
|
char const *domain,
|
|
|
|
sres_record_t ***return_cached)
|
|
|
|
{
|
|
|
|
sres_record_t **result = NULL, *rr = NULL;
|
|
|
|
sres_rr_hash_entry_t **rr_iter, **rr_iter2;
|
|
|
|
int result_size, rr_count = 0;
|
|
|
|
unsigned hash;
|
|
|
|
time_t now;
|
|
|
|
char b[8];
|
|
|
|
|
|
|
|
if (!domain || !return_cached)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
*return_cached = NULL;
|
|
|
|
|
|
|
|
SU_DEBUG_9(("%s(%p, %s, \"%s\") called\n", "sres_cache_get",
|
2007-04-15 02:03:41 +00:00
|
|
|
(void *)cache, sres_record_type(type, b), domain));
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
hash = sres_hash_key(domain);
|
|
|
|
|
|
|
|
if (!LOCK(cache))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
time(&now);
|
|
|
|
|
|
|
|
/* First pass: just count the number of rr:s for array allocation */
|
|
|
|
rr_iter2 = sres_htable_hash(cache->cache_hash, hash);
|
|
|
|
|
|
|
|
/* Find the domain records from the hash table */
|
|
|
|
for (rr_iter = rr_iter2;
|
|
|
|
rr_iter && *rr_iter;
|
|
|
|
rr_iter = sres_htable_next(cache->cache_hash, rr_iter)) {
|
|
|
|
rr = (*rr_iter)->rr;
|
|
|
|
|
|
|
|
if (rr != NULL &&
|
2007-08-06 19:24:10 +00:00
|
|
|
now <= (*rr_iter)->rr_expires &&
|
2006-12-21 06:30:28 +00:00
|
|
|
(type == sres_qtype_any || rr->sr_type == type) &&
|
|
|
|
rr->sr_name != NULL &&
|
|
|
|
strcasecmp(rr->sr_name, domain) == 0)
|
|
|
|
rr_count++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (rr_count == 0) {
|
|
|
|
UNLOCK(cache);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
result_size = (sizeof *result) * (rr_count + 1);
|
|
|
|
result = su_zalloc(cache->cache_home, result_size);
|
|
|
|
if (result == NULL) {
|
|
|
|
UNLOCK(cache);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Second pass: add the rr pointers to the allocated array */
|
|
|
|
|
|
|
|
for (rr_iter = rr_iter2, rr_count = 0;
|
|
|
|
rr_iter && *rr_iter;
|
|
|
|
rr_iter = sres_htable_next(cache->cache_hash, rr_iter)) {
|
|
|
|
rr = (*rr_iter)->rr;
|
|
|
|
|
|
|
|
if (rr != NULL &&
|
2007-08-06 19:24:10 +00:00
|
|
|
now <= (*rr_iter)->rr_expires &&
|
2006-12-21 06:30:28 +00:00
|
|
|
(type == sres_qtype_any || rr->sr_type == type) &&
|
|
|
|
rr->sr_name != NULL &&
|
|
|
|
strcasecmp(rr->sr_name, domain) == 0) {
|
|
|
|
SU_DEBUG_9(("rr found in cache: %s %02d\n",
|
|
|
|
rr->sr_name, rr->sr_type));
|
|
|
|
|
|
|
|
result[rr_count++] = rr;
|
|
|
|
rr->sr_refcount++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
result[rr_count] = NULL;
|
|
|
|
|
|
|
|
UNLOCK(cache);
|
|
|
|
|
|
|
|
SU_DEBUG_9(("%s(%p, %s, \"%s\") returned %d entries\n", "sres_cache_get",
|
2007-04-15 02:03:41 +00:00
|
|
|
(void *)cache, sres_record_type(type, b), domain, rr_count));
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
*return_cached = result;
|
|
|
|
|
|
|
|
return rr_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
sres_record_t *
|
|
|
|
sres_cache_alloc_record(sres_cache_t *cache,
|
|
|
|
sres_record_t const *template,
|
|
|
|
size_t extra)
|
|
|
|
{
|
|
|
|
sres_record_t *sr;
|
|
|
|
size_t size, name_length;
|
|
|
|
|
|
|
|
size = template->sr_size;
|
|
|
|
|
|
|
|
assert(size >= sizeof(sres_common_t));
|
|
|
|
assert(template->sr_name != NULL);
|
|
|
|
|
|
|
|
name_length = strlen(template->sr_name);
|
|
|
|
|
|
|
|
sr = su_alloc(cache->cache_home, size + extra + name_length + 1);
|
|
|
|
|
|
|
|
if (sr) {
|
|
|
|
char *s = (char *)sr + size + extra;
|
|
|
|
sr->sr_refcount = 0;
|
|
|
|
sr->sr_name = memcpy(s, template->sr_name, name_length);
|
|
|
|
sr->sr_name[name_length] = '\0';
|
|
|
|
memcpy(&sr->sr_status, &template->sr_status,
|
|
|
|
size - offsetof(sres_common_t, r_status));
|
|
|
|
}
|
|
|
|
|
|
|
|
return sr;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Free a record that has not been stored. */
|
2007-08-06 19:24:10 +00:00
|
|
|
void sres_cache_free_record(sres_cache_t *cache, void *_sr)
|
2006-12-21 06:30:28 +00:00
|
|
|
{
|
2007-08-06 19:24:10 +00:00
|
|
|
sres_record_t *sr = _sr;
|
2006-12-21 06:30:28 +00:00
|
|
|
|
|
|
|
if (sr) {
|
|
|
|
assert(sr->sr_refcount == 0);
|
2007-08-06 19:24:10 +00:00
|
|
|
su_free(cache->cache_home, sr);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Store record to cache */
|
|
|
|
void
|
|
|
|
sres_cache_store(sres_cache_t *cache, sres_record_t *rr, time_t now)
|
|
|
|
{
|
|
|
|
sres_rr_hash_entry_t **rr_iter, *rr_hash_entry;
|
|
|
|
unsigned hash;
|
|
|
|
|
|
|
|
if (rr == NULL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
hash = sres_hash_key(rr->sr_name);
|
|
|
|
|
|
|
|
if (!LOCK(cache))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (sres_htable_is_full(cache->cache_hash))
|
|
|
|
sres_htable_resize(cache->cache_home, cache->cache_hash, 0);
|
|
|
|
|
2007-08-06 19:24:10 +00:00
|
|
|
if (sres_heap_is_full(cache->cache_heap))
|
|
|
|
if (sres_heap_resize(cache->cache_home, &cache->cache_heap, 0) < 0) {
|
|
|
|
UNLOCK(cache);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
for (rr_iter = sres_htable_hash(cache->cache_hash, hash);
|
|
|
|
(rr_hash_entry = *rr_iter);
|
|
|
|
rr_iter = sres_htable_next(cache->cache_hash, rr_iter)) {
|
|
|
|
sres_record_t *or = rr_hash_entry->rr;
|
|
|
|
|
|
|
|
if (or == NULL)
|
|
|
|
continue;
|
|
|
|
if (rr_hash_entry->rr_hash_key != hash)
|
|
|
|
continue;
|
|
|
|
if (or->sr_type != rr->sr_type)
|
|
|
|
continue;
|
|
|
|
if (!!or->sr_name != !!rr->sr_name)
|
|
|
|
continue;
|
|
|
|
if (or->sr_name != rr->sr_name &&
|
|
|
|
strcasecmp(or->sr_name, rr->sr_name) != 0)
|
|
|
|
continue;
|
|
|
|
if (rr->sr_type != sres_type_soa /* There can be only one */
|
|
|
|
&& sres_record_compare(or, rr))
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* There was an old entry in the cache.. Zap it, replace this with it */
|
2007-08-06 19:24:10 +00:00
|
|
|
sres_heap_remove(cache->cache_heap, rr_hash_entry->rr_heap_index);
|
|
|
|
rr_hash_entry->rr_expires = now + rr->sr_ttl;
|
2006-12-21 06:30:28 +00:00
|
|
|
rr_hash_entry->rr = rr;
|
|
|
|
rr->sr_refcount++;
|
2007-08-06 19:24:10 +00:00
|
|
|
sres_heap_add(cache->cache_heap, rr_hash_entry);
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
_sres_cache_free_one(cache, or);
|
|
|
|
|
|
|
|
UNLOCK(cache);
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
rr_hash_entry = su_zalloc(cache->cache_home, sizeof(*rr_hash_entry));
|
2007-08-06 19:24:10 +00:00
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
if (rr_hash_entry) {
|
|
|
|
rr_hash_entry->rr_hash_key = hash;
|
2007-08-06 19:24:10 +00:00
|
|
|
rr_hash_entry->rr_expires = now + rr->sr_ttl;
|
2006-12-21 06:30:28 +00:00
|
|
|
rr_hash_entry->rr = rr;
|
|
|
|
rr->sr_refcount++;
|
|
|
|
|
2007-08-06 19:24:10 +00:00
|
|
|
sres_heap_add(cache->cache_heap, rr_hash_entry);
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
cache->cache_hash->ht_used++;
|
2007-08-06 19:24:10 +00:00
|
|
|
|
|
|
|
*rr_iter = rr_hash_entry;
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
UNLOCK(cache);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Free the list records. */
|
|
|
|
void sres_cache_free_answers(sres_cache_t *cache, sres_record_t **answers)
|
|
|
|
{
|
|
|
|
if (answers && LOCK(cache)) {
|
|
|
|
_sres_cache_free_answers(cache, answers);
|
|
|
|
UNLOCK(cache);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Free and zero one record. */
|
|
|
|
void sres_cache_free_one(sres_cache_t *cache, sres_record_t *answer)
|
|
|
|
{
|
|
|
|
if (LOCK(cache)) {
|
|
|
|
_sres_cache_free_one(cache, answer);
|
|
|
|
UNLOCK(cache);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
|
|
/* Private functions */
|
|
|
|
|
2007-05-08 19:14:10 +00:00
|
|
|
su_inline
|
2006-12-21 06:30:28 +00:00
|
|
|
void _sres_cache_free_answers(sres_cache_t *cache, sres_record_t **answers)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; answers[i] != NULL; i++) {
|
|
|
|
if (answers[i]->sr_refcount <= 1)
|
|
|
|
su_free(cache->cache_home, answers[i]);
|
|
|
|
else
|
|
|
|
answers[i]->sr_refcount--;
|
|
|
|
answers[i] = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
su_free(cache->cache_home, answers);
|
|
|
|
}
|
|
|
|
|
2007-05-08 19:14:10 +00:00
|
|
|
su_inline
|
2006-12-21 06:30:28 +00:00
|
|
|
void _sres_cache_free_one(sres_cache_t *cache, sres_record_t *answer)
|
|
|
|
{
|
|
|
|
if (answer) {
|
|
|
|
if (answer->sr_refcount <= 1)
|
|
|
|
su_free(cache->cache_home, answer);
|
|
|
|
else
|
|
|
|
answer->sr_refcount--;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Calculate a hash key for a string */
|
|
|
|
static
|
|
|
|
unsigned
|
|
|
|
sres_hash_key(const char *string)
|
|
|
|
{
|
|
|
|
unsigned int result = 0;
|
|
|
|
|
|
|
|
while (string && *string)
|
|
|
|
result = result * 797 + (unsigned char) * (string++);
|
|
|
|
|
|
|
|
if (result == 0)
|
|
|
|
result--;
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2007-08-06 19:24:10 +00:00
|
|
|
/** Remove entries from cache. */
|
2006-12-21 06:30:28 +00:00
|
|
|
void sres_cache_clean(sres_cache_t *cache, time_t now)
|
|
|
|
{
|
|
|
|
size_t i;
|
|
|
|
|
|
|
|
if (now < cache->cache_cleaned + SRES_CACHE_TIMER_INTERVAL)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* Clean cache from old entries */
|
|
|
|
|
2007-08-06 19:24:10 +00:00
|
|
|
for (;;) {
|
|
|
|
if (!LOCK(cache))
|
|
|
|
return;
|
|
|
|
|
|
|
|
cache->cache_cleaned = now;
|
|
|
|
|
|
|
|
for (i = 0; i < 100; i++) {
|
|
|
|
sres_rr_hash_entry_t *e = sres_heap_get(cache->cache_heap, 1);
|
|
|
|
|
|
|
|
if (e == NULL || e->rr_expires >= now) {
|
|
|
|
UNLOCK(cache);
|
|
|
|
return;
|
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
|
2007-08-06 19:24:10 +00:00
|
|
|
sres_heap_remove(cache->cache_heap, 1);
|
2006-12-21 06:30:28 +00:00
|
|
|
sres_htable_remove(cache->cache_hash, e);
|
|
|
|
_sres_cache_free_one(cache, e->rr);
|
2007-08-06 19:24:10 +00:00
|
|
|
su_free(cache->cache_home, e);
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
2007-08-06 19:24:10 +00:00
|
|
|
UNLOCK(cache);
|
|
|
|
}
|
2006-12-21 06:30:28 +00:00
|
|
|
}
|
|
|
|
|
merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:
Mon Nov 19 22:05:07 EST 2007 Pekka Pessi <first.lastname@nokia.com>
* test_htable2.c: define struct before using it in prototypes
Fri Jan 11 09:12:01 EST 2008 Bernhard Suttner <suttner at comdasys.com>
* Using # in SOATAG_HOLD to set media as inactive instead of sendonly
Fri Jan 11 09:15:18 EST 2008 Pekka.Pessi@nokia.com
* soa_tag.c: documented SOATAG_HOLD() inactive mode
Fri Jan 11 09:28:46 EST 2008 Pekka.Pessi@nokia.com
* su_addrinfo.c: if su_getaddrinfo() service is NULL, try both with "0" and NULL
Fri Jan 11 09:30:23 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: added tests to DIST_SUBDIRS
Fri Jan 11 12:11:12 EST 2008 Pekka.Pessi@nokia.com
* nta.c: NetModule hack re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
Fri Jan 11 12:12:23 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: NetModule hack for re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
New functions sres_cache_set_srv_priority() and
sres_set_cached_srv_priority().
Fri Jan 11 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: fixed dist target
Fri Jan 11 12:19:33 EST 2008 Pekka.Pessi@nokia.com
* tport_internal.h: grammar in doc
Mon Jan 14 06:59:17 EST 2008 Pekka.Pessi@nokia.com
* su.h: IPv6 fix for Vista SDK
Patch by Michael Jerris
Wed Jan 16 13:20:47 EST 2008 Pekka.Pessi@nokia.com
* nua: fix sf.net bug #1867753 (avoid duplicating initial route set)
Thu Jan 17 07:48:10 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: documented sres_set_cached_srv_priority(), sres_cache_set_srv_priority()
Thu Jan 17 07:51:32 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/su_wait.h, su_port.h, su_root.c: documented new functions and types for 1.12.8
Thu Jan 17 07:52:03 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/htable2.h: marked new features for release 1.12.8
Thu Jan 17 07:52:33 EST 2008 Pekka.Pessi@nokia.com
* su_alloc.c: marked new features for release 1.12.8.
Thu Jan 17 07:53:01 EST 2008 Pekka.Pessi@nokia.com
* AUTHORS: updated
Thu Jan 17 07:53:21 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: added new features and bug fixes since 1.12.7
Thu Jan 17 07:55:18 EST 2008 Pekka.Pessi@nokia.com
* libsofia-sip-ua/docs/Doxyfile.aliases: added @NEW_1_12_8 and @VERSION_1_12_8
Thu Jan 17 09:48:48 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* autogen.sh: use automake 1.9 unless otherwise specified
Thu Jan 17 11:40:46 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: cleaned inactive hold, added tests
Thu Jan 17 11:41:54 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* Makefile.am: added hide_emails.sh to dist
Thu Jan 17 11:42:35 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* nua_stack.c: removed noisy debug message from nua_client_request_sendmsg()
Fri Jan 18 11:06:10 EST 2008 Pekka.Pessi@nokia.com
* nua: Added NUA_ERROR_AT() macro
Made internally generated 900 (and 904) response phrases unique as suggested
by Jerry Richards.
Mon Jan 21 10:39:50 EST 2008 Stefan Knoblich
* TLS debug cleanup
Mon Jan 21 12:05:38 EST 2008 Pekka.Pessi@nokia.com
* tport: build fixes from Freeswitch
Mon Jan 21 12:14:25 EST 2008 Pekka.Pessi@nokia.com
* su_global_log.c: disable warning on SU_DEBUG[] (Doxygen-only variable)
Patch from Michael Jerris.
Mon Jan 21 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* sres.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:16:39 EST 2008 Pekka.Pessi@nokia.com
* stun.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:45:04 EST 2008 Stefan Knoblich
* TLS debug cleanup, 2/2.
Silence openssl messages, part 2 of 2. Changed to TPORT_DEBUG=1 (thanks
MikeJ). This one converts all ERR_print_errors() calls
Mon Jan 21 13:00:49 EST 2008 Pekka.Pessi@nokia.com
* nua: removed asserts() on hairy dialog/request handling cases
Mon Jan 21 14:06:35 EST 2008 Pekka.Pessi@nokia.com
* soa.c: using session state in soa_set_activity()
The media mode bits are set using (local) session description instead of
remote offer/answer when O/A has been completed.
Mon Jan 21 14:08:08 EST 2008 Pekka.Pessi@nokia.com
* soa_static.c: soa_sdp_mode_set() now includes wanted media state in offer
The wanted media state is based on original user SDP and SOATAG_HOLD()
content. Removed soa_sdp_mode_set_is_needed(), using dry-run parameter
instead.
Mon Jan 21 14:09:11 EST 2008 Pekka.Pessi@nokia.com
* nua_subnotref.c: fixed REFER re-try case
REFER trashed its dialog when it got retried if there was no other dialog
usages.
Mon Jan 21 14:20:31 EST 2008 Pekka.Pessi@nokia.com
* nua_stack.c: return specific error phrases from nua_client_init_request()
As suggested by Jerry Richards.
Tue Jan 22 11:15:04 EST 2008 Pekka.Pessi@nokia.com
* sip_util.c: updated sip_response_terminates_dialog() as per RFC 5057.
Changes handling of 423 in case of SUBSCRIBE.
Tue Jan 22 11:34:01 EST 2008 Pekka.Pessi@nokia.com
* conformance.docs: added RFC 5057 (sipping-dialogusage)
Tue Jan 22 11:34:16 EST 2008 Pekka.Pessi@nokia.com
* test_auth_digest.c: testing empty realm
Tue Jan 22 11:35:44 EST 2008 Pekka.Pessi@nokia.com
* test_soa.c: testing hold with inactive, offered mode and setting remote activity flags while in hold
Tue Jan 22 12:27:41 EST 2008 Pekka.Pessi@nokia.com
* nta.c: fixed memory corruption in case sending ACK failed
Thanks for Fabio Margarido for reporting this problem.
Tue Jan 22 12:49:02 EST 2008 Pekka.Pessi@nokia.com
* nua/test_refer.c: run test_challenge_refer() only if we use proxy
Test case is now more deterministic, too.
Tue Jan 22 12:51:59 EST 2008 Pekka.Pessi@nokia.com
* docs/Makefile.am, docs/conformance.docs: fixed links to RFC 5057.
Tue Jan 22 13:57:38 EST 2008 Pekka.Pessi@nokia.com
* sres: added ttl parameter to sres_set_cached_srv_priority() and sres_cache_set_srv_priority().
Tue Jan 22 13:59:44 EST 2008 Pekka.Pessi@nokia.com
* nta.c: added NTATAG_GRAYLIST().
Use NTATAG_GRAYLIST() as ttl value for sres_set_cached_srv_priority().
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed Jan 23 06:56:11 EST 2008 Pekka.Pessi@nokia.com
* sip_extra.c, sip_parser.c: updated documentation
Wed Jan 23 09:47:50 EST 2008 Pekka.Pessi@nokia.com
* test_nta.c: fixed receiving with sink socket
Wed Jan 23 10:07:30 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: fixed signedness error
Wed Jan 23 10:11:14 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* win32 project files: fixed slash direction
Wed Jan 23 10:13:00 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* torture_su.c: set blocking on
Wed Jan 23 10:13:36 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_tport.c: using blocking sockets in test_incomplete()
Wed Jan 23 11:01:11 EST 2008 Pekka.Pessi@nokia.com
* nta.c: now using RFC3261-compliant dialog-matching
Wed Jan 23 11:05:23 EST 2008 Pekka.Pessi@nokia.com
* nta.c: ignore tags in nta_leg_by_dialog() if they are empty strings
Wed Jan 23 11:05:58 EST 2008 Pekka.Pessi@nokia.com
* nta.c: asserting in proper place when handling queue tail
Wed Jan 23 12:11:09 EST 2008 Pekka.Pessi@nokia.com
* torture_sip.c: added tests for accessing other extra headers beside P-Asserted-Identity/P-Preferred-Identity
Wed Jan 23 13:08:55 EST 2008 Pekka.Pessi@nokia.com
* nua: terminate dialog when redirected and re-establish it with new request
Wed Jan 23 13:18:16 EST 2008 Pekka.Pessi@nokia.com
* test_100rel.c: added test for redirect after 100rel response.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7328 d0543943-73ff-0310-b7d9-9358b9ac24b2
2008-01-23 18:37:33 +00:00
|
|
|
/** Set the priority of the matching cached SRV record.
|
|
|
|
*
|
|
|
|
* The SRV records with the domain name, target and port are matched and
|
|
|
|
* their priority value is adjusted. This function is used to implement
|
|
|
|
* greylisting of SIP servers.
|
|
|
|
*
|
|
|
|
* @param cache pointer to DNS cache object
|
|
|
|
* @param domain domain name of the SRV record(s) to modify
|
|
|
|
* (including final dot)
|
|
|
|
* @param target SRV target of the SRV record(s) to modify
|
|
|
|
* @param port port number of SRV record(s) to modify
|
|
|
|
* (in host byte order)
|
|
|
|
* @param priority new priority value (0=highest, 65535=lowest)
|
|
|
|
*
|
|
|
|
* @sa sres_set_cached_srv_priority()
|
|
|
|
*
|
|
|
|
* @NEW_1_12_8
|
|
|
|
*/
|
|
|
|
int sres_cache_set_srv_priority(sres_cache_t *cache,
|
|
|
|
char const *domain,
|
|
|
|
char const *target,
|
|
|
|
uint16_t port,
|
|
|
|
uint16_t priority)
|
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
unsigned hash;
|
|
|
|
sres_rr_hash_entry_t **iter;
|
2008-01-25 17:42:24 +00:00
|
|
|
|
merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:
Mon Nov 19 22:05:07 EST 2007 Pekka Pessi <first.lastname@nokia.com>
* test_htable2.c: define struct before using it in prototypes
Fri Jan 11 09:12:01 EST 2008 Bernhard Suttner <suttner at comdasys.com>
* Using # in SOATAG_HOLD to set media as inactive instead of sendonly
Fri Jan 11 09:15:18 EST 2008 Pekka.Pessi@nokia.com
* soa_tag.c: documented SOATAG_HOLD() inactive mode
Fri Jan 11 09:28:46 EST 2008 Pekka.Pessi@nokia.com
* su_addrinfo.c: if su_getaddrinfo() service is NULL, try both with "0" and NULL
Fri Jan 11 09:30:23 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: added tests to DIST_SUBDIRS
Fri Jan 11 12:11:12 EST 2008 Pekka.Pessi@nokia.com
* nta.c: NetModule hack re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
Fri Jan 11 12:12:23 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: NetModule hack for re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
New functions sres_cache_set_srv_priority() and
sres_set_cached_srv_priority().
Fri Jan 11 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: fixed dist target
Fri Jan 11 12:19:33 EST 2008 Pekka.Pessi@nokia.com
* tport_internal.h: grammar in doc
Mon Jan 14 06:59:17 EST 2008 Pekka.Pessi@nokia.com
* su.h: IPv6 fix for Vista SDK
Patch by Michael Jerris
Wed Jan 16 13:20:47 EST 2008 Pekka.Pessi@nokia.com
* nua: fix sf.net bug #1867753 (avoid duplicating initial route set)
Thu Jan 17 07:48:10 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: documented sres_set_cached_srv_priority(), sres_cache_set_srv_priority()
Thu Jan 17 07:51:32 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/su_wait.h, su_port.h, su_root.c: documented new functions and types for 1.12.8
Thu Jan 17 07:52:03 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/htable2.h: marked new features for release 1.12.8
Thu Jan 17 07:52:33 EST 2008 Pekka.Pessi@nokia.com
* su_alloc.c: marked new features for release 1.12.8.
Thu Jan 17 07:53:01 EST 2008 Pekka.Pessi@nokia.com
* AUTHORS: updated
Thu Jan 17 07:53:21 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: added new features and bug fixes since 1.12.7
Thu Jan 17 07:55:18 EST 2008 Pekka.Pessi@nokia.com
* libsofia-sip-ua/docs/Doxyfile.aliases: added @NEW_1_12_8 and @VERSION_1_12_8
Thu Jan 17 09:48:48 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* autogen.sh: use automake 1.9 unless otherwise specified
Thu Jan 17 11:40:46 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: cleaned inactive hold, added tests
Thu Jan 17 11:41:54 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* Makefile.am: added hide_emails.sh to dist
Thu Jan 17 11:42:35 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* nua_stack.c: removed noisy debug message from nua_client_request_sendmsg()
Fri Jan 18 11:06:10 EST 2008 Pekka.Pessi@nokia.com
* nua: Added NUA_ERROR_AT() macro
Made internally generated 900 (and 904) response phrases unique as suggested
by Jerry Richards.
Mon Jan 21 10:39:50 EST 2008 Stefan Knoblich
* TLS debug cleanup
Mon Jan 21 12:05:38 EST 2008 Pekka.Pessi@nokia.com
* tport: build fixes from Freeswitch
Mon Jan 21 12:14:25 EST 2008 Pekka.Pessi@nokia.com
* su_global_log.c: disable warning on SU_DEBUG[] (Doxygen-only variable)
Patch from Michael Jerris.
Mon Jan 21 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* sres.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:16:39 EST 2008 Pekka.Pessi@nokia.com
* stun.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:45:04 EST 2008 Stefan Knoblich
* TLS debug cleanup, 2/2.
Silence openssl messages, part 2 of 2. Changed to TPORT_DEBUG=1 (thanks
MikeJ). This one converts all ERR_print_errors() calls
Mon Jan 21 13:00:49 EST 2008 Pekka.Pessi@nokia.com
* nua: removed asserts() on hairy dialog/request handling cases
Mon Jan 21 14:06:35 EST 2008 Pekka.Pessi@nokia.com
* soa.c: using session state in soa_set_activity()
The media mode bits are set using (local) session description instead of
remote offer/answer when O/A has been completed.
Mon Jan 21 14:08:08 EST 2008 Pekka.Pessi@nokia.com
* soa_static.c: soa_sdp_mode_set() now includes wanted media state in offer
The wanted media state is based on original user SDP and SOATAG_HOLD()
content. Removed soa_sdp_mode_set_is_needed(), using dry-run parameter
instead.
Mon Jan 21 14:09:11 EST 2008 Pekka.Pessi@nokia.com
* nua_subnotref.c: fixed REFER re-try case
REFER trashed its dialog when it got retried if there was no other dialog
usages.
Mon Jan 21 14:20:31 EST 2008 Pekka.Pessi@nokia.com
* nua_stack.c: return specific error phrases from nua_client_init_request()
As suggested by Jerry Richards.
Tue Jan 22 11:15:04 EST 2008 Pekka.Pessi@nokia.com
* sip_util.c: updated sip_response_terminates_dialog() as per RFC 5057.
Changes handling of 423 in case of SUBSCRIBE.
Tue Jan 22 11:34:01 EST 2008 Pekka.Pessi@nokia.com
* conformance.docs: added RFC 5057 (sipping-dialogusage)
Tue Jan 22 11:34:16 EST 2008 Pekka.Pessi@nokia.com
* test_auth_digest.c: testing empty realm
Tue Jan 22 11:35:44 EST 2008 Pekka.Pessi@nokia.com
* test_soa.c: testing hold with inactive, offered mode and setting remote activity flags while in hold
Tue Jan 22 12:27:41 EST 2008 Pekka.Pessi@nokia.com
* nta.c: fixed memory corruption in case sending ACK failed
Thanks for Fabio Margarido for reporting this problem.
Tue Jan 22 12:49:02 EST 2008 Pekka.Pessi@nokia.com
* nua/test_refer.c: run test_challenge_refer() only if we use proxy
Test case is now more deterministic, too.
Tue Jan 22 12:51:59 EST 2008 Pekka.Pessi@nokia.com
* docs/Makefile.am, docs/conformance.docs: fixed links to RFC 5057.
Tue Jan 22 13:57:38 EST 2008 Pekka.Pessi@nokia.com
* sres: added ttl parameter to sres_set_cached_srv_priority() and sres_cache_set_srv_priority().
Tue Jan 22 13:59:44 EST 2008 Pekka.Pessi@nokia.com
* nta.c: added NTATAG_GRAYLIST().
Use NTATAG_GRAYLIST() as ttl value for sres_set_cached_srv_priority().
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed Jan 23 06:56:11 EST 2008 Pekka.Pessi@nokia.com
* sip_extra.c, sip_parser.c: updated documentation
Wed Jan 23 09:47:50 EST 2008 Pekka.Pessi@nokia.com
* test_nta.c: fixed receiving with sink socket
Wed Jan 23 10:07:30 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: fixed signedness error
Wed Jan 23 10:11:14 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* win32 project files: fixed slash direction
Wed Jan 23 10:13:00 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* torture_su.c: set blocking on
Wed Jan 23 10:13:36 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_tport.c: using blocking sockets in test_incomplete()
Wed Jan 23 11:01:11 EST 2008 Pekka.Pessi@nokia.com
* nta.c: now using RFC3261-compliant dialog-matching
Wed Jan 23 11:05:23 EST 2008 Pekka.Pessi@nokia.com
* nta.c: ignore tags in nta_leg_by_dialog() if they are empty strings
Wed Jan 23 11:05:58 EST 2008 Pekka.Pessi@nokia.com
* nta.c: asserting in proper place when handling queue tail
Wed Jan 23 12:11:09 EST 2008 Pekka.Pessi@nokia.com
* torture_sip.c: added tests for accessing other extra headers beside P-Asserted-Identity/P-Preferred-Identity
Wed Jan 23 13:08:55 EST 2008 Pekka.Pessi@nokia.com
* nua: terminate dialog when redirected and re-establish it with new request
Wed Jan 23 13:18:16 EST 2008 Pekka.Pessi@nokia.com
* test_100rel.c: added test for redirect after 100rel response.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7328 d0543943-73ff-0310-b7d9-9358b9ac24b2
2008-01-23 18:37:33 +00:00
|
|
|
if (cache == NULL || domain == NULL || target == NULL)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
hash = sres_hash_key(domain);
|
|
|
|
|
|
|
|
if (!LOCK(cache))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
for (iter = sres_htable_hash(cache->cache_hash, hash);
|
|
|
|
iter && *iter;
|
|
|
|
iter = sres_htable_next(cache->cache_hash, iter)) {
|
|
|
|
sres_record_t *rr = (*iter)->rr;
|
|
|
|
|
|
|
|
if (rr && rr->sr_name &&
|
|
|
|
sres_type_srv == rr->sr_type &&
|
2008-01-25 17:42:24 +00:00
|
|
|
(port == 0 || rr->sr_srv->srv_port == port) &&
|
|
|
|
rr->sr_srv->srv_target &&
|
|
|
|
strcasecmp(rr->sr_srv->srv_target, target) == 0 &&
|
merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:
Mon Nov 19 22:05:07 EST 2007 Pekka Pessi <first.lastname@nokia.com>
* test_htable2.c: define struct before using it in prototypes
Fri Jan 11 09:12:01 EST 2008 Bernhard Suttner <suttner at comdasys.com>
* Using # in SOATAG_HOLD to set media as inactive instead of sendonly
Fri Jan 11 09:15:18 EST 2008 Pekka.Pessi@nokia.com
* soa_tag.c: documented SOATAG_HOLD() inactive mode
Fri Jan 11 09:28:46 EST 2008 Pekka.Pessi@nokia.com
* su_addrinfo.c: if su_getaddrinfo() service is NULL, try both with "0" and NULL
Fri Jan 11 09:30:23 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: added tests to DIST_SUBDIRS
Fri Jan 11 12:11:12 EST 2008 Pekka.Pessi@nokia.com
* nta.c: NetModule hack re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
Fri Jan 11 12:12:23 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: NetModule hack for re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
New functions sres_cache_set_srv_priority() and
sres_set_cached_srv_priority().
Fri Jan 11 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: fixed dist target
Fri Jan 11 12:19:33 EST 2008 Pekka.Pessi@nokia.com
* tport_internal.h: grammar in doc
Mon Jan 14 06:59:17 EST 2008 Pekka.Pessi@nokia.com
* su.h: IPv6 fix for Vista SDK
Patch by Michael Jerris
Wed Jan 16 13:20:47 EST 2008 Pekka.Pessi@nokia.com
* nua: fix sf.net bug #1867753 (avoid duplicating initial route set)
Thu Jan 17 07:48:10 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: documented sres_set_cached_srv_priority(), sres_cache_set_srv_priority()
Thu Jan 17 07:51:32 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/su_wait.h, su_port.h, su_root.c: documented new functions and types for 1.12.8
Thu Jan 17 07:52:03 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/htable2.h: marked new features for release 1.12.8
Thu Jan 17 07:52:33 EST 2008 Pekka.Pessi@nokia.com
* su_alloc.c: marked new features for release 1.12.8.
Thu Jan 17 07:53:01 EST 2008 Pekka.Pessi@nokia.com
* AUTHORS: updated
Thu Jan 17 07:53:21 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: added new features and bug fixes since 1.12.7
Thu Jan 17 07:55:18 EST 2008 Pekka.Pessi@nokia.com
* libsofia-sip-ua/docs/Doxyfile.aliases: added @NEW_1_12_8 and @VERSION_1_12_8
Thu Jan 17 09:48:48 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* autogen.sh: use automake 1.9 unless otherwise specified
Thu Jan 17 11:40:46 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: cleaned inactive hold, added tests
Thu Jan 17 11:41:54 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* Makefile.am: added hide_emails.sh to dist
Thu Jan 17 11:42:35 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* nua_stack.c: removed noisy debug message from nua_client_request_sendmsg()
Fri Jan 18 11:06:10 EST 2008 Pekka.Pessi@nokia.com
* nua: Added NUA_ERROR_AT() macro
Made internally generated 900 (and 904) response phrases unique as suggested
by Jerry Richards.
Mon Jan 21 10:39:50 EST 2008 Stefan Knoblich
* TLS debug cleanup
Mon Jan 21 12:05:38 EST 2008 Pekka.Pessi@nokia.com
* tport: build fixes from Freeswitch
Mon Jan 21 12:14:25 EST 2008 Pekka.Pessi@nokia.com
* su_global_log.c: disable warning on SU_DEBUG[] (Doxygen-only variable)
Patch from Michael Jerris.
Mon Jan 21 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* sres.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:16:39 EST 2008 Pekka.Pessi@nokia.com
* stun.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:45:04 EST 2008 Stefan Knoblich
* TLS debug cleanup, 2/2.
Silence openssl messages, part 2 of 2. Changed to TPORT_DEBUG=1 (thanks
MikeJ). This one converts all ERR_print_errors() calls
Mon Jan 21 13:00:49 EST 2008 Pekka.Pessi@nokia.com
* nua: removed asserts() on hairy dialog/request handling cases
Mon Jan 21 14:06:35 EST 2008 Pekka.Pessi@nokia.com
* soa.c: using session state in soa_set_activity()
The media mode bits are set using (local) session description instead of
remote offer/answer when O/A has been completed.
Mon Jan 21 14:08:08 EST 2008 Pekka.Pessi@nokia.com
* soa_static.c: soa_sdp_mode_set() now includes wanted media state in offer
The wanted media state is based on original user SDP and SOATAG_HOLD()
content. Removed soa_sdp_mode_set_is_needed(), using dry-run parameter
instead.
Mon Jan 21 14:09:11 EST 2008 Pekka.Pessi@nokia.com
* nua_subnotref.c: fixed REFER re-try case
REFER trashed its dialog when it got retried if there was no other dialog
usages.
Mon Jan 21 14:20:31 EST 2008 Pekka.Pessi@nokia.com
* nua_stack.c: return specific error phrases from nua_client_init_request()
As suggested by Jerry Richards.
Tue Jan 22 11:15:04 EST 2008 Pekka.Pessi@nokia.com
* sip_util.c: updated sip_response_terminates_dialog() as per RFC 5057.
Changes handling of 423 in case of SUBSCRIBE.
Tue Jan 22 11:34:01 EST 2008 Pekka.Pessi@nokia.com
* conformance.docs: added RFC 5057 (sipping-dialogusage)
Tue Jan 22 11:34:16 EST 2008 Pekka.Pessi@nokia.com
* test_auth_digest.c: testing empty realm
Tue Jan 22 11:35:44 EST 2008 Pekka.Pessi@nokia.com
* test_soa.c: testing hold with inactive, offered mode and setting remote activity flags while in hold
Tue Jan 22 12:27:41 EST 2008 Pekka.Pessi@nokia.com
* nta.c: fixed memory corruption in case sending ACK failed
Thanks for Fabio Margarido for reporting this problem.
Tue Jan 22 12:49:02 EST 2008 Pekka.Pessi@nokia.com
* nua/test_refer.c: run test_challenge_refer() only if we use proxy
Test case is now more deterministic, too.
Tue Jan 22 12:51:59 EST 2008 Pekka.Pessi@nokia.com
* docs/Makefile.am, docs/conformance.docs: fixed links to RFC 5057.
Tue Jan 22 13:57:38 EST 2008 Pekka.Pessi@nokia.com
* sres: added ttl parameter to sres_set_cached_srv_priority() and sres_cache_set_srv_priority().
Tue Jan 22 13:59:44 EST 2008 Pekka.Pessi@nokia.com
* nta.c: added NTATAG_GRAYLIST().
Use NTATAG_GRAYLIST() as ttl value for sres_set_cached_srv_priority().
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed Jan 23 06:56:11 EST 2008 Pekka.Pessi@nokia.com
* sip_extra.c, sip_parser.c: updated documentation
Wed Jan 23 09:47:50 EST 2008 Pekka.Pessi@nokia.com
* test_nta.c: fixed receiving with sink socket
Wed Jan 23 10:07:30 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: fixed signedness error
Wed Jan 23 10:11:14 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* win32 project files: fixed slash direction
Wed Jan 23 10:13:00 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* torture_su.c: set blocking on
Wed Jan 23 10:13:36 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_tport.c: using blocking sockets in test_incomplete()
Wed Jan 23 11:01:11 EST 2008 Pekka.Pessi@nokia.com
* nta.c: now using RFC3261-compliant dialog-matching
Wed Jan 23 11:05:23 EST 2008 Pekka.Pessi@nokia.com
* nta.c: ignore tags in nta_leg_by_dialog() if they are empty strings
Wed Jan 23 11:05:58 EST 2008 Pekka.Pessi@nokia.com
* nta.c: asserting in proper place when handling queue tail
Wed Jan 23 12:11:09 EST 2008 Pekka.Pessi@nokia.com
* torture_sip.c: added tests for accessing other extra headers beside P-Asserted-Identity/P-Preferred-Identity
Wed Jan 23 13:08:55 EST 2008 Pekka.Pessi@nokia.com
* nua: terminate dialog when redirected and re-establish it with new request
Wed Jan 23 13:18:16 EST 2008 Pekka.Pessi@nokia.com
* test_100rel.c: added test for redirect after 100rel response.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7328 d0543943-73ff-0310-b7d9-9358b9ac24b2
2008-01-23 18:37:33 +00:00
|
|
|
strcasecmp(rr->sr_name, domain) == 0) {
|
2008-01-25 17:42:24 +00:00
|
|
|
/* record found --> change priority of server */
|
|
|
|
rr->sr_srv->srv_priority = priority;
|
|
|
|
ret++;
|
merge to sofia sip darcs tree. Includes multiple fixes and several merges of changes from the freeswitch tree back to darcs as follows:
Mon Nov 19 22:05:07 EST 2007 Pekka Pessi <first.lastname@nokia.com>
* test_htable2.c: define struct before using it in prototypes
Fri Jan 11 09:12:01 EST 2008 Bernhard Suttner <suttner at comdasys.com>
* Using # in SOATAG_HOLD to set media as inactive instead of sendonly
Fri Jan 11 09:15:18 EST 2008 Pekka.Pessi@nokia.com
* soa_tag.c: documented SOATAG_HOLD() inactive mode
Fri Jan 11 09:28:46 EST 2008 Pekka.Pessi@nokia.com
* su_addrinfo.c: if su_getaddrinfo() service is NULL, try both with "0" and NULL
Fri Jan 11 09:30:23 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: added tests to DIST_SUBDIRS
Fri Jan 11 12:11:12 EST 2008 Pekka.Pessi@nokia.com
* nta.c: NetModule hack re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
Fri Jan 11 12:12:23 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: NetModule hack for re-prioritizing SRV records
Original hack by Stefan Leuenberger <Stefan.Leuenberger@netmodule.com>.
The hack reprioritizes the SRV records used with transaction in case a
server refuses connection or it does not answer.
New functions sres_cache_set_srv_priority() and
sres_set_cached_srv_priority().
Fri Jan 11 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* Makefile.am: fixed dist target
Fri Jan 11 12:19:33 EST 2008 Pekka.Pessi@nokia.com
* tport_internal.h: grammar in doc
Mon Jan 14 06:59:17 EST 2008 Pekka.Pessi@nokia.com
* su.h: IPv6 fix for Vista SDK
Patch by Michael Jerris
Wed Jan 16 13:20:47 EST 2008 Pekka.Pessi@nokia.com
* nua: fix sf.net bug #1867753 (avoid duplicating initial route set)
Thu Jan 17 07:48:10 EST 2008 Pekka.Pessi@nokia.com
* sres.c, sres_cache.c: documented sres_set_cached_srv_priority(), sres_cache_set_srv_priority()
Thu Jan 17 07:51:32 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/su_wait.h, su_port.h, su_root.c: documented new functions and types for 1.12.8
Thu Jan 17 07:52:03 EST 2008 Pekka.Pessi@nokia.com
* sofia-sip/htable2.h: marked new features for release 1.12.8
Thu Jan 17 07:52:33 EST 2008 Pekka.Pessi@nokia.com
* su_alloc.c: marked new features for release 1.12.8.
Thu Jan 17 07:53:01 EST 2008 Pekka.Pessi@nokia.com
* AUTHORS: updated
Thu Jan 17 07:53:21 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: added new features and bug fixes since 1.12.7
Thu Jan 17 07:55:18 EST 2008 Pekka.Pessi@nokia.com
* libsofia-sip-ua/docs/Doxyfile.aliases: added @NEW_1_12_8 and @VERSION_1_12_8
Thu Jan 17 09:48:48 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* autogen.sh: use automake 1.9 unless otherwise specified
Thu Jan 17 11:40:46 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: cleaned inactive hold, added tests
Thu Jan 17 11:41:54 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* Makefile.am: added hide_emails.sh to dist
Thu Jan 17 11:42:35 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* nua_stack.c: removed noisy debug message from nua_client_request_sendmsg()
Fri Jan 18 11:06:10 EST 2008 Pekka.Pessi@nokia.com
* nua: Added NUA_ERROR_AT() macro
Made internally generated 900 (and 904) response phrases unique as suggested
by Jerry Richards.
Mon Jan 21 10:39:50 EST 2008 Stefan Knoblich
* TLS debug cleanup
Mon Jan 21 12:05:38 EST 2008 Pekka.Pessi@nokia.com
* tport: build fixes from Freeswitch
Mon Jan 21 12:14:25 EST 2008 Pekka.Pessi@nokia.com
* su_global_log.c: disable warning on SU_DEBUG[] (Doxygen-only variable)
Patch from Michael Jerris.
Mon Jan 21 12:15:19 EST 2008 Pekka.Pessi@nokia.com
* sres.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:16:39 EST 2008 Pekka.Pessi@nokia.com
* stun.c: default log level to the same as SU_DEBUG define
Patch by Michael Jerris
Mon Jan 21 12:45:04 EST 2008 Stefan Knoblich
* TLS debug cleanup, 2/2.
Silence openssl messages, part 2 of 2. Changed to TPORT_DEBUG=1 (thanks
MikeJ). This one converts all ERR_print_errors() calls
Mon Jan 21 13:00:49 EST 2008 Pekka.Pessi@nokia.com
* nua: removed asserts() on hairy dialog/request handling cases
Mon Jan 21 14:06:35 EST 2008 Pekka.Pessi@nokia.com
* soa.c: using session state in soa_set_activity()
The media mode bits are set using (local) session description instead of
remote offer/answer when O/A has been completed.
Mon Jan 21 14:08:08 EST 2008 Pekka.Pessi@nokia.com
* soa_static.c: soa_sdp_mode_set() now includes wanted media state in offer
The wanted media state is based on original user SDP and SOATAG_HOLD()
content. Removed soa_sdp_mode_set_is_needed(), using dry-run parameter
instead.
Mon Jan 21 14:09:11 EST 2008 Pekka.Pessi@nokia.com
* nua_subnotref.c: fixed REFER re-try case
REFER trashed its dialog when it got retried if there was no other dialog
usages.
Mon Jan 21 14:20:31 EST 2008 Pekka.Pessi@nokia.com
* nua_stack.c: return specific error phrases from nua_client_init_request()
As suggested by Jerry Richards.
Tue Jan 22 11:15:04 EST 2008 Pekka.Pessi@nokia.com
* sip_util.c: updated sip_response_terminates_dialog() as per RFC 5057.
Changes handling of 423 in case of SUBSCRIBE.
Tue Jan 22 11:34:01 EST 2008 Pekka.Pessi@nokia.com
* conformance.docs: added RFC 5057 (sipping-dialogusage)
Tue Jan 22 11:34:16 EST 2008 Pekka.Pessi@nokia.com
* test_auth_digest.c: testing empty realm
Tue Jan 22 11:35:44 EST 2008 Pekka.Pessi@nokia.com
* test_soa.c: testing hold with inactive, offered mode and setting remote activity flags while in hold
Tue Jan 22 12:27:41 EST 2008 Pekka.Pessi@nokia.com
* nta.c: fixed memory corruption in case sending ACK failed
Thanks for Fabio Margarido for reporting this problem.
Tue Jan 22 12:49:02 EST 2008 Pekka.Pessi@nokia.com
* nua/test_refer.c: run test_challenge_refer() only if we use proxy
Test case is now more deterministic, too.
Tue Jan 22 12:51:59 EST 2008 Pekka.Pessi@nokia.com
* docs/Makefile.am, docs/conformance.docs: fixed links to RFC 5057.
Tue Jan 22 13:57:38 EST 2008 Pekka.Pessi@nokia.com
* sres: added ttl parameter to sres_set_cached_srv_priority() and sres_cache_set_srv_priority().
Tue Jan 22 13:59:44 EST 2008 Pekka.Pessi@nokia.com
* nta.c: added NTATAG_GRAYLIST().
Use NTATAG_GRAYLIST() as ttl value for sres_set_cached_srv_priority().
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Tue Jan 22 14:04:29 EST 2008 Pekka.Pessi@nokia.com
* RELEASE: updated.
Wed Jan 23 06:56:11 EST 2008 Pekka.Pessi@nokia.com
* sip_extra.c, sip_parser.c: updated documentation
Wed Jan 23 09:47:50 EST 2008 Pekka.Pessi@nokia.com
* test_nta.c: fixed receiving with sink socket
Wed Jan 23 10:07:30 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* soa_static.c: fixed signedness error
Wed Jan 23 10:11:14 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* win32 project files: fixed slash direction
Wed Jan 23 10:13:00 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* torture_su.c: set blocking on
Wed Jan 23 10:13:36 EST 2008 Pekka Pessi <Pekka.Pessi@nokia.com>
* test_tport.c: using blocking sockets in test_incomplete()
Wed Jan 23 11:01:11 EST 2008 Pekka.Pessi@nokia.com
* nta.c: now using RFC3261-compliant dialog-matching
Wed Jan 23 11:05:23 EST 2008 Pekka.Pessi@nokia.com
* nta.c: ignore tags in nta_leg_by_dialog() if they are empty strings
Wed Jan 23 11:05:58 EST 2008 Pekka.Pessi@nokia.com
* nta.c: asserting in proper place when handling queue tail
Wed Jan 23 12:11:09 EST 2008 Pekka.Pessi@nokia.com
* torture_sip.c: added tests for accessing other extra headers beside P-Asserted-Identity/P-Preferred-Identity
Wed Jan 23 13:08:55 EST 2008 Pekka.Pessi@nokia.com
* nua: terminate dialog when redirected and re-establish it with new request
Wed Jan 23 13:18:16 EST 2008 Pekka.Pessi@nokia.com
* test_100rel.c: added test for redirect after 100rel response.
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7328 d0543943-73ff-0310-b7d9-9358b9ac24b2
2008-01-23 18:37:33 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
UNLOCK(cache);
|
|
|
|
|
|
|
|
/** @return number of modified entries or -1 upon an error. */
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2006-12-21 06:30:28 +00:00
|
|
|
HTABLE_BODIES_WITH(sres_htable, ht, sres_rr_hash_entry_t, SRES_HENTRY_HASH,
|
|
|
|
unsigned, size_t);
|
2007-08-06 19:24:10 +00:00
|
|
|
|
|
|
|
static inline
|
|
|
|
int sres_heap_earlier_entry(sres_rr_hash_entry_t const *a,
|
|
|
|
sres_rr_hash_entry_t const *b)
|
|
|
|
{
|
|
|
|
return a->rr_expires < b->rr_expires;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline
|
|
|
|
void sres_heap_set_entry(sres_rr_hash_entry_t **heap,
|
|
|
|
size_t index,
|
|
|
|
sres_rr_hash_entry_t *entry)
|
|
|
|
{
|
|
|
|
entry->rr_heap_index = index;
|
|
|
|
heap[index] = entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
HEAP_BODIES(static inline,
|
|
|
|
sres_heap_t,
|
|
|
|
sres_heap_,
|
|
|
|
sres_rr_hash_entry_t *,
|
|
|
|
sres_heap_earlier_entry,
|
|
|
|
sres_heap_set_entry,
|
|
|
|
su_realloc,
|
|
|
|
NULL);
|