[asterisk-commits] russell: branch russell/iax2_find_callno r114839 - /team/russell/iax2_find_ca...

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Apr 29 13:33:22 2008
New Revision: 114839

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114839
Log:
add another sanity check, and return the correct call number

Modified:
    team/russell/iax2_find_callno/channels/chan_iax2.c

Modified: team/russell/iax2_find_callno/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/russell/iax2_find_callno/channels/chan_iax2.c?view=diff&rev=114839&r1=114838&r2=114839
==============================================================================
--- team/russell/iax2_find_callno/channels/chan_iax2.c (original)
+++ team/russell/iax2_find_callno/channels/chan_iax2.c Tue Apr 29 13:33:22 2008
@@ -1625,7 +1625,7 @@
 				}
 				ao2_ref(pvt, -1);
 				pvt = NULL;
-				return callno;
+				return dcallno;
 			}
 		}
 
@@ -1712,7 +1712,9 @@
 			ast_string_field_set(iaxs[x], mohsuggest, mohsuggest);
 			ast_string_field_set(iaxs[x], parkinglot, default_parkinglot);
 
-			store_by_peercallno(iaxs[x]);
+			if (iaxs[x]->peercallno) {
+				store_by_peercallno(iaxs[x]);
+			}
 		} else {
 			ast_log(LOG_WARNING, "Out of resources\n");
 			ast_mutex_unlock(&iaxsl[x]);