retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

Mon May 25 10:32:56 CDT 2009 Pekka Pessi <first.last@nokia.com> 

* test_nta.c: use s2_fast_forward()


git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14180 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2009-07-10 00:42:37 +00:00
parent 34fd0d3205
commit 1eb6218be2
3 changed files with 21 additions and 16 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 Jul 9 19:39:59 CDT 2009
Thu Jul 9 19:40:57 CDT 2009

6
libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am
View File

@ -60,7 +60,8 @@ LDADD = libnta.la \
../url/liburl.la \
../msg/libmsg.la \
../bnf/libbnf.la \
../su/libsu.la
../su/libsu.la \
${top_builddir}/s2check/libs2.a
test_nta_LDFLAGS = -static
@ -72,8 +73,7 @@ check_nta_SOURCES = check_nta.c check_nta.h \
check_nta_api.c \
check_nta_client.c
check_nta_LDADD = ${LDADD} ${top_builddir}/s2check/libs2.a \
@CHECK_LIBS@
check_nta_LDADD = ${LDADD} @CHECK_LIBS@
else
check_nta_SOURCES = $(top_srcdir)/s2check/exit77.c

29
libs/sofia-sip/libsofia-sip-ua/nta/test_nta.c
View File

@ -72,6 +72,8 @@ typedef struct client_t client_t;
#include <assert.h>
#include <unistd.h>
#include "s2util.h"
#if HAVE_OPEN_C
#include <sys/param.h>
#endif
@ -500,6 +502,17 @@ void until_final_received(client_t *c)
}
}
static
void fast_final_received(client_t *c)
{
for (c->c_final = 0; !c->c_final; ) {
if (tstflags & tst_verbatim) {
fputs(".", stdout); fflush(stdout);
}
s2_fast_forward(500, c->c_ag->ag_root);
}
}
static
int client_run(client_t *c, int expected)
{
@ -1616,15 +1629,8 @@ int test_tports(agent_t *ag)
url_t url[1];
client_t ctx[1] = {{ ag, "Test 0.9" }};
printf("%s: starting MESSAGE timeout test, completing in 4 seconds\n",
name);
nta_agent_set_params(ag->ag_agent,
NTATAG_TIMEOUT_408(1),
NTATAG_SIP_T1(25),
NTATAG_SIP_T1X64(64 * 25),
NTATAG_SIP_T2(8 * 25),
NTATAG_SIP_T4(10 * 25),
TAG_END());
*url = *ag->ag_aliases->m_url;
@ -1644,14 +1650,10 @@ int test_tports(agent_t *ag)
SIPTAG_CONTACT(ag->ag_m_bob),
TAG_END());
TEST_1(!client_run(ctx, 408));
TEST_1(!client_run_with(ctx, 408, fast_final_received));
TEST_P(ag->ag_latest_leg, NULL);
nta_agent_set_params(ag->ag_agent,
NTATAG_SIP_T1(500),
NTATAG_SIP_T1X64(64 * 500),
NTATAG_SIP_T2(NTA_SIP_T2),
NTATAG_SIP_T4(NTA_SIP_T4),
TAG_END());
}
@ -3958,6 +3960,9 @@ int main(int argc, char *argv[])
retval |= test_prack(ag); SINGLE_FAILURE_CHECK();
retval |= test_fix_467(ag); SINGLE_FAILURE_CHECK();
}
s2_fast_forward(64000, ag->ag_root);
retval |= test_deinit(ag); fflush(stdout);
su_home_deinit(ag->ag_home);