Ensure Min-SE is included in outbound INVITEs

Asterisk now includes Min-SE in outbound INVITEs when the value is not
90 (the default) and session timers are not disabled. This has the
effect of Asterisk following RFC4028 more closely with regard to 422
responses and preventing situations in which Asterisk would be forced
to temporarily accept a call to tear it down based on a Session-Expires
below the locally configured Min-SE.

(issue SWP-5051)
Review: https://reviewboard.asterisk.org/r/2222/
Reported-by: Kinsey Moore
Patch-by: Kinsey Moore
........

Merged revisions 377946 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 377947 from http://svn.asterisk.org/svn/asterisk/branches/10

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/11@377948 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 9abd9bc8c43a60a7c563994108a63faa952e3e53..9e193f1a1f835a14af039cb679ac3bea7e94d372 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -13962,7 +13962,9 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init,
        }
 
        /* Add Session-Timers related headers */
-       if (st_get_mode(p, 0) == SESSION_TIMER_MODE_ORIGINATE) {
+       if (st_get_mode(p, 0) == SESSION_TIMER_MODE_ORIGINATE
+               || (st_get_mode(p, 0) == SESSION_TIMER_MODE_ACCEPT
+                       && st_get_se(p, FALSE) != DEFAULT_MIN_SE)) {
                char i2astr[10];
 
                if (!p->stimer->st_interval) {
@@ -13970,9 +13972,11 @@ static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init,
                }
 
                p->stimer->st_active = TRUE;
-               
-               snprintf(i2astr, sizeof(i2astr), "%d", p->stimer->st_interval);
-               add_header(&req, "Session-Expires", i2astr);
+               if (st_get_mode(p, 0) == SESSION_TIMER_MODE_ORIGINATE) {        
+                       snprintf(i2astr, sizeof(i2astr), "%d", p->stimer->st_interval);
+                       add_header(&req, "Session-Expires", i2astr);
+               }
+
                snprintf(i2astr, sizeof(i2astr), "%d", st_get_se(p, FALSE));
                add_header(&req, "Min-SE", i2astr);
        }
@@ -28959,7 +28963,10 @@ static void proc_422_rsp(struct sip_pvt *p, struct sip_request *rsp)
                ast_log(LOG_WARNING, "Parsing of Min-SE header failed %s\n", p_hdrval);
                return;
        }
-       p->stimer->st_interval = minse;
+       p->stimer->st_cached_min_se = minse;
+       if (p->stimer->st_interval < minse) {
+               p->stimer->st_interval = minse;
+       }
        transmit_invite(p, SIP_INVITE, 1, 2, NULL);
 }
 
@@ -30542,8 +30549,8 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
                                        ast_log(LOG_WARNING, "Invalid session-minse '%s' at line %d of %s\n", v->value, v->lineno, config);
                                        peer->stimer.st_min_se = global_min_se;
                                }
-                               if (peer->stimer.st_min_se < 90) {
-                                       ast_log(LOG_WARNING, "session-minse '%s' at line %d of %s is not allowed to be < 90 secs\n", v->value, v->lineno, config);
+                               if (peer->stimer.st_min_se < DEFAULT_MIN_SE) {
+                                       ast_log(LOG_WARNING, "session-minse '%s' at line %d of %s is not allowed to be < %d secs\n", v->value, v->lineno, config, DEFAULT_MIN_SE);
                                        peer->stimer.st_min_se = global_min_se;
                                }
                        } else if (!strcasecmp(v->name, "session-refresher")) {
@@ -31638,8 +31645,8 @@ static int reload_config(enum channelreloadreason reason)
                                ast_log(LOG_WARNING, "Invalid session-minse '%s' at line %d of %s\n", v->value, v->lineno, config);
                                global_min_se = DEFAULT_MIN_SE;
                        }
-                       if (global_min_se < 90) {
-                               ast_log(LOG_WARNING, "session-minse '%s' at line %d of %s is not allowed to be < 90 secs\n", v->value, v->lineno, config);
+                       if (global_min_se < DEFAULT_MIN_SE) {
+                               ast_log(LOG_WARNING, "session-minse '%s' at line %d of %s is not allowed to be < %d secs\n", v->value, v->lineno, config, DEFAULT_MIN_SE);
                                global_min_se = DEFAULT_MIN_SE;
                        }
                } else if (!strcasecmp(v->name, "session-refresher")) {