[svn-commits] oej: branch oej/sip-max-forwards-1.4 r270262 - in /team/oej/sip-max-forwards-...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Mon Jun 14 14:52:13 CDT 2010
Author: oej
Date: Mon Jun 14 14:52:10 2010
New Revision: 270262
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=270262
Log:
- Add global maxforwards setting
- Add channel variable support in dialplan
Modified:
team/oej/sip-max-forwards-1.4/channels/chan_sip.c
team/oej/sip-max-forwards-1.4/configs/sip.conf.sample
Modified: team/oej/sip-max-forwards-1.4/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/sip-max-forwards-1.4/channels/chan_sip.c?view=diff&rev=270262&r1=270261&r2=270262
==============================================================================
--- team/oej/sip-max-forwards-1.4/channels/chan_sip.c (original)
+++ team/oej/sip-max-forwards-1.4/channels/chan_sip.c Mon Jun 14 14:52:10 2010
@@ -173,7 +173,7 @@
#define DEFAULT_MIN_EXPIRY 60
#define DEFAULT_MAX_EXPIRY 3600
#define DEFAULT_REGISTRATION_TIMEOUT 20
-#define DEFAULT_MAX_FORWARDS "70"
+#define DEFAULT_MAX_FORWARDS 70
/* guard limit must be larger than guard secs */
/* guard min must be < 1000, and should be >= 250 */
@@ -559,6 +559,7 @@
static int global_regattempts_max; /*!< Registration attempts before giving up */
static int global_shrinkcallerid; /*!< enable or disable shrinking of caller id */
static int global_allowguest; /*!< allow unauthenticated users/peers to connect? */
+static int global_max_forwards; /*!< Initial value of the Max-forwards loop protection */
static int global_allowsubscribe; /*!< Flag for disabling ALL subscriptions, this is FALSE only if all peers are FALSE
the global setting is in globals_flags[1] */
static int global_mwitime; /*!< Time between MWI checks for peers */
@@ -1562,6 +1563,7 @@
static void make_our_tag(char *tagbuf, size_t len);
static int add_header(struct sip_request *req, const char *var, const char *value);
static int add_header_contentLength(struct sip_request *req, int len);
+static int add_header_max_forwards(struct sip_pvt *dialog, struct sip_request *req, int value);
static int add_line(struct sip_request *req, const char *line);
static int add_text(struct sip_request *req, const char *text);
static int add_digit(struct sip_request *req, char digit, unsigned int duration);
@@ -6063,6 +6065,23 @@
return 0;
}
+/*! \brief Add 'Max-Forwards' header to SIP message */
+static int add_header_max_forwards(struct sip_pvt *dialog, struct sip_request *req, int value)
+{
+ char clen[10];
+ const char *max = NULL;
+
+ if (dialog->owner) {
+ max = pbx_builtin_getvar_helper(dialog->owner, "SIP_MAX_FORWARDS");
+ }
+
+ /* The channel variable overrides the peer value */
+ if (max == NULL) {
+ snprintf(clen, sizeof(clen), "%d", value);
+ }
+ return add_header(req, "Max-Forwards", max != NULL ? max : clen);
+}
+
/*! \brief Add 'Content-Length' header to SIP message */
static int add_header_contentLength(struct sip_request *req, int len)
{
@@ -6526,7 +6545,7 @@
if (!ast_strlen_zero(global_useragent))
add_header(req, "User-Agent", global_useragent);
- add_header(req, "Max-Forwards", DEFAULT_MAX_FORWARDS);
+ add_header_max_forwards(p, req, global_max_forwards);
if (!ast_strlen_zero(p->rpid))
add_header(req, "Remote-Party-ID", p->rpid);
@@ -7580,7 +7599,7 @@
add_header(req, "CSeq", tmp);
if (!ast_strlen_zero(global_useragent))
add_header(req, "User-Agent", global_useragent);
- add_header(req, "Max-Forwards", DEFAULT_MAX_FORWARDS);
+ add_header_max_forwards(p, req, global_max_forwards);
if (!ast_strlen_zero(p->rpid))
add_header(req, "Remote-Party-ID", p->rpid);
}
@@ -8218,8 +8237,7 @@
add_header(&req, "CSeq", tmp);
if (!ast_strlen_zero(global_useragent))
add_header(&req, "User-Agent", global_useragent);
- add_header(&req, "Max-Forwards", DEFAULT_MAX_FORWARDS);
-
+ add_header_max_forwards(p, &req, global_max_forwards);
if (auth) /* Add auth header */
add_header(&req, authheader, auth);
@@ -11486,6 +11504,7 @@
print_codec_to_cli(fd, &default_prefs);
ast_cli(fd, "\n");
ast_cli(fd, " T1 minimum: %d\n", global_t1min);
+ ast_cli(fd, " Max forwards: %d\n", global_max_forwards);
ast_cli(fd, " No premature media: %s\n", global_prematuremediafilter ? "Yes" : "No");
ast_cli(fd, " Relax DTMF: %s\n", global_relaxdtmf ? "Yes" : "No");
ast_cli(fd, " Compact SIP headers: %s\n", compactheaders ? "Yes" : "No");
@@ -18368,6 +18387,7 @@
autocreatepeer = DEFAULT_AUTOCREATEPEER;
global_autoframing = 0;
global_allowguest = DEFAULT_ALLOWGUEST;
+ global_max_forwards = DEFAULT_MAX_FORWARDS;
global_rtptimeout = 0;
global_rtpholdtimeout = 0;
global_rtpkeepalive = 0;
@@ -18442,6 +18462,8 @@
ast_set2_flag(&global_flags[1], ast_true(v->value), SIP_PAGE2_IGNOREREGEXPIRE);
} else if (!strcasecmp(v->name, "t1min")) {
global_t1min = atoi(v->value);
+ } else if (!strcasecmp(v->name, "maxforwards")) {
+ global_max_forwards = atoi(v->value);
} else if (!strcasecmp(v->name, "dynamic_exclude_static") || !strcasecmp(v->name, "dynamic_excludes_static")) {
global_dynamic_exclude_static = ast_true(v->value);
} else if (!strcasecmp(v->name, "contactpermit") || !strcasecmp(v->name, "contactdeny")) {
Modified: team/oej/sip-max-forwards-1.4/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/oej/sip-max-forwards-1.4/configs/sip.conf.sample?view=diff&rev=270262&r1=270261&r2=270262
==============================================================================
--- team/oej/sip-max-forwards-1.4/configs/sip.conf.sample (original)
+++ team/oej/sip-max-forwards-1.4/configs/sip.conf.sample Mon Jun 14 14:52:10 2010
@@ -83,6 +83,7 @@
;defaultexpiry=120 ; Default length of incoming/outgoing registration
;t1min=100 ; Minimum roundtrip time for messages to monitored hosts
; Defaults to 100 ms
+;maxforwards=60 ; Default anti-loop header in SIP requests (defaults to 70)
;notifymimetype=text/plain ; Allow overriding of mime type in MWI NOTIFY
;checkmwi=10 ; Default time between mailbox checks for peers
;buggymwi=no ; Cisco SIP firmware doesn't support the MWI RFC
More information about the svn-commits
mailing list