From: Joshua Colp <jcolp@digium.com>
Date: Mon, 8 Jan 2007 05:13:24 +0000 (+0000)
Subject: Merged revisions 49890 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3525
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=585e0e3e09611766b5606d23e84ca767d7cd6c78;p=thirdparty%2Fasterisk.git

Merged revisions 49890 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r49890 | file | 2007-01-08 00:11:54 -0500 (Mon, 08 Jan 2007) | 10 lines

Merged revisions 49889 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r49889 | file | 2007-01-08 00:10:07 -0500 (Mon, 08 Jan 2007) | 2 lines

Ensure we use the default refresh value of 60 if the remote server does not send one. (issue #8746 reported by maethor)

........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49891 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 532308f0f6..4248394e8a 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5423,7 +5423,7 @@ static int iax2_ack_registry(struct iax_ies *ies, struct sockaddr_in *sin, int c
 	/* Start pessimistic */
 	char peer[256] = "";
 	char msgstatus[60];
-	int refresh = 0;
+	int refresh = 60;
 	char ourip[256] = "<Unspecified>";
 	struct sockaddr_in oldus;
 	struct sockaddr_in us;