sync to the 1.12.6work3 (1.12.7 pre-release) from darcs:

Mon Oct  8 15:00:04 EDT 2007  Pekka Pessi <first.lastname@nokia.com>
  * tport: fixed problem with tls send blocking

Wed Oct 10 13:55:25 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * Fixed the internal type of statistics

Thu Oct 11 11:25:59 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * nta: fix sf.net bug #1810115, crash after nta_destroy()

  su_msg_t delivery, again.

  Thanks to Mikhail Zabaluev for reporting this.

Thu Oct 11 11:45:20 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * nta: fixed type checking on NTATAG_UDP_MTU()/NTATAG_UDP_MTU_REF()

Thu Oct 11 13:25:12 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * nua: fixed the from header handling

  The agent-level From header no longer overrides the From header set by
  nua_invite() and friends.

  Thanks to Fabio Margarido for keeping reporting about the problem.

Thu Oct 11 13:28:58 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * RELEASE: updated

Thu Oct 11 11:30:13 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * torture_sresolv.c: fixed printf() formatting types

  Passed a size_t to %u.

Thu Oct 11 11:44:54 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  * rules/sofia.am: not using make -C dir

Thu Oct 11 14:16:51 EDT 2007  Pekka Pessi <Pekka.Pessi@nokia.com>
  tagged release candidate 1 for 1.12.7

Thu Oct 11 12:25:28 EDT 2007  Pekka.Pessi@nokia.com
  * su_clone_start(): fixed spurious release of a pthreaded port




git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5842 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris committed 2007-10-11 19:58:13 +00:00
1 parent 19d18e46ba
commit c13fd78987
22 files changed
+522 -122

No files matched your search

+15 -11
View File
@@ -256,12 +256,6 @@ static int outgoing_recv_reliable(nta_outgoing_t *orq, msg_t *msg, sip_t *sip);
/* Internal message passing */
union sm_arg_u {
struct leg_recv_s {
nta_leg_t *leg;
msg_t *msg;
tport_t *tport;
} a_leg_recv[1];
struct outgoing_recv_s {
nta_outgoing_t *orq;
msg_t *msg;
@@ -922,7 +916,7 @@ int agent_set_params(nta_agent_t *agent, tagi_t *tags)
unsigned bad_resp_mask = agent->sa_bad_resp_mask;
usize_t maxsize = agent->sa_maxsize;
unsigned max_forwards = agent->sa_max_forwards->mf_count;
usize_t udp_mtu = agent->sa_udp_mtu;
unsigned udp_mtu = agent->sa_udp_mtu;
unsigned sip_t1 = agent->sa_t1;
unsigned sip_t2 = agent->sa_t2;
unsigned sip_t4 = agent->sa_t4;
@@ -6651,8 +6645,7 @@ nta_outgoing_t *nta_outgoing_tcancel(nta_outgoing_t *orq,
#if HAVE_SOFIA_SRESOLV
if (!orq->orq_resolved) {
if (orq->orq_resolver)
outgoing_cancel_resolver(orq);
outgoing_destroy_resolver(orq);
outgoing_reply(orq, SIP_487_REQUEST_CANCELLED, 1);
return NULL; /* XXX - Does anyone care about reply? */
}
@@ -7742,6 +7735,9 @@ void outgoing_cut_off(nta_outgoing_t *orq)
su_inline
void outgoing_reclaim(nta_outgoing_t *orq)
{
if (orq->orq_status2b)
*orq->orq_status2b = -1;
if (orq->orq_request)
msg_destroy(orq->orq_request), orq->orq_request = NULL;
if (orq->orq_response)
@@ -8726,6 +8722,8 @@ int outgoing_reply(nta_outgoing_t *orq, int status, char const *phrase,
a->sip = sip;
a->status = status;
orq->orq_status2b = &a->status;
if (su_msg_send(su_msg) == SU_SUCCESS) {
return 0;
}
@@ -8744,8 +8742,14 @@ void outgoing_delayed_recv(su_root_magic_t *rm,
union sm_arg_u *u)
{
struct outgoing_recv_s *a = u->a_outgoing_recv;
if (outgoing_recv(a->orq, a->status, a->msg, a->sip) < 0 && a->msg)
msg_destroy(a->msg);
if (a->status > 0) {
a->orq->orq_status2b = 0;
if (outgoing_recv(a->orq, a->status, a->msg, a->sip) >= 0)
return;
}
msg_destroy(a->msg);
}
@@ -257,32 +257,32 @@ struct nta_agent_s
/* Statistics */
struct {
uint32_t as_recv_msg;
uint32_t as_recv_request;
uint32_t as_recv_response;
uint32_t as_bad_message;
uint32_t as_bad_request;
uint32_t as_bad_response;
uint32_t as_drop_request;
uint32_t as_drop_response;
uint32_t as_client_tr;
uint32_t as_server_tr;
uint32_t as_dialog_tr;
uint32_t as_acked_tr;
uint32_t as_canceled_tr;
uint32_t as_trless_request;
uint32_t as_trless_to_tr;
uint32_t as_trless_response;
uint32_t as_trless_200;
uint32_t as_merged_request;
uint32_t as_sent_msg;
uint32_t as_sent_request;
uint32_t as_sent_response;
uint32_t as_retry_request;
uint32_t as_retry_response;
uint32_t as_recv_retry;
uint32_t as_tout_request;
uint32_t as_tout_response;
usize_t as_recv_msg;
usize_t as_recv_request;
usize_t as_recv_response;
usize_t as_bad_message;
usize_t as_bad_request;
usize_t as_bad_response;
usize_t as_drop_request;
usize_t as_drop_response;
usize_t as_client_tr;
usize_t as_server_tr;
usize_t as_dialog_tr;
usize_t as_acked_tr;
usize_t as_canceled_tr;
usize_t as_trless_request;
usize_t as_trless_to_tr;
usize_t as_trless_response;
usize_t as_trless_200;
usize_t as_merged_request;
usize_t as_sent_msg;
usize_t as_sent_request;
usize_t as_sent_response;
usize_t as_retry_request;
usize_t as_retry_response;
usize_t as_recv_retry;
usize_t as_tout_request;
usize_t as_tout_response;
} sa_stats[1];
/** Hash of dialogs. */
@@ -544,6 +544,8 @@ struct nta_outgoing_s
char const *orq_branch; /**< Transaction branch */
char const *orq_via_branch; /**< @Via branch */
int *orq_status2b; /**< Delayed response */
nta_outgoing_t *orq_cancel; /**< CANCEL transaction */
uint32_t orq_rseq; /**< Latest incoming rseq */
+1 -1
View File
@@ -415,7 +415,7 @@ tag_typedef_t ntatag_maxsize = USIZETAG_TYPEDEF(maxsize);
* nta_agent_create(), nta_agent_set_params()
*
* @par Parameter type
* - #usize_t
* - unsigned
*
* @par Values
* - Maximum size of an outgoing UDP request
@@ -150,10 +150,10 @@ NTA_DLL extern tag_typedef_t ntatag_maxsize_ref;
#define NTATAG_MAXSIZE_REF(x) ntatag_maxsize_ref, tag_usize_vr(&(x))
NTA_DLL extern tag_typedef_t ntatag_udp_mtu;
#define NTATAG_UDP_MTU(x) ntatag_udp_mtu, tag_usize_v((x))
#define NTATAG_UDP_MTU(x) ntatag_udp_mtu, tag_uint_v((x))
NTA_DLL extern tag_typedef_t ntatag_udp_mtu_ref;
#define NTATAG_UDP_MTU_REF(x) ntatag_udp_mtu_ref, tag_usize_vr(&(x))
#define NTATAG_UDP_MTU_REF(x) ntatag_udp_mtu_ref, tag_uint_vr(&(x))
NTA_DLL extern tag_typedef_t ntatag_max_forwards;
#define NTATAG_MAX_FORWARDS(x) ntatag_max_forwards, tag_uint_v((x))
@@ -445,6 +445,54 @@ int api_test_deinit(agent_t *ag)
END();
}
static int api_test_destroy(agent_t *ag)
{
nta_agent_t *nta;
su_root_t *root;
su_home_t home[1];
nta_outgoing_t *orq;
nta_leg_t *leg;
int i;
BEGIN();
memset(home, 0, sizeof home);
home->suh_size = sizeof home;
su_home_init(home);
TEST_1(root = su_root_create(NULL));
for (i = 0; i < 2; i++) {
TEST_1(nta = nta_agent_create(root,
(url_string_t *)"sip:*:*",
NULL,
NULL,
TAG_END()));
TEST_1(leg = nta_leg_tcreate(nta, NULL, NULL,
NTATAG_NO_DIALOG(1),
TAG_END()));
/* This creates a delayed response message */
orq = nta_outgoing_tcreate(leg, outgoing_callback, ag, NULL,
SIP_METHOD_MESSAGE,
URL_STRING_MAKE("sip:foo.bar;transport=none"),
SIPTAG_FROM_STR("<sip:bar.foo>"),
SIPTAG_TO_STR("<sip:foo.bar>"),
TAG_END());
TEST_1(orq);
TEST_VOID(nta_outgoing_destroy(orq));
TEST_VOID(nta_leg_destroy(leg));
TEST_VOID(nta_agent_destroy(nta));
}
TEST_VOID(su_root_destroy(root));
TEST_VOID(su_home_deinit(home));
END();
}
/* Get and check parameters */
int api_test_params(agent_t *ag)
{
@@ -460,7 +508,7 @@ int api_test_params(agent_t *ag)
unsigned blacklist = -1;
unsigned debug_drop_prob = -1;
unsigned max_forwards = -1;
unsigned maxsize = -1;
usize_t maxsize = -1;
unsigned preload = -1;
unsigned progress = -1;
unsigned sip_t1 = -1;
@@ -1114,22 +1162,9 @@ static int api_test_errors(agent_t *ag)
TEST_P(nta_outgoing_tcancel(NONE, NULL, NULL, TAG_END()), NULL);
TEST_VOID(nta_outgoing_destroy(NONE));
#if 0
nta_reliable_t *nta_reliable_treply(nta_incoming_t *ireq,
nta_prack_f *callback,
nta_reliable_magic_t *rmagic,
int status, char const *phrase,
tag_type_t tag,
tag_value_t value, ...);
nta_reliable_t *nta_reliable_mreply(nta_incoming_t *irq,
nta_prack_f *callback,
nta_reliable_magic_t *rmagic,
msg_t *msg);
void nta_reliable_destroy(nta_reliable_t *);
#endif
TEST_P(nta_reliable_treply(NULL, NULL, NULL, 0, NULL, TAG_END()), NULL);
TEST_P(nta_reliable_mreply(NULL, NULL, NULL, NULL), NULL);
TEST_VOID(nta_reliable_destroy(NULL));
TEST_VOID(nta_agent_destroy(nta));
TEST_VOID(su_root_destroy(root));
@@ -1382,6 +1417,7 @@ int main(int argc, char *argv[])
retval |= api_test_init(ag); fflush(stdout); SINGLE_FAILURE_CHECK();
if (retval == 0) {
retval |= api_test_errors(ag); SINGLE_FAILURE_CHECK();
retval |= api_test_destroy(ag); SINGLE_FAILURE_CHECK();
retval |= api_test_params(ag); SINGLE_FAILURE_CHECK();
retval |= api_test_stats(ag); SINGLE_FAILURE_CHECK();
retval |= api_test_dialog_matching(ag); SINGLE_FAILURE_CHECK();