try to enable ringback on H.323->SIP calls (bug #1645) and clean up code a lil bit

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2976 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 1 insertions, 6 deletions

diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 0b24a7381..22106a51e 100755
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -598,8 +598,7 @@ static int oh323_indicate(struct ast_channel *c, int condition)
 	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 @@ int setup_incoming_call(call_details_t cd)
 	} 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 @@ int setup_incoming_call(call_details_t cd)
 		} 
 	}
 
-/* 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);