[svn-commits] qwell: branch qwell/codec_consistency r110623 - in /team/qwell/codec_consiste...

Mon Mar 24 16:24:59 CDT 2008

Author: qwell
Date: Mon Mar 24 16:24:58 2008
New Revision: 110623

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110623
Log:
Merged revisions 110615,110619,110621 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r110615 | russell | 2008-03-24 12:36:04 -0500 (Mon, 24 Mar 2008) | 10 lines

Merged revisions 110614 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r110614 | russell | 2008-03-24 12:34:56 -0500 (Mon, 24 Mar 2008) | 2 lines

Turn a NOTICE into a DEBUG message.

........

................
r110619 | mmichelson | 2008-03-24 14:19:37 -0500 (Mon, 24 Mar 2008) | 23 lines

Merged revisions 110618 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r110618 | mmichelson | 2008-03-24 14:17:41 -0500 (Mon, 24 Mar 2008) | 15 lines

This is a revert for revision 108288. The reason is that that revision
was not for an actual bug fix per se, and so it really should not have been in 1.4 in
the first place. Plus, people who compile with DO_CRASH are more likely
to encounter a crash due to this change. While I think the usage of DO_CRASH
in ast_sched_del is a bit absurd, this sort of change is beyond the scope of 1.4
and should be done instead in a developer branch based on trunk 
so that all scheduler functions are fixed at once.

I also am reverting the change to trunk and 1.6 since they also suffer from
the DO_CRASH potential.

(closes issue #12272)
Reported by: qq12345


........

................
r110621 | mmichelson | 2008-03-24 15:14:07 -0500 (Mon, 24 Mar 2008) | 11 lines

Remove the "Event: registration" header from Asterisk-generated
SIP REGISTER requests. rjain points out that RFC 3265 specifies
that the Event: header is not a valid header for REGISTER requests
and that the "registration" value is not defined at IANA.

(closes issue #12279)
Reported by: rjain
Patches:
      chan_sip.c.diff uploaded by rjain (license 226)


................

Modified:
    team/qwell/codec_consistency/   (props changed)
    team/qwell/codec_consistency/channels/chan_iax2.c
    team/qwell/codec_consistency/channels/chan_sip.c

Propchange: team/qwell/codec_consistency/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/qwell/codec_consistency/
------------------------------------------------------------------------------

--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Mar 24 16:24:58 2008
@@ -1,1 +1,1 @@
-/trunk:1-110611
+/trunk:1-110622

Modified: team/qwell/codec_consistency/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/channels/chan_iax2.c?view=diff&rev=110623&r1=110622&r2=110623
==============================================================================
--- team/qwell/codec_consistency/channels/chan_iax2.c (original)
+++ team/qwell/codec_consistency/channels/chan_iax2.c Mon Mar 24 16:24:58 2008
@@ -1086,7 +1086,7 @@
 	}
 	time(&t);
 	if (t != lasterror) 
-		ast_log(LOG_NOTICE, "Out of idle IAX2 threads for scheduling!\n");
+		ast_debug(1, "Out of idle IAX2 threads for scheduling!\n");
 	lasterror = t;
 
 	return -1;
@@ -7430,7 +7430,7 @@
 	if (!(thread = find_idle_thread())) {
 		time(&t);
 		if (t != last_errtime)
-			ast_log(LOG_NOTICE, "Out of idle IAX2 threads for I/O, pausing!\n");
+			ast_debug(1, "Out of idle IAX2 threads for I/O, pausing!\n");
 		last_errtime = t;
 		usleep(1);
 		return 1;

Modified: team/qwell/codec_consistency/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/qwell/codec_consistency/channels/chan_sip.c?view=diff&rev=110623&r1=110622&r2=110623
==============================================================================
--- team/qwell/codec_consistency/channels/chan_sip.c (original)
+++ team/qwell/codec_consistency/channels/chan_sip.c Mon Mar 24 16:24:58 2008
@@ -4236,8 +4236,7 @@
 		p->invitestate = INV_CALLING;
 	
 		/* Initialize auto-congest time */
-		ast_sched_del(sched, p->initid);
-		p->initid = ast_sched_add(sched, p->timer_b, auto_congest, dialog_ref(p));
+		AST_SCHED_REPLACE(p->initid, sched, p->timer_b, auto_congest, dialog_ref(p));
 	}
 
 	return res;
@@ -4307,7 +4306,7 @@
 
 	if (p->stateid > -1)
 		ast_extension_state_del(p->stateid, NULL);
-	ast_sched_del(sched, p->initid);
+	AST_SCHED_DEL(sched, p->initid);
 	AST_SCHED_DEL(sched, p->waitid);
 	AST_SCHED_DEL(sched, p->autokillid);
 
@@ -9382,7 +9381,6 @@
 	snprintf(tmp, sizeof(tmp), "%d", r->expiry);
 	add_header(&req, "Expires", tmp);
 	add_header(&req, "Contact", p->our_contact);
-	add_header(&req, "Event", "registration");
 	add_header_contentLength(&req, 0);
 
 	initialize_initreq(p, &req);
@@ -14552,7 +14550,7 @@
 
 	/* Acknowledge sequence number - This only happens on INVITE from SIP-call */
 	/* Don't auto congest anymore since we've gotten something useful back */
-	ast_sched_del(sched, p->initid);
+	AST_SCHED_DEL(sched, p->initid);
 
 	/* RFC3261 says we must treat every 1xx response (but not 100)
 	   that we don't recognize as if it was 183.


