Author: mikej Date: Tue Feb 26 13:08:51 2008 New Revision: 7744 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_cancel_bye.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_ops.c Log: Tue Feb 26 12:45:52 EST 2008 Pekka.Pessi@nokia.com * test_nua.c: fixed tests Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am Tue Feb 26 13:08:51 2008 @@ -51,8 +51,9 @@ test_call_reject.c test_cancel_bye.c \ test_call_hold.c test_session_timer.c \ test_refer.c test_100rel.c \ - test_sip_events.c test_extension.c -#test_simple.c + test_sip_events.c test_simple.c \ + test_extension.c + libtestproxy_la_SOURCES = test_proxy.h test_proxy.c Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_cancel_bye.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_cancel_bye.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_cancel_bye.c Tue Feb 26 13:08:51 2008 @@ -1433,6 +1433,9 @@ a_call->sdp = "m=audio 5008 RTP/AVP 8"; c_call->sdp = "m=audio 5010 RTP/AVP 0 8"; + if (!ctx->proxy_tests) + return 0; + /* BYE after receiving 401 A C Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_nua.h Tue Feb 26 13:08:51 2008 @@ -178,7 +178,10 @@ unsigned bit4:1, bit5:1, bit6:1, bit7:1; unsigned :0; } flags; - + /* Accross-run state information */ + struct { + unsigned n; + } state; } a, b, c; struct proxy *p; Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_ops.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_ops.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/test_ops.c Tue Feb 26 13:08:51 2008 @@ -182,6 +182,12 @@ ep->name, (void *)nh, nua_event_name(event), phrase, nua_substate_name(t ? t->t_value : 0)); } + else if ((int)event >= nua_i_bye || + event == nua_i_invite || event == nua_i_cancel || + event == nua_i_ack) { + fprintf(stderr, "%s %s.nua(%p): event %s %03d %s\n", timestamp, + ep->name, (void *)nh, nua_event_name(event), status, phrase); + } else if ((int)event >= 0) { fprintf(stderr, "%s %s.nua(%p): event %s %s\n", timestamp, ep->name, (void *)nh, nua_event_name(event), phrase);