[svn-commits] rizzo: branch rizzo/astobj2 r47915 - /team/rizzo/astobj2/channels/chan_sip.c

[svn-commits at lists.digium.com]

Author: rizzo
Date: Wed Nov 22 02:55:40 2006
New Revision: 47915

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47915
Log:
move a common statement out of an if/then/else block

Modified:
    team/rizzo/astobj2/channels/chan_sip.c

Modified: team/rizzo/astobj2/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/rizzo/astobj2/channels/chan_sip.c?view=diff&rev=47915&r1=47914&r2=47915
==============================================================================
--- team/rizzo/astobj2/channels/chan_sip.c (original)
+++ team/rizzo/astobj2/channels/chan_sip.c Wed Nov 22 02:55:40 2006
@@ -7469,13 +7469,12 @@
 			 * probably DNS.  We need to reschedule a registration try */
 			sip_destroy(p);	/* and the reference goes */
 			if (r->timeout > -1) {
+				ast_log(LOG_WARNING, "Still have a registration timeout for %s@%s (create_addr() error), event %d\n", r->username, r->hostname, r->timeout);
 				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->timeout = ast_sched_add(sched, global_reg_timeout*1000, sip_reg_timeout, r);
 			r->regattempts++;
 			return 0;
 		}