[svn-commits] bbryant: branch bbryant/iax2_rotation r115571 - /team/bbryant/iax2_rotation/c...

[SVN commits to the Digium repositories]

Author: bbryant
Date: Thu May  8 14:28:14 2008
New Revision: 115571

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115571
Log:
Update branch so i can merge change into it.

Modified:
    team/bbryant/iax2_rotation/channels/chan_iax2.c

Modified: team/bbryant/iax2_rotation/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/bbryant/iax2_rotation/channels/chan_iax2.c?view=diff&rev=115571&r1=115570&r2=115571
==============================================================================
--- team/bbryant/iax2_rotation/channels/chan_iax2.c (original)
+++ team/bbryant/iax2_rotation/channels/chan_iax2.c Thu May  8 14:28:14 2008
@@ -3729,8 +3729,8 @@
 	struct iax_ie_data ied1;
 	unsigned int transferid = (unsigned int)ast_random();
 
-	call0enc = (ast_test_flag(iaxs[callno0], IAX_ENCRYPTED) && ast_test_flag(iaxs[callno0], IAX_KEYPOPULATED));
-	call1enc = (ast_test_flag(iaxs[callno1], IAX_ENCRYPTED) && ast_test_flag(iaxs[callno1], IAX_KEYPOPULATED));
+	call0enc = ast_test_flag(iaxs[callno0], IAX_ENCRYPTED | IAX_KEYPOPULATED);
+	call1enc = ast_test_flag(iaxs[callno1], IAX_ENCRYPTED | IAX_KEYPOPULATED);
 
 	memset(&ied0, 0, sizeof(ied0));
 	iax_ie_append_addr(&ied0, IAX_IE_APPARENT_ADDR, &iaxs[callno1]->addr);
@@ -3743,7 +3743,8 @@
 	iax_ie_append_int(&ied1, IAX_IE_TRANSFERID, transferid);
 	
 	if (call0enc && call1enc) {
-		iax2_send_rotate_transfer(iaxs[callno0], iaxs[callno1]);
+		res = iax2_send_rotate_transfer(iaxs[callno0], iaxs[callno1]);
+		ast_log(LOG_NOTICE, "iax2_start_transfer: rotate_transfer returned with, %d\n", res);
 	} else if (call0enc || call1enc) {
 		ast_set_flag(iaxs[callno0], IAX_NOTRANSFER);
 		ast_set_flag(iaxs[callno1], IAX_NOTRANSFER);
@@ -4583,8 +4584,8 @@
 {
 	struct MD5Context md5;
 	unsigned char digest[16];
-	char dgststr[33] = ""; //, *tmp;
-	int i;
+	//char dgststr[33] = ""; //, *tmp;
+	//int i;
 
 	MD5Init(&md5);
 	MD5Update(&md5, (unsigned char *)ies->challenge, strlen(ies->challenge));
@@ -4661,8 +4662,8 @@
 	struct MD5Context md5;
 	char challenge[11] = "";
 	unsigned char digest[16];
-	char dgststr[33] = ""; //, *tmp;
-	int res = 0, i;
+	//char dgststr[33] = ""; //, *tmp;
+	int res = 0;//, i;
 
 	pvt->rotateid = iax2_sched_add(sched, (ast_random() % 180001) + 120000, iax2_send_rotate, pvt);