Make mimetype for NOTIFY configurable

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 2488bd543c3355d18e3956227da48970b8c5730d..919a1fd3c14bd8170414ca2ddf1cddb2924a72d6 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -91,6 +91,8 @@ static char callerid[AST_MAX_EXTENSION] = "asterisk";
 
 static char fromdomain[AST_MAX_EXTENSION] = "";
 
+static char notifymime[AST_MAX_EXTENSION] = "application/simple-message-summary";
+
 static int usecnt =0;
 static pthread_mutex_t usecnt_lock = AST_MUTEX_INITIALIZER;
 
@@ -2472,7 +2474,7 @@ static int transmit_notify(struct sip_pvt *p, int newmsgs, int oldmsgs)
        char clen[20];
        initreqprep(&req, p, "NOTIFY", NULL);
        add_header(&req, "Event", "message-summary");
-       add_header(&req, "Content-Type", "application/simple-message-summary");
+       add_header(&req, "Content-Type", notifymime);
 
        snprintf(tmp, sizeof(tmp), "Message-Waiting: %s\n", newmsgs ? "yes" : "no");
        snprintf(tmp2, sizeof(tmp2), "Voicemail: %d/%d\n", newmsgs, oldmsgs);
@@ -5129,6 +5131,8 @@ static int reload_config(void)
                                ast_log(LOG_WARNING, "Unknown dtmf mode '%s', using rfc2833\n", v->value);
                                globaldtmfmode = SIP_DTMF_RFC2833;
                        }
+               } else if (!strcasecmp(v->name, "notifymimetype")) {
+                       strncpy(notifymime, v->value, sizeof(notifymime) - 1);
                } else if (!strcasecmp(v->name, "language")) {
                        strncpy(language, v->value, sizeof(language)-1);
                } else if (!strcasecmp(v->name, "callerid")) {

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 55508be61922e658f7d48f6514bc867ac3b29461..0010d47797b8ab0c6b1b710959af1112c9411f0e 100755 (executable)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -9,6 +9,7 @@ context = default               ; Default for incoming calls
 ;tos=184
 ;maxexpirey=3600               ; Max length of incoming registration we allow
 ;defaultexpirey=120            ; Default length of incoming/outoing registration
+;notifymimetype=text/plain     ; Allow overriding of mime type in NOTIFY
 ;
 ;register => 1234@mysipprovider.com    ; Register with a SIP provider
 ;register => 2345@mysipprovider.com/1234 ; Register 2345 at sip provider as 1234 here.