[asterisk-commits] dvossel: branch dvossel/iax2transfer_1.6.1 r173494 - /team/dvossel/iax2transf...

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Feb  4 13:44:46 2009
New Revision: 173494

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=173494
Log:
updating iax2transfer patch to match 1.6.0 and 1.4. 

Modified:
    team/dvossel/iax2transfer_1.6.1/channels/chan_iax2.c

Modified: team/dvossel/iax2transfer_1.6.1/channels/chan_iax2.c
URL: http://svn.digium.com/svn-view/asterisk/team/dvossel/iax2transfer_1.6.1/channels/chan_iax2.c?view=diff&rev=173494&r1=173493&r2=173494
==============================================================================
--- team/dvossel/iax2transfer_1.6.1/channels/chan_iax2.c (original)
+++ team/dvossel/iax2transfer_1.6.1/channels/chan_iax2.c Wed Feb  4 13:44:46 2009
@@ -2414,7 +2414,7 @@
 			remove_by_peercallno(pvt);
 		}
 
-		if(pvt->transfercallno) {
+		if (pvt->transfercallno) {
 			remove_by_transfercallno(pvt);
 		}
 
@@ -12460,13 +12460,18 @@
 		return AST_MODULE_LOAD_FAILURE;
 	}
 	iax_peercallno_pvts = ao2_container_alloc(IAX_MAX_CALLS, pvt_hash_cb, pvt_cmp_cb);
-	iax_transfercallno_pvts = ao2_container_alloc(IAX_MAX_CALLS, transfercallno_pvt_hash_cb, transfercallno_pvt_cmp_cb);
 	if (!iax_peercallno_pvts) {
 		ao2_ref(peers, -1);
 		ao2_ref(users, -1);
 		return AST_MODULE_LOAD_FAILURE;
 	}
-
+	iax_transfercallno_pvts = ao2_container_alloc(IAX_MAX_CALLS, transfercallno_pvt_hash_cb, transfercallno_pvt_cmp_cb);
+	if (!iax_transfercallno_pvts) {
+		ao2_ref(peers, -1);
+		ao2_ref(users, -1);
+		ao2_ref(iax_peercallno_pvts, -1);
+		return AST_MODULE_LOAD_FAILURE;
+	}
 	ast_custom_function_register(&iaxpeer_function);
 	ast_custom_function_register(&iaxvar_function);