- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r12736 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:36:03 2009 New Revision: 12736 Log: Thu Mar 5 13:06:15 CST 2009 Pekka Pessi <first.last(a)nokia.com> * check_nta: use S2_CASE() Ignore-this: c94d4219b0882f1343bcfc56f975ea48 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:36:03 2009 @@ -1 +1 @@ -Tue Mar 24 10:33:24 CDT 2009 +Tue Mar 24 10:35:04 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/check_nta_client.c Tue Mar 24 10:36:03 2009 @@ -95,7 +95,7 @@ struct message *request; struct event *response; - s2_case("2.0.0", "Send MESSAGE", + S2_CASE("2.0.0", "Send MESSAGE", "Basic non-INVITE transaction with outbound proxy"); orq = nta_outgoing_tcreate(s2->default_leg, @@ -123,7 +123,7 @@ struct message *request; struct event *response; - s2_case("2.0.0", "Send MESSAGE", + S2_CASE("2.0.0", "Send MESSAGE", "Basic non-INVITE transaction with " "numeric per-transaction outbound proxy"); @@ -155,7 +155,7 @@ char payload[2048]; - s2_case("2.0.2", "Send MESSAGE", + S2_CASE("2.0.2", "Send MESSAGE", "Basic non-INVITE transaction exceeding " "default path MTU (1300 bytes)"); @@ -210,7 +210,7 @@ char payload[2048]; - s2_case("2.1.0", "Try UDP after trying with TCP", + S2_CASE("2.1.0", "Try UDP after trying with TCP", "TCP connect() is refused"); memset(payload, 'x', sizeof payload); @@ -279,7 +279,7 @@ char payload[2048]; - s2_case("2.1.1", "Try UDP after trying with TCP", + S2_CASE("2.1.1", "Try UDP after trying with TCP", "TCP connect() times out"); memset(payload, 'x', sizeof payload); @@ -337,7 +337,7 @@ struct event *response; url_t udpurl[1]; - s2_case("2.1.2", "Send MESSAGE", + S2_CASE("2.1.2", "Send MESSAGE", "Non-INVITE transaction to TCP-only server"); client_setup_tcp_only_server();

1 0

[commit] r12735 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:34:23 2009 New Revision: 12735 Log: Thu Mar 5 13:04:56 CST 2009 Pekka Pessi <first.last(a)nokia.com> * check_nua: use S2_CASE() Ignore-this: 85691a39065d7ad3da57f45fe87c1da Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:34:23 2009 @@ -1 +1 @@ -Tue Mar 24 10:32:33 CDT 2009 +Tue Mar 24 10:33:24 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c Tue Mar 24 10:34:23 2009 @@ -201,7 +201,7 @@ struct message *invite; struct message *bye; - s2_case("6.1.1", "SIP_CC_OE_CE_V_019", + S2_CASE("6.1.1", "SIP_CC_OE_CE_V_019", "Ensure that the IUT when an INVITE client transaction " "is in the Calling state, on receipt of Success (200 OK) " "responses differing only on the tag in the To header, " @@ -241,7 +241,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("6.1.2", "SIP_CC_OE_CE_TI_008", + S2_CASE("6.1.2", "SIP_CC_OE_CE_TI_008", "If an unreliable transport is used, ensure that " "the IUT, when an INVITE client transaction is in " "the Completed state, on receipt of final responses " @@ -291,7 +291,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("6.1.2", "SIP_CC_OE_CE_TI_011_012", + S2_CASE("6.1.2", "SIP_CC_OE_CE_TI_011_012", "Ensure that the IUT, when an INVITE client transaction " "has been in the Terminated state, on receipt of a " "retransmitted Success (200 OK) responses sends an ACK " Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c Tue Mar 24 10:34:23 2009 @@ -117,7 +117,7 @@ nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); struct message *m; - s2_case("1.0.1", "Failed Register", "REGISTER returned 403 response"); + S2_CASE("1.0.1", "Failed Register", "REGISTER returned 403 response"); nua_register(nh, TAG_END()); @@ -135,7 +135,7 @@ START_TEST(register_1_1_1) { - s2_case("1.1.1", "Basic Register", "REGISTER returning 200 OK"); + S2_CASE("1.1.1", "Basic Register", "REGISTER returning 200 OK"); s2_register_setup(); @@ -149,7 +149,7 @@ nua_handle_t *nh; struct message *m; - s2_case("1.1.2", "Register with dual authentication", + S2_CASE("1.1.2", "Register with dual authentication", "Register, authenticate"); nh = nua_handle(nua, NULL, TAG_END()); @@ -230,7 +230,7 @@ nua_handle_t *nh; struct message *m; - s2_case("1.2.1", "Register behind NAT", + S2_CASE("1.2.1", "Register behind NAT", "Register through NAT, detect NAT, re-REGISTER"); nh = nua_handle(nua, NULL, TAG_END()); @@ -324,7 +324,7 @@ { nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); - s2_case("1.2.2.1", "Register behind NAT", + S2_CASE("1.2.2.1", "Register behind NAT", "Authenticate, outbound activated"); mark_point(); @@ -339,7 +339,7 @@ nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); struct message *m; - s2_case("1.2.2.2", "Register behind NAT", + S2_CASE("1.2.2.2", "Register behind NAT", "Authenticate, outbound activated, " "authenticate OPTIONS probe, " "NAT binding change"); @@ -421,7 +421,7 @@ nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); struct message *m; - s2_case("1.2.2.3", "Register behind NAT", + S2_CASE("1.2.2.3", "Register behind NAT", "Authenticate, outbound activated, " "detect NAT binding change when re-REGISTERing"); @@ -476,7 +476,7 @@ nua_handle_t *nh; struct message *m; - s2_case("1.2.3", "Register behind NAT", + S2_CASE("1.2.3", "Register behind NAT", "Outbound activated by error response"); nh = nua_handle(nua, NULL, TAG_END()); @@ -525,7 +525,7 @@ nua_handle_t *nh; struct message *m; - s2_case("1.3.1", "Register over TCP via NAT", + S2_CASE("1.3.1", "Register over TCP via NAT", "REGISTER via TCP, detect NTA, re-REGISTER"); nh = nua_handle(nua, NULL, TAG_END()); @@ -576,7 +576,7 @@ { nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); - s2_case("1.3.2.1", "Register behind NAT", + S2_CASE("1.3.2.1", "Register behind NAT", "Authenticate, outbound activated"); mark_point(); @@ -593,7 +593,7 @@ nua_handle_t *nh = nua_handle(nua, NULL, TAG_END()); struct message *m; - s2_case("1.3.2.2", "Register behind NAT with TCP", + S2_CASE("1.3.2.2", "Register behind NAT with TCP", "Detect NAT over TCP using rport. " "Authenticate, detect NAT, " "close TCP at server, wait for re-REGISTERs."); @@ -652,7 +652,7 @@ struct message *m; tport_t *tcp; - s2_case("1.3.3.1", "Register behind NAT with UDP and TCP", + S2_CASE("1.3.3.1", "Register behind NAT with UDP and TCP", "Register with UDP, UDP time-outing, then w/ TCP using rport. "); nua_set_params(nua, NTATAG_TCP_RPORT(1), TAG_END()); 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 Tue Mar 24 10:34:23 2009 @@ -428,7 +428,7 @@ { nua_handle_t *nh; - s2_case("2.1.1", "Basic call", + S2_CASE("2.1.1", "Basic call", "NUA sends INVITE, NUA sends BYE"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -446,7 +446,7 @@ { nua_handle_t *nh; - s2_case("2.1.2.1", "Basic call", + S2_CASE("2.1.2.1", "Basic call", "NUA sends INVITE, NUA receives BYE"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -463,7 +463,7 @@ { nua_handle_t *nh; - s2_case("2.1.2.2", "Basic call over TCP", + S2_CASE("2.1.2.2", "Basic call over TCP", "NUA sends INVITE, NUA receives BYE"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), @@ -484,7 +484,7 @@ { nua_handle_t *nh; - s2_case("2.1.3.1", "Incoming call", + S2_CASE("2.1.3.1", "Incoming call", "NUA receives INVITE and BYE"); nh = invite_to_nua(TAG_END()); @@ -500,7 +500,7 @@ { nua_handle_t *nh; - s2_case("2.1.3.2", "Incoming call over TCP", + S2_CASE("2.1.3.2", "Incoming call over TCP", "NUA receives INVITE and BYE"); dialog->tport = s2sip->tcp.tport; @@ -518,7 +518,7 @@ { nua_handle_t *nh; - s2_case("2.1.4", "Incoming call", + S2_CASE("2.1.4", "Incoming call", "NUA receives INVITE and sends BYE"); nh = invite_to_nua(TAG_END()); @@ -534,7 +534,7 @@ { nua_handle_t *nh; - s2_case("2.1.5", "Incoming call", + S2_CASE("2.1.5", "Incoming call", "NUA receives INVITE and sends BYE, BYE is challenged"); nh = invite_to_nua(TAG_END()); @@ -553,7 +553,7 @@ struct event *invite; struct message *response; - s2_case("2.1.6", "Basic call", + S2_CASE("2.1.6", "Basic call", "NUA received INVITE, " "NUA responds (and saves proxy for dialog), " "NUA sends BYE"); @@ -621,7 +621,7 @@ nua_handle_t *nh, *nh2; sip_replaces_t *replaces; - s2_case("2.1.7", "Call lookup", + S2_CASE("2.1.7", "Call lookup", "Test dialog and call-id lookup"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -654,7 +654,7 @@ nua_handle_t *nh; struct message *invite, *ack; - s2_case("2.1.8", "Call using NUTAG_PROXY()", + S2_CASE("2.1.8", "Call using NUTAG_PROXY()", "Test handle-specific NUTAG_PROXY()."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -713,7 +713,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("2.2.1", "Cancel call", + S2_CASE("2.2.1", "Cancel call", "NUA is caller, NUA sends CANCEL immediately"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -749,7 +749,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("2.2.2", "Canceled call", + S2_CASE("2.2.2", "Canceled call", "NUA is caller, NUA sends CANCEL after receiving 100"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -776,7 +776,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("2.2.3", "Canceled call", + S2_CASE("2.2.3", "Canceled call", "NUA is caller, NUA sends CANCEL after receiving 180"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -807,7 +807,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("2.2.4", "Cancel and 200 OK glare", + S2_CASE("2.2.4", "Cancel and 200 OK glare", "NUA is caller, NUA sends CANCEL after receiving 180 " "but UAS already sent 200 OK."); @@ -852,7 +852,7 @@ nua_handle_t *nh; struct message *invite, *cancel, *bye; - s2_case( + S2_CASE( "2.2.5", "Cancel and 200 OK glare", "NUA is caller, " "NUA uses nua_bye() to send CANCEL after receiving 180\n" @@ -907,7 +907,7 @@ struct event *invite; struct message *response; - s2_case("2.2.6", "Cancel call", + S2_CASE("2.2.6", "Cancel call", "NUA is callee, sends 100, 180, INVITE gets canceled"); soa_generate_offer(soa, 1, NULL); @@ -959,7 +959,7 @@ struct message *response; char const *via = "SIP/2.0/UDP host.in.invalid;rport"; - s2_case("2.2.7", "Call gets canceled", + S2_CASE("2.2.7", "Call gets canceled", "NUA is callee, sends 100, 180, INVITE gets canceled. " "Using RFC 2543 dialog and transaction matching."); @@ -1013,7 +1013,7 @@ struct message *invite, *cancel; int timeout; - s2_case("2.2.8", "CANCEL and INVITE times out", + S2_CASE("2.2.8", "CANCEL and INVITE times out", "NUA is caller, NUA sends CANCEL after receiving 180 " "but UAS never responds."); @@ -1058,7 +1058,7 @@ struct message *invite, *cancel; int timeout; - s2_case("2.2.9", "CANCEL a RFC2543 UA", + S2_CASE("2.2.9", "CANCEL a RFC2543 UA", "NUA is caller, NUA sends CANCEL after receiving 180, " "UAS sends 200 OK to CANCEL but no response to INVITE."); @@ -1101,7 +1101,7 @@ struct event *event; int timeout; - s2_case("2.2.10", "CANCEL and INVITE times out", + S2_CASE("2.2.10", "CANCEL and INVITE times out", "NUA is caller, NUA sends CANCEL after receiving 180 " "but UAS never responds."); @@ -1221,7 +1221,7 @@ rr->r_url->url_user = "record"; rr->r_url->url_params = "lr"; - s2_case("2.3.1", "Incoming call with call timers", + S2_CASE("2.3.1", "Incoming call with call timers", "NUA receives INVITE, " "activates call timers, " "sends re-INVITE twice, " @@ -1249,7 +1249,7 @@ { nua_handle_t *nh; - s2_case("2.3.2", "Incoming call with call timers", + S2_CASE("2.3.2", "Incoming call with call timers", "NUA receives INVITE, " "activates call timers, " "sends re-INVITE, " @@ -1294,7 +1294,7 @@ int with_sdp; sip_record_route_t rr[1]; - s2_case("2.4.1", "Call with 100rel", + S2_CASE("2.4.1", "Call with 100rel", "NUA sends INVITE, " "receives 183, sends PRACK, receives 200 for it, " "receives 180, sends PRACK, receives 200 for it, " @@ -1357,7 +1357,7 @@ struct message *invite, *prack; int with_sdp; - s2_case("2.4.2", "Call with 100rel", + S2_CASE("2.4.2", "Call with 100rel", "NUA sends INVITE, " "receives 183, sends PRACK, receives 200 for it, " "receives 180, sends PRACK, receives 200 for it, " @@ -1425,7 +1425,7 @@ struct message *invite, *prack, *update; int with_sdp; - s2_case("2.5.1", "Call with preconditions", + S2_CASE("2.5.1", "Call with preconditions", "NUA sends INVITE, " "receives 183, sends PRACK, receives 200 for it, " "sends UPDATE, receives 200 for it, " @@ -1493,7 +1493,7 @@ sip_rseq_t rs[1]; sip_rack_t rack[1]; - s2_case("2.5.2", "Call with preconditions - send 200 w/ ongoing PRACK ", + S2_CASE("2.5.2", "Call with preconditions - send 200 w/ ongoing PRACK ", "NUA sends INVITE, " "receives 183, sends PRACK, " "receives 200 to INVITE, " @@ -1570,7 +1570,7 @@ sip_rseq_t rs[1]; sip_rack_t rack[1]; - s2_case("2.5.3", "Call with preconditions - send 200 w/ ongoing UPDATE ", + S2_CASE("2.5.3", "Call with preconditions - send 200 w/ ongoing UPDATE ", "NUA sends INVITE, " "receives 183, sends PRACK, receives 200 to PRACK, " "sends UPDATE, " @@ -1658,7 +1658,7 @@ struct message *invite, *ack; int i; - s2_case("2.6.1", "Queued re-INVITEs", + S2_CASE("2.6.1", "Queued re-INVITEs", "NUA receives INVITE, " "sends re-INVITE twice, " "sends BYE."); @@ -1696,7 +1696,7 @@ nua_handle_t *nh; struct message *invite, *ack, *response; - s2_case("2.6.2", "Re-INVITE glare", + S2_CASE("2.6.2", "Re-INVITE glare", "NUA sends re-INVITE and then receives re-INVITE, " "sends BYE."); @@ -1754,7 +1754,7 @@ nua_handle_t *nh; struct message *response; - s2_case("2.6.3", "Handling re-INVITE without SDP gracefully", + S2_CASE("2.6.3", "Handling re-INVITE without SDP gracefully", "NUA receives INVITE, " "re-INVITE without SDP (w/o NUTAG_REFRESH_WITHOUT_SDP(), " "re-INVITE without SDP (using NUTAG_REFRESH_WITHOUT_SDP(), " @@ -1819,7 +1819,7 @@ nua_handle_t *nh; struct message *invite, *ack; - s2_case("2.6.4", "re-INVITEs w/o SDP", + S2_CASE("2.6.4", "re-INVITEs w/o SDP", "NUA sends re-INVITE w/o SDP, " "receives SDP w/ offer, " "sends ACK w/ answer, " @@ -1874,7 +1874,7 @@ nua_handle_t *nh; struct message *invite, *ack; - s2_case("3.1.1", "Call failure", "Call fails with 403 response"); + S2_CASE("3.1.1", "Call failure", "Call fails with 403 response"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -1908,7 +1908,7 @@ struct message *invite; int i; - s2_case("3.1.2", "Call fails after too many retries", + S2_CASE("3.1.2", "Call fails after too many retries", "Call fails after 4 times 500 Retry-After"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), @@ -1945,7 +1945,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("3.2.1", "Re-INVITE failure", "Re-INVITE fails with 403 response"); + S2_CASE("3.2.1", "Re-INVITE failure", "Re-INVITE fails with 403 response"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -1976,7 +1976,7 @@ struct message *invite, *bye; int i; - s2_case("3.2.2", "Re-INVITE fails after too many retries", + S2_CASE("3.2.2", "Re-INVITE fails after too many retries", "Call fails after 4 times 500 Retry-After"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), @@ -2023,7 +2023,7 @@ nua_handle_t *nh; struct message *invite; - s2_case("3.2.3", "Re-INVITE failure", "Re-INVITE fails with 491 response"); + S2_CASE("3.2.3", "Re-INVITE failure", "Re-INVITE fails with 491 response"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2071,7 +2071,7 @@ nua_handle_t *nh; struct message *bye, *r481; - s2_case("4.1.1", "Re-INVITE while terminating", + S2_CASE("4.1.1", "Re-INVITE while terminating", "NUA sends BYE, " "BYE is challenged, " "and NUA is re-INVITEd at the same time."); @@ -2113,7 +2113,7 @@ nua_handle_t *nh; struct message *bye, *r481; - s2_case("4.1.2", "Re-INVITE while terminating", + S2_CASE("4.1.2", "Re-INVITE while terminating", "NUA sends BYE, and gets re-INVITEd at same time"); nh = invite_to_nua(TAG_END()); @@ -2149,7 +2149,7 @@ struct message *bye; struct event *i_bye; - s2_case("4.1.3", "BYE while terminating", + S2_CASE("4.1.3", "BYE while terminating", "NUA sends BYE and receives BYE"); nh = invite_to_nua(TAG_END()); @@ -2190,7 +2190,7 @@ struct message *bye; struct event *i_bye; - s2_case("4.1.4", "Send BYE after BYE has been received", + S2_CASE("4.1.4", "Send BYE after BYE has been received", "NUA receives BYE, tries to send BYE at same time"); nh = invite_to_nua(TAG_END()); @@ -2229,7 +2229,7 @@ struct message *bye; struct event *i_bye; - s2_case("4.1.5", "Send BYE after BYE has been received", + S2_CASE("4.1.5", "Send BYE after BYE has been received", "NUA receives BYE, tries to send BYE at same time"); nh = invite_to_nua(TAG_END()); @@ -2265,7 +2265,7 @@ nua_handle_t *nh; struct message *bye, *r486; - s2_case("4.1.6", "Send BYE after INVITE has been received", + S2_CASE("4.1.6", "Send BYE after INVITE has been received", "NUA receives INVITE, sends BYE at same time"); nh = invite_to_nua(TAG_END()); @@ -2303,7 +2303,7 @@ nua_handle_t *nh; struct message *bye, *r486; - s2_case("4.1.7", "Send BYE after INVITE has been received", + S2_CASE("4.1.7", "Send BYE after INVITE has been received", "NUA receives INVITE, sends BYE at same time"); nh = invite_to_nua(TAG_END()); @@ -2340,7 +2340,7 @@ nua_handle_t *nh; struct message *bye, *r486; - s2_case("4.1.8", "BYE followed by response to INVITE", + S2_CASE("4.1.8", "BYE followed by response to INVITE", "NUA receives INVITE, sends BYE at same time"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2380,7 +2380,7 @@ struct message *bye; struct event *i_bye; - s2_case("4.1.6", "Send BYE, receive BYE, destroy", + 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()); @@ -2424,7 +2424,7 @@ struct message *invite, *bye; struct event *i_bye; - s2_case("4.1.6", "Send auto-BYE upon receiving 501, receive BYE, destroy", + 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()); @@ -2475,7 +2475,7 @@ struct message *invite, *ack; struct event *i_bye; - s2_case("4.1.11", "Receive BYE in completing state", + S2_CASE("4.1.11", "Receive BYE in completing state", "NUA sends INVITE, receives 200, receives BYE."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2511,7 +2511,7 @@ nua_handle_t *nh; struct message *bye; - s2_case("4.2.1", "BYE in progress while call timer expires", + S2_CASE("4.2.1", "BYE in progress while call timer expires", "NUA receives INVITE, " "activates call timers, " "sends BYE, BYE challenged, " @@ -2555,7 +2555,7 @@ nua_handle_t *nh; struct message *bye; - s2_case("4.2.2", "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, " @@ -2626,7 +2626,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("4.3.1", "Destroy handle after INVITE sent", + S2_CASE("4.3.1", "Destroy handle after INVITE sent", "NUA sends INVITE, handle gets destroyed."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2654,7 +2654,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("4.3.2", "Destroy handle in calling state", + S2_CASE("4.3.2", "Destroy handle in calling state", "NUA sends INVITE, receives 180, handle gets destroyed."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2682,7 +2682,7 @@ nua_handle_t *nh; struct message *invite, *ack, *bye; - s2_case("4.3.3", "Destroy handle in completing state", + S2_CASE("4.3.3", "Destroy handle in completing state", "NUA sends INVITE, receives 200, handle gets destroyed."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2718,7 +2718,7 @@ nua_handle_t *nh; struct message *invite, *ack, *bye; - s2_case("4.3.3", "Destroy handle in ready state ", + S2_CASE("4.3.3", "Destroy handle in ready state ", "NUA sends INVITE, receives 200, handle gets destroyed."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -2757,7 +2757,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("4.3.5", "Destroy handle in re-INVITE calling state", + S2_CASE("4.3.5", "Destroy handle in re-INVITE calling state", "NUA sends re-INVITE, handle gets destroyed."); nh = invite_to_nua(TAG_END()); @@ -2785,7 +2785,7 @@ nua_handle_t *nh; struct message *invite, *cancel; - s2_case("4.3.6", "Destroy handle in calling state of re-INVITE", + S2_CASE("4.3.6", "Destroy handle in calling state of re-INVITE", "NUA sends re-INVITE, receives 180, handle gets destroyed."); nh = invite_to_nua(TAG_END()); @@ -2814,7 +2814,7 @@ nua_handle_t *nh; struct message *invite, *ack, *bye; - s2_case("4.3.7", "Destroy handle in completing state of re-INVITE", + S2_CASE("4.3.7", "Destroy handle in completing state of re-INVITE", "NUA sends INVITE, receives 200, handle gets destroyed."); nh = invite_to_nua(TAG_END()); @@ -2850,7 +2850,7 @@ nua_handle_t *nh; struct message *invite, *ack, *bye; - s2_case("4.3.8", "Destroy handle after INVITE sent", + S2_CASE("4.3.8", "Destroy handle after INVITE sent", "NUA sends INVITE, handle gets destroyed, " "but remote end returns 200 OK. " "Make sure nua tries to release call properly."); @@ -2882,7 +2882,7 @@ nua_handle_t *nh; struct message *invite, *cancel, *ack, *bye; - s2_case("4.3.9", "Destroy handle in calling state", + S2_CASE("4.3.9", "Destroy handle in calling state", "NUA sends INVITE, receives 180, handle gets destroyed, " "but remote end returns 200 OK. " "Make sure nua tries to release call properly."); @@ -2923,7 +2923,7 @@ struct event *invite; struct message *response; - s2_case("4.4.1", "Destroy handle while call is on-going", + S2_CASE("4.4.1", "Destroy handle while call is on-going", "NUA is callee, sends 100, destroys handle"); soa_generate_offer(soa, 1, NULL); @@ -2958,7 +2958,7 @@ struct event *invite; struct message *response; - s2_case("4.4.1", "Destroy handle while call is on-going", + S2_CASE("4.4.1", "Destroy handle while call is on-going", "NUA is callee, sends 180, destroys handle"); soa_generate_offer(soa, 1, NULL); @@ -2999,7 +2999,7 @@ struct event *invite; struct message *response, *bye; - s2_case("4.4.3.1", "Destroy handle while call is on-going", + S2_CASE("4.4.3.1", "Destroy handle while call is on-going", "NUA is callee, sends 200, destroys handle"); soa_generate_offer(soa, 1, NULL); @@ -3053,7 +3053,7 @@ struct event *invite; struct message *response, *bye; - s2_case("4.4.3.1", "Destroy handle while call is on-going", + S2_CASE("4.4.3.1", "Destroy handle while call is on-going", "NUA is callee, sends 200, destroys handle"); soa_generate_offer(soa, 1, NULL); @@ -3139,7 +3139,7 @@ nua_handle_t *nh; struct message *response; - s2_case("5.1.1", "Test nua_respond() API", + S2_CASE("5.1.1", "Test nua_respond() API", "Test nua_respond() API with OPTIONS."); s2_sip_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END()); @@ -3198,7 +3198,7 @@ pthread_t tid; void *thread_return = NULL; - s2_case("5.1.2", "Test nua_respond() API with another thread", + S2_CASE("5.1.2", "Test nua_respond() API with another thread", "Test multithreading nua_respond() API with OPTIONS."); nua_set_params(nua, NUTAG_APPL_METHOD("OPTIONS"), TAG_END()); @@ -3262,7 +3262,7 @@ struct event *refer; struct message *notify; - s2_case("5.2.1", "Receive REFER", + S2_CASE("5.2.1", "Receive REFER", "Make a call, receive REFER."); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -3299,7 +3299,7 @@ struct message *notify0, *notify1, *notify2; struct dialog *dialog1, *dialog2; - s2_case("5.2.2", "Receive REFER", + S2_CASE("5.2.2", "Receive REFER", "Make a call, receive REFER, " "make another call with automatic NOTIFYs"); @@ -3395,7 +3395,7 @@ START_TEST(empty) { - s2_case("0.0.0", "Empty test case", + S2_CASE("0.0.0", "Empty test case", "Detailed explanation for empty test case."); tport_set_params(s2sip->master, TPTAG_LOG(1), TAG_END()); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c Tue Mar 24 10:34:23 2009 @@ -265,7 +265,7 @@ { nua_handle_t *nh; struct event *notify; - s2_case("6.1.1", "Basic subscription", + S2_CASE("6.1.1", "Basic subscription", "NUA sends SUBSCRIBE, waits for NOTIFY, sends un-SUBSCRIBE"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -283,7 +283,7 @@ struct message *subscribe, *response; struct event *notify, *event; - s2_case("6.1.2", "Basic subscription with refresh", + S2_CASE("6.1.2", "Basic subscription with refresh", "NUA sends SUBSCRIBE, waits for NOTIFY, " "sends re-SUBSCRIBE, waits for NOTIFY, " "sends un-SUBSCRIBE"); @@ -331,7 +331,7 @@ struct message *response; struct event *notify, *event; - s2_case("6.1.3", "Subscription terminated by notifier", + S2_CASE("6.1.3", "Subscription terminated by notifier", "NUA sends SUBSCRIBE, waits for NOTIFY, " "gets NOTIFY terminating the subscription,"); @@ -361,7 +361,7 @@ struct message *response; struct event *notify, *event; - s2_case("6.1.4", "Subscription terminated by notifier, re-established", + S2_CASE("6.1.4", "Subscription terminated by notifier, re-established", "NUA sends SUBSCRIBE, waits for NOTIFY, " "gets NOTIFY terminating the subscription,"); @@ -419,7 +419,7 @@ nua_handle_t *nh; struct event *notify; - s2_case("6.2.1", "Event fetch - NOTIFY after 202", + S2_CASE("6.2.1", "Event fetch - NOTIFY after 202", "NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -436,7 +436,7 @@ nua_handle_t *nh; struct event *notify; - s2_case("6.2.2", "Event fetch - NOTIFY before 200", + S2_CASE("6.2.2", "Event fetch - NOTIFY before 200", "NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY"); send_notify_before_response = 1; @@ -456,7 +456,7 @@ struct message *subscribe; struct event *event; - s2_case("6.2.3", "Event fetch - no NOTIFY", + S2_CASE("6.2.3", "Event fetch - no NOTIFY", "NUA sends SUBSCRIBE with Expires 0, waits for NOTIFY, times out"); nh = nua_handle(nua, NULL, SIPTAG_TO(s2sip->aor), TAG_END()); @@ -539,7 +539,7 @@ struct message *notify, *response; sip_t *sip; - s2_case("6.3.1", "Basic NOTIFY server", + S2_CASE("6.3.1", "Basic NOTIFY server", "NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "First NOTIFY terminates subscription. "); @@ -612,7 +612,7 @@ struct message *notify; sip_t *sip; - s2_case("6.3.2", "NOTIFY server - automatic subscription termination", + S2_CASE("6.3.2", "NOTIFY server - automatic subscription termination", "NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "The subscription terminates with timeout. "); @@ -664,7 +664,7 @@ struct event *response; sip_t *sip; - s2_case("6.3.3", "NOTIFY server - terminate with error response to NOTIFY", + S2_CASE("6.3.3", "NOTIFY server - terminate with error response to NOTIFY", "NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "The subscription terminates when watcher " "returns 481 to second NOTIFY."); @@ -709,7 +709,7 @@ struct event *response; sip_t *sip; - s2_case("6.3.4", "NOTIFY server - terminate with error response to NOTIFY", + S2_CASE("6.3.4", "NOTIFY server - terminate with error response to NOTIFY", "NUA receives SUBSCRIBE, sends 202 and NOTIFY. " "The subscription terminates when watcher " "returns 481 to second NOTIFY. The queued 3rd NOTIFY gets " @@ -778,7 +778,7 @@ START_TEST(empty) { - s2_case("0.0.0", "Empty test case", + S2_CASE("0.0.0", "Empty test case", "Detailed explanation for empty test case."); tport_set_params(s2sip->master, TPTAG_LOG(1), TAG_END());

1 0

[commit] r12734 - in freeswitch/trunk/libs/sofia-sip: . s2check
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:33:33 2009 New Revision: 12734 Log: Thu Mar 5 12:29:30 CST 2009 Pekka Pessi <first.last(a)nokia.com> * s2base.h: added S2_CASE(), added test function name to s2_case() parameters Ignore-this: c9ceff2812044e2643c21548be29233e Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2base.c freeswitch/trunk/libs/sofia-sip/s2check/s2base.h Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:33:33 2009 @@ -1 +1 @@ -Tue Mar 24 10:31:53 CDT 2009 +Tue Mar 24 10:32:33 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2base.c (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.c Tue Mar 24 10:33:33 2009 @@ -126,13 +126,15 @@ void s2_case(char const *number, char const *title, - char const *description) + char const *description, + char const *function) { stamps.start = now(); _s2_case = number; if (s2_start_stop) - printf("%s - starting %s/%s-%s\n", s2_tester, _s2_suite, _s2_case, title); + printf("%s - starting %s (%s/%s %s)\n", s2_tester, function, + _s2_suite, _s2_case, title); } void s2_step(void) Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2base.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2base.h (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2base.h Tue Mar 24 10:33:33 2009 @@ -44,7 +44,16 @@ void s2_case(char const *tag, char const *title, - char const *description); + char const *description, + char const *function); + +#if HAVE_FUNC +#define S2_CASE(n, t, d) s2_case((n),(t),(d), __func__) +#elif HAVE_FUNCTION +#define S2_CASE(n, t, d) s2_case((n),(t),(d), __FUNCTION__) +#else +#define S2_CASE(n, t, d) s2_case((n),(t),(d), "") +#endif void s2_teardown_started(char const *label); void s2_teardown(void);

1 0

[commit] r12733 - in freeswitch/trunk/libs/sofia-sip: . s2check
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:32:49 2009 New Revision: 12733 Log: Thu Mar 5 11:44:15 CST 2009 Pekka Pessi <first.last(a)nokia.com> * s2check.h: redefine tcase_add_loop_test, too Ignore-this: 149c19e8d089b60e8ddcb98da54c9d88 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/s2check/s2check.h freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:32:49 2009 @@ -1 +1 @@ -Tue Mar 24 10:30:39 CDT 2009 +Tue Mar 24 10:31:53 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2check.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2check.h (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2check.h Tue Mar 24 10:32:49 2009 @@ -42,10 +42,16 @@ SOFIA_BEGIN_DECLS #undef tcase_add_test +#undef tcase_add_loop_test + /* Redirect tcase_add_test() to our function */ -#define tcase_add_test(tc, tf) s2_tcase_add_test(tc, tf, "" #tf "") +#define tcase_add_test(tc, tf) s2_tcase_add_test(tc, tf, "" #tf "", 0, 0, 1) + +void s2_tcase_add_test(TCase *, TFun, char const *name, + int signo, int start, int end); -void s2_tcase_add_test(TCase *, TFun, char const *name); +#define tcase_add_loop_test(tc, tf, s, e) \ + s2_tcase_add_test(tc, tf, "" #tf "", 0, (s), (e)) void s2_select_tests(char const *pattern); Modified: freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c (original) +++ freeswitch/trunk/libs/sofia-sip/s2check/s2tcase.c Tue Mar 24 10:32:49 2009 @@ -46,7 +46,8 @@ * A special version of tcase_add_test() that inserts test function into * tcase only if its name matches given pattern. */ -void s2_tcase_add_test(TCase *tc, TFun tf, char const *name) +void s2_tcase_add_test(TCase *tc, TFun tf, char const *name, + int signo, int start, int end) { char const * const *patterns; @@ -54,9 +55,9 @@ for (patterns = test_patterns; *patterns; patterns++) { if (!fnmatch(*patterns, name, 0)) { if (strcmp(*patterns, "*")) { - printf("%s: running\n", name); + printf("%s: selected\n", name); } - _tcase_add_test(tc, tf, name, 0, 0, 1); + _tcase_add_test(tc, tf, name, signo, start, end); return; } } @@ -64,9 +65,9 @@ for (patterns = test_patterns; *patterns; patterns++) { if (!strcmp(*patterns, name) || !strcmp(*patterns, "*")) { if (strcmp(*patterns, "*")) { - printf("%s: running\n", name); + printf("%s: selected\n", name); } - _tcase_add_test(tc, tf, name, 0, 0, 1); + _tcase_add_test(tc, tf, name, signo, start, end); return; } }

1 0

[commit] r12732 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: mikej Date: Tue Mar 24 10:32:08 2009 New Revision: 12732 Log: Thu Mar 5 10:20:11 CST 2009 Pekka Pessi <first.last(a)nokia.com> * check_nua: s2_setup_logs() now turns on transport logging, too Ignore-this: 4ad4dc1efaf76c34a46038586a00e084 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:32:08 2009 @@ -1 +1 @@ -Tue Mar 24 10:29:44 CDT 2009 +Tue Mar 24 10:30:39 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c Tue Mar 24 10:32:08 2009 @@ -295,6 +295,11 @@ su_log_soft_set_level(nea_log, level); su_log_soft_set_level(nta_log, level); su_log_soft_set_level(tport_log, level); + + if (getenv("TPORT_LOG") == NULL && getenv("S2_TPORT_LOG") == NULL) { + if (s2sip) + tport_set_params(s2sip->master, TPTAG_LOG(level > 1), TAG_END()); + } } nua_t *s2_nua_setup(char const *label,

1 0

[commit] r12731 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: brian Date: Tue Mar 24 10:30:45 2009 New Revision: 12731 Log: Thu Mar 5 10:19:35 CST 2009 Pekka Pessi <first.last(a)nokia.com> * check_nua: using fail_unless_event() macro Ignore-this: b03dc7431e8fea9835322bd8f825a803 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Mar 24 10:30:45 2009 @@ -1 +1 @@ -Tue Mar 10 14:57:43 CDT 2009 +Tue Mar 24 10:29:44 CDT 2009 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_etsi.c Tue Mar 24 10:30:45 2009 @@ -103,7 +103,7 @@ mark_point(); nua_shutdown(nua); - fail_unless(s2_check_event(nua_r_shutdown, 200)); + fail_unless_event(nua_r_shutdown, 200); s2_nua_teardown(); } @@ -186,7 +186,7 @@ fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); } @@ -216,7 +216,7 @@ respond_with_sdp(invite, d1, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -253,7 +253,7 @@ invite = invite_sent_by_nua(nh, TAG_END()); s2_sip_respond_to(invite, d1, 404, "First not found", TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 404)); + fail_unless_event(nua_r_invite, 404); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -276,7 +276,7 @@ /* Wake up nua thread and let it time out INVITE transaction */ nua_set_params(s2->nua, TAG_END()); - s2_check_event(nua_r_set_params, 0); + fail_unless_event(nua_r_set_params, 0); s2_sip_respond_to(invite, d1, 404, "Not found after 32 seconds", TAG_END()); s2_sip_free_message(invite); @@ -307,7 +307,7 @@ respond_with_sdp(invite, d1, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.c Tue Mar 24 10:30:45 2009 @@ -405,7 +405,7 @@ s2_sip_free_message(m); assert(s2->registration->contact != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2->registration->nh = nh; } @@ -437,7 +437,7 @@ s2_sip_free_message(m); - s2_check_event(nua_r_unregister, 200); + fail_unless_event(nua_r_unregister, 200); nua_handle_destroy(nh); s2->registration->nh = NULL; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_nua.h Tue Mar 24 10:30:45 2009 @@ -83,6 +83,9 @@ int s2_check_callstate(enum nua_callstate state); int s2_check_substate(struct event *e, enum nua_substate state); +#define fail_unless_event(event, status) \ + fail_unless(s2_check_event(event, status)) + #define SIP_METHOD_UNKNOWN sip_method_unknown, NULL void s2_flush_all(void); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_register.c Tue Mar 24 10:30:45 2009 @@ -94,7 +94,7 @@ { s2_teardown_started("register"); nua_shutdown(nua); - fail_unless(s2_check_event(nua_r_shutdown, 200)); + fail_unless_event(nua_r_shutdown, 200); s2_nua_teardown(); } @@ -162,7 +162,7 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 407); + fail_unless_event(nua_r_register, 407); nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END()); @@ -173,7 +173,7 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 401); + fail_unless_event(nua_r_register, 401); nua_authenticate(nh, NUTAG_AUTH(s2_auth2_credentials), TAG_END()); @@ -190,7 +190,7 @@ s2_sip_free_message(m); assert(s2->registration->contact != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2->registration->nh = nh; @@ -250,7 +250,7 @@ s2_sip_free_message(m); assert(s2->registration->contact != NULL); - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); @@ -266,7 +266,7 @@ fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2->registration->nh = nh; @@ -294,7 +294,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 401); + fail_unless_event(nua_r_register, 401); nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END()); @@ -315,7 +315,7 @@ s2_sip_free_message(m); assert(s2->registration->contact != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); return nh; } @@ -392,7 +392,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_i_outbound, 0); + fail_unless_event(nua_i_outbound, 0); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); fail_if(!m->sip->sip_authorization); @@ -406,7 +406,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); @@ -448,7 +448,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); fail_if(!m->sip->sip_authorization); @@ -465,7 +465,7 @@ fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2_register_teardown(); @@ -494,7 +494,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); @@ -509,7 +509,7 @@ fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2->registration->nh = nh; @@ -545,7 +545,7 @@ s2_sip_free_message(m); assert(s2->registration->contact != NULL); - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); @@ -563,7 +563,7 @@ fail_if(s2->registration->contact->m_next != NULL); fail_unless( url_has_param(s2->registration->contact->m_url, "transport=tcp")); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); s2->registration->nh = nh; @@ -599,7 +599,7 @@ "close TCP at server, wait for re-REGISTERs."); nua_set_params(nua, NTATAG_TCP_RPORT(1), TAG_END()); - s2_check_event(nua_r_set_params, 200); + fail_unless_event(nua_r_set_params, 200); mark_point(); s2->registration->nh = nh; @@ -623,7 +623,7 @@ /* The "NAT binding" changed when new TCP connection is established */ /* => NUA re-REGISTERs with newly detected contact */ - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); fail_if(!m->sip->sip_authorization); @@ -637,7 +637,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); @@ -656,7 +656,7 @@ "Register with UDP, UDP time-outing, then w/ TCP using rport. "); nua_set_params(nua, NTATAG_TCP_RPORT(1), TAG_END()); - s2_check_event(nua_r_set_params, 200); + fail_unless_event(nua_r_set_params, 200); mark_point(); s2->registration->nh = nh; @@ -683,7 +683,7 @@ SIPTAG_VIA(natted_via(m)), TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 401); + fail_unless_event(nua_r_register, 401); nua_authenticate(nh, NUTAG_AUTH(s2_auth_credentials), TAG_END()); /* Turn off pong */ @@ -703,7 +703,7 @@ s2_sip_free_message(m); /* NUA detects oops... re-registers UDP */ - s2_check_event(nua_r_register, 100); + fail_unless_event(nua_r_register, 100); m = s2_sip_wait_for_request(SIP_METHOD_REGISTER); fail_if(!m); fail_if(!m->sip->sip_authorization); @@ -717,7 +717,7 @@ TAG_END()); s2_sip_free_message(m); - s2_check_event(nua_r_register, 200); + fail_unless_event(nua_r_register, 200); fail_unless(s2->registration->contact != NULL); fail_if(s2->registration->contact->m_next != NULL); 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 Tue Mar 24 10:30:45 2009 @@ -99,7 +99,7 @@ if (s2->shutdown == 0) { mark_point(); nua_shutdown(nua); - fail_unless(s2_check_event(nua_r_shutdown, 200)); + fail_unless_event(nua_r_shutdown, 200); } mark_point(); @@ -242,7 +242,7 @@ } ta_end(ta); - fail_unless(s2_check_event(nua_r_invite, status)); + fail_unless_event(nua_r_invite, status); return s2_sip_wait_for_request(SIP_METHOD_PRACK); } @@ -264,12 +264,12 @@ SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); } @@ -322,7 +322,7 @@ fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_ack, 200)); + fail_unless_event(nua_i_ack, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); return nh; @@ -343,7 +343,7 @@ fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); } @@ -366,14 +366,14 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 407)); + fail_unless_event(nua_r_bye, 407); nua_authenticate(nh, NUTAG_AUTH("Digest:\"s2test\":abc:abc"), TAG_END()); bye = s2_sip_wait_for_request(SIP_METHOD_BYE); fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_if(s2->events); } @@ -396,12 +396,12 @@ fail_if(!cancel); s2_sip_respond_to(cancel, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(cancel); - fail_unless(s2_check_event(nua_r_cancel, 200)); + fail_unless_event(nua_r_cancel, 200); s2_sip_respond_to(invite, dialog, SIP_487_REQUEST_CANCELLED, TAG_END()); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); - fail_unless(s2_check_event(nua_r_invite, 487)); + fail_unless_event(nua_r_invite, 487); } static void @@ -414,7 +414,7 @@ fail_if(s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, ta_tags(ta))); ta_end(ta); - fail_unless(s2_check_event(nua_i_bye, 200)); + fail_unless_event(nua_i_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_unless(s2_sip_check_response(200, SIP_METHOD_BYE)); } @@ -598,7 +598,7 @@ fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_ack, 200)); + fail_unless_event(nua_i_ack, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); nua_bye(nh, TAG_END()); @@ -608,7 +608,7 @@ fail_unless(tport_is_tcp(bye->tport)); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -669,12 +669,12 @@ SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); ack = s2_sip_wait_for_request(SIP_METHOD_ACK); fail_unless(ack && tport_is_tcp(ack->tport)); @@ -734,9 +734,9 @@ fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); - fail_unless(s2_check_event(nua_r_invite, 487)); + fail_unless_event(nua_r_invite, 487); fail_unless(s2_check_callstate(nua_callstate_terminated)); - fail_unless(s2_check_event(nua_r_cancel, 200)); + fail_unless_event(nua_r_cancel, 200); fail_if(s2->events != NULL); nua_handle_destroy(nh); @@ -791,7 +791,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); cancel_by_nua(nh, invite, dialog, TAG_END()); @@ -823,7 +823,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_cancel(nh, TAG_END()); @@ -834,7 +834,7 @@ s2_sip_respond_to(cancel, dialog, SIP_481_NO_TRANSACTION, TAG_END()); s2_sip_free_message(cancel); - fail_unless(s2_check_event(nua_r_cancel, 481)); + fail_unless_event(nua_r_cancel, 481); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -872,7 +872,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_bye(nh, TAG_END()); @@ -883,7 +883,7 @@ s2_sip_respond_to(cancel, dialog, SIP_481_NO_TRANSACTION, TAG_END()); s2_sip_free_message(cancel); - fail_unless(s2_check_event(nua_r_cancel, 481)); + fail_unless_event(nua_r_cancel, 481); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -893,7 +893,7 @@ fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -935,7 +935,7 @@ s2_sip_free_message(response); fail_if(s2_sip_request_to(dialog, SIP_METHOD_CANCEL, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_cancel, 200)); + fail_unless_event(nua_i_cancel, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); response = s2_sip_wait_for_response(200, SIP_METHOD_CANCEL); @@ -990,7 +990,7 @@ s2_sip_free_message(response); fail_if(s2_sip_request_to(dialog, SIP_METHOD_CANCEL, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_cancel, 200)); + fail_unless_event(nua_i_cancel, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); response = s2_sip_wait_for_response(200, SIP_METHOD_CANCEL); @@ -1029,7 +1029,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_cancel(nh, TAG_END()); @@ -1045,8 +1045,8 @@ s2_sip_free_message(cancel); } - fail_unless(s2_check_event(nua_r_cancel, 408)); - fail_unless(s2_check_event(nua_r_invite, 408)); + fail_unless_event(nua_r_cancel, 408); + fail_unless_event(nua_r_invite, 408); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); } @@ -1074,7 +1074,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_cancel(nh, TAG_END()); @@ -1088,7 +1088,7 @@ s2_nua_fast_forward(1, s2base->root); } - fail_unless(s2_check_event(nua_r_invite, 408)); + fail_unless_event(nua_r_invite, 408); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); } @@ -1117,7 +1117,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_cancel(nh, TAG_END()); @@ -1138,7 +1138,7 @@ s2->registration->nh = NULL; nua_set_params(s2->nua, NUTAG_SHUTDOWN_EVENTS(1), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); nua_shutdown(s2->nua); event = s2_wait_for_event(nua_r_shutdown, 100); @@ -1202,7 +1202,7 @@ SIPTAG_RECORD_ROUTE(rr), TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); ack = s2_sip_wait_for_request(SIP_METHOD_ACK); if (rr == NULL) @@ -1319,7 +1319,7 @@ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; fail_unless(s2_check_callstate(nua_callstate_proceeding)); - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); prack = respond_with_100rel(invite, dialog, with_sdp = 0, SIP_180_RINGING, @@ -1330,7 +1330,7 @@ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; fail_unless(s2_check_callstate(nua_callstate_proceeding)); - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); /* Change the record-route */ rr->r_url->url_user = "record2"; @@ -1338,7 +1338,7 @@ SIPTAG_RECORD_ROUTE(rr), TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); ack = s2_sip_wait_for_request(SIP_METHOD_ACK); fail_if(!ack); @@ -1383,7 +1383,7 @@ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; fail_unless(s2_check_callstate(nua_callstate_proceeding)); - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); prack = respond_with_100rel(invite, dialog, with_sdp = 0, SIP_180_RINGING, @@ -1391,11 +1391,11 @@ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; fail_unless(s2_check_callstate(nua_callstate_proceeding)); - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -1450,7 +1450,7 @@ SIPTAG_REQUIRE_STR("100rel"), TAG_END()); s2_sip_free_message(prack), prack = NULL; - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); fail_unless(s2_check_callstate(nua_callstate_proceeding)); update = s2_sip_wait_for_request(SIP_METHOD_UPDATE); @@ -1463,7 +1463,7 @@ TAG_END()); s2_sip_free_message(update), update = NULL; - fail_unless(s2_check_event(nua_r_update, 200)); + fail_unless_event(nua_r_update, 200); fail_unless(s2_check_callstate(nua_callstate_proceeding)); prack = respond_with_100rel(invite, dialog, with_sdp = 0, @@ -1472,11 +1472,11 @@ s2_sip_respond_to(prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; fail_unless(s2_check_callstate(nua_callstate_proceeding)); - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -1518,7 +1518,7 @@ SIPTAG_REQUIRE_STR("100rel"), SIPTAG_RSEQ(rs), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 183)); + fail_unless_event(nua_r_invite, 183); fail_unless(s2_check_callstate(nua_callstate_proceeding)); sip_rack_init(rack)->ra_response = s2_rseq; @@ -1532,14 +1532,14 @@ s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); respond_with_sdp( prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -1554,7 +1554,7 @@ TAG_END()); s2_sip_free_message(update), update = NULL; - fail_unless(s2_check_event(nua_r_update, 200)); + fail_unless_event(nua_r_update, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); bye_to_nua(nh, TAG_END()); @@ -1594,7 +1594,7 @@ SIPTAG_REQUIRE_STR("100rel"), SIPTAG_RSEQ(rs), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 183)); + fail_unless_event(nua_r_invite, 183); fail_unless(s2_check_callstate(nua_callstate_proceeding)); sip_rack_init(rack)->ra_response = s2_rseq; @@ -1609,7 +1609,7 @@ prack, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(prack), prack = NULL; - fail_unless(s2_check_event(nua_r_prack, 200)); + fail_unless_event(nua_r_prack, 200); fail_unless(s2_check_callstate(nua_callstate_proceeding)); update = s2_sip_wait_for_request(SIP_METHOD_UPDATE); @@ -1618,7 +1618,7 @@ s2_sip_respond_to(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); process_offer(update); @@ -1627,7 +1627,7 @@ TAG_END()); s2_sip_free_message(update), update = NULL; - fail_unless(s2_check_event(nua_r_update, 200)); + fail_unless_event(nua_r_update, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); @@ -1681,7 +1681,7 @@ fail_if(!ack); s2_sip_free_message(ack); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); } @@ -1727,7 +1727,7 @@ fail_if(soa_process_reject(soa, NULL) < 0); /* We get nua_r_invite with 100 trying (and 500 in sip->sip_status) */ - fail_unless(s2_check_event(nua_r_invite, 100)); + fail_unless_event(nua_r_invite, 100); s2_nua_fast_forward(10, s2base->root); @@ -1737,7 +1737,7 @@ process_offer(invite); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); ack = s2_sip_wait_for_request(SIP_METHOD_ACK); fail_if(!ack); @@ -1780,13 +1780,13 @@ fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_ack, 200)); + fail_unless_event(nua_i_ack, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); s2_nua_fast_forward(10, s2base->root); nua_set_hparams(nh, NUTAG_REFRESH_WITHOUT_SDP(1), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_INVITE, NULL, SIPTAG_USER_AGENT_STR("evil (evil) evil"), @@ -1805,7 +1805,7 @@ fail_if(s2_sip_request_to(dialog, SIP_METHOD_ACK, NULL, TAG_END())); - fail_unless(s2_check_event(nua_i_ack, 200)); + fail_unless_event(nua_i_ack, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); bye_by_nua(nh, TAG_END()); @@ -1842,7 +1842,7 @@ process_answer(ack); s2_sip_free_message(ack); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); bye_by_nua(nh, TAG_END()); @@ -1894,7 +1894,7 @@ fail_if(!ack); fail_if(strcmp(ack->sip->sip_to->a_display, "UAS Changed")); s2_sip_free_message(ack); - fail_unless(s2_check_event(nua_r_invite, 403)); + fail_unless_event(nua_r_invite, 403); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -1929,11 +1929,11 @@ fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); if (i == 3) break; - fail_unless(s2_check_event(nua_r_invite, 100)); + fail_unless_event(nua_r_invite, 100); s2_nua_fast_forward(5, s2base->root); } - fail_unless(s2_check_event(nua_r_invite, 500)); + fail_unless_event(nua_r_invite, 500); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -1961,7 +1961,7 @@ s2_sip_free_message(invite); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); - fail_unless(s2_check_event(nua_r_invite, 403)); + fail_unless_event(nua_r_invite, 403); /* Return to previous state */ fail_unless(s2_check_callstate(nua_callstate_ready)); @@ -1999,18 +1999,18 @@ fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); if (i == 3) break; - fail_unless(s2_check_event(nua_r_invite, 100)); + fail_unless_event(nua_r_invite, 100); s2_nua_fast_forward(5, s2base->root); } - fail_unless(s2_check_event(nua_r_invite, 500)); + fail_unless_event(nua_r_invite, 500); /* Graceful termination */ fail_unless(s2_check_callstate(nua_callstate_terminating)); bye = s2_sip_wait_for_request(SIP_METHOD_BYE); fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -2038,7 +2038,7 @@ s2_sip_respond_to(invite, NULL, SIP_491_REQUEST_PENDING, TAG_END()); s2_sip_free_message(invite); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); - fail_unless(s2_check_event(nua_r_invite, 491)); + fail_unless_event(nua_r_invite, 491); /* Return to previous state */ fail_unless(s2_check_callstate(nua_callstate_ready)); @@ -2088,7 +2088,7 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 407)); + fail_unless_event(nua_r_bye, 407); soa_generate_offer(soa, 1, NULL); @@ -2137,7 +2137,7 @@ s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); nua_handle_destroy(nh); } @@ -2157,7 +2157,7 @@ mark_point(); nua_set_hparams(nh, NUTAG_APPL_METHOD("BYE"), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_flush_events(); @@ -2174,7 +2174,7 @@ s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_unless(s2_sip_check_response(200, SIP_METHOD_BYE)); @@ -2197,7 +2197,7 @@ mark_point(); nua_set_hparams(nh, NUTAG_APPL_METHOD("BYE"), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_flush_events(); s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END()); @@ -2212,7 +2212,7 @@ s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_respond(nh, 200, "OKOK", NUTAG_WITH(i_bye->data->e_msg), TAG_END()); @@ -2236,7 +2236,7 @@ mark_point(); nua_set_hparams(nh, NUTAG_APPL_METHOD("BYE"), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_flush_events(); s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END()); @@ -2251,7 +2251,7 @@ s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); nua_handle_destroy(nh); @@ -2271,14 +2271,14 @@ nh = invite_to_nua(TAG_END()); nua_set_hparams(nh, NUTAG_AUTOANSWER(0), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_flush_events(); request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END()); fail_unless(s2_sip_check_response(100, SIP_METHOD_INVITE)); nua_bye(nh, TAG_END()); - fail_unless(s2_check_event(nua_i_invite, 100)); + fail_unless_event(nua_i_invite, 100); fail_unless(s2_check_callstate(nua_callstate_received)); do { @@ -2309,14 +2309,14 @@ nh = invite_to_nua(TAG_END()); nua_set_hparams(nh, NUTAG_AUTOANSWER(0), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_flush_events(); request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END()); fail_unless(s2_sip_check_response(100, SIP_METHOD_INVITE)); nua_bye(nh, TAG_END()); - fail_unless(s2_check_event(nua_i_invite, 100)); + fail_unless_event(nua_i_invite, 100); fail_unless(s2_check_callstate(nua_callstate_received)); bye = s2_sip_wait_for_request(SIP_METHOD_BYE); @@ -2352,7 +2352,7 @@ request_with_sdp(dialog, SIP_METHOD_INVITE, NULL, TAG_END()); fail_unless(s2_sip_check_response(100, SIP_METHOD_INVITE)); nua_bye(nh, TAG_END()); - fail_unless(s2_check_event(nua_i_invite, 100)); + fail_unless_event(nua_i_invite, 100); fail_unless(s2_check_callstate(nua_callstate_received)); nua_respond(nh, SIP_486_BUSY_HERE, TAG_END()); @@ -2445,7 +2445,7 @@ fail_if(!bye); fail_unless(s2_check_callstate(nua_callstate_calling)); - fail_unless(s2_check_event(nua_r_invite, 501)); + fail_unless_event(nua_r_invite, 501); fail_unless(s2_check_callstate(nua_callstate_terminating)); s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END()); @@ -2483,12 +2483,12 @@ invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); s2_sip_request_to(dialog, SIP_METHOD_BYE, NULL, TAG_END()); @@ -2533,7 +2533,7 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 407)); + fail_unless_event(nua_r_bye, 407); s2_nua_fast_forward(300, s2base->root); @@ -2542,7 +2542,7 @@ fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_if(s2->events); @@ -2579,7 +2579,7 @@ SIPTAG_PROXY_AUTHENTICATE_STR(s2_auth_digest_str), TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 407)); + fail_unless_event(nua_r_bye, 407); s2_nua_fast_forward(160, s2base->root); @@ -2588,7 +2588,7 @@ fail_if(!bye); s2_sip_respond_to(bye, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(bye); - fail_unless(s2_check_event(nua_r_bye, 200)); + fail_unless_event(nua_r_bye, 200); fail_unless(s2_check_callstate(nua_callstate_terminated)); fail_if(s2->events); @@ -2662,7 +2662,7 @@ invite = invite_sent_by_nua(nh, TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_handle_destroy(nh); @@ -2690,11 +2690,11 @@ invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); nua_handle_destroy(nh); @@ -2726,11 +2726,11 @@ invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); nua_ack(nh, TAG_END()); @@ -2793,7 +2793,7 @@ invite = invite_sent_by_nua(nh, TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_handle_destroy(nh); @@ -2822,11 +2822,11 @@ invite = invite_sent_by_nua(nh, NUTAG_AUTOACK(0), TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_completing)); nua_handle_destroy(nh); @@ -2892,7 +2892,7 @@ invite = invite_sent_by_nua(nh, TAG_END()); process_offer(invite); s2_sip_respond_to(invite, dialog, SIP_180_RINGING, TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); nua_handle_destroy(nh); @@ -3156,7 +3156,7 @@ nua_handle_destroy(nh); nua_set_params(nua, NUTAG_APPL_METHOD("OPTIONS"), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END()); @@ -3202,7 +3202,7 @@ "Test multithreading nua_respond() API with OPTIONS."); nua_set_params(nua, NUTAG_APPL_METHOD("OPTIONS"), TAG_END()); - fail_unless(s2_check_event(nua_r_set_params, 200)); + fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_OPTIONS, NULL, TAG_END()); @@ -3354,7 +3354,7 @@ invite, dialog, SIP_180_RINGING, SIPTAG_CONTENT_DISPOSITION_STR("session;handling=optional"), TAG_END()); - fail_unless(s2_check_event(nua_r_invite, 180)); + fail_unless_event(nua_r_invite, 180); fail_unless(s2_check_callstate(nua_callstate_proceeding)); notify1 = s2_sip_wait_for_request(SIP_METHOD_NOTIFY); @@ -3362,7 +3362,7 @@ respond_with_sdp(invite, dialog, SIP_200_OK, TAG_END()); s2_sip_free_message(invite); - fail_unless(s2_check_event(nua_r_invite, 200)); + fail_unless_event(nua_r_invite, 200); fail_unless(s2_check_callstate(nua_callstate_ready)); fail_unless(s2_sip_check_request(SIP_METHOD_ACK)); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_simple.c Tue Mar 24 10:30:45 2009 @@ -80,7 +80,7 @@ nua_shutdown(nua); - fail_unless(s2_check_event(nua_r_shutdown, 200)); + fail_unless_event(nua_r_shutdown, 200); s2_nua_teardown(); } @@ -509,7 +509,7 @@ nua_set_params(nua, NUTAG_APPL_METHOD("SUBSCRIBE"), SIPTAG_ALLOW_EVENTS_STR(event), TAG_END()); - s2_check_event(nua_r_set_params, 200); + fail_unless_event(nua_r_set_params, 200); ta_start(ta, tag, value); s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL, @@ -550,7 +550,7 @@ s2_sip_check_response(489, SIP_METHOD_SUBSCRIBE); nua_set_params(nua, NUTAG_APPL_METHOD("SUBSCRIBE"), TAG_END()); - s2_check_event(nua_r_set_params, 200); + fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL, SIPTAG_EVENT_STR("presence"), @@ -558,7 +558,7 @@ s2_sip_check_response(489, SIP_METHOD_SUBSCRIBE); nua_set_params(nua, SIPTAG_ALLOW_EVENTS_STR("presence"), TAG_END()); - s2_check_event(nua_r_set_params, 200); + fail_unless_event(nua_r_set_params, 200); s2_sip_request_to(dialog, SIP_METHOD_SUBSCRIBE, NULL, SIPTAG_EVENT_STR("presence"), @@ -601,7 +601,7 @@ "terminated")); s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END()); - s2_check_event(nua_r_notify, 200); + fail_unless_event(nua_r_notify, 200); nua_handle_destroy(nh); } END_TEST @@ -629,7 +629,7 @@ fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate, "active")); s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END()); - s2_check_event(nua_r_notify, 200); + fail_unless_event(nua_r_notify, 200); s2_nua_fast_forward(300, s2base->root); @@ -640,7 +640,7 @@ fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate, "terminated")); s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END()); - s2_check_event(nua_r_notify, 200); + fail_unless_event(nua_r_notify, 200); nua_handle_destroy(nh); } @@ -682,7 +682,7 @@ fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate, "active")); s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END()); - s2_check_event(nua_r_notify, 200); + fail_unless_event(nua_r_notify, 200); nua_notify(nh, NUTAG_SUBSTATE(nua_substate_active), @@ -728,7 +728,7 @@ fail_unless(su_strmatch(sip->sip_subscription_state->ss_substate, "active")); s2_sip_respond_to(notify, dialog, SIP_200_OK, TAG_END()); - s2_check_event(nua_r_notify, 200); + fail_unless_event(nua_r_notify, 200); nua_notify(nh, NUTAG_SUBSTATE(nua_substate_active),

1 0

[commit] r12730 - in freeswitch/trunk/src: . include mod/languages/mod_lua mod/languages/mod_managed mod/languages/mod_managed/managed mod/languages/mod_perl mod/languages/mod_python
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: anthm Date: Tue Mar 24 10:30:08 2009 New Revision: 12730 Log: fix hanguphook order of operations vs destroy method issue in c++ code Modified: freeswitch/trunk/src/include/switch_cpp.h freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/include/switch_cpp.h ============================================================================== --- freeswitch/trunk/src/include/switch_cpp.h (original) +++ freeswitch/trunk/src/include/switch_cpp.h Tue Mar 24 10:30:08 2009 @@ -264,7 +264,7 @@ SWITCH_DECLARE(int) originate(CoreSession * a_leg_session, char *dest, int timeout = 60); - SWITCH_DECLARE(void) destroy(void); + SWITCH_DECLARE(virtual void) destroy(void); /** \brief set a DTMF callback function * Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Tue Mar 24 10:30:08 2009 @@ -21,8 +21,14 @@ hh = mark = 0; } static switch_status_t lua_hanguphook(switch_core_session_t *session_hungup); -Session::~Session() + + +void Session::destroy(void) { + + if (!allocated) { + return; + } if (session) { if (!channel) { @@ -30,8 +36,6 @@ } switch_channel_set_private(channel, "CoreSession", NULL); switch_core_event_hook_remove_state_change(session, lua_hanguphook); - session = NULL; - channel = NULL; } switch_safe_free(hangup_func_str); @@ -39,8 +43,13 @@ switch_safe_free(cb_function); switch_safe_free(cb_arg); - init_vars(); - + CoreSession::destroy(); +} + + +Session::~Session() +{ + destroy(); } bool Session::begin_allow_threads() Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.h Tue Mar 24 10:30:08 2009 @@ -23,6 +23,7 @@ Session(char *uuid, CoreSession *a_leg = NULL); Session(switch_core_session_t *session); ~Session(); + virtual void destroy(void); virtual bool begin_allow_threads(); virtual bool end_allow_threads(); @@ -40,6 +41,7 @@ char *hangup_func_str; char *hangup_func_arg; void setLUA(lua_State *state); + }; } #endif Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua_wrap.cpp Tue Mar 24 10:30:08 2009 @@ -7388,6 +7388,30 @@ } +static int _wrap_Session_destroy(lua_State* L) { + int SWIG_arg = -1; + LUA::Session *arg1 = (LUA::Session *) 0 ; + + SWIG_check_num_args("destroy",1,1) + if(!SWIG_isptrtype(L,1)) SWIG_fail_arg("destroy",1,"LUA::Session *"); + + if (!SWIG_IsOK(SWIG_ConvertPtr(L,1,(void**)&arg1,SWIGTYPE_p_LUA__Session,0))){ + SWIG_fail_ptr("Session_destroy",1,SWIGTYPE_p_LUA__Session); + } + + (arg1)->destroy(); + SWIG_arg=0; + + return SWIG_arg; + + if(0) SWIG_fail; + +fail: + lua_error(L); + return SWIG_arg; +} + + static int _wrap_Session_begin_allow_threads(lua_State* L) { int SWIG_arg = -1; LUA::Session *arg1 = (LUA::Session *) 0 ; @@ -8086,6 +8110,7 @@ delete arg1; } static swig_lua_method swig_LUA_Session_methods[] = { + {"destroy", _wrap_Session_destroy}, {"begin_allow_threads", _wrap_Session_begin_allow_threads}, {"end_allow_threads", _wrap_Session_end_allow_threads}, {"check_hangup_hook", _wrap_Session_check_hangup_hook}, Modified: freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/freeswitch_wrap.cxx Tue Mar 24 10:30:08 2009 @@ -1444,6 +1444,17 @@ } +SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE_get() { + char * jresult ; + char *result = 0 ; + + result = (char *) "transfer_after_bridge"; + + jresult = SWIG_csharp_string_callback((const char *)result); + return jresult; +} + + SWIGEXPORT char * SWIGSTDCALL CSharp_SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE_get() { char * jresult ; char *result = 0 ; @@ -13113,6 +13124,64 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_in_set(void * jarg1, void * jarg2) { + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_size_t arg2 ; + switch_size_t *argp2 ; + + arg1 = (switch_file_handle *)jarg1; + argp2 = (switch_size_t *)jarg2; + if (!argp2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0); + return ; + } + arg2 = *argp2; + if (arg1) (arg1)->samples_in = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_samples_in_get(void * jarg1) { + void * jresult ; + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_size_t result; + + arg1 = (switch_file_handle *)jarg1; + result = ((arg1)->samples_in); + jresult = new switch_size_t((switch_size_t &)result); + return jresult; +} + + +SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_samples_out_set(void * jarg1, void * jarg2) { + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_size_t arg2 ; + switch_size_t *argp2 ; + + arg1 = (switch_file_handle *)jarg1; + argp2 = (switch_size_t *)jarg2; + if (!argp2) { + SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null switch_size_t", 0); + return ; + } + arg2 = *argp2; + if (arg1) (arg1)->samples_out = arg2; + +} + + +SWIGEXPORT void * SWIGSTDCALL CSharp_switch_file_handle_samples_out_get(void * jarg1) { + void * jresult ; + switch_file_handle *arg1 = (switch_file_handle *) 0 ; + switch_size_t result; + + arg1 = (switch_file_handle *)jarg1; + result = ((arg1)->samples_out); + jresult = new switch_size_t((switch_size_t &)result); + return jresult; +} + + SWIGEXPORT void SWIGSTDCALL CSharp_switch_file_handle_vol_set(void * jarg1, int jarg2) { switch_file_handle *arg1 = (switch_file_handle *) 0 ; int32_t arg2 ; @@ -22245,6 +22314,18 @@ } +SWIGEXPORT void SWIGSTDCALL CSharp_switch_process_import(void * jarg1, void * jarg2, char * jarg3) { + switch_core_session_t *arg1 = (switch_core_session_t *) 0 ; + switch_channel_t *arg2 = (switch_channel_t *) 0 ; + char *arg3 = (char *) 0 ; + + arg1 = (switch_core_session_t *)jarg1; + arg2 = (switch_channel_t *)jarg2; + arg3 = (char *)jarg3; + switch_process_import(arg1,arg2,(char const *)arg3); +} + + SWIGEXPORT int SWIGSTDCALL CSharp_SWITCH_RTP_MAX_BUF_LEN_get() { int jresult ; int result; Modified: freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs (original) +++ freeswitch/trunk/src/mod/languages/mod_managed/managed/swig.cs Tue Mar 24 10:30:08 2009 @@ -249,7 +249,7 @@ return ret; } - public void destroy() { + public virtual void destroy() { freeswitchPINVOKE.CoreSession_destroy(swigCPtr); } @@ -3382,6 +3382,10 @@ return ret; } + public static void switch_process_import(SWIGTYPE_p_switch_core_session session, SWIGTYPE_p_switch_channel peer_channel, string varname) { + freeswitchPINVOKE.switch_process_import(SWIGTYPE_p_switch_core_session.getCPtr(session), SWIGTYPE_p_switch_channel.getCPtr(peer_channel), varname); + } + public static switch_status_t switch_rtp_add_crypto_key(SWIGTYPE_p_switch_rtp rtp_session, switch_rtp_crypto_direction_t direction, uint index, switch_rtp_crypto_key_type_t type, SWIGTYPE_p_unsigned_char key, SWIGTYPE_p_switch_size_t keylen) { switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_add_crypto_key(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), (int)direction, index, (int)type, SWIGTYPE_p_unsigned_char.getCPtr(key), SWIGTYPE_p_switch_size_t.getCPtr(keylen)); if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); @@ -4181,6 +4185,7 @@ public static readonly string SWITCH_LOCAL_VIDEO_PORT_VARIABLE = freeswitchPINVOKE.SWITCH_LOCAL_VIDEO_PORT_VARIABLE_get(); public static readonly string SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE = freeswitchPINVOKE.SWITCH_HANGUP_AFTER_BRIDGE_VARIABLE_get(); public static readonly string SWITCH_PARK_AFTER_BRIDGE_VARIABLE = freeswitchPINVOKE.SWITCH_PARK_AFTER_BRIDGE_VARIABLE_get(); + public static readonly string SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE = freeswitchPINVOKE.SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE_get(); public static readonly string SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE = freeswitchPINVOKE.SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE_get(); public static readonly string SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE = freeswitchPINVOKE.SWITCH_EXEC_AFTER_BRIDGE_ARG_VARIABLE_get(); public static readonly string SWITCH_MAX_FORWARDS_VARIABLE = freeswitchPINVOKE.SWITCH_MAX_FORWARDS_VARIABLE_get(); @@ -4754,6 +4759,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_PARK_AFTER_BRIDGE_VARIABLE_get")] public static extern string SWITCH_PARK_AFTER_BRIDGE_VARIABLE_get(); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE_get")] + public static extern string SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE_get(); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE_get")] public static extern string SWITCH_EXEC_AFTER_BRIDGE_APP_VARIABLE_get(); @@ -7520,6 +7528,18 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_offset_pos_get")] public static extern uint switch_file_handle_offset_pos_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_samples_in_set")] + public static extern void switch_file_handle_samples_in_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_samples_in_get")] + public static extern IntPtr switch_file_handle_samples_in_get(HandleRef jarg1); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_samples_out_set")] + public static extern void switch_file_handle_samples_out_set(HandleRef jarg1, HandleRef jarg2); + + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_samples_out_get")] + public static extern IntPtr switch_file_handle_samples_out_get(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_file_handle_vol_set")] public static extern void switch_file_handle_vol_set(HandleRef jarg1, int jarg2); @@ -9632,6 +9652,9 @@ [DllImport("mod_managed", EntryPoint="CSharp_switch_ivr_sound_test")] public static extern int switch_ivr_sound_test(HandleRef jarg1); + [DllImport("mod_managed", EntryPoint="CSharp_switch_process_import")] + public static extern void switch_process_import(HandleRef jarg1, HandleRef jarg2, string jarg3); + [DllImport("mod_managed", EntryPoint="CSharp_SWITCH_RTP_MAX_BUF_LEN_get")] public static extern int SWITCH_RTP_MAX_BUF_LEN_get(); @@ -20488,6 +20511,30 @@ } } + public SWIGTYPE_p_switch_size_t samples_in { + set { + freeswitchPINVOKE.switch_file_handle_samples_in_set(swigCPtr, SWIGTYPE_p_switch_size_t.getCPtr(value)); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + } + get { + SWIGTYPE_p_switch_size_t ret = new SWIGTYPE_p_switch_size_t(freeswitchPINVOKE.switch_file_handle_samples_in_get(swigCPtr), true); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + public SWIGTYPE_p_switch_size_t samples_out { + set { + freeswitchPINVOKE.switch_file_handle_samples_out_set(swigCPtr, SWIGTYPE_p_switch_size_t.getCPtr(value)); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + } + get { + SWIGTYPE_p_switch_size_t ret = new SWIGTYPE_p_switch_size_t(freeswitchPINVOKE.switch_file_handle_samples_out_get(swigCPtr), true); + if (freeswitchPINVOKE.SWIGPendingException.Pending) throw freeswitchPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + public int vol { set { freeswitchPINVOKE.switch_file_handle_vol_set(swigCPtr, value); Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch.pm Tue Mar 24 10:30:08 2009 @@ -478,6 +478,7 @@ } } +*destroy = *freeswitchc::Session_destroy; *begin_allow_threads = *freeswitchc::Session_begin_allow_threads; *end_allow_threads = *freeswitchc::Session_end_allow_threads; *check_hangup_hook = *freeswitchc::Session_check_hangup_hook; Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.cpp Tue Mar 24 10:30:08 2009 @@ -44,18 +44,33 @@ } } static switch_status_t perl_hanguphook(switch_core_session_t *session_hungup); -Session::~Session() + +void Session::destroy(void) { - switch_safe_free(cb_function); - switch_safe_free(cb_arg); + + if (!allocated) { + return; + } - if (session && hangup_func_str) { + if (session) { + if (!channel) { + channel = switch_core_session_get_channel(session); + } + switch_channel_set_private(channel, "CoreSession", NULL); switch_core_event_hook_remove_state_change(session, perl_hanguphook); } + switch_safe_free(cb_function); + switch_safe_free(cb_arg); switch_safe_free(hangup_func_str); - switch_safe_free(hangup_func_arg); + switch_safe_free(hangup_func_arg); + + CoreSession::destroy(); +} +Session::~Session() +{ + destroy(); } bool Session::begin_allow_threads() Modified: freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/freeswitch_perl.h Tue Mar 24 10:30:08 2009 @@ -31,7 +31,8 @@ Session(char *uuid, CoreSession *a_leg = NULL); Session(switch_core_session_t *session); ~Session(); - + + virtual void destroy(void); virtual bool begin_allow_threads(); virtual bool end_allow_threads(); virtual void check_hangup_hook(); Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl_wrap.cpp Tue Mar 24 10:30:08 2009 @@ -9942,6 +9942,33 @@ } +XS(_wrap_Session_destroy) { + { + PERL::Session *arg1 = (PERL::Session *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + int argvi = 0; + dXSARGS; + + if ((items < 1) || (items > 1)) { + SWIG_croak("Usage: Session_destroy(self);"); + } + res1 = SWIG_ConvertPtr(ST(0), &argp1,SWIGTYPE_p_PERL__Session, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Session_destroy" "', argument " "1"" of type '" "PERL::Session *""'"); + } + arg1 = reinterpret_cast< PERL::Session * >(argp1); + (arg1)->destroy(); + + + XSRETURN(argvi); + fail: + + SWIG_croak_null(); + } +} + + XS(_wrap_Session_begin_allow_threads) { { PERL::Session *arg1 = (PERL::Session *) 0 ; @@ -11217,6 +11244,7 @@ {"freeswitchc::dtmf_callback", _wrap_dtmf_callback}, {"freeswitchc::new_Session", _wrap_new_Session}, {"freeswitchc::delete_Session", _wrap_delete_Session}, +{"freeswitchc::Session_destroy", _wrap_Session_destroy}, {"freeswitchc::Session_begin_allow_threads", _wrap_Session_begin_allow_threads}, {"freeswitchc::Session_end_allow_threads", _wrap_Session_end_allow_threads}, {"freeswitchc::Session_check_hangup_hook", _wrap_Session_check_hangup_hook}, @@ -11534,17 +11562,17 @@ SWIG_TypeClientData(SWIGTYPE_p_IVRMenu, (void*) "freeswitch::IVRMenu"); SWIG_TypeClientData(SWIGTYPE_p_API, (void*) "freeswitch::API"); SWIG_TypeClientData(SWIGTYPE_p_input_callback_state, (void*) "freeswitch::input_callback_state_t"); - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_HUP", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_HUP))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_FREE", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_FREE))); SvREADONLY_on(sv); } while(0) /*@SWIG@*/; - /*@SWIG:/usr/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { + /*@SWIG:/usr/local/share/swig/1.3.35/perl5/perltypemaps.swg,64,%set_constant@*/ do { SV *sv = get_sv((char*) SWIG_prefix "S_RDLOCK", TRUE | 0x2 | GV_ADDMULTI); sv_setsv(sv, SWIG_From_int SWIG_PERL_CALL_ARGS_1(static_cast< int >(S_RDLOCK))); SvREADONLY_on(sv); Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch.py Tue Mar 24 10:30:08 2009 @@ -324,6 +324,7 @@ def begin_allow_threads(*args): return _freeswitch.Session_begin_allow_threads(*args) def end_allow_threads(*args): return _freeswitch.Session_end_allow_threads(*args) def check_hangup_hook(*args): return _freeswitch.Session_check_hangup_hook(*args) + def destroy(*args): return _freeswitch.Session_destroy(*args) def run_dtmf_callback(*args): return _freeswitch.Session_run_dtmf_callback(*args) def setInputCallback(*args): return _freeswitch.Session_setInputCallback(*args) def unsetInputCallback(*args): return _freeswitch.Session_unsetInputCallback(*args) Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Tue Mar 24 10:30:08 2009 @@ -21,16 +21,25 @@ } static switch_status_t python_hanguphook(switch_core_session_t *session_hungup); -Session::~Session() +void Session::destroy(void) { - if (hangup_func) { - if (session) { - switch_core_event_hook_remove_state_change(session, python_hanguphook); + if (!allocated) { + return; + } + + if (session) { + if (!channel) { + channel = switch_core_session_get_channel(session); } - Py_DECREF(hangup_func); - hangup_func = NULL; + switch_channel_set_private(channel, "CoreSession", NULL); + switch_core_event_hook_remove_state_change(session, python_hanguphook); } + + if (hangup_func) { + Py_DECREF(hangup_func); + hangup_func = NULL; + } if (hangup_func_arg) { Py_DECREF(hangup_func_arg); @@ -49,7 +58,14 @@ if (Self) { Py_DECREF(Self); - } + } + + CoreSession::destroy(); +} + +Session::~Session() +{ + destroy(); } bool Session::begin_allow_threads() Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.h Tue Mar 24 10:30:08 2009 @@ -27,6 +27,7 @@ virtual bool begin_allow_threads(); virtual bool end_allow_threads(); virtual void check_hangup_hook(); + virtual void destroy(void); virtual switch_status_t run_dtmf_callback(void *input, switch_input_type_t itype); void setInputCallback(PyObject *cbfunc, PyObject *funcargs = NULL); Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/mod_python_wrap.cpp Tue Mar 24 10:30:08 2009 @@ -9442,6 +9442,27 @@ } +SWIGINTERN PyObject *_wrap_Session_destroy(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { + PyObject *resultobj = 0; + PYTHON::Session *arg1 = (PYTHON::Session *) 0 ; + void *argp1 = 0 ; + int res1 = 0 ; + PyObject * obj0 = 0 ; + + if (!PyArg_ParseTuple(args,(char *)"O:Session_destroy",&obj0)) SWIG_fail; + res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_PYTHON__Session, 0 | 0 ); + if (!SWIG_IsOK(res1)) { + SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Session_destroy" "', argument " "1"" of type '" "PYTHON::Session *""'"); + } + arg1 = reinterpret_cast< PYTHON::Session * >(argp1); + (arg1)->destroy(); + resultobj = SWIG_Py_Void(); + return resultobj; +fail: + return NULL; +} + + SWIGINTERN PyObject *_wrap_Session_run_dtmf_callback(PyObject *SWIGUNUSEDPARM(self), PyObject *args) { PyObject *resultobj = 0; PYTHON::Session *arg1 = (PYTHON::Session *) 0 ; @@ -10114,6 +10135,7 @@ { (char *)"Session_begin_allow_threads", _wrap_Session_begin_allow_threads, METH_VARARGS, NULL}, { (char *)"Session_end_allow_threads", _wrap_Session_end_allow_threads, METH_VARARGS, NULL}, { (char *)"Session_check_hangup_hook", _wrap_Session_check_hangup_hook, METH_VARARGS, NULL}, + { (char *)"Session_destroy", _wrap_Session_destroy, METH_VARARGS, NULL}, { (char *)"Session_run_dtmf_callback", _wrap_Session_run_dtmf_callback, METH_VARARGS, NULL}, { (char *)"Session_setInputCallback", _wrap_Session_setInputCallback, METH_VARARGS, NULL}, { (char *)"Session_unsetInputCallback", _wrap_Session_unsetInputCallback, METH_VARARGS, NULL}, Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Mar 24 10:30:08 2009 @@ -887,6 +887,10 @@ SWITCH_DECLARE(void) CoreSession::destroy(void) { this_check_void(); + + if (!allocated) { + return; + } switch_safe_free(xml_cdr_text); switch_safe_free(uuid); @@ -903,7 +907,7 @@ } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "destroy/unlink session from object\n"); - + if (switch_channel_up(channel) && switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); } @@ -912,7 +916,7 @@ channel = NULL; } - allocated = 0; + init_vars(); }

1 0

[commit] r12729 - freeswitch/trunk/libs/esl/python
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: brian Date: Tue Mar 24 10:00:44 2009 New Revision: 12729 Log: ESL-9 Modified: freeswitch/trunk/libs/esl/python/single_command.py Modified: freeswitch/trunk/libs/esl/python/single_command.py ============================================================================== --- freeswitch/trunk/libs/esl/python/single_command.py (original) +++ freeswitch/trunk/libs/esl/python/single_command.py Tue Mar 24 10:00:44 2009 @@ -2,21 +2,42 @@ import string import sys +from optparse import OptionParser from ESL import * -con = ESLconnection("localhost","8021","ClueCon") -#are we connected? - -if con.connected: - - #get argument passed to script - command = string.join(sys.argv[1:]) - - #run command - e=con.sendRecv("api "+ command) - print e.getBody() - -else: - - print "Not Connected" - +def main(argv): + + try: + + parser = OptionParser() + parser.add_option("-a", "--auth", dest="auth", default="ClueCon", + help="ESL password") + parser.add_option("-s", "--server", dest="server", default="127.0.0.1", + help="FreeSWITCH server IP address") + parser.add_option("-p", "--port", dest="port", default="8021", + help="FreeSWITCH server event socket port") + parser.add_option("-c", "--command", dest="command", + help="command to run, surround mutli word commands in \"\'s") + + (options, args) = parser.parse_args() + + + con = ESLconnection(options.server, options.port, options.auth) + #are we connected? + + if con.connected: + #run command + e=con.sendRecv("api "+ options.command) + print e.getBody() + + else: + + print "Not Connected" + sys.exit(2) + + except: + + print parser.get_usage() + +if __name__ == "__main__": + main(sys.argv[1:]) \ No newline at end of file

1 0

[commit] r12728 - in freeswitch/trunk/src: . mod/formats/mod_sndfile mod/languages/mod_lua
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: anthm Date: Tue Mar 24 09:54:13 2009 New Revision: 12728 Log: FSCORE-341 Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp freeswitch/trunk/src/switch_core_file.c freeswitch/trunk/src/switch_cpp.cpp Modified: freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c (original) +++ freeswitch/trunk/src/mod/formats/mod_sndfile/mod_sndfile.c Tue Mar 24 09:54:13 2009 @@ -103,7 +103,8 @@ context->sfinfo.channels = handle->channels; context->sfinfo.samplerate = handle->samplerate; if (handle->samplerate == 8000 || handle->samplerate == 16000 || - handle->samplerate == 24000 || handle->samplerate == 32000 || handle->samplerate == 48000) { + handle->samplerate == 24000 || handle->samplerate == 32000 || handle->samplerate == 48000 || + handle->samplerate == 11025 || handle->samplerate == 22050 || handle->samplerate == 44100) { context->sfinfo.format |= SF_FORMAT_PCM_16; } Modified: freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_lua/freeswitch_lua.cpp Tue Mar 24 09:54:13 2009 @@ -24,20 +24,23 @@ Session::~Session() { - if (channel) { - switch_channel_set_private(channel, "CoreSession", NULL); - } - - if (hangup_func_str) { - if (session) { - switch_core_event_hook_remove_state_change(session, lua_hanguphook); + if (session) { + if (!channel) { + channel = switch_core_session_get_channel(session); } - switch_safe_free(hangup_func_str); + switch_channel_set_private(channel, "CoreSession", NULL); + switch_core_event_hook_remove_state_change(session, lua_hanguphook); + session = NULL; + channel = NULL; } + switch_safe_free(hangup_func_str); switch_safe_free(hangup_func_arg); switch_safe_free(cb_function); switch_safe_free(cb_arg); + + init_vars(); + } bool Session::begin_allow_threads() Modified: freeswitch/trunk/src/switch_core_file.c ============================================================================== --- freeswitch/trunk/src/switch_core_file.c (original) +++ freeswitch/trunk/src/switch_core_file.c Tue Mar 24 09:54:13 2009 @@ -290,10 +290,10 @@ fh->dbuf = switch_core_alloc(fh->memory_pool, fh->dbuflen); } switch_assert(fh->resampler->to_len <= fh->dbuflen); - memcpy(fh->dbuf, fh->resampler->to, fh->resampler->to_len); + memcpy(fh->dbuf, fh->resampler->to, fh->resampler->to_len * 2); data = fh->dbuf; } else { - memcpy(data, fh->resampler->to, fh->resampler->to_len); + memcpy(data, fh->resampler->to, fh->resampler->to_len * 2); } *len = fh->resampler->to_len / fh->channels; Modified: freeswitch/trunk/src/switch_cpp.cpp ============================================================================== --- freeswitch/trunk/src/switch_cpp.cpp (original) +++ freeswitch/trunk/src/switch_cpp.cpp Tue Mar 24 09:54:13 2009 @@ -888,22 +888,28 @@ { this_check_void(); - if (channel) { - switch_channel_set_private(channel, "CoreSession", NULL); - } - switch_safe_free(xml_cdr_text); switch_safe_free(uuid); switch_safe_free(tts_name); switch_safe_free(voice_name); if (session) { + if (!channel) { + channel = switch_core_session_get_channel(session); + } + + if (channel) { + switch_channel_set_private(channel, "CoreSession", NULL); + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "destroy/unlink session from object\n"); - if (switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) { + + if (switch_channel_up(channel) && switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) { switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); } switch_core_session_rwunlock(session); session = NULL; + channel = NULL; } allocated = 0;

1 0

[commit] r12727 - freeswitch/trunk/scripts/contrib/swk/php/xml_curl
by FreeSWITCH SVN 24 Mar '09

24 Mar '09

Author: silik0n Date: Tue Mar 24 03:43:19 2009 New Revision: 12727 Log: you dont need my RFC1918 address in your configs Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSConfig.php freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSConfig.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSConfig.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSConfig.php Tue Mar 24 03:43:19 2009 @@ -45,7 +45,7 @@ public function __construct(){ $dbtype='mysql'; /* Set the Database type */ // $db_hostname = 'localhost'; /* Database Server hostname */ - $db_hostname = '192.168.1.140'; /* Database Server hostname */ + $db_hostname = '127.0.0.1'; /* Database Server hostname */ $db_port = '3306'; /* Database Server Port */ $db_username = 'root'; /* Database Server username */ $db_password = 'password'; /* Database Server password */ Modified: freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php ============================================================================== --- freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php (original) +++ freeswitch/trunk/scripts/contrib/swk/php/xml_curl/FSDirectory.php Tue Mar 24 03:43:19 2009 @@ -45,7 +45,7 @@ public function __construct(){ $dbtype='mysql'; /* Set the Database type */ // $db_hostname = 'localhost'; /* Database Server hostname */ - $db_hostname = '192.168.1.140'; /* Database Server hostname */ + $db_hostname = '127.0.0.1'; /* Database Server hostname */ $db_port = '3306'; /* Database Server Port */ $db_username = 'root'; /* Database Server username */ $db_password = 'password'; /* Database Server password */

1 0