eliminate useless warnings generated by IAXy registrations

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

diff --git a/ChangeLog b/ChangeLog
index 6b689930c9ef27fd3f89a93f0af88265bfcfbf9b..ea778b5d17b39bf002e4c41f68ba515bcc9a5d68 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-09  Kevin P. Fleming  <kpfleming@digium.com>
+
+       * channels/chan_iax2.c (update_registry): don't complain about unspecifed registration expiration intervals, just use the minimum
+
 2005-11-08  Kevin P. Fleming  <kpfleming@digium.com>
 
        * Asterisk 1.2.0-rc1 released.

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 093a4c231f054deacd5e82a6e2b907a7b7f6f78d..806b1d2ca3535b5729573a4367e76641adc9d312 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5660,6 +5660,9 @@ static int update_registry(char *name, struct sockaddr_in *sin, int callno, char
        /* Setup the expiry */
        if (p->expire > -1)
                ast_sched_del(sched, p->expire);
+       /* treat an unspecified refresh interval as the minimum */
+       if (!refresh)
+               refresh = min_reg_expire;
        if (refresh > max_reg_expire) {
                ast_log(LOG_NOTICE, "Restricting registration for peer '%s' to %d seconds (requested %d)\n",
                        p->name, max_reg_expire, refresh);