Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Make sip debug easier to read (bug #3785)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5197 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Mark Spencer 21 years ago
parent 1719cd39d3
commit 47979c3e73
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File

32
channels/chan_sip.c
Unescape View File

@ -734,6 +734,7 @@ static int ast_sip_ouraddrfor(struct in_addr *them, struct in_addr *us)
return 0; return 0;
} }
/*--- append_history: Append to SIP dialog history */
static int append_history(struct sip_pvt *p, char *event, char *data) static int append_history(struct sip_pvt *p, char *event, char *data)
{ {
struct sip_history *hist, *prev; struct sip_history *hist, *prev;
@ -777,9 +778,9 @@ static int retrans_pkt(void *data)
pkt->retrans++; pkt->retrans++;
if (sip_debug_test_pvt(pkt->owner)) { if (sip_debug_test_pvt(pkt->owner)) {
if (ast_test_flag(pkt->owner, SIP_NAT) & SIP_NAT_ROUTE) if (ast_test_flag(pkt->owner, SIP_NAT) & SIP_NAT_ROUTE)
ast_verbose("Retransmitting #%d (NAT):\n%s\n to %s:%d\n", pkt->retrans, pkt->data, ast_inet_ntoa(iabuf, sizeof(iabuf), pkt->owner->recv.sin_addr), ntohs(pkt->owner->recv.sin_port)); ast_verbose("Retransmitting #%d (NAT) to %s:%d:\n%s\n---\n", pkt->retrans, ast_inet_ntoa(iabuf, sizeof(iabuf), pkt->owner->recv.sin_addr), ntohs(pkt->owner->recv.sin_port), pkt->data);
else else
ast_verbose("Retransmitting #%d (no NAT):\n%s\n to %s:%d\n", pkt->retrans, pkt->data, ast_inet_ntoa(iabuf, sizeof(iabuf), pkt->owner->sa.sin_addr), ntohs(pkt->owner->sa.sin_port)); ast_verbose("Retransmitting #%d (no NAT) to %s:%d:\n%s\n---\n", pkt->retrans, ast_inet_ntoa(iabuf, sizeof(iabuf), pkt->owner->sa.sin_addr), ntohs(pkt->owner->sa.sin_port), pkt->data);
} }
append_history(pkt->owner, "ReTx", pkt->data); append_history(pkt->owner, "ReTx", pkt->data);
__sip_xmit(pkt->owner, pkt->data, pkt->packetlen); __sip_xmit(pkt->owner, pkt->data, pkt->packetlen);
@ -987,9 +988,9 @@ static int send_response(struct sip_pvt *p, struct sip_request *req, int reliabl
char tmpmsg[80]; char tmpmsg[80];
if (sip_debug_test_pvt(p)) { if (sip_debug_test_pvt(p)) {
if (ast_test_flag(p, SIP_NAT) & SIP_NAT_ROUTE) if (ast_test_flag(p, SIP_NAT) & SIP_NAT_ROUTE)
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) to %s:%d:\n%s\n---\n", reliable ? "Reliably " : "", ast_inet_ntoa(iabuf, sizeof(iabuf), p->recv.sin_addr), ntohs(p->recv.sin_port), req->data);
else else
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) to %s:%d:\n%s\n---\n", reliable ? "Reliably " : "", ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), ntohs(p->sa.sin_port), req->data);
} }
if (reliable) { if (reliable) {
if (recordhistory) { if (recordhistory) {
@ -1020,9 +1021,9 @@ static int send_request(struct sip_pvt *p, struct sip_request *req, int reliable
char tmpmsg[80]; char tmpmsg[80];
if (sip_debug_test_pvt(p)) { if (sip_debug_test_pvt(p)) {
if (ast_test_flag(p, SIP_NAT) & SIP_NAT_ROUTE) if (ast_test_flag(p, SIP_NAT) & SIP_NAT_ROUTE)
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 (NAT) to %s:%d:\n%s\n---\n", reliable ? "Reliably " : "", ast_inet_ntoa(iabuf, sizeof(iabuf), p->recv.sin_addr), ntohs(p->recv.sin_port), req->data);
else else
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 (no NAT) to %s:%d:\n%s\n---\n", reliable ? "Reliably " : "", ast_inet_ntoa(iabuf, sizeof(iabuf), p->sa.sin_addr), ntohs(p->sa.sin_port), req->data);
} }
if (reliable) { if (reliable) {
if (recordhistory) { if (recordhistory) {
@ -8549,27 +8550,36 @@ static int sipsock_read(int *id, int fd, short events, void *ignore)
int nounlock; int nounlock;
int recount = 0; int recount = 0;
int debug; int debug;
char iabuf[INET_ADDRSTRLEN];
len = sizeof(sin); len = sizeof(sin);
memset(&req, 0, sizeof(req)); memset(&req, 0, sizeof(req));
res = recvfrom(sipsock, req.data, sizeof(req.data) - 1, 0, (struct sockaddr *)&sin, &len); res = recvfrom(sipsock, req.data, sizeof(req.data) - 1, 0, (struct sockaddr *)&sin, &len);
if (res < 0) { if (res < 0) {
#if !defined(__FreeBSD__)
if (errno == EAGAIN) if (errno == EAGAIN)
ast_log(LOG_NOTICE, "SIP: Received packet with bad UDP checksum\n"); ast_log(LOG_NOTICE, "SIP: Received packet with bad UDP checksum\n");
else if (errno != ECONNREFUSED) else
#endif
if (errno != ECONNREFUSED)
ast_log(LOG_WARNING, "Recv error: %s\n", strerror(errno)); ast_log(LOG_WARNING, "Recv error: %s\n", strerror(errno));
return 1; return 1;
} }
req.data[res] = '\0'; req.data[res] = '\0';
req.len = res; req.len = res;
debug = sip_debug_test_addr(&sin); debug = sip_debug_test_addr(&sin);
if (debug)
ast_verbose("\n\nSip read: \n%s\n", req.data);
if (pedanticsipchecking) if (pedanticsipchecking)
req.len = lws2sws(req.data, req.len); req.len = lws2sws(req.data, req.len);
parse(&req);
if (debug) if (debug)
ast_verbose("%d headers, %d lines\n", req.headers, req.lines); ast_verbose("\n<-- SIP read from %s:%d: \n%s\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), ntohs(sin.sin_port), req.data);
parse(&req);
if (debug) {
ast_verbose("--- (%d headers %d lines)", req.headers, req.lines);
if (req.headers + req.lines == 0)
ast_verbose(" Nat keepalive ");
ast_verbose("---\n");
}
if (req.headers < 2) { if (req.headers < 2) {
/* Must have at least two headers */ /* Must have at least two headers */
return 1; return 1;

Write Preview
Loading…
Cancel
Save