[Asterisk-cvs] asterisk/channels chan_h323.c,1.49,1.50

[jeremy at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv21835

Modified Files:
	chan_h323.c 
Log Message:
try to enable ringback on H.323->SIP calls (bug #1645) and clean up code a lil bit


Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- chan_h323.c	3 May 2004 22:19:03 -0000	1.49
+++ chan_h323.c	16 May 2004 07:04:48 -0000	1.50
@@ -598,8 +598,7 @@
 	switch(condition) {
 	case AST_CONTROL_RINGING:
 		if (c->_state == AST_STATE_RING) {
-		//	transmit_response(p, "180 Ringing", &p->initreq);
-			break;
+			return -1;
 		}
 		return 0;
 	case AST_CONTROL_BUSY:
@@ -1024,11 +1023,8 @@
 	} else { 
 		/* Either this call is not from the Gatekeeper 
 		   or we are not allowing gk routed calls */
-		
-
 		user  = find_user(cd);
 
-
 		if (!user) {
 			sprintf(p->callerid, "%s <%s>", p->cd.call_source_aliases, p->cd.call_source_e164); 
 			if (!ast_strlen_zero(p->cd.call_dest_e164)) {
@@ -1086,7 +1082,6 @@
 		} 
 	}
 
-/* I know this is horrid, don't kill me saddam */
 exit:
 	/* allocate a channel and tell asterisk about it */
 	c = oh323_new(p, AST_STATE_RINGING, cd.call_token);