From 58c3c3a049991fedd39f62008f8eb8fca047e7c5 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Tue, 22 Nov 2011 18:22:57 -0600 Subject: [PATCH] comment out optional Require header from re-invites for the sake of interop with testy t.38 terminals --- libs/sofia-sip/.update | 2 +- libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c | 15 +++++++-------- src/mod/endpoints/mod_sofia/mod_sofia.c | 1 + 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update index 79031274b7..9101269125 100644 --- a/libs/sofia-sip/.update +++ b/libs/sofia-sip/.update @@ -1 +1 @@ -Wed Nov 2 08:58:40 CDT 2011 +Tue Nov 22 18:16:53 CST 2011 diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c b/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c index bc80310f23..1958b5645a 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c +++ b/libs/sofia-sip/libsofia-sip-ua/nua/nua_session.c @@ -4486,14 +4486,13 @@ session_timer_add_headers(struct session_timer *t, return 1; sip_add_tl(msg, sip, - TAG_IF(expires != 0, SIPTAG_SESSION_EXPIRES(x)), - TAG_IF(min != 0 - /* Min-SE: 0 is optional with initial INVITE */ - || !initial, - SIPTAG_MIN_SE(min_se)), - TAG_IF(refresher == nua_remote_refresher && expires != 0, - SIPTAG_REQUIRE_STR("timer")), - TAG_END()); + TAG_IF(expires != 0, SIPTAG_SESSION_EXPIRES(x)), + TAG_IF(min != 0 + /* Min-SE: 0 is optional with initial INVITE */ + || !initial, + SIPTAG_MIN_SE(min_se)), + //TAG_IF(refresher == nua_remote_refresher && expires != 0, SIPTAG_REQUIRE_STR("timer")), + TAG_END()); return 1; } diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index 7d37776f69..f416c0fff0 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -5412,3 +5412,4 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sofia_shutdown) * For VIM: * vim:set softtabstop=4 shiftwidth=4 tabstop=4: */ +