automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11306 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d6ed5633aed6c76c003d07c324df9d16533c8962..9960b7174cbe858e461914b8bd1c4749af79b880 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1707,7 +1707,10 @@ static struct sip_peer *realtime_peer(const char *peername, struct sockaddr_in *
                var = ast_load_realtime("sippeers", "name", peername, NULL);
        else if (sin) { /* Then check on IP address */
                ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr);
-               var = ast_load_realtime("sippeers", "ipaddr", iabuf, NULL);
+               var = ast_load_realtime("sippeers", "host", iabuf, NULL);       /* First check for fixed IP hosts */
+               if (!var)
+                       var = ast_load_realtime("sippeers", "ipaddr", iabuf, NULL);     /* Then check for registred hosts */
+       
        } else
                return NULL;
 

diff --git a/cli.c b/cli.c
index 4a0f95e540724b9e596082c5d0bb4b10e9527262..e2a646d5b64e1acb00b9451db020f7707d8fd79f 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -1363,7 +1363,10 @@ int ast_cli_command(int fd, char *s)
                        if (e) {
                                switch(e->handler(fd, x, argv)) {
                                case RESULT_SHOWUSAGE:
-                                       ast_cli(fd, "%s", e->usage);
+                                       if (e->usage)
+                                               ast_cli(fd, "%s", e->usage);
+                                       else
+                                               ast_cli(fd, "%s", "Invalid usage, but no usage information available.\n");
                                        break;
                                }
                        } else