diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-06-25 19:26:31 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-06-25 19:26:31 +0000 |
| commit | e0883154cffeec8d6b73c01c34c81a94cc5f05a6 (patch) | |
| tree | 88236cba80938eaad2f068386780788af6e3df8b /channels/sip | |
| parent | 82a7409c15cf943ebc12cc8453424350628732bf (diff) | |
Re-fix how local tag is generated when sending a 481 to an INVITE.
Match our local tag to whatever to-tag was sent in the initial INVITE.
Because the size of the to-tag may not fit in the buffer in the sip_pvt,
it has been changed to a string field.
(closes issue ASTERISK-19892)
reported by Walter Doekes
Review: https://reviewboard.asterisk.org/r/1977
........
Merged revisions 369352 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 369353 from http://svn.asterisk.org/svn/asterisk/branches/10
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@369367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/sip')
| -rw-r--r-- | channels/sip/include/sip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h index a9b7e0277..dbf572388 100644 --- a/channels/sip/include/sip.h +++ b/channels/sip/include/sip.h @@ -1025,6 +1025,7 @@ struct sip_pvt { AST_STRING_FIELD(rdnis); /*!< Referring DNIS */ AST_STRING_FIELD(redircause); /*!< Referring cause */ AST_STRING_FIELD(theirtag); /*!< Their tag */ + AST_STRING_FIELD(tag); /*!< Our tag for this session */ AST_STRING_FIELD(username); /*!< [user] name */ AST_STRING_FIELD(peername); /*!< [peer] name, not set if [user] */ AST_STRING_FIELD(authname); /*!< Who we use for authentication */ @@ -1076,7 +1077,6 @@ struct sip_pvt { */ unsigned short req_secure_signaling:1;/*!< Whether we are required to have secure signaling or not */ unsigned short natdetected:1; /*!< Whether we detected a NAT when processing the Via */ - char tag[11]; /*!< Our tag for this session */ int timer_t1; /*!< SIP timer T1, ms rtt */ int timer_b; /*!< SIP timer B, ms */ unsigned int sipoptions; /*!< Supported SIP options on the other end */ |