kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-21 04:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve SIP history

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-07-14 11:51:44 +00:00
parent 1b9251ad14
commit 9cd917c42a
1 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
channels/chan_sip.c
View File

@@ -835,11 +835,24 @@ static int __sip_semi_ack(struct sip_pvt *p, int seqno, int resp)
return res; return res;
} }
static void parse(struct sip_request *req);
static char *get_header(struct sip_request *req, char *name);
static void copy_request(struct sip_request *dst,struct sip_request *src);
static void parse_copy(struct sip_request *dst, struct sip_request *src)
{
memset(dst, 0, sizeof(*dst));
memcpy(dst->data, src->data, sizeof(dst->data));
dst->len = src->len;
parse(dst);
}
/*--- send_response: Transmit response on SIP request---*/ /*--- send_response: Transmit response on SIP request---*/
static int send_response(struct sip_pvt *p, struct sip_request *req, int reliable, int seqno) static int send_response(struct sip_pvt *p, struct sip_request *req, int reliable, int seqno)
{ {
int res; int res;
char iabuf[INET_ADDRSTRLEN]; char iabuf[INET_ADDRSTRLEN];
struct sip_request tmp;
char tmpmsg[80];
if (sip_debug_test_pvt(p)) { if (sip_debug_test_pvt(p)) {
if (p->nat == SIP_NAT_ALWAYS) if (p->nat == SIP_NAT_ALWAYS)
ast_verbose("%sTransmitting (NAT):\n%s\n to %s:%d\n", reliable ? "Reliably " : "", req->data, ast_inet_ntoa(iabuf, sizeof(iabuf), p->recv.sin_addr), ntohs(p->recv.sin_port)); ast_verbose("%sTransmitting (NAT):\n%s\n to %s:%d\n", reliable ? "Reliably " : "", req->data, ast_inet_ntoa(iabuf, sizeof(iabuf), p->recv.sin_addr), ntohs(p->recv.sin_port));
@@ -847,10 +860,18 @@ static int send_response(struct sip_pvt *p, struct sip_request *req, int reliabl
ast_verbose("%sTransmitting (no NAT):\n%s\n to %s:%d\n", reliable ? "Reliably " : "", req->data, ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), ntohs(p->sa.sin_port)); ast_verbose("%sTransmitting (no NAT):\n%s\n to %s:%d\n", reliable ? "Reliably " : "", req->data, ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), ntohs(p->sa.sin_port));
} }
if (reliable) { if (reliable) {
append_history(p, "TxRespRel", req->data); if (recordhistory) {
parse_copy(&tmp, req);
snprintf(tmpmsg, sizeof(tmpmsg), "%s / %s", tmp.data, get_header(&tmp, "CSeq"));
append_history(p, "TxRespRel", tmpmsg);
}
res = __sip_reliable_xmit(p, seqno, 1, req->data, req->len, (reliable > 1)); res = __sip_reliable_xmit(p, seqno, 1, req->data, req->len, (reliable > 1));
} else { } else {
append_history(p, "TxResp", req->data); if (recordhistory) {
parse_copy(&tmp, req);
snprintf(tmpmsg, sizeof(tmpmsg), "%s / %s", tmp.data, get_header(&tmp, "CSeq"));
append_history(p, "TxResp", tmpmsg);
}
res = __sip_xmit(p, req->data, req->len); res = __sip_xmit(p, req->data, req->len);
} }
if (res > 0) if (res > 0)
@@ -863,6 +884,8 @@ static int send_request(struct sip_pvt *p, struct sip_request *req, int reliable
{ {
int res; int res;
char iabuf[INET_ADDRSTRLEN]; char iabuf[INET_ADDRSTRLEN];
struct sip_request tmp;
char tmpmsg[80];
if (sip_debug_test_pvt(p)) { if (sip_debug_test_pvt(p)) {
if (p->nat == SIP_NAT_ALWAYS) if (p->nat == SIP_NAT_ALWAYS)
ast_verbose("%sTransmitting:\n%s (NAT) to %s:%d\n", reliable ? "Reliably " : "", req->data, ast_inet_ntoa(iabuf, sizeof(iabuf), p->recv.sin_addr), ntohs(p->recv.sin_port)); ast_verbose("%sTransmitting:\n%s (NAT) to %s:%d\n", reliable ? "Reliably " : "", req->data, ast_inet_ntoa(iabuf, sizeof(iabuf), p->recv.sin_addr), ntohs(p->recv.sin_port));
@@ -870,10 +893,18 @@ static int send_request(struct sip_pvt *p, struct sip_request *req, int reliable
ast_verbose("%sTransmitting:\n%s (no NAT) to %s:%d\n", reliable ? "Reliably " : "", req->data, ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), ntohs(p->sa.sin_port)); ast_verbose("%sTransmitting:\n%s (no NAT) to %s:%d\n", reliable ? "Reliably " : "", req->data, ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), ntohs(p->sa.sin_port));
} }
if (reliable) { if (reliable) {
append_history(p, "TxReqRel", req->data); if (recordhistory) {
parse_copy(&tmp, req);
snprintf(tmpmsg, sizeof(tmpmsg), "%s / %s", tmp.data, get_header(&tmp, "CSeq"));
append_history(p, "TxReqRel", tmpmsg);
}
res = __sip_reliable_xmit(p, seqno, 0, req->data, req->len, (reliable > 1)); res = __sip_reliable_xmit(p, seqno, 0, req->data, req->len, (reliable > 1));
} else { } else {
append_history(p, "TxReq", req->data); if (recordhistory) {
parse_copy(&tmp, req);
snprintf(tmpmsg, sizeof(tmpmsg), "%s / %s", tmp.data, get_header(&tmp, "CSeq"));
append_history(p, "TxReq", tmpmsg);
}
res = __sip_xmit(p, req->data, req->len); res = __sip_xmit(p, req->data, req->len);
} }
return res; return res;
@@ -7348,7 +7379,12 @@ retrylock:
goto retrylock; goto retrylock;
} }
memcpy(&p->recv, &sin, sizeof(p->recv)); memcpy(&p->recv, &sin, sizeof(p->recv));
append_history(p, "Rx", req.data); if (recordhistory) {
char tmp[80] = "";
/* This is a response, note what it was for */
snprintf(tmp, sizeof(tmp), "%s / %s", req.data, get_header(&req, "CSeq"));
append_history(p, "Rx", tmp);
}
nounlock = 0; nounlock = 0;
handle_request(p, &req, &sin, &recount, &nounlock); handle_request(p, &req, &sin, &recount, &nounlock);
if (p->owner && !nounlock) if (p->owner && !nounlock)