Skip to content
Snippets Groups Projects
Commit f92d6412 authored by Alec L Davis's avatar Alec L Davis
Browse files

Merged revisions 353369 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/10

................
  r353369 | alecdavis | 2012-01-31 11:42:28 +1300 (Tue, 31 Jan 2012) | 9 lines
  
  Merged revisions 353368 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r353368 | alecdavis | 2012-01-31 11:40:40 +1300 (Tue, 31 Jan 2012) | 2 lines
    
    prevent debug messsges displaying -ve Cseq numbers. Missed in R353320
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@353370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 0ccc1f52
No related branches found
No related tags found
No related merge requests found
......@@ -4008,7 +4008,7 @@ int __sip_ack(struct sip_pvt *p, uint32_t seqno, int resp, int sipmethod)
res = TRUE;
msg = "Found";
if (!resp && (seqno == p->pendinginvite)) {
ast_debug(1, "Acked pending invite %d\n", p->pendinginvite);
ast_debug(1, "Acked pending invite %u\n", p->pendinginvite);
p->pendinginvite = 0;
}
if (cur->retransid > -1) {
......@@ -25885,7 +25885,7 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct as
return 0;
}
if (p->ocseq && (p->ocseq < seqno)) {
ast_debug(1, "Ignoring out of order response %d (expecting %d)\n", seqno, p->ocseq);
ast_debug(1, "Ignoring out of order response %u (expecting %u)\n", seqno, p->ocseq);
return -1;
} else {
char causevar[256], causeval[256];
......@@ -25924,7 +25924,7 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct as
if (p->pendinginvite && seqno == p->pendinginvite && (req->method == SIP_ACK || req->method == SIP_CANCEL)) {
ast_debug(2, "Got CANCEL or ACK on INVITE with transactions in between.\n");
} else {
ast_debug(1, "Ignoring too old SIP packet packet %d (expecting >= %d)\n", seqno, p->icseq);
ast_debug(1, "Ignoring too old SIP packet packet %u (expecting >= %u)\n", seqno, p->icseq);
if (req->method == SIP_INVITE) {
unsigned int ran = (ast_random() % 10) + 1;
char seconds[4];
......@@ -25943,7 +25943,7 @@ static int handle_incoming(struct sip_pvt *p, struct sip_request *req, struct as
respond appropriately. We do this if we receive a repeat of
the last sequence number */
req->ignore = 1;
ast_debug(3, "Ignoring SIP message because of retransmit (%s Seqno %d, ours %d)\n", sip_methods[p->method].text, p->icseq, seqno);
ast_debug(3, "Ignoring SIP message because of retransmit (%s Seqno %u, ours %u)\n", sip_methods[p->method].text, p->icseq, seqno);
}
 
/* RFC 3261 section 9. "CANCEL has no effect on a request to which a UAS has
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment