Use iax/iax2 regfunk names

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

diff --git a/channels/chan_iax.c b/channels/chan_iax.c
index fe580353de4759d79bb6eef78882a1d1ad0ccf7b..69ad1822eb623382340adcb3bd8e6812a6a3d7e6 100755 (executable)
--- a/channels/chan_iax.c
+++ b/channels/chan_iax.c
@@ -3207,8 +3207,8 @@ static int expire_registry(void *data)
        p->expire = -1;
        /* Reset expirey value */
        p->expirey = expirey;
-       if (regfunk)
-               regfunk(p->name, 0);
+       if (iax_regfunk)
+               iax_regfunk(p->name, 0);
        return 0;
 }
 
@@ -3224,8 +3224,8 @@ static int update_registry(char *name, struct sockaddr_in *sin, int callno)
        for (p = peerl.peers;p;p = p->next) {
                if (!strcasecmp(name, p->name)) {
                        if (memcmp(&p->addr, sin, sizeof(p->addr))) {
-                               if (regfunk)
-                                       regfunk(p->name, 1);
+                               if (iax_regfunk)
+                                       iax_regfunk(p->name, 1);
                                if  (option_verbose > 2)
                                ast_verbose(VERBOSE_PREFIX_3 "Registered '%s' (%s) at %s:%d\n", p->name, 
                                        iaxs[callno]->state & IAX_STATE_AUTHENTICATED ? "AUTHENTICATED" : "UNAUTHENTICATED", inet_ntoa(sin->sin_addr), htons(sin->sin_port));

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 2446c9ab66eb6bd11b7d64c6cdef5d76c712a561..259d2a8019cb44801fb6402fe4a60bff1b84af9f 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3168,8 +3168,8 @@ static int expire_registry(void *data)
        p->expire = -1;
        /* Reset expirey value */
        p->expirey = expirey;
-       if (regfunk)
-               regfunk(p->name, 0);
+       if (iax2_regfunk)
+               iax2_regfunk(p->name, 0);
        return 0;
 }
 
@@ -3187,8 +3187,8 @@ static int update_registry(char *name, struct sockaddr_in *sin, int callno)
        for (p = peerl.peers;p;p = p->next) {
                if (!strcasecmp(name, p->name)) {
                        if (inaddrcmp(&p->addr, sin)) {
-                               if (regfunk)
-                                       regfunk(p->name, 1);
+                               if (iax2_regfunk)
+                                       iax2_regfunk(p->name, 1);
                                if  (option_verbose > 2)
                                ast_verbose(VERBOSE_PREFIX_3 "Registered '%s' (%s) at %s:%d\n", p->name, 
                                        iaxs[callno]->state & IAX_STATE_AUTHENTICATED ? "AUTHENTICATED" : "UNAUTHENTICATED", inet_ntoa(sin->sin_addr), htons(sin->sin_port));