res_pjsip: Actually enable session timers when timers=always

When a pjsip endpoint is defined with timers=always, this has been a
functional noop.  This patch correctly sets the feature bitmap to both
enable support for session timers and to enable them even when the
endpoint itself does not request or support timers.

ASTERISK-29603
Reported-By: Ray Crumrine
Change-Id: I8b5eeaa9ec7f50cc6d96dd34c2b4aa9c53fb5440

diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index 39c3daba5a80cc3bdc477a95f9e0f23b328f3c2a..ace68d2fdc271b95aef7563ffee1f9a1d8f98664 100644 (file)
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -220,7 +220,7 @@ static int timers_handler(const struct aco_option *opt, struct ast_variable *var
        } else if (!strcasecmp(var->value, "required")) {
                endpoint->extensions.flags |= PJSIP_INV_REQUIRE_TIMER;
        } else if (!strcasecmp(var->value, "always") || !strcasecmp(var->value, "forced")) {
-               endpoint->extensions.flags |= PJSIP_INV_ALWAYS_USE_TIMER;
+               endpoint->extensions.flags |= (PJSIP_INV_SUPPORT_TIMER | PJSIP_INV_ALWAYS_USE_TIMER);
        } else if (!ast_false(var->value)) {
                return -1;
        }