Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

Tue Feb 10 19:39:02 CST 2009 Pekka Pessi <first.last@nokia.com>

Browse Source 
* sres_cache: added sres_cache_copy_answers()



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11949 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-02-12 21:14:45 +00:00
parent 87b2408635
commit 816f984722
4 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/sofia-sip/.update
View File

@ -1 +1 @@
Thu Feb 12 15:13:11 CST 2009
Thu Feb 12 15:14:36 CST 2009

4
libs/sofia-sip/libsofia-sip-ua/sresolv/sofia-resolv/sres_cache.h
View File

@ -90,6 +90,10 @@ SRESPUBFUN void sres_cache_free_answers(sres_cache_t *, sres_record_t **);
/** Free and zero one record. */
SRESPUBFUN void sres_cache_free_one(sres_cache_t *, sres_record_t *answer);
/** Copy list of records */
SRESPUBFUN
sres_record_t **sres_cache_copy_answers(sres_cache_t *, sres_record_t **);
/** Remove old records from cache. */
SRESPUBFUN void sres_cache_clean(sres_cache_t *cache, time_t now);

39
libs/sofia-sip/libsofia-sip-ua/sresolv/sres_cache.c
View File

@ -131,6 +131,8 @@ su_inline
void _sres_cache_free_one(sres_cache_t *cache, sres_record_t *answer);
su_inline
void _sres_cache_free_answers(sres_cache_t *cache, sres_record_t **answers);
su_inline sres_record_t **_sres_cache_copy_answers(
sres_cache_t *, sres_record_t **);
static unsigned sres_hash_key(const char *string);
@ -458,6 +460,20 @@ void sres_cache_free_one(sres_cache_t *cache, sres_record_t *answer)
}
}
/** Copy the list of records. */
sres_record_t **
sres_cache_copy_answers(sres_cache_t *cache, sres_record_t **answers)
{
sres_record_t **copy = NULL;
if (answers && LOCK(cache)) {
copy = _sres_cache_copy_answers(cache, answers);
UNLOCK(cache);
}
return copy;
}
/* ---------------------------------------------------------------------- */
/* Private functions */
@ -488,6 +504,29 @@ void _sres_cache_free_one(sres_cache_t *cache, sres_record_t *answer)
}
}
su_inline sres_record_t **
_sres_cache_copy_answers(sres_cache_t *cache, sres_record_t **answers)
{
int i, n;
sres_record_t **copy;
for (n = 0; answers[n] != NULL; n++)
;
copy = su_alloc(cache->cache_home, (n + 1) * (sizeof *copy));
if (copy == NULL)
return NULL;
for (i = 0; i < n; i++) {
copy[i] = answers[i];
copy[i]->sr_refcount++;
}
copy[i] = NULL;
return copy;
}
/** Calculate a hash key for a string */
static
unsigned

11
libs/sofia-sip/libsofia-sip-ua/sresolv/torture_sresolv.c
View File

@ -234,6 +234,7 @@ int test_cache(void)
BEGIN();
sres_a_record_t *a, a0[1], **all;
sres_record_t **copy;
char host[128];
sres_cache_t *cache;
time_t now, base;
@ -292,6 +293,11 @@ int test_cache(void)
for (i = 0, N; i < N; i++)
TEST(all[i]->a_record->r_refcount, 2);
TEST_1(copy = sres_cache_copy_answers(cache, (sres_record_t **)all));
for (i = 0, N; i < N; i++)
TEST(all[i]->a_record->r_refcount, 3);
clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &t0);
for (now = base; now <= base + 3660; now += 30)
@ -306,6 +312,11 @@ int test_cache(void)
(unsigned)N, (long unsigned)t2.tv_sec, t2.tv_nsec);
}
for (i = 0, N; i < N; i++)
TEST(all[i]->a_record->r_refcount, 2);
sres_cache_free_answers(cache, copy), copy = NULL;
for (i = 0, N; i < N; i++)
TEST(all[i]->a_record->r_refcount, 1);