[asterisk-commits] branch oej/metermaids r11308 - in /team/oej/metermaids: ./ channels/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Feb 27 10:38:39 2006
New Revision: 11308

URL: http://svn.digium.com/view/asterisk?rev=11308&view=rev
Log:
Update to trunk. automerge failed on cli.c

Modified:
    team/oej/metermaids/   (props changed)
    team/oej/metermaids/channels/chan_sip.c
    team/oej/metermaids/cli.c

Propchange: team/oej/metermaids/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 27 10:38:39 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-11263
+/branches/1.2:1-7496,7498-11307

Modified: team/oej/metermaids/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/channels/chan_sip.c?rev=11308&r1=11307&r2=11308&view=diff
==============================================================================
--- team/oej/metermaids/channels/chan_sip.c (original)
+++ team/oej/metermaids/channels/chan_sip.c Mon Feb 27 10:38:39 2006
@@ -1681,7 +1681,10 @@
 		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;
 

Modified: team/oej/metermaids/cli.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/cli.c?rev=11308&r1=11307&r2=11308&view=diff
==============================================================================
--- team/oej/metermaids/cli.c (original)
+++ team/oej/metermaids/cli.c Mon Feb 27 10:38:39 2006
@@ -1452,6 +1452,22 @@
 			ast_mutex_lock(&clilock);
 			e->inuse--;
 			ast_mutex_unlock(&clilock);
+			if (e) {
+				switch(e->handler(fd, x, argv)) {
+				case RESULT_SHOWUSAGE:
+					if (e->usage)
+						ast_cli(fd, "%s", e->usage);
+					else
+						ast_cli(fd, "%s", "Invalid usage, but no usage information available.\n");
+					break;
+				}
+			} else 
+				ast_cli(fd, "No such command '%s' (type 'help' for help)\n", find_best(argv));
+			if (e) {
+				ast_mutex_lock(&clilock);
+				e->inuse--;
+				ast_mutex_unlock(&clilock);
+			}
 		}
 	}
 	free(dup);