chan_iax2 shouldn't use IAX/Registry on temponly peers (bug #2610)

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/v1-0@3956 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index a9beeebc7f306639b202d3201abbf5e2e42c1658..46e015fe658b4ca2083ea85c33ba5ef6828626b6 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -4342,7 +4342,8 @@ static int expire_registry(void *data)
        p->expire = -1;
        /* Reset expirey value */
        p->expirey = expirey;
-       ast_db_del("IAX/Registry", p->name);
+       if (p->temponly !=1)
+               ast_db_del("IAX/Registry", p->name);
        register_peer_exten(p, 0);
        if (iax2_regfunk)
                iax2_regfunk(p->name, 0);
@@ -4358,7 +4359,7 @@ static void reg_source_db(struct iax2_peer *p)
        struct in_addr in;
        char iabuf[INET_ADDRSTRLEN];
        char *c, *d;
-       if (!ast_db_get("IAX/Registry", p->name, data, sizeof(data))) {
+       if ((p->temponly != 1) && (!ast_db_get("IAX/Registry", p->name, data, sizeof(data)))) {
                c = strchr(data, ':');
                if (c) {
                        *c = '\0';
@@ -4418,7 +4419,7 @@ static int update_registry(char *name, struct sockaddr_in *sin, int callno, char
                        if (iax2_regfunk)
                                iax2_regfunk(p->name, 1);
                        snprintf(data, sizeof(data), "%s:%d:%d", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr), ntohs(sin->sin_port), p->expirey);
-                       if (sin->sin_addr.s_addr) {
+                       if ((p->temponly != 1) && (sin->sin_addr.s_addr)) {
                                ast_db_put("IAX/Registry", p->name, data);
                                if  (option_verbose > 2)
                                ast_verbose(VERBOSE_PREFIX_3 "Registered '%s' (%s) at %s:%d\n", p->name,