automerge commit

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

channels/chan_sip.c

@@ -1720,7 +1720,7 @@ static void update_peer(struct sip_peer *p, int expiry)
 static struct sip_peer *realtime_peer(const char *peername, struct sockaddr_in *sin)
 {
 	struct sip_peer *peer=NULL;
-	struct ast_variable *var;
+	struct ast_variable *var = NULL;
 	struct ast_variable *tmp;
 	char *newpeername = (char *) peername;
 	char iabuf[80];
@@ -1728,7 +1728,7 @@ static struct sip_peer *realtime_peer(const char *peername, struct sockaddr_in *
 	/* First check on peer name */
 	if (newpeername) {
 		var = ast_load_realtime("sippeers", "name", newpeername, "host", "dynamic", NULL);
-		if (!var && sin) {
+		if (!var && sin)
 			var = ast_load_realtime("sippeers", "name", newpeername, "host", ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr), NULL);
 		if (!var) {
 			var = ast_load_realtime("sippeers", "name", newpeername, NULL);
@@ -1754,14 +1754,13 @@ static struct sip_peer *realtime_peer(const char *peername, struct sockaddr_in *
 			}
 		}
 	}
-	} else if (sin) {	/* Then check on IP address */
+
+	if (!var && sin) {	/* Then check on IP address */
 		ast_inet_ntoa(iabuf, sizeof(iabuf), sin->sin_addr);
 		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;
 
 	if (!var)
 		return NULL;