[asterisk-commits] russell: branch russell/chan_refcount r96396 - in /team/russell/chan_refcount...

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Jan  3 16:53:15 2008
New Revision: 96396

URL: http://svn.digium.com/view/asterisk?view=rev&rev=96396
Log:
resolve conflict, reset automerge

Modified:
    team/russell/chan_refcount/   (props changed)
    team/russell/chan_refcount/channels/chan_iax2.c

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/russell/chan_refcount/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jan  3 16:53:15 2008
@@ -1,1 +1,1 @@
-/trunk:1-96367
+/trunk:1-96395

Modified: team/russell/chan_refcount/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/chan_refcount/channels/chan_iax2.c?view=diff&rev=96396&r1=96395&r2=96396
==============================================================================
--- team/russell/chan_refcount/channels/chan_iax2.c (original)
+++ team/russell/chan_refcount/channels/chan_iax2.c Thu Jan  3 16:53:15 2008
@@ -9053,11 +9053,11 @@
 	iax_frame_wrap(fr, &f);
 
 	/* If this is our most recent packet, use it as our basis for timestamping */
-	if (iaxs[fr->callno]->last < fr->ts) {
+	if (iaxs[fr->callno] && iaxs[fr->callno]->last < fr->ts) {
 		/*iaxs[fr->callno]->last = fr->ts; (do it afterwards cos schedule/forward_delivery needs the last ts too)*/
 		fr->outoforder = 0;
 	} else {
-		if (iaxdebug)
+		if (iaxdebug && iaxs[fr->callno])
 			ast_debug(1, "Received out of order packet... (type=%d, subclass %d, ts = %d, last = %d)\n", f.frametype, f.subclass, fr->ts, iaxs[fr->callno]->last);
 		fr->outoforder = -1;
 	}