sync to darcs tree

Thu Jan 17 07:57:29 EST 2008  Pekka.Pessi@nokia.com
  * configure.ac: prerelease version

Wed Jan 23 13:22:39 EST 2008  Pekka.Pessi@nokia.com
  * test_nta.c: fixed memset() usage. MSG_TRUNC.

Wed Jan 23 13:25:42 EST 2008  Pekka Pessi <Pekka.Pessi@nokia.com>
  * RELEASE, configure.ac: release 1.12.8

Wed Jan 23 13:25:46 EST 2008  Pekka Pessi <Pekka.Pessi@nokia.com>
  tagged rel-sofia-sip_1_12_8

Wed Jan 23 13:25:52 EST 2008  Pekka Pessi <Pekka.Pessi@nokia.com>
  tagged 1.12.8

Wed Jan 23 14:25:07 EST 2008  Pekka.Pessi@nokia.com
  * RELEASE, configure.ac: 1.12.8devel

Fri Jan 25 04:31:39 EST 2008  Pekka.Pessi@nokia.com
  * nta.c: fixed graylisting if used with IPv4/IPv6 only



git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@7372 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris committed 2008-01-26 19:57:55 +00:00
1 parent c9d1827232
commit aa1b4bb463
4 files changed
+90 -121

No files matched your search

+54 -38
View File
@@ -8846,12 +8846,14 @@ struct sipdns_query
uint16_t sq_type; /* query type */
uint16_t sq_priority; /* priority or preference */
uint16_t sq_weight; /* preference or weight */
uint16_t sq_grayish; /* candidate for graylisting */
};
static int outgoing_resolve_next(nta_outgoing_t *orq);
static int outgoing_resolving(nta_outgoing_t *orq);
static int outgoing_resolving_error(nta_outgoing_t *,
int status, char const *phrase);
static void outgoing_graylist(nta_outgoing_t *orq, struct sipdns_query *sq);
static int outgoing_query_naptr(nta_outgoing_t *orq, char const *domain);
static void outgoing_answer_naptr(sres_context_t *orq, sres_query_t *q,
sres_record_t *answers[]);
@@ -9092,50 +9094,61 @@ outgoing_try_another(nta_outgoing_t *orq)
/* find latest A/AAAA record */
sq = sr->sr_head;
if (!sq || (sr->sr_a_aaaa1 != sr->sr_a_aaaa2 && sq->sq_type == sr->sr_a_aaaa1))
sq = sr->sr_done;
if (sq && sq->sq_otype == sres_type_srv) {
char const *target = sq->sq_domain, *proto = sq->sq_proto;
unsigned prio = sq->sq_priority, maxprio = prio;
SU_DEBUG_5(("nta: no response from %s:%s;transport=%s\n", target, sq->sq_port, proto));
for (sq = sr->sr_head; sq; sq = sq->sq_next)
if (sq->sq_otype == sres_type_srv && sq->sq_priority > maxprio)
maxprio = sq->sq_priority;
for (sq = sr->sr_done; sq; sq = sq->sq_next)
if (sq->sq_otype == sres_type_srv && sq->sq_priority > maxprio)
maxprio = sq->sq_priority;
for (sq = sr->sr_done; sq; sq = sq->sq_next) {
int modified;
if (sq->sq_type != sres_type_srv || strcmp(proto, sq->sq_proto))
continue;
/* modify the SRV record(s) corresponding to the latest A/AAAA record */
modified = sres_set_cached_srv_priority(
orq->orq_agent->sa_resolver,
sq->sq_domain,
target,
sq->sq_port[0] ? (uint16_t)strtoul(sq->sq_port, NULL, 10) : 0,
orq->orq_agent->sa_graylist,
maxprio + 1);
if (modified >= 0)
SU_DEBUG_3(("nta: reduced priority of %d %s SRV records (increase value to %u)\n",
modified, sq->sq_domain, maxprio + 1));
else
SU_DEBUG_3(("nta: failed to reduce %s SRV priority\n", sq->sq_domain));
}
if (sq && sq->sq_type == sr->sr_a_aaaa2 && sr->sr_a_aaaa1 != sr->sr_a_aaaa2) {
sq->sq_grayish = 1;
}
else {
outgoing_graylist(orq, sr->sr_done);
}
}
return outgoing_resolve_next(orq);
}
/** Graylist SRV records */
static void outgoing_graylist(nta_outgoing_t *orq, struct sipdns_query *sq)
{
struct sipdns_resolver *sr = orq->orq_resolver;
char const *target = sq->sq_domain, *proto = sq->sq_proto;
unsigned prio = sq->sq_priority, maxprio = prio;
/* Don't know how to graylist but SRV records */
if (sq->sq_otype != sres_type_srv)
return;
SU_DEBUG_5(("nta: graylisting %s:%s;transport=%s\n", target, sq->sq_port, proto));
for (sq = sr->sr_head; sq; sq = sq->sq_next)
if (sq->sq_otype == sres_type_srv && sq->sq_priority > maxprio)
maxprio = sq->sq_priority;
for (sq = sr->sr_done; sq; sq = sq->sq_next)
if (sq->sq_otype == sres_type_srv && sq->sq_priority > maxprio)
maxprio = sq->sq_priority;
for (sq = sr->sr_done; sq; sq = sq->sq_next) {
int modified;
if (sq->sq_type != sres_type_srv || strcmp(proto, sq->sq_proto))
continue;
/* modify the SRV record(s) corresponding to the latest A/AAAA record */
modified = sres_set_cached_srv_priority(
orq->orq_agent->sa_resolver,
sq->sq_domain,
target,
sq->sq_port[0] ? (uint16_t)strtoul(sq->sq_port, NULL, 10) : 0,
orq->orq_agent->sa_graylist,
maxprio + 1);
if (modified >= 0)
SU_DEBUG_3(("nta: reduced priority of %d %s SRV records (increase value to %u)\n",
modified, sq->sq_domain, maxprio + 1));
else
SU_DEBUG_3(("nta: failed to reduce %s SRV priority\n", sq->sq_domain));
}
}
/** Cancel resolver query */
su_inline void outgoing_cancel_resolver(nta_outgoing_t *orq)
{
@@ -9765,6 +9778,9 @@ outgoing_query_results(nta_outgoing_t *orq,
}
else {
sq->sq_next = sr->sr_done, sr->sr_done = sq;
if (rlen == 0 && sq->sq_grayish)
outgoing_graylist(orq, sq);
}
if (rlen > 1)
@@ -2256,11 +2256,15 @@ int test_dialog(agent_t *ag)
END();
}
#ifndef MSG_TRUNC
#define MSG_TRUNC 0
#endif
static ssize_t recv_udp(agent_t *ag, void *b, size_t size)
{
ssize_t n;
memset(b, size, 0);
memset(b, 0, size);
for (;;) {
su_root_step(ag->ag_root, 10L);
@@ -2305,10 +2309,6 @@ int test_merging(agent_t *ag)
su_sockaddr_t *su = ag->ag_su_nta;
socklen_t sulen = ag->ag_su_nta_len;
#ifndef MSG_TRUNC
#define MSG_TRUNC 0
#endif
/* Empty sink socket */
su_setblocking(ag->ag_sink_socket, 0);
while (su_recv(ag->ag_sink_socket, m1, sizeof m1, MSG_TRUNC) >= 0)