Merged revisions 332026 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r332026 | mnicholson | 2011-08-16 10:06:31 -0500 (Tue, 16 Aug 2011) | 2 lines

  use DEFAULT_STORE_SIP_CAUSE to set the default value for the 'storesipcause' option

  AST-580
........

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d128ad85f804d5dc6ee99265dfb7ca6dbbf6ad86..207c271babb638115f731fb0077ed93d6fc7c2b3 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -28089,7 +28089,7 @@ static int reload_config(enum channelreloadreason reason)
        global_shrinkcallerid = 1;
        authlimit = DEFAULT_AUTHLIMIT;
        authtimeout = DEFAULT_AUTHTIMEOUT;
-       global_store_sip_cause = FALSE;
+       global_store_sip_cause = DEFAULT_STORE_SIP_CAUSE;
 
        sip_cfg.matchexternaddrlocally = DEFAULT_MATCHEXTERNADDRLOCALLY;
 

diff --git a/channels/sip/include/sip.h b/channels/sip/include/sip.h
index e44a50685cc355f339dd538708e6df80a34ad063..b0134d1c04f98a5668d24ff449febf408bcedbf6 100644 (file)
--- a/channels/sip/include/sip.h
+++ b/channels/sip/include/sip.h
@@ -222,6 +222,7 @@
 #define DEFAULT_SDPSESSION "Asterisk PBX"  /*!< Default SDP session name, (s=) header unless re-defined in sip.conf */
 #define DEFAULT_SDPOWNER   "root"          /*!< Default SDP username field in (o=) header unless re-defined in sip.conf */
 #define DEFAULT_ENGINE     "asterisk"      /*!< Default RTP engine to use for sessions */
+#define DEFAULT_STORE_SIP_CAUSE FALSE      /*!< Store HASH(SIP_CAUSE,<channel name>) for channels by default */
 #endif
 /*@}*/