- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8611 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/msg
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 09:54:56 2008 New Revision: 8611 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c Log: Tue May 20 09:30:06 EDT 2008 Pekka.Pessi(a)nokia.com * msg_mime.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 09:54:56 2008 @@ -1 +1 @@ -Sun May 25 09:53:58 EDT 2008 +Sun May 25 09:54:31 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/msg_mime.c Sun May 25 09:54:56 2008 @@ -1871,8 +1871,10 @@ b = msg_params_dup(&c->c_params, o->c_params, b, xtra); MSG_STRING_DUP(b, c->c_type, o->c_type); - c->c_subtype = strchr(c->c_type, '/'); - c->c_subtype++; + + c->c_subtype = c->c_type ? strchr(c->c_type, '/') : NULL; + if (c->c_subtype) + c->c_subtype++; assert(b <= end); (void)end;

1 0

[commit] r8610 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sdp
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 09:54:06 2008 New Revision: 8610 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c Log: Tue May 20 09:29:34 EDT 2008 Pekka.Pessi(a)nokia.com * sdp: Fixed klocwork issues. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 09:54:06 2008 @@ -1 +1 @@ -Sun May 25 09:52:56 EDT 2008 +Sun May 25 09:53:58 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c Sun May 25 09:54:06 2008 @@ -98,7 +98,7 @@ /* Internal prototypes */ static void parse_message(sdp_parser_t *p); -static void parsing_error(sdp_parser_t *p, char const *fmt, ...); +static int parsing_error(sdp_parser_t *p, char const *fmt, ...); /** Parse an SDP message. * @@ -357,7 +357,7 @@ if (!STRICT(p)) strip = SPACE TAB; /* skip initial whitespace */ else - strip = NULL; + strip = ""; p->pr_ok = 1; p->pr_session->sdp_size = sizeof(p->pr_session); @@ -550,18 +550,15 @@ sdp_media_t *m; if (!p || !p->pr_ok) - ; + return -1; else if (sdp->sdp_version[0] != 0) - parsing_error(p, "Incorrect version"); + return parsing_error(p, "Incorrect version"); else if (!sdp->sdp_origin) - parsing_error(p, "No o= present"); + return parsing_error(p, "No o= present"); else if (p->pr_strict && !sdp->sdp_subject) - parsing_error(p, "No s= present"); + return parsing_error(p, "No s= present"); else if (p->pr_strict && !sdp->sdp_time) - parsing_error(p, "No t= present"); - - if (!p->pr_ok) - return -1; + return parsing_error(p, "No t= present"); /* If there is no session level c= check that one exists for all media */ /* c= line may be missing if this is a RTSP description */ @@ -1707,7 +1704,7 @@ if (!STRICT(p)) strip = SPACE TAB; /* skip initial whitespace */ else - strip = NULL; + strip = ""; for (; record && p->pr_ok; @@ -1846,7 +1843,7 @@ size_t n; char *retval = *message; - if (strip) + if (strip[0]) retval += strspn(retval, strip); n = strcspn(retval, sep); @@ -1867,7 +1864,7 @@ return retval; } -static void parsing_error(sdp_parser_t *p, char const *fmt, ...) +static int parsing_error(sdp_parser_t *p, char const *fmt, ...) { int n; va_list ap; @@ -1878,6 +1875,8 @@ va_end(ap); p->pr_ok = 0; + + return -1; } static void parse_alloc_error(sdp_parser_t *p, const char *typename) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_print.c Sun May 25 09:54:06 2008 @@ -681,17 +681,15 @@ static void printing_error(sdp_printer_t *p, const char *fmt, ...) { va_list ap; - va_start(ap, fmt); - + if (p->pr_ok) { int n; - + va_start(ap, fmt); n = vsnprintf(p->pr_buffer, p->pr_bsiz, fmt, ap); - - p->pr_ok = 0; + va_end(ap); } - va_end(ap); + p->pr_ok = 0; } static void sdp_printf(sdp_printer_t *p, const char *fmt, ...)

1 0

[commit] r8609 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 09:53:04 2008 New Revision: 8609 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Log: Tue May 20 07:51:51 EDT 2008 Pekka.Pessi(a)nokia.com * nua_session.c: fixed klocwork issues Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 09:53:04 2008 @@ -1 +1 @@ -Sun May 25 09:52:17 EDT 2008 +Sun May 25 09:52:56 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c Sun May 25 09:53:04 2008 @@ -223,7 +223,7 @@ nua_dialog_state_t *ds, nua_dialog_usage_t *du) { - nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du); if (ds->ds_has_session) return -1; @@ -243,7 +243,7 @@ nua_client_request_t *cr0, nua_server_request_t *sr0) { - nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du); nua_client_request_t *cr, *cr_next; nua_server_request_t *sr; @@ -1478,7 +1478,7 @@ nua_dialog_usage_t *du, sip_time_t now) { - nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du); nua_client_request_t const *cr = du->du_cr; nua_server_request_t const *sr; @@ -1525,7 +1525,7 @@ nua_dialog_state_t *ds, nua_dialog_usage_t *du) { - nua_session_usage_t *ss = nua_dialog_usage_private(du); + nua_session_usage_t *ss = NUA_DIALOG_USAGE_PRIVATE(du); nua_server_request_t *sr, *sr_next; nua_client_request_t *cri; @@ -2729,7 +2729,7 @@ if (nh->nh_soa == NULL) { if (sr->sr_offer_recv && session_get_description(sip, NULL, NULL)) - sr->sr_answer_sent = 1, ss->ss_oa_sent = Answer; + sr->sr_answer_sent = 1, ss ? ss->ss_oa_sent = Answer : Answer; } else if ((sr->sr_offer_recv && soa_generate_answer(nh->nh_soa, NULL) < 0) || (sr->sr_answer_recv && soa_process_answer(nh->nh_soa, NULL) < 0)) { @@ -2743,7 +2743,7 @@ if (session_include_description(nh->nh_soa, 1, msg, sip) < 0) sr_status(sr, SIP_500_INTERNAL_SERVER_ERROR); else - sr->sr_answer_sent = 1, ss->ss_oa_sent = Answer; + sr->sr_answer_sent = 1, ss ? ss->ss_oa_sent = Answer : Answer; } } @@ -3398,7 +3398,7 @@ } sr->sr_offer_recv = 1; - ss->ss_oa_recv = Offer; + ss ? ss->ss_oa_recv = Offer : Offer; } return 0; @@ -3416,7 +3416,7 @@ if (200 <= sr->sr_status && sr->sr_status < 300 && sr->sr_sdp) { if (nh->nh_soa == NULL) { - sr->sr_answer_sent = 1, ss->ss_oa_sent = Answer; + sr->sr_answer_sent = 1, ss ? ss->ss_oa_sent = Answer : Answer; } else if (soa_generate_answer(nh->nh_soa, NULL) < 0) { SU_DEBUG_5(("nua(%p): %s server: %s %s\n",

1 0

[commit] r8608 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 09:52:27 2008 New Revision: 8608 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c Log: Tue May 20 07:46:57 EDT 2008 Pekka.Pessi(a)nokia.com * nua_publish.c: fixed klocwork issue Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 09:52:27 2008 @@ -1 +1 @@ -Sun May 25 09:51:44 EDT 2008 +Sun May 25 09:52:17 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_publish.c Sun May 25 09:52:27 2008 @@ -110,7 +110,7 @@ nua_server_request_t *sr ) { - struct publish_usage *pu = nua_dialog_usage_private(du); + struct publish_usage *pu = NUA_DIALOG_USAGE_PRIVATE(du); su_free(nh->nh_home, pu->pu_etag);

1 0

[commit] r8607 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 09:51:51 2008 New Revision: 8607 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c Log: Tue May 20 07:46:20 EDT 2008 Pekka.Pessi(a)nokia.com * nua_params.c: fixed klocwork issue Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 09:51:51 2008 @@ -1 +1 @@ -Sun May 25 09:51:04 EDT 2008 +Sun May 25 09:51:44 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_params.c Sun May 25 09:51:51 2008 @@ -1103,7 +1103,6 @@ if (nh == dnh || nh->nh_prefs != dnh->nh_prefs) { dst = nh->nh_prefs, *old = *dst; - assert(dst); } else { dst = su_zalloc(home, sizeof *dst), memset(old, 0, sizeof *old);

1 0

[commit] r8606 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 09:51:11 2008 New Revision: 8606 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c Log: Tue May 20 07:46:10 EDT 2008 Pekka.Pessi(a)nokia.com * nua_event_server.c: fixed klocwork issue Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 09:51:11 2008 @@ -1 +1 @@ -Sun May 25 09:50:22 EDT 2008 +Sun May 25 09:51:04 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_event_server.c Sun May 25 09:51:11 2008 @@ -145,7 +145,7 @@ if (ev == NULL) { char *o_type = su_strdup(home, event->o_type); - char *o_subtype = strchr(o_type, '.'); + char *o_subtype = o_type ? strchr(o_type, '.') : NULL; if (o_subtype) *o_subtype++ = '\0';

1 0

[commit] r8605 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sun May 25 09:50:32 2008 New Revision: 8605 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h Log: Tue May 20 07:45:46 EDT 2008 Pekka.Pessi(a)nokia.com * nua_dialog.h: added NUA_DIALOG_USAGE_PRIVATE() and NUA_DIALOG_USAGE_PUBLIC() Macros to use with non-NULL pointers. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sun May 25 09:50:32 2008 @@ -1 +1 @@ -Sat May 24 23:25:00 EDT 2008 +Sun May 25 09:50:22 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_dialog.h Sun May 25 09:50:32 2008 @@ -501,6 +501,9 @@ #define nua_dialog_usage_public(p) ((p) ? (nua_dialog_usage_t*)(p) - 1 : NULL) #endif +#define NUA_DIALOG_USAGE_PRIVATE(du) ((void *)((du) + 1)) +#define NUA_DIALOG_USAGE_PUBLIC(pu) ((void *)((nua_dialog_usage_t *)(pu) - 1)) + /* ---------------------------------------------------------------------- */ int nua_client_create(nua_owner_t *owner,

1 0

[commit] r8604 - in freeswitch/trunk/conf: dialplan lang/en lang/en/demo
by Freeswitch SVN 25 May '08

25 May '08

Author: brian Date: Sun May 25 09:45:52 2008 New Revision: 8604 Modified: freeswitch/trunk/conf/dialplan/default.xml freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml freeswitch/trunk/conf/lang/en/en.xml Log: tweaks... mcollins Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Sun May 25 09:45:52 2008 @@ -210,6 +210,8 @@  <extension name="ivr_demo"> <condition field="destination_number" expression="5000"> + <action application="answer"/> + <action application="sleep" data="2000"/> <action application="ivr" data="demo_ivr"/> </condition> </extension> Modified: freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml (original) +++ freeswitch/trunk/conf/lang/en/demo/demo-ivr.xml Sun May 25 09:45:52 2008 @@ -15,8 +15,6 @@ <input pattern="(.*)"> <match>  - <action function="execute" data="answer"/> - <action function="execute" data="sleep(1000)"/> <action function="play-file" data="ivr/ivr-welcome_to_freeswitch.wav"/> <action function="execute" data="sleep(250)"/> <action function="play-file" data="ivr/ivr-this_ivr_will_let_you_test_features.wav"/> Modified: freeswitch/trunk/conf/lang/en/en.xml ============================================================================== --- freeswitch/trunk/conf/lang/en/en.xml (original) +++ freeswitch/trunk/conf/lang/en/en.xml Sun May 25 09:45:52 2008 @@ -1,6 +1,6 @@ <include> <language name="en" sound-path="$${base_dir}/sounds/en/us/callie" tts-engine="cepstral" tts-voice="callie"> - <X-PRE-PROCESS cmd="include" data="demo/demo*.xml"/>  + <X-PRE-PROCESS cmd="include" data="demo/*.xml"/>   <X-PRE-PROCESS cmd="include" data="vm/sounds.xml"/> </language>

1 0

[commit] r8603 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/su libsofia-sip-ua/su/sofia-sip
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sat May 24 23:25:07 2008 New Revision: 8603 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Log: Wed May 21 10:42:52 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * su_home_check_alloc(): added Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Sat May 24 23:25:07 2008 @@ -1 +1 @@ -Sat May 24 23:22:13 EDT 2008 +Sat May 24 23:25:00 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su_alloc.h Sat May 24 23:25:07 2008 @@ -103,6 +103,8 @@ SU_DLL void su_home_check(su_home_t const *home); +SU_DLL int su_home_check_alloc(su_home_t const *home, void const *data); + SU_DLL int su_home_mutex_lock(su_home_t *home); SU_DLL int su_home_mutex_unlock(su_home_t *home); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_alloc.c Sat May 24 23:25:07 2008 @@ -283,7 +283,7 @@ su_block_find_collision_size; #endif -su_inline su_alloc_t *su_block_find(su_block_t *b, void const *p) +su_inline su_alloc_t *su_block_find(su_block_t const *b, void const *p) { size_t h, h0, probe; @@ -306,8 +306,10 @@ probe = (b->sub_n > SUB_P) ? SUB_P : 1; do { - if (b->sub_nodes[h].sua_data == p) - return &b->sub_nodes[h]; + if (b->sub_nodes[h].sua_data == p) { + su_alloc_t const *retval = &b->sub_nodes[h]; + return (su_alloc_t *)retval; /* discard const */ + } h += probe; if (h >= b->sub_n) h -= b->sub_n; @@ -463,7 +465,7 @@ home->suh_blocks = b2; if (sub && !sub->sub_auto) - safefree(sub); + free(sub); sub = b2; } @@ -836,6 +838,27 @@ safefree(data); } +/** Check if pointer has been allocated through home. + * + * @param home pointer to a memory home + * @param data pointer to a memory area possibly allocated though home + */ +int su_home_check_alloc(su_home_t const *home, void const *data) +{ + int retval = 0; + + if (home && data) { + su_block_t const *sub = MEMLOCK(home); + su_alloc_t *allocation = su_block_find(sub, data); + + retval = allocation != NULL; + + UNLOCK(home); + } + + return retval; +} + /** Check home consistency. * * Ensures that the home structure and all memory blocks allocated through

1 0

[commit] r8602 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua
by Freeswitch SVN 25 May '08

25 May '08

Author: mikej Date: Sat May 24 23:24:35 2008 New Revision: 8602 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Log: Wed May 21 10:41:10 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * check_session.c: added new BYE glare test cases Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c Sat May 24 23:24:35 2008 @@ -1138,7 +1138,7 @@ /* ====================================================================== */ /* Weird call termination cases */ -START_TEST(terminating_re_invite) +START_TEST(bye_4_1_1) { nua_handle_t *nh; struct message *bye, *r481; @@ -1180,7 +1180,7 @@ END_TEST -START_TEST(bye_invite_glare) +START_TEST(bye_4_1_2) { nua_handle_t *nh; struct message *bye, *r481; @@ -1215,7 +1215,7 @@ } END_TEST -START_TEST(call_4_1_3) +START_TEST(bye_4_1_3) { nua_handle_t *nh; struct message *bye; @@ -1256,7 +1256,7 @@ END_TEST -START_TEST(call_4_1_4) +START_TEST(bye_4_1_4) { nua_handle_t *nh; struct message *bye; @@ -1295,7 +1295,7 @@ END_TEST -START_TEST(call_4_1_5) +START_TEST(bye_4_1_5) { nua_handle_t *nh; struct message *bye; @@ -1332,7 +1332,7 @@ END_TEST -START_TEST(bye_invite_glare2) +START_TEST(bye_4_1_6) { nua_handle_t *nh; struct message *bye, *r486; @@ -1370,7 +1370,7 @@ END_TEST -START_TEST(bye_invite_glare3) +START_TEST(bye_4_1_7) { nua_handle_t *nh; struct message *bye, *r486; @@ -1407,7 +1407,7 @@ } END_TEST -START_TEST(bye_then_respond) +START_TEST(bye_4_1_8) { nua_handle_t *nh; struct message *bye, *r486; @@ -1446,7 +1446,102 @@ END_TEST -START_TEST(bye_with_timer) +START_TEST(bye_4_1_9) +{ + nua_handle_t *nh; + struct message *bye; + struct event *i_bye; + + s2_case("4.1.6", "Send BYE, receive BYE, destroy", + "NUA sends BYE, receives BYE and handle gets destroyed"); + + nh = invite_to_nua(TAG_END()); + + mark_point(); + + s2_flush_events(); + + nua_bye(nh, TAG_END()); + bye = s2_wait_for_request(SIP_METHOD_BYE); + fail_if(!bye); + + s2_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END()); + i_bye = s2_wait_for_event(nua_i_bye, 200); + fail_if(!i_bye); + s2_free_event(i_bye), i_bye = NULL; + fail_unless(s2_check_callstate(nua_callstate_terminated)); + fail_unless(s2_check_response(200, SIP_METHOD_BYE)); + nua_handle_destroy(nh); + mark_point(); + + su_root_step(s2->root, 10); + su_root_step(s2->root, 10); + su_root_step(s2->root, 10); + + mark_point(); + s2_respond_to(bye, dialog, SIP_200_OK, TAG_END()); + s2_free_message(bye); + + mark_point(); + while (su_home_check_alloc((su_home_t *)nua, (void *)nh)) { + su_root_step(s2->root, 10); + } +} +END_TEST + + +START_TEST(bye_4_1_10) +{ + nua_handle_t *nh; + struct message *invite, *bye; + struct event *i_bye; + + s2_case("4.1.6", "Send auto-BYE upon receiving 501, receive BYE, destroy", + "NUA sends BYE, receives BYE and handle gets destroyed"); + + nh = invite_to_nua(TAG_END()); + + mark_point(); + + s2_flush_events(); + + nua_invite(nh, TAG_END()); + invite = s2_wait_for_request(SIP_METHOD_INVITE); + fail_if(!invite); + s2_respond_to(invite, dialog, SIP_501_NOT_IMPLEMENTED, TAG_END()); + s2_free_message(invite); + + fail_unless(s2_check_request(SIP_METHOD_ACK)); + + bye = s2_wait_for_request(SIP_METHOD_BYE); + fail_if(!bye); + + fail_unless(s2_check_callstate(nua_callstate_calling)); + fail_unless(s2_check_event(nua_r_invite, 501)); + fail_unless(s2_check_callstate(nua_callstate_terminating)); + + s2_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END()); + i_bye = s2_wait_for_event(nua_i_bye, 200); + fail_if(!i_bye); + s2_free_event(i_bye), i_bye = NULL; + fail_unless(s2_check_callstate(nua_callstate_terminated)); + fail_unless(s2_check_response(200, SIP_METHOD_BYE)); + nua_handle_destroy(nh); + + su_root_step(s2->root, 10); + su_root_step(s2->root, 10); + su_root_step(s2->root, 10); + + s2_respond_to(bye, dialog, SIP_200_OK, TAG_END()); + s2_free_message(bye); + + while (su_home_check_alloc((su_home_t *)nua, (void *)nh)) { + su_root_step(s2->root, 10); + } +} +END_TEST + +START_TEST(bye_4_2_1) { nua_handle_t *nh; struct message *bye; @@ -1490,12 +1585,12 @@ } END_TEST -START_TEST(bye_with_timer2) +START_TEST(bye_4_2_2) { nua_handle_t *nh; struct message *bye; - s2_case("4.2.1", "BYE in progress while call timer expires", + s2_case("4.2.2", "BYE in progress while call timer expires", "NUA receives INVITE, " "activates call timers, " "sends BYE, BYE challenged, " @@ -1541,16 +1636,18 @@ TCase *tc = tcase_create("4 - Call Termination"); tcase_add_checked_fixture(tc, call_setup, call_teardown); { - tcase_add_test(tc, terminating_re_invite); - tcase_add_test(tc, bye_invite_glare); - tcase_add_test(tc, call_4_1_3); - tcase_add_test(tc, call_4_1_4); - tcase_add_test(tc, call_4_1_5); - tcase_add_test(tc, bye_invite_glare2); - tcase_add_test(tc, bye_invite_glare3); - tcase_add_test(tc, bye_with_timer); - tcase_add_test(tc, bye_with_timer2); - tcase_add_test(tc, bye_then_respond); + tcase_add_test(tc, bye_4_1_1); + tcase_add_test(tc, bye_4_1_2); + tcase_add_test(tc, bye_4_1_3); + tcase_add_test(tc, bye_4_1_4); + tcase_add_test(tc, bye_4_1_5); + tcase_add_test(tc, bye_4_1_6); + tcase_add_test(tc, bye_4_1_7); + tcase_add_test(tc, bye_4_1_8); + tcase_add_test(tc, bye_4_1_9); + tcase_add_test(tc, bye_4_1_10); + tcase_add_test(tc, bye_4_2_1); + tcase_add_test(tc, bye_4_2_2); tcase_set_timeout(tc, 5); } return tc;

1 0