Add option for small headers (bug #2948)

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index aaaa75abf056c42de75aa7c9f95f41a975bdf49e..b5f427f34c9235f8fa4da406d946b30428794bea 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -193,6 +193,8 @@ static int tos = 0;
 
 static int videosupport = 0;
 
+static int compactheaders = 0;                                                 /* send compact sip headers */
+
 static int global_dtmfmode = SIP_DTMF_RFC2833;         /* DTMF mode default */
 static int recordhistory = 0;
 static int global_promiscredir;                                /* Support of 302 REDIR - Default off */
@@ -2813,6 +2815,8 @@ static int process_sdp(struct sip_pvt *p, struct sip_request *req)
 /*--- add_header: Add header to SIP message */
 static int add_header(struct sip_request *req, char *var, char *value)
 {
+       int x = 0;
+       char *shortname = "";
        if (req->len >= sizeof(req->data) - 4) {
                ast_log(LOG_WARNING, "Out of space, can't add anymore (%s:%s)\n", var, value);
                return -1;
@@ -2821,8 +2825,18 @@ static int add_header(struct sip_request *req, char *var, char *value)
                ast_log(LOG_WARNING, "Can't add more headers when lines have been added\n");
                return -1;
        }
+
        req->header[req->headers] = req->data + req->len;
-       snprintf(req->header[req->headers], sizeof(req->data) - req->len - 4, "%s: %s\r\n", var, value);
+       if (compactheaders) {
+               for (x=0;x<sizeof(aliases) / sizeof(aliases[0]); x++)
+                       if (!strcasecmp(aliases[x].fullname, var))
+                               shortname = aliases[x].shortname;
+       }
+       if(!ast_strlen_zero(shortname)) {
+               snprintf(req->header[req->headers], sizeof(req->data) - req->len - 4, "%s: %s\r\n", shortname, value);
+       } else {
+               snprintf(req->header[req->headers], sizeof(req->data) - req->len - 4, "%s: %s\r\n", var, value);
+       }
        req->len += strlen(req->header[req->headers]);
        if (req->headers < SIP_MAX_HEADERS)
                req->headers++;
@@ -8631,6 +8645,7 @@ static int reload_config(void)
        strncpy(default_callerid, DEFAULT_CALLERID, sizeof(default_callerid) - 1);
        global_canreinvite = REINVITE_INVITE;
        videosupport = 0;
+       compactheaders = 0;
        relaxdtmf = 0;
        ourport = DEFAULT_SIP_PORT;
        global_rtptimeout = 0;
@@ -8696,6 +8711,8 @@ static int reload_config(void)
                        }
                } else if (!strcasecmp(v->name, "videosupport")) {
                        videosupport = ast_true(v->value);
+               } else if (!strcasecmp(v->name, "compactheaders")) {
+                       compactheaders = ast_true(v->value);
                } else if (!strcasecmp(v->name, "notifymimetype")) {
                        strncpy(default_notifymime, v->value, sizeof(default_notifymime) - 1);
                } else if (!strcasecmp(v->name, "musicclass")) {

diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample
index 0fb4c8a19a2eb712ef31a6c2c90e224ffc4a7973..49194ab54cb19ef415e6b28369f12e1cafcb3f1d 100755 (executable)
--- a/configs/sip.conf.sample
+++ b/configs/sip.conf.sample
@@ -79,6 +79,9 @@ srvlookup=yes                 ; Enable DNS SRV lookups on outbound calls
                                ; Other options: 
                                ; info : SIP INFO messages
                                ; inband : Inband audio
+
+;compactheaders = yes          ; send compact sip headers.
+
 ;
 ; If regcontext is specified, Asterisk will dynamically 
 ; create and destroy a NoOp priority 1 extension for a given