Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.789
diff -u -r1.789 chan_sip.c
--- chan_sip.c 25 Jul 2005 18:36:58 -0000 1.789
+++ chan_sip.c 25 Jul 2005 20:49:18 -0000
@@ -3411,6 +3411,15 @@
return 0;
}
+/*--- add_header_contentLen: Add 'Content-Length' header to SIP message */
+static int add_header_contentLength(struct sip_request *req, int len)
+{
+ char clen[10];
+
+ snprintf(clen, sizeof(clen), "%d", len);
+ return add_header(req, "Content-Length", clen);
+}
+
/*--- add_blank_header: Add blank header to SIP message */
static int add_blank_header(struct sip_request *req)
{
@@ -3796,7 +3805,7 @@
return -1;
}
respprep(&resp, p, msg, req);
- add_header(&resp, "Content-Length", "0");
+ add_header_contentLength(&resp, 0);
/* If we are cancelling an incoming invite for some reason, add information
about the reason why we are doing this in clear text */
if (p->owner && p->owner->hangupcause) {
@@ -3847,7 +3856,7 @@
struct sip_request resp;
respprep(&resp, p, msg, req);
append_date(&resp);
- add_header(&resp, "Content-Length", "0");
+ add_header_contentLength(&resp, 0);
add_blank_header(&resp);
return send_response(p, &resp, 0, 0);
}
@@ -3858,7 +3867,7 @@
struct sip_request resp;
respprep(&resp, p, msg, req);
add_header(&resp, "Accept", "application/sdp");
- add_header(&resp, "Content-Length", "0");
+ add_header_contentLength(&resp, 0);
add_blank_header(&resp);
return send_response(p, &resp, reliable, 0);
}
@@ -3879,7 +3888,7 @@
snprintf(tmp, sizeof(tmp), "Digest realm=\"%s\", nonce=\"%s\" %s", global_realm, randdata, stale ? ", stale=true" : "");
respprep(&resp, p, msg, req);
add_header(&resp, header, tmp);
- add_header(&resp, "Content-Length", "0");
+ add_header_contentLength(&resp, 0);
add_blank_header(&resp);
return send_response(p, &resp, reliable, seqno);
}
@@ -3888,11 +3897,8 @@
static int add_text(struct sip_request *req, const char *text)
{
/* XXX Convert \n's to \r\n's XXX */
- int len = strlen(text);
- char clen[256];
- snprintf(clen, sizeof(clen), "%d", len);
add_header(req, "Content-Type", "text/plain");
- add_header(req, "Content-Length", clen);
+ add_header_contentLength(req, strlen(text));
add_line(req, text);
return 0;
}
@@ -3902,13 +3908,10 @@
static int add_digit(struct sip_request *req, char digit)
{
char tmp[256];
- int len;
- char clen[256];
+
snprintf(tmp, sizeof(tmp), "Signal=%c\r\nDuration=250\r\n", digit);
- len = strlen(tmp);
- snprintf(clen, sizeof(clen), "%d", len);
add_header(req, "Content-Type", "application/dtmf-relay");
- add_header(req, "Content-Length", clen);
+ add_header_contentLength(req, strlen(tmp));
add_line(req, tmp);
return 0;
}
@@ -4083,9 +4086,8 @@
len = strlen(v) + strlen(s) + strlen(o) + strlen(c) + strlen(t) + strlen(m) + strlen(a);
if ((p->vrtp) && (!ast_test_flag(p, SIP_NOVIDEO)) && (capability & VIDEO_CODEC_MASK)) /* only if video response is appropriate */
len += strlen(m2) + strlen(a2);
- snprintf(costr, sizeof(costr), "%d", len);
add_header(resp, "Content-Type", "application/sdp");
- add_header(resp, "Content-Length", costr);
+ add_header_contentLength(resp, len);
add_line(resp, v);
add_line(resp, o);
add_line(resp, s);
@@ -4426,7 +4428,7 @@
ast_rtp_offered_from_local(p->rtp, 1);
add_sdp(&req, p);
} else {
- add_header(&req, "Content-Length", "0");
+ add_header_contentLength(&req, 0);
add_blank_header(&req);
}
@@ -4445,14 +4447,10 @@
/*--- transmit_state_notify: Used in the SUBSCRIBE notification subsystem ----*/
static int transmit_state_notify(struct sip_pvt *p, int state, int full)
{
- char tmp[4000];
- int maxbytes = 0;
- int bytes = 0;
- char from[256], to[256];
- char *t, *c, *a;
- char *mfrom, *mto;
+ char tmp[4000], from[256], to[256];
+ char *t = tmp, *c, *a, *mfrom, *mto;
+ int maxbytes = sizeof(tmp);
struct sip_request req;
- char clen[20];
memset(from, 0, sizeof(from));
memset(to, 0, sizeof(to));
@@ -4494,58 +4492,28 @@
else
state = 0;
- t = tmp;
- maxbytes = sizeof(tmp);
- bytes = snprintf(t, maxbytes, "\n");
- t += bytes;
- maxbytes -= bytes;
- bytes = snprintf(t, maxbytes, "\n");
- t += bytes;
- maxbytes -= bytes;
- bytes = snprintf(t, maxbytes, "\n");
- t += bytes;
- maxbytes -= bytes;
- bytes = snprintf(t, maxbytes, "\n", mfrom);
- t += bytes;
- maxbytes -= bytes;
- bytes = snprintf(t, maxbytes, "\n", p->exten);
- t += bytes;
- maxbytes -= bytes;
- bytes = snprintf(t, maxbytes, "\n", mto);
- t += bytes;
- maxbytes -= bytes;
- bytes = snprintf(t, maxbytes, "\n", !state ? "open" : (state==1) ? "inuse" : "closed");
- t += bytes;
- maxbytes -= bytes;
- bytes = snprintf(t, maxbytes, "\n", !state ? "online" : (state==1) ? "onthephone" : "offline");
- t += bytes;
- maxbytes -= bytes;
- bytes = snprintf(t, maxbytes, "\n\n\n");
+ ast_build_string(&t, &maxbytes, "\n");
+ ast_build_string(&t, &maxbytes, "\n");
+ ast_build_string(&t, &maxbytes, "\n");
+ ast_build_string(&t, &maxbytes, "\n", mfrom);
+ ast_build_string(&t, &maxbytes, "\n", p->exten);
+ ast_build_string(&t, &maxbytes, "\n", mto);
+ ast_build_string(&t, &maxbytes, "\n", !state ? "open" : (state==1) ? "inuse" : "closed");
+ ast_build_string(&t, &maxbytes, "\n", !state ? "online" : (state==1) ? "onthephone" : "offline");
+ ast_build_string(&t, &maxbytes, "\n\n\n");
} else {
add_header(&req, "Event", "dialog");
add_header(&req, "Content-Type", "application/dialog-info+xml");
-
- t = tmp;
- maxbytes = sizeof(tmp);
- bytes = snprintf(t, maxbytes, "\n");
- t += bytes;
- maxbytes -= bytes;
- bytes = snprintf(t, maxbytes, "\n", p->dialogver++, full ? "full":"partial", mfrom);
- t += bytes;
- maxbytes -= bytes;
- bytes = snprintf(t, maxbytes, "\n\n");
+ ast_build_string(&t, &maxbytes, "\n");
+ ast_build_string(&t, &maxbytes, "\n", p->dialogver++, full ? "full":"partial", mfrom);
+ ast_build_string(&t, &maxbytes, "\n\n");
}
if (t > tmp + sizeof(tmp))
ast_log(LOG_WARNING, "Buffer overflow detected!! (Please file a bug report)\n");
- snprintf(clen, sizeof(clen), "%d", (int)strlen(tmp));
- add_header(&req, "Content-Length", clen);
+ add_header_contentLength(&req, strlen(tmp));
add_line(&req, tmp);
return send_request(p, &req, 1, p->ocseq);
@@ -4560,22 +4528,24 @@
static int transmit_notify_with_mwi(struct sip_pvt *p, int newmsgs, int oldmsgs)
{
struct sip_request req;
- char tmp[256];
- char tmp2[256];
- char clen[20];
+ char tmp[500];
+ char *t = tmp;
+ int maxbytes = sizeof(tmp);
+
initreqprep(&req, p, SIP_NOTIFY, NULL);
add_header(&req, "Event", "message-summary");
add_header(&req, "Content-Type", default_notifymime);
- snprintf(tmp, sizeof(tmp), "Messages-Waiting: %s\r\n", newmsgs ? "yes" : "no");
- snprintf(tmp2, sizeof(tmp2), "Voice-Message: %d/%d (0/0)\r\n", newmsgs, oldmsgs);
- snprintf(clen, sizeof(clen), "%d", (int)(strlen(tmp) + strlen(tmp2)));
- add_header(&req, "Content-Length", clen);
+ ast_build_string(&t, &maxbytes, "Messages-Waiting: %s\r\n", newmsgs ? "yes" : "no");
+ ast_build_string(&t, &maxbytes, "Voice-Message: %d/%d (0/0)\r\n", newmsgs, oldmsgs);
+
+ if (t > tmp + sizeof(tmp))
+ ast_log(LOG_WARNING, "Buffer overflow detected!! (Please file a bug report)\n");
+
+ add_header_contentLength(&req, strlen(tmp));
add_line(&req, tmp);
- add_line(&req, tmp2);
- if (!p->initreq.headers) {
- /* Use this as the basis */
+ if (!p->initreq.headers) { /* Use this as the basis */
copy_request(&p->initreq, &req);
parse(&p->initreq);
if (sip_debug_test_pvt(p))
@@ -4609,17 +4579,15 @@
static int transmit_notify_with_sipfrag(struct sip_pvt *p, int cseq)
{
struct sip_request req;
- char tmp[256];
- char clen[20];
+ char tmp[20];
reqprep(&req, p, SIP_NOTIFY, 0, 1);
snprintf(tmp, sizeof(tmp), "refer;id=%d", cseq);
add_header(&req, "Event", tmp);
add_header(&req, "Subscription-state", "terminated;reason=noresource");
add_header(&req, "Content-Type", "message/sipfrag;version=2.0");
- ast_copy_string(tmp, "SIP/2.0 200 OK", sizeof(tmp));
- snprintf(clen, sizeof(clen), "%d", (int)(strlen(tmp)));
- add_header(&req, "Content-Length", clen);
+ strcpy(tmp, "SIP/2.0 200 OK");
+ add_header_contentLength(&req, strlen(tmp));
add_line(&req, tmp);
if (!p->initreq.headers) {
@@ -4898,7 +4866,7 @@
add_header(&req, "Expires", tmp);
add_header(&req, "Contact", p->our_contact);
add_header(&req, "Event", "registration");
- add_header(&req, "Content-Length", "0");
+ add_header_contentLength(&req, 0);
add_blank_header(&req);
copy_request(&p->initreq, &req);
parse(&p->initreq);
@@ -4992,7 +4960,7 @@
{
struct sip_request resp;
reqprep(&resp, p, sipmethod, seqno, newbranch);
- add_header(&resp, "Content-Length", "0");
+ add_header_contentLength(&resp, 0);
add_blank_header(&resp);
return send_request(p, &resp, reliable, seqno ? seqno : p->ocseq);
}
@@ -5018,7 +4986,7 @@
}
}
- add_header(&resp, "Content-Length", "0");
+ add_header_contentLength(&resp, 0);
add_blank_header(&resp);
return send_request(p, &resp, reliable, seqno ? seqno : p->ocseq);
}