August 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r9283 - freeswitch/trunk/src
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: anthm Date: Tue Aug 12 14:04:59 2008 New Revision: 9283 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: fix compiler error Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Aug 12 14:04:59 2008 @@ -421,7 +421,7 @@ olen = mlen; if (ringback.fh->resampler) { - olen *= ringback.fh->resampler->rfactor; + olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor); } switch_core_file_read(ringback.fh, write_frame.data, &olen); @@ -1220,7 +1220,7 @@ olen = mlen; if (ringback.fh->resampler) { - olen *= ringback.fh->resampler->rfactor; + olen = (switch_size_t) (olen * ringback.fh->resampler->rfactor); } switch_core_file_read(ringback.fh, write_frame.data, &olen);

1 0

[commit] r9282 - in freeswitch/trunk/src: . mod/applications/mod_dptools
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: anthm Date: Tue Aug 12 14:00:56 2008 New Revision: 9282 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_originate.c Log: make error endpoint able to forked dial Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Aug 12 14:00:56 2008 @@ -1882,6 +1882,31 @@ } } + +/* fake chan_error */ +switch_endpoint_interface_t *error_endpoint_interface; +static switch_call_cause_t error_outgoing_channel(switch_core_session_t *session, + switch_event_t *var_event, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags); +switch_io_routines_t error_io_routines = { + /*.outgoing_channel */ error_outgoing_channel +}; + +static switch_call_cause_t error_outgoing_channel(switch_core_session_t *session, + switch_event_t *var_event, + switch_caller_profile_t *outbound_profile, + switch_core_session_t **new_session, switch_memory_pool_t **pool, switch_originate_flag_t flags) +{ + switch_call_cause_t cause = switch_channel_str2cause(outbound_profile->destination_number); + if (cause == SWITCH_CAUSE_NONE) { + cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; + } + + return cause; +} + + /* fake chan_user */ switch_endpoint_interface_t *user_endpoint_interface; static switch_call_cause_t user_outgoing_channel(switch_core_session_t *session, @@ -2189,6 +2214,10 @@ /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); + error_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); + error_endpoint_interface->interface_name = "ERROR"; + error_endpoint_interface->io_routines = &error_io_routines; + user_endpoint_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_ENDPOINT_INTERFACE); user_endpoint_interface->interface_name = "USER"; user_endpoint_interface->io_routines = &user_io_routines; Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Aug 12 14:00:56 2008 @@ -542,11 +542,6 @@ *bleg = NULL; - if (!strncasecmp(bridgeto, "error/", 6)) { - *cause = switch_channel_str2cause(bridgeto + 6); - return SWITCH_STATUS_SUCCESS; - } - switch_zmalloc(write_frame.data, SWITCH_RECOMMENDED_BUFFER_SIZE); write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;

1 0

[commit] r9281 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: mikej Date: Tue Aug 12 13:11:25 2008 New Revision: 9281 Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-11.sdp Log: add new test file Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-11.sdp ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/tests/message-11.sdp Tue Aug 12 13:11:25 2008 @@ -0,0 +1,34 @@ +v=0 +o=- 3250588766 0 IN IP4 77.75.1.10 +s=- +c=IN IP4 77.75.1.10 +t=0 0 +m=audio 54424 RTP/AVP 18 99 101 102 103 15 104 4 105 106 107 108 125 109 100 8 0 +a=rtpmap:18 G729/8000 +a=fmtp:18 annexb=no +a=rtpmap:99 G.729a/8000 +a=rtpmap:101 G.726-16/8000 +a=rtpmap:102 G.726-24/8000 +a=rtpmap:103 G.726-32/8000 +a=rtpmap:15 G728/8000 +a=rtpmap:104 G.723.1-H/8000 +a=rtpmap:4 G723/8000 +a=rtpmap:105 G.723.1-L/8000 +a=rtpmap:106 G.729b/8000 +a=rtpmap:107 G.723.1a-H/8000 +a=rtpmap:108 G.723.1a-L/8000 +a=rtpmap:125 G.nX64/8000 +a=rtpmap:109 AMR/8000 +a=rtpmap:100 X-NSE/8000 +a=fmtp:100 192-194,200-202 +a=rtpmap:8 PCMA/8000 +a=rtpmap:0 PCMU/8000 +a=maxptime:20 +a=maxptime:30 +a=ptime:20 +a=ptime:30 +a=X-cap: 1 audio RTP/AVP 100 +a=X-cap: 2 image udptl t38 +a=X-sqn:0 +a=X-cpar: a=rtpmap:100 X-NSE/8000 +a=X-cpar: a=fmtp:100 192-194,200-202

1 0

[commit] r9280 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/sdp
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: mikej Date: Tue Aug 12 13:08:44 2008 New Revision: 9280 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/run_test_sdp freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c Log: Tue Aug 12 12:56:16 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * sdp_parse: the syntax is updated to RFC 4566 "The changes to the memo are intended to be backward-compatible clarifications." Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Aug 12 13:08:44 2008 @@ -1 +1 @@ -Tue Aug 12 13:07:50 EDT 2008 +Tue Aug 12 13:08:36 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/run_test_sdp ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/run_test_sdp (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/run_test_sdp Tue Aug 12 13:08:44 2008 @@ -11,7 +11,7 @@ if test -r $tests/message-1.sdp ; then -for n in 1 2 3 4 5 6 7 8 9 10; +for n in 1 2 3 4 5 6 7 8 9 10 11; do echo -n "$n: " "$test_sdp" < "$tests/message-$n.sdp" && echo OK Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/sdp_parse.c Tue Aug 12 13:08:44 2008 @@ -250,6 +250,7 @@ #define CRLF "\015\012" #define ALPHA "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" #define DIGIT "0123456789" +#define TOKEN ALPHA DIGIT "-!#$%&'*+.^_`{|}~" /* ========================================================================= */ /* Parsing functions */ @@ -891,9 +892,7 @@ { /* bandwidth-fields = *("b=" bwtype ":" bandwidth CRLF) - - bwtype = 1*(alpha-numeric) - ; CT or AS + bwtype = token bandwidth = 1*(DIGIT) */ /* NOTE: bwtype can also be like X-barf */ @@ -901,7 +900,7 @@ char *name; unsigned long value; - name = token(&r, ":", ALPHA DIGIT "-", SPACE TAB); + name = token(&r, ":", TOKEN, SPACE TAB); if (name == NULL || parse_ul(p, &r, &value, 0)) { parsing_error(p, "invalid bandwidth"); @@ -941,16 +940,21 @@ static void parse_time(sdp_parser_t *p, char *r, sdp_time_t **result) { /* - time-fields = 1*( "t=" start-time space stop-time + time-fields = 1*( "t=" start-time SP stop-time *(CRLF repeat-fields) CRLF) [zone-adjustments CRLF] - start-time = time | "0" + start-time = time / "0" - stop-time = time | "0" + stop-time = time / "0" - time = POS-DIGIT 9*(DIGIT) - ;sufficient for 2 more centuries + time = POS-DIGIT 9*DIGIT + ; Decimal representation of NTP time in + ; seconds since 1900. The representation + ; of NTP time is an unbounded length field + ; containing at least 10 digits. Unlike the + ; 64-bit representation used elsewhere, time + ; in SDP does not wrap in the year 2036. */ PARSE_ALLOC(p, sdp_time_t, t); *result = t; @@ -975,14 +979,13 @@ static void parse_repeat(sdp_parser_t *p, char *d, sdp_repeat_t **result) { /* - repeat-fields = "r=" repeat-interval space typed-time - 1*(space typed-time) + repeat-fields = %x72 "=" repeat-interval 2*(SP typed-time) - repeat-interval = typed-time + repeat-interval = POS-DIGIT *DIGIT [fixed-len-time-unit] - typed-time = 1*(DIGIT) [fixed-len-time-unit] + typed-time = 1*DIGIT [fixed-len-time-unit] - fixed-len-time-unit = "d" | "h" | "m" | "s" + fixed-len-time-unit = %x64 / %x68 / %x6d / %x73 ; "d" | "h" | "m" | "s" */ unsigned long tt, *interval; @@ -1129,17 +1132,15 @@ /* key-field = ["k=" key-type CRLF] - key-type = "prompt" | "clear:" key-data | "base64:" key-data | "uri:" uri - key-data = email-safe | "~" | " */ - s = token(&r, ":", ALPHA DIGIT "-", SPACE TAB); + s = token(&r, ":", TOKEN, SPACE TAB); if (!s) { parsing_error(p, "invalid key method"); return; @@ -1149,16 +1150,24 @@ PARSE_ALLOC(p, sdp_key_t, k); *result = k; - if (strcasecmp(s, "clear") == 0) + /* These are defined as key-sensitive in RFC 4566 */ +#define MATCH(s, tok) \ + (STRICT(p) ? strcmp((s), (tok)) == 0 : strcasecmp((s), (tok)) == 0) + + if (MATCH(s, "clear")) k->k_method = sdp_key_clear, k->k_method_name = "clear"; - else if (strcasecmp(s, "base64") == 0) + else if (MATCH(s, "base64")) k->k_method = sdp_key_base64, k->k_method_name = "base64"; - else if (strcasecmp(s, "uri") == 0) + else if (MATCH(s, "uri")) k->k_method = sdp_key_uri, k->k_method_name = "uri"; - else if (strcasecmp(s, "prompt") == 0) + else if (MATCH(s, "prompt")) k->k_method = sdp_key_prompt, k->k_method_name = "prompt"; - else + else if (!STRICT(p)) k->k_method = sdp_key_x, k->k_method_name = s; + else { + parsing_error(p, "invalid key method"); + return; + } k->k_material = r; } @@ -1180,16 +1189,16 @@ /* attribute-fields = *("a=" attribute CRLF) - attribute = (att-field ":" att-value) | att-field + attribute = (att-field ":" att-value) / att-field - att-field = 1*(alpha-numeric) + att-field = token att-value = byte-string */ char *name = NULL, *value = NULL; - if (!(name = token(&r, ":", ALPHA DIGIT "-", SPACE TAB))) { + if (!(name = token(&r, ":", TOKEN, SPACE TAB))) { parsing_error(p,"invalid attribute name"); return; } @@ -1248,15 +1257,15 @@ media-field = "m=" media space port ["/" integer] space proto 1*(space fmt) CRLF - media = 1*(alpha-numeric) + media = token ;typically "audio", "video", "application" ;or "data" - fmt = 1*(alpha-numeric) + fmt = token ;typically an RTP payload type for audio ;and video media - proto = 1*(alpha-numeric) + proto = token *("/" token) ;typically "RTP/AVP" or "udp" for IP4 port = 1*(DIGIT) @@ -1270,9 +1279,7 @@ m->m_mode = sdp_sendrecv; - s = token(&r, SPACE, ALPHA DIGIT, NULL); - if (s == NULL && p->pr_config) - s = token(&r, SPACE, "*", NULL); + s = token(&r, SPACE, TOKEN, NULL); if (!s) { parsing_error(p, "m= invalid media field"); return; @@ -1304,10 +1311,7 @@ m->m_number_of_ports = value; } - /* alpha-numeric and "/" */ - s = token(&r, SPACE, ALPHA DIGIT "/", SPACE); - if (s == NULL && p->pr_config) - s = token(&r, SPACE, "*", SPACE); + s = token(&r, SPACE, "/" TOKEN, SPACE); if (s == NULL) { parsing_error(p, "m= missing protocol"); return; @@ -1331,7 +1335,7 @@ while (r && *r) { PARSE_ALLOC(p, sdp_list_t, l); *fmt = l; - l->l_text = next(&r, SPACE TAB, SPACE TAB); + l->l_text = token(&r, SPACE TAB, TOKEN, SPACE TAB); fmt = &l->l_next; } } @@ -1536,9 +1540,9 @@ /* attribute-fields = *("a=" attribute CRLF) - attribute = (att-field ":" att-value) | att-field + attribute = (att-field ":" att-value) / att-field - att-field = 1*(alpha-numeric) + att-field = token att-value = byte-string @@ -1549,7 +1553,7 @@ char *name = NULL, *value = NULL; int n; - if (!(name = token(&r, ":", ALPHA DIGIT "-", SPACE TAB))) { + if (!(name = token(&r, ":", TOKEN, SPACE TAB))) { parsing_error(p,"invalid attribute name"); return; } @@ -1623,7 +1627,7 @@ return -1; } - encoding = token(&r, "/", ALPHA DIGIT "-", NULL); + encoding = token(&r, "/", TOKEN, NULL); if (!r) { parsing_error(p, "a=rtpmap:%lu: missing <clock rate>", pt); return -2;

1 0

[commit] r9279 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: mikej Date: Tue Aug 12 13:08:03 2008 New Revision: 9279 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.docs freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c Log: Fri Aug 8 09:41:49 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua: updated tag documentation Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Aug 12 13:08:03 2008 @@ -1 +1 @@ -Tue Aug 12 13:07:33 EDT 2008 +Tue Aug 12 13:07:50 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.docs ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.docs (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua.docs Tue Aug 12 13:08:03 2008 @@ -1126,7 +1126,7 @@ <td> If there was a failure in SDP negotiation or other failure with media, the stack will automatically terminate the call. The BYE follows - immediatelhy after the ACK. + immediately after the ACK. </td></tr> <tr><td>C6a</td> <td>calling</td> Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_tag.c Tue Aug 12 13:08:03 2008 @@ -338,7 +338,7 @@ */ tag_typedef_t nutag_method = STRTAG_TYPEDEF(method); -/**@def NUTAG_METHOD_REF(x) +/**@def NUTAG_METHOD_REF(x) * Reference tag for NUTAG_METHOD(). */ @@ -349,7 +349,7 @@ */ tag_typedef_t nutag_uicc = STRTAG_TYPEDEF(uicc); -/*#@def NUTAG_UICC_REF(x) +/*#@def NUTAG_UICC_REF(x) * Reference tag for NUTAG_UICC(). */ @@ -367,11 +367,11 @@ * - nua_invite() * * @par Parameter type - * int + * int (boolean: nonzero is true, zero is false) * * @par Values - * @c 0 Do not add @AcceptContact \n - * @c !=0 Add @AcceptContact with media tags + * - 0 (false) - Do not add @AcceptContact + * - 1 (true) - Add @AcceptContact with media tags * * Corresponding tag taking reference parameter is NUTAG_MEDIA_FEATURES_REF() * @@ -380,13 +380,13 @@ */ tag_typedef_t nutag_media_features = BOOLTAG_TYPEDEF(media_features); -/**@def NUTAG_MEDIA_FEATURES_REF(x) +/**@def NUTAG_MEDIA_FEATURES_REF(x) * Reference tag for NUTAG_MEDIA_FEATURES(). */ -/**@def NUTAG_CALLEE_CAPS(x) - * +/**@def NUTAG_CALLEE_CAPS(x) + * * Add methods parameter and media feature parameter to the @Contact headers * generated for REGISTER request. * @@ -399,8 +399,8 @@ * int * * @par Values - * @c 0 Do not include methods and media feature paramete \n - * @c !=0 Include media tags in + * - 0 (false) - Do not include methods and media feature parameters + * - 1 (true) - Include media tags in @Contact * * Corresponding tag taking reference parameter is NUTAG_MEDIA_FEATURES_REF(). * @@ -409,7 +409,7 @@ */ tag_typedef_t nutag_callee_caps = BOOLTAG_TYPEDEF(callee_caps); -/**@def NUTAG_CALLEE_CAPS_REF(x) +/**@def NUTAG_CALLEE_CAPS_REF(x) * Reference tag for NUTAG_CALLEE_CAPS(). */ @@ -424,11 +424,11 @@ * - nua_invite(), nua_respond() * * @par Parameter type - * int (boolean) + * int (boolean: nonzero is true, zero is false) * * @par Values - * @c 0 False - do not try to use early media \n - * @c !=0 True - try to use early media + * - 0 (false) - do not try to use early media + * - 1 (true) - try to use early media * * @sa NUTAG_EARLY_ANSWER() * @@ -436,7 +436,7 @@ */ tag_typedef_t nutag_early_media = BOOLTAG_TYPEDEF(early_media); -/**@def NUTAG_EARLY_MEDIA_REF(x) +/**@def NUTAG_EARLY_MEDIA_REF(x) * Reference tag for NUTAG_EARLY_MEDIA(). */ @@ -459,13 +459,18 @@ * nua_respond() * * @par Parameter type - * int (boolean) + * int (boolean: nonzero is true, zero is false) * * @par Values - * @c 0 False \n - * @c !=0 True + * - 0 (false) - include 100rel in all preliminary responses + * - 1 (true) - include 100rel only in 183 responses + * + * @note + * This tag takes only effect when NUTAG_EARLY_MEDIA(1) has been used, too. * * Corresponding tag taking reference parameter is NUTAG_ONLY183_100REL_REF(). + * + * @sa */ tag_typedef_t nutag_only183_100rel = BOOLTAG_TYPEDEF(only183_100rel); @@ -493,7 +498,7 @@ * @note Requires that @soa is enabled with NUTAG_MEDIA_ENABLE(1). * * @sa NUTAG_EARLY_MEDIA(), NUTAG_AUTOALERT(), NUTAG_MEDIA_ENABLE() - * + * * @since New in @VERSION_1_12_2. */ tag_typedef_t nutag_early_answer = BOOLTAG_TYPEDEF(early_answer); @@ -586,7 +591,7 @@ */ tag_typedef_t nutag_soa_name = STRTAG_TYPEDEF(soa_name); -/**@def NUTAG_SOA_NAME_REF(x) +/**@def NUTAG_SOA_NAME_REF(x) * Reference tag for NUTAG_SOA_NAME(). */ @@ -700,7 +705,7 @@ * #nua_i_state * * @par Parameter type - * boolean + * int (boolean: nonzero is true, zero is false) * * Corresponding tag taking reference parameter is NUTAG_OFFER_RECV_REF(). */ @@ -719,7 +724,7 @@ * #nua_i_state * * @par Parameter type - * boolean + * int (boolean: nonzero is true, zero is false) * * Corresponding tag taking reference parameter is NUTAG_ANSWER_RECV_REF(). */ @@ -738,7 +743,7 @@ * #nua_i_state * * @par Parameter type - * boolean + * int (boolean: nonzero is true, zero is false) * * Corresponding tag taking reference parameter is NUTAG_OFFER_SENT_REF(). */ @@ -980,14 +985,14 @@ * unsigned int * * @par Values - * @c 0 disable \n - * @c >0 interval in seconds + * - 0 disable + * - >0 interval in seconds * * Corresponding tag taking reference parameter is NUTAG_SESSION_TIMER_REF(). * * @sa NUTAG_SUPPORTED(), NUTAG_MIN_SE(), NUTAG_SESSION_REFRESHER(), - * nua_invite(), #nua_r_invite, #nua_i_invite, nua_respond(), - * nua_update(), #nua_r_update, #nua_i_update, + * nua_invite(), #nua_r_invite, #nua_i_invite, nua_respond(), + * nua_update(), #nua_r_update, #nua_i_update, * NUTAG_UPDATE_REFRESH(), @RFC4028, @SessionExpires, @MinSE */ tag_typedef_t nutag_session_timer = UINTTAG_TYPEDEF(session_timer); @@ -1169,7 +1174,7 @@ */ tag_typedef_t nutag_refer_with_id = BOOLTAG_TYPEDEF(refer_with_id); -/**@def NUTAG_REFER_WITH_ID_REF(x) +/**@def NUTAG_REFER_WITH_ID_REF(x) * Reference tag for NUTAG_REFER_WITH_ID(). */ @@ -1211,8 +1216,8 @@ * int (boolean) * * @par Values - * @c 0 No automatic sending of "200 Ok" \n - * @c !=0 "200 Ok" sent automatically + * - 0 (false) - No automatic sending of "200 Ok" + * - 1 (true) - "200 Ok" sent automatically * * Corresponding tag taking reference parameter is NUTAG_AUTOANSWER_REF(). * @@ -2569,7 +2574,7 @@ */ tag_typedef_t nutag_path_enable = BOOLTAG_TYPEDEF(path_enable); -/**@def NUTAG_PATH_ENABLE_REF(x) +/**@def NUTAG_PATH_ENABLE_REF(x) * Reference tag for NUTAG_PATH_ENABLE(). */ @@ -2812,8 +2817,8 @@ * int (boolean) * * @par Values - * @c 0 False \n - * @c !=0 True + * - 0 (false) - pass only #nua_r_shutdown events to application during shutdown + * - 1 (true) - pass all events to application during shutdown * * Corresponding tag taking reference parameter is NUTAG_SHUTDOWN_EVENTS_REF(). *

1 0

[commit] r9278 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: mikej Date: Tue Aug 12 13:07:38 2008 New Revision: 9278 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/check_session.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Log: Fri Aug 8 08:09:34 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua: fix bug #2041747 with Organization header Using Organization tags crashed the nua stack. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Aug 12 13:07:38 2008 @@ -1 +1 @@ -Tue Aug 12 13:07:15 EDT 2008 +Tue Aug 12 13:07:33 EDT 2008 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 Aug 12 13:07:38 2008 @@ -60,7 +60,8 @@ { s2_case("0.1.1", "Setup for Call Tests", ""); - nua = s2_nua_setup(TAG_END()); + nua = s2_nua_setup(SIPTAG_ORGANIZATION_STR("Pussy Galore's Flying Circus"), + TAG_END()); soa = soa_create(NULL, s2->root, NULL); Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_stack.c Tue Aug 12 13:07:38 2008 @@ -1716,7 +1716,8 @@ NH_PGET(nh, user_agent)) < 0) ; else if (!sip->sip_organization && NH_PGET(nh, organization) && - sip_add_dup(msg, sip, (void *)NH_PGET(nh, organization)) < 0) + sip_add_make(msg, sip, sip_organization_class, + NH_PGET(nh, organization)) < 0) ; else if (!sip->sip_allow && NH_PGET(nh, allow) && sip_add_dup(msg, sip, (void *)NH_PGET(nh, allow)) < 0) @@ -2561,7 +2562,7 @@ sip_add_make(msg, sip, sip_supported_class, "path"); if (!sip->sip_organization && NH_PGET(nh, organization)) - sip_add_dup(msg, sip, (sip_header_t *)NH_PGET(nh, organization)); + sip_add_make(msg, sip, sip_organization_class, NH_PGET(nh, organization)); if (!sip->sip_user_agent && NH_PGET(nh, user_agent)) sip_add_make(msg, sip, sip_user_agent_class, NH_PGET(nh, user_agent));

1 0

[commit] r9277 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: mikej Date: Tue Aug 12 13:07:20 2008 New Revision: 9277 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c Log: Fri Aug 8 07:55:01 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_subnotref.c: do not terminate SUBSCRIBE usage if Expires: 0 is used Terminate subscription only when NOTIFY is received or timeout occurs. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Aug 12 13:07:20 2008 @@ -1 +1 @@ -Tue Aug 12 13:06:53 EDT 2008 +Tue Aug 12 13:07:15 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c Tue Aug 12 13:07:20 2008 @@ -256,11 +256,6 @@ struct event_usage *eu = nua_dialog_usage_private(du); sip_event_t *o = sip->sip_event; - if (eu->eu_notified && - sip->sip_expires && - sip->sip_expires->ex_delta == 0) - cr->cr_terminating = 1; - if (nua_client_bind(cr, du) < 0) return -1;

1 0

[commit] r9276 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/soa
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: mikej Date: Tue Aug 12 13:06:57 2008 New Revision: 9276 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Log: Thu Aug 7 07:53:01 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * soa_static.c: increment version number in o= line only when generating offer or answer Bug reported by Timo Bruhn. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Aug 12 13:06:57 2008 @@ -1 +1 @@ -Tue Aug 12 13:06:30 EDT 2008 +Tue Aug 12 13:06:53 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/soa_static.c Tue Aug 12 13:06:57 2008 @@ -87,6 +87,9 @@ int *sss_u2s; /** Mapping from session SDP m= lines to user SDP m= lines */ int *sss_s2u; + + /** Our latest offer or answer */ + sdp_session_t *sss_latest; } soa_static_session_t; @@ -1103,6 +1106,8 @@ int *u2s = NULL, *s2u = NULL, *tbf; + sdp_session_t *latest = NULL, *previous = NULL; + char const *phrase = "Internal Media Error"; su_home_t tmphome[SU_HOME_AUTO_SIZE(8192)]; @@ -1327,10 +1332,27 @@ if (ss->ss_local->ssd_sdp != local && sdp_session_cmp(ss->ss_local->ssd_sdp, local)) { - /* We have modified local session: update origin-line */ - if (local->sdp_origin != o) - *o = *local->sdp_origin, local->sdp_origin = o; - o->o_version++; + int bump; + + switch (action) { + case generate_offer: + bump = sdp_session_cmp(local, sss->sss_latest); + break; + case generate_answer: + bump = 1; + break; + case process_answer: + default: + bump = 0; + break; + } + + if (bump) { + /* Upgrade the version number */ + if (local->sdp_origin != o) + *o = *local->sdp_origin, local->sdp_origin = o; + o->o_version++; + } /* Do sanity checks for the created SDP */ if (!local->sdp_subject) /* s= is mandatory */ @@ -1362,6 +1384,11 @@ goto internal_error; } + + if (bump) { + latest = sdp_session_dup(ss->ss_home, ss->ss_local->ssd_sdp); + previous = sss->sss_latest; + } } if (u2s) { @@ -1373,10 +1400,12 @@ switch (action) { case generate_offer: ss->ss_local_user_version = user_version; + sss->sss_latest = latest; break; case generate_answer: ss->ss_local_user_version = user_version; ss->ss_local_remote_version = remote_version; + sss->sss_latest = latest; break; case process_answer: ss->ss_local_remote_version = remote_version; @@ -1384,6 +1413,9 @@ break; } + if (previous) + su_free(ss->ss_home, previous); + su_home_deinit(tmphome); return 0;

1 0

[commit] r9275 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nua tests
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: mikej Date: Tue Aug 12 13:06:35 2008 New Revision: 9275 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c freeswitch/trunk/libs/sofia-sip/tests/test_simple.c Log: Wed Aug 6 15:17:30 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nua_subnotref.c: nua_unsubscribe() should not terminate usage w/ final response Do not terminate until final NOTIFY or timeout. Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Aug 12 13:06:35 2008 @@ -1 +1 @@ -Tue Aug 12 13:06:05 EDT 2008 +Tue Aug 12 13:06:30 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/nua_subnotref.c Tue Aug 12 13:06:35 2008 @@ -249,7 +249,7 @@ nua_dialog_usage_t *du = cr->cr_usage; sip_time_t expires = 0; - if (cr->cr_event != nua_r_subscribe || !du || du->du_shutdown) + if (cr->cr_event == nua_r_destroy || !du || du->du_shutdown) cr->cr_terminating = 1; if (du) { @@ -281,7 +281,7 @@ nua_dialog_usage_reset_refresh(du); /* during SUBSCRIBE transaction */ - if (cr->cr_terminating) + if (cr->cr_terminating || cr->cr_event != nua_r_subscribe) expires = eu->eu_delta = 0; else if (sip->sip_expires) /* Use value specified by application or negotiated with Min-Expires */ Modified: freeswitch/trunk/libs/sofia-sip/tests/test_simple.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/tests/test_simple.c (original) +++ freeswitch/trunk/libs/sofia-sip/tests/test_simple.c Tue Aug 12 13:06:35 2008 @@ -954,7 +954,10 @@ TEST(e->data->e_status, 200); r_tags = e->data->e_tags; TEST_1(tl_find(r_tags, nutag_substate)); - TEST(tl_find(r_tags, nutag_substate)->t_value, nua_substate_terminated); + if (en1 == a->events->head) + TEST(tl_find(r_tags, nutag_substate)->t_value, nua_substate_terminated); + else + TEST(tl_find(r_tags, nutag_substate)->t_value, nua_substate_active); TEST_1(sip = sip_object(e->data->e_msg)); TEST_1(sip->sip_expires); TEST_1(sip->sip_expires->ex_delta == 0);

1 0

[commit] r9274 - in freeswitch/trunk/libs/sofia-sip: . libsofia-sip-ua/nta
by Freeswitch SVN 12 Aug '08

12 Aug '08

Author: mikej Date: Tue Aug 12 13:06:11 2008 New Revision: 9274 Modified: freeswitch/trunk/libs/sofia-sip/.update freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Log: Wed Aug 6 14:49:13 EDT 2008 Pekka Pessi <first.last(a)nokia.com> * nta: fix to #2037585: always release error callback when changing transports Modified: freeswitch/trunk/libs/sofia-sip/.update ============================================================================== --- freeswitch/trunk/libs/sofia-sip/.update (original) +++ freeswitch/trunk/libs/sofia-sip/.update Tue Aug 12 13:06:11 2008 @@ -1 +1 @@ -Tue Aug 12 13:04:52 EDT 2008 +Tue Aug 12 13:06:05 EDT 2008 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/nta.c Tue Aug 12 13:06:11 2008 @@ -7343,6 +7343,12 @@ orq->orq_tport = tport_ref(tp); + if (orq->orq_pending && tp != old_tp) { + tport_release(old_tp, orq->orq_pending, + orq->orq_request, NULL, orq, 0); + orq->orq_pending = 0; + } + if (old_tp) tport_unref(old_tp); if (outgoing_insert_via(orq, agent_tport_via(tp)) < 0) { @@ -7441,6 +7447,12 @@ if (orq->orq_try_udp_instead) tag = tptag_mtu, value = 65535; + if (orq->orq_pending) { + tport_release(orq->orq_tport, orq->orq_pending, + orq->orq_request, NULL, orq, 0); + orq->orq_pending = 0; + } + tp = tport_tsend(orq->orq_tport, msg, tpn, tag, value, IF_SIGCOMP_TPTAG_COMPARTMENT(cc) @@ -7477,12 +7489,6 @@ } } - if (orq->orq_pending && orq->orq_tport) - tport_release(orq->orq_tport, orq->orq_pending, orq->orq_request, - NULL, orq, 0); - - orq->orq_pending = 0; - outgoing_tport_error(agent, orq, NULL, orq->orq_request, err); return; @@ -7548,6 +7554,8 @@ tport_t *tp; tp_name_t tpn[1]; + assert(orq->orq_pending == 0); + *tpn = *orq->orq_tpn; tpn->tpn_proto = "tcp"; orq->orq_try_tcp_instead = 1; @@ -7568,8 +7576,9 @@ return; } + /* No TCP - try again with UDP without SIP MTU limit */ tpn->tpn_proto = "udp"; - orq->orq_try_udp_instead = 1; /* Try again without SIP MTU limit */ + orq->orq_try_udp_instead = 1; tp = tport_by_name(orq->orq_agent->sa_tports, tpn); if (tp && tp != orq->orq_tport) { @@ -7587,6 +7596,12 @@ tport_t *tp; tp_name_t tpn[1]; + if (orq->orq_pending) { + tport_release(orq->orq_tport, orq->orq_pending, + orq->orq_request, NULL, orq, 0); + orq->orq_pending = 0; + } + *tpn = *orq->orq_tpn; tpn->tpn_proto = "udp"; orq->orq_try_udp_instead = 1;

1 0