[asterisk-commits] oej: branch oej/obproxy r53290 - in /team/oej/obproxy: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Feb  6 12:39:36 2007
New Revision: 53290

URL: http://svn.digium.com/view/asterisk?view=rev&rev=53290
Log:
Add credit

Modified:
    team/oej/obproxy/CREDITS
    team/oej/obproxy/channels/chan_sip.c

Modified: team/oej/obproxy/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/obproxy/CREDITS?view=diff&rev=53290&r1=53289&r2=53290
==============================================================================
--- team/oej/obproxy/CREDITS (original)
+++ team/oej/obproxy/CREDITS Tue Feb  6 12:39:36 2007
@@ -133,6 +133,8 @@
 
 Voop A/S, Nuvio Inc, Inotel S.A and Foniris Telecom A/S - funding for rewrite of SIP transfers
 
+Talkplus, inc - outbound proxy support in chan_sip
+
 Philippe Sultan - RADIUS CDR module
 	INRIA, http://www.inria.fr/
 

Modified: team/oej/obproxy/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/obproxy/channels/chan_sip.c?view=diff&rev=53290&r1=53289&r2=53290
==============================================================================
--- team/oej/obproxy/channels/chan_sip.c (original)
+++ team/oej/obproxy/channels/chan_sip.c Tue Feb  6 12:39:36 2007
@@ -7300,19 +7300,17 @@
 		if (create_addr(p, r->hostname)) {
 			/* we have what we hope is a temporary network error,
 			 * probably DNS.  We need to reschedule a registration try */
-			if (!p->outboundproxy) {
-				sip_destroy(p);
-				if (r->timeout > -1) {
-					ast_sched_del(sched, r->timeout);
-					r->timeout = ast_sched_add(sched, global_reg_timeout*1000, sip_reg_timeout, r);
-					ast_log(LOG_WARNING, "Still have a registration timeout for %s@%s (create_addr() error), %d\n", r->username, r->hostname, r->timeout);
-				} else {
-					r->timeout = ast_sched_add(sched, global_reg_timeout*1000, sip_reg_timeout, r);
-					ast_log(LOG_WARNING, "Probably a DNS error for registration to %s@%s, trying REGISTER again (after %d seconds)\n", r->username, r->hostname, global_reg_timeout);
-				}
-				r->regattempts++;
-				return 0;
+			sip_destroy(p);
+			if (r->timeout > -1) {
+				ast_sched_del(sched, r->timeout);
+				r->timeout = ast_sched_add(sched, global_reg_timeout*1000, sip_reg_timeout, r);
+				ast_log(LOG_WARNING, "Still have a registration timeout for %s@%s (create_addr() error), %d\n", r->username, r->hostname, r->timeout);
+			} else {
+				r->timeout = ast_sched_add(sched, global_reg_timeout*1000, sip_reg_timeout, r);
+				ast_log(LOG_WARNING, "Probably a DNS error for registration to %s@%s, trying REGISTER again (after %d seconds)\n", r->username, r->hostname, global_reg_timeout);
 			}
+			r->regattempts++;
+			return 0;
 		}
 		/* Copy back Call-ID in case create_addr changed it */
 		ast_string_field_set(r, callid, p->callid);