diff options
author | Jonathan Rose <jrose@digium.com> | 2011-05-20 13:42:15 +0000 |
---|---|---|
committer | Jonathan Rose <jrose@digium.com> | 2011-05-20 13:42:15 +0000 |
commit | f90bc95f0d9f82121bec6ddea6b9d8158aef2285 (patch) | |
tree | 9d750e6b460dc7702cbbdf19400793060ad13ef3 /channels/sip | |
parent | 87004f0d9fefa8e768a40db8e2711ccd31a8a10c (diff) |
Merged revisions 319938 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r319938 | jrose | 2011-05-20 08:28:24 -0500 (Fri, 20 May 2011) | 12 lines
Adds legacy_useroption_parsing to address interoperability concerns.
With the new option engaged, Asterisk should interpret user fields with useroptions
contained within the userfield of the uri by stripping them out of the original message
whenever a semicolon is encountered in the userfield string.
(closes issue #18344)
Reported by: danimal
Tested by: jrose
Review: https://reviewboard.asterisk.org/r/1223/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@319939 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sip')
-rw-r--r-- | channels/sip/include/sip.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h index b856a7f3e..4b69010b3 100644 --- a/channels/sip/include/sip.h +++ b/channels/sip/include/sip.h @@ -212,6 +212,7 @@ #define DEFAULT_ALWAYSAUTHREJECT TRUE /*!< Don't reject authentication requests always */ #define DEFAULT_AUTH_OPTIONS FALSE #define DEFAULT_REGEXTENONQUALIFY FALSE +#define DEFAULT_LEGACY_USEROPTION_PARSING FALSE #define DEFAULT_T1MIN 100 /*!< 100 MS for minimal roundtrip time */ #define DEFAULT_MAX_CALL_BITRATE (384) /*!< Max bitrate for video */ #ifndef DEFAULT_USERAGENT @@ -683,6 +684,7 @@ struct sip_settings { int allow_external_domains; /*!< Accept calls to external SIP domains? */ int callevents; /*!< Whether we send manager events or not */ int regextenonqualify; /*!< Whether to add/remove regexten when qualifying peers */ + int legacy_useroption_parsing; /*!< Whether to strip useroptions in URI via semicolons */ int matchexternaddrlocally; /*!< Match externaddr/externhost setting against localnet setting */ char regcontext[AST_MAX_CONTEXT]; /*!< Context for auto-extensions */ unsigned int disallowed_methods; /*!< methods that we should never try to use */ |