automerge commit

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 6868626686d1d6a20a953767e0770017c956bc21..e359b407e64cba7803cbf586031290134947a1a4 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -596,7 +596,7 @@ static int global_rtautoclear;
 static struct sip_pvt {
        ast_mutex_t lock;                       /*!< Channel private lock */
        int method;                             /*!< SIP method of this packet */
-       char callid[80];                        /*!< Global CallID */
+       char callid[128];                       /*!< Global CallID */
        char randdata[80];                      /*!< Random data */
        struct ast_codec_pref prefs;            /*!< codec prefs */
        unsigned int ocseq;                     /*!< Current outgoing seqno */
@@ -842,7 +842,7 @@ struct sip_registry {
        struct sip_pvt *call;           /*!< create a sip_pvt structure for each outbound "registration call" in progress */
        int regstate;                   /*!< Registration state (see above) */
        int callid_valid;               /*!< 0 means we haven't chosen callid for this registry yet. */
-       char callid[80];                /*!< Global CallID for this registry */
+       char callid[128];               /*!< Global CallID for this registry */
        unsigned int ocseq;             /*!< Sequence number we got to for REGISTERs for this registry */
        struct sockaddr_in us;          /*!< Who the server thinks we are */