[asterisk-commits] mattf: branch mattf/asterisk-ss7 r43274 - in /team/mattf/asterisk-ss7: ./ app...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Sep 19 09:30:28 MST 2006 

Author: mattf
Date: Tue Sep 19 11:30:27 2006
New Revision: 43274

URL: http://svn.digium.com/view/asterisk?rev=43274&view=rev
Log:
Merged revisions 43256-43259,43263-43264,43271-43273 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r43256 | kpfleming | 2006-09-19 09:04:15 -0500 (Tue, 19 Sep 2006) | 2 lines

restore ability for Makefiles to use 'generic' platform names when needed

........
r43257 | qwell | 2006-09-19 09:16:12 -0500 (Tue, 19 Sep 2006) | 2 lines

be a little more consistent with our variable usage

........
r43258 | qwell | 2006-09-19 09:19:54 -0500 (Tue, 19 Sep 2006) | 2 lines

Add a few more 'generic' platforms

........
r43259 | qwell | 2006-09-19 09:24:14 -0500 (Tue, 19 Sep 2006) | 2 lines

Let's order these better..

........
r43263 | file | 2006-09-19 10:23:39 -0500 (Tue, 19 Sep 2006) | 2 lines

Improve output of sip show peers (issue #6624 reported by mavetju with minor code changes by myself)

........
r43264 | file | 2006-09-19 10:36:25 -0500 (Tue, 19 Sep 2006) | 2 lines

Warning be gone!

........
r43271 | mogorman | 2006-09-19 11:23:03 -0500 (Tue, 19 Sep 2006) | 1 line

blocking version 43269 from being pushed into trunk
........
r43272 | mogorman | 2006-09-19 11:23:45 -0500 (Tue, 19 Sep 2006) | 3 lines

similar patch for verbose vs debug with minor changes
bug 2617

........
r43273 | mattf | 2006-09-19 11:25:21 -0500 (Tue, 19 Sep 2006) | 2 lines

Let's try this out.  Seems silly, but we'll try it anyways

........

Modified:
    team/mattf/asterisk-ss7/   (props changed)
    team/mattf/asterisk-ss7/apps/app_dial.c
    team/mattf/asterisk-ss7/apps/app_macro.c
    team/mattf/asterisk-ss7/apps/app_queue.c
    team/mattf/asterisk-ss7/channels/chan_sip.c
    team/mattf/asterisk-ss7/codecs/gsm/Makefile
    team/mattf/asterisk-ss7/configure
    team/mattf/asterisk-ss7/configure.ac
    team/mattf/asterisk-ss7/main/asterisk.c
    team/mattf/asterisk-ss7/main/config.c
    team/mattf/asterisk-ss7/main/frame.c
    team/mattf/asterisk-ss7/main/pbx.c
    team/mattf/asterisk-ss7/makeopts.in
    team/mattf/asterisk-ss7/pbx/pbx_gtkconsole.c
    team/mattf/asterisk-ss7/utils/Makefile

Propchange: team/mattf/asterisk-ss7/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/mattf/asterisk-ss7/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/mattf/asterisk-ss7/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 19 11:30:27 2006
@@ -1,1 +1,1 @@
-/trunk:1-43251
+/trunk:1-43273

Modified: team/mattf/asterisk-ss7/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_dial.c?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_dial.c (original)
+++ team/mattf/asterisk-ss7/apps/app_dial.c Tue Sep 19 11:30:27 2006
@@ -1182,7 +1182,7 @@
 			/* Again, keep going even if there's an error */
 			if (option_debug)
 				ast_log(LOG_DEBUG, "ast call on peer returned %d\n", res);
-			else if (option_verbose > 2)
+			if (option_verbose > 2)
 				ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", numsubst);
 			ast_hangup(tmp->chan);
 			tmp->chan = NULL;

Modified: team/mattf/asterisk-ss7/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_macro.c?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_macro.c (original)
+++ team/mattf/asterisk-ss7/apps/app_macro.c Tue Sep 19 11:30:27 2006
@@ -238,14 +238,14 @@
 			case AST_PBX_KEEPALIVE:
 				if (option_debug)
 					ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited KEEPALIVE in macro %s on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
-				else if (option_verbose > 1)
+				if (option_verbose > 1)
 					ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited KEEPALIVE in macro '%s' on '%s'\n", chan->context, chan->exten, chan->priority, macro, chan->name);
 				goto out;
 				break;
 			default:
 				if (option_debug)
 					ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
-				else if (option_verbose > 1)
+				if (option_verbose > 1)
 					ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s' in macro '%s'\n", chan->context, chan->exten, chan->priority, chan->name, macro);
 				dead = 1;
 				goto out;

Modified: team/mattf/asterisk-ss7/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/apps/app_queue.c?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/apps/app_queue.c (original)
+++ team/mattf/asterisk-ss7/apps/app_queue.c Tue Sep 19 11:30:27 2006
@@ -1636,7 +1636,7 @@
 		/* Again, keep going even if there's an error */
 		if (option_debug)
 			ast_log(LOG_DEBUG, "ast call on peer returned %d\n", res);
-		else if (option_verbose > 2)
+		if (option_verbose > 2)
 			ast_verbose(VERBOSE_PREFIX_3 "Couldn't call %s\n", tmp->interface);
 		do_hang(tmp);
 		(*busies)++;

Modified: team/mattf/asterisk-ss7/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/channels/chan_sip.c?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/channels/chan_sip.c (original)
+++ team/mattf/asterisk-ss7/channels/chan_sip.c Tue Sep 19 11:30:27 2006
@@ -7918,7 +7918,7 @@
 	}
 	transmit_state_notify(p, state, 1);
 
-	if (option_debug > 1)
+	if (option_verbose > 1)
 		ast_verbose(VERBOSE_PREFIX_1 "Extension Changed %s new state %s for Notify User %s\n", exten, ast_extension_state2str(state), p->username);
 	return 0;
 }
@@ -9121,7 +9121,8 @@
 }
 
 /*! \brief  Report Peer status in character string
- * 	\return 1 if peer is online, -1 if unmonitored */
+ *  \return 0 if peer is unreachable, 1 if peer is online, -1 if unmonitored
+ */
 static int peer_status(struct sip_peer *peer, char *status, int statuslen)
 {
 	int res = 0;
@@ -9239,8 +9240,10 @@
 
 	char name[256];
 	int total_peers = 0;
-	int peers_online = 0;
-	int peers_offline = 0;
+	int peers_mon_online = 0;
+	int peers_mon_offline = 0;
+	int peers_unmon_offline = 0;
+	int peers_unmon_online = 0;
 	char *id;
 	char idtext[256] = "";
 	int realtimepeers;
@@ -9267,9 +9270,8 @@
 		return RESULT_SHOWUSAGE;
 	}
 
-	if (!s) { /* Normal list */
+	if (!s) /* Normal list */
 		ast_cli(fd, FORMAT2, "Name/username", "Host", "Dyn", "Nat", "ACL", "Port", "Status", (realtimepeers ? "Realtime" : ""));
-	} 
 	
 	ASTOBJ_CONTAINER_TRAVERSE(&peerl, 1, do {
 		char status[20] = "";
@@ -9287,23 +9289,19 @@
 			snprintf(name, sizeof(name), "%s/%s", iterator->name, iterator->username);
 		else
 			ast_copy_string(name, iterator->name, sizeof(name));
-
+		
 		pstatus = peer_status(iterator, status, sizeof(status));
-		if (pstatus) 	
-			peers_online++;
-		else	{
-			if (pstatus == 0)
-				peers_offline++;
-			else {	/* Unmonitored */
-				/* Checking if port is 0 */
-				if ( ntohs(iterator->addr.sin_port) == 0 ) {
-					peers_offline++;
-				} else {
-					peers_online++;
-				}
-			}
-		}			
-		
+		if (pstatus == 1)
+			peers_mon_online++;
+		else if (pstatus == 0)
+			peers_mon_offline++;
+		else {
+			if (iterator->addr.sin_port == 0)
+				peers_unmon_offline++;
+			else
+				peers_unmon_online++;
+		}
+
 		snprintf(srch, sizeof(srch), FORMAT, name,
 			iterator->addr.sin_addr.s_addr ? ast_inet_ntoa(iterator->addr.sin_addr) : "(Unspecified)",
 			ast_test_flag(&iterator->flags[1], SIP_PAGE2_DYNAMIC) ? " D " : "   ", 	/* Dynamic or not? */
@@ -9352,10 +9350,10 @@
 
 		total_peers++;
 	} while(0) );
-
-	if (!s) {
-		ast_cli(fd,"%d sip peers [%d online , %d offline]\n",total_peers,peers_online,peers_offline);
-	}
+	
+	if (!s)
+		ast_cli(fd, "%d sip peers [Monitored: %d online, %d offline Unmonitored: %d online, %d offline]\n",
+		        total_peers, peers_mon_online, peers_mon_offline, peers_unmon_online, peers_unmon_offline);
 
 	if (havepattern)
 		regfree(&regexbuf);

Modified: team/mattf/asterisk-ss7/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/codecs/gsm/Makefile?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/codecs/gsm/Makefile (original)
+++ team/mattf/asterisk-ss7/codecs/gsm/Makefile Tue Sep 19 11:30:27 2006
@@ -50,7 +50,7 @@
 #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
 #So we go lowest common available by gcc and go a step down, still a step up from
 #the default as we now have a better instruction set to work with. - Belgarath
-ifeq (${PROC},ultrasparc)
+ifeq ($(PROC),ultrasparc)
 OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 
 endif
 
@@ -208,9 +208,9 @@
 # add k6-specific code only if not on a non-k6 hardware or proc.
 # XXX Keep a space after each findstring argument
 # XXX should merge with GSM_OBJECTS
-ifeq (${OSARCH},Linux)
+ifeq ($(OSARCH),linux-gnu)
 ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-ifeq (,$(findstring ${PROC} , arm ia64 s390 bfin ))
+ifeq (,$(findstring $(PROC) , arm ia64 s390 bfin ))
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif
 endif
@@ -260,9 +260,9 @@
 		$(SRC)/short_term.o	\
 		$(SRC)/table.o
 
-ifeq (${OSARCH},Linux)
+ifeq ($(OSARCH),linux-gnu)
 ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
-ifeq (,$(findstring ${PROC} , arm ia64 bfin ))
+ifeq (,$(findstring $(PROC) , arm ia64 bfin ))
 GSM_OBJECTS+= $(SRC)/k6opt.o
 endif
 endif

Modified: team/mattf/asterisk-ss7/configure
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/configure?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/configure (original)
+++ team/mattf/asterisk-ss7/configure Tue Sep 19 11:30:27 2006
@@ -1,5 +1,9 @@
 #! /bin/sh
+<<<<<<< .working
 # From configure.ac Revision: 43233 .
+=======
+# From configure.ac Revision: 43259 .
+>>>>>>> .merge-right.r43273
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.60a.
 #
@@ -655,6 +659,7 @@
 HOST_CPU
 HOST_VENDOR
 HOST_OS
+OSARCH
 UNAME
 PBX_OSREV
 CC
@@ -2050,6 +2055,26 @@
 
 
 
+case "${host_os}" in
+     freebsd*)
+     OSARCH=FreeBSD
+     ;;
+     netbsd*)
+     OSARCH=NetBSD
+     ;;
+     openbsd*)
+     OSARCH=OpenBSD
+     ;;
+     solaris*)
+     OSARCH=SunOS
+     ;;
+     *)
+     OSARCH=${HOST_OS}
+     ;;
+esac
+
+
+
 #  check for uname
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}uname", so it can be a program name with args.
@@ -30847,6 +30872,7 @@
 HOST_CPU!$HOST_CPU$ac_delim
 HOST_VENDOR!$HOST_VENDOR$ac_delim
 HOST_OS!$HOST_OS$ac_delim
+OSARCH!$OSARCH$ac_delim
 UNAME!$UNAME$ac_delim
 PBX_OSREV!$PBX_OSREV$ac_delim
 CC!$CC$ac_delim
@@ -30890,7 +30916,6 @@
 PBX_GNUTLS!$PBX_GNUTLS$ac_delim
 GSM_LIB!$GSM_LIB$ac_delim
 GSM_INCLUDE!$GSM_INCLUDE$ac_delim
-PBX_GSM!$PBX_GSM$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -30932,6 +30957,7 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+PBX_GSM!$PBX_GSM$ac_delim
 IKSEMEL_LIB!$IKSEMEL_LIB$ac_delim
 IKSEMEL_INCLUDE!$IKSEMEL_INCLUDE$ac_delim
 PBX_IKSEMEL!$PBX_IKSEMEL$ac_delim
@@ -31029,6 +31055,11 @@
 ZAPTEL_INCLUDE!$ZAPTEL_INCLUDE$ac_delim
 PBX_ZAPTEL!$PBX_ZAPTEL$ac_delim
 ALLOCA!$ALLOCA$ac_delim
+<<<<<<< .working
+=======
+EGREP!$EGREP$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+>>>>>>> .merge-right.r43273
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -31070,9 +31101,13 @@
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+<<<<<<< .working
 EGREP!$EGREP$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 POW_LIB!$POW_LIB$ac_delim
+=======
+POW_LIB!$POW_LIB$ac_delim
+>>>>>>> .merge-right.r43273
 GC_CFLAGS!$GC_CFLAGS$ac_delim
 GC_LDFLAGS!$GC_LDFLAGS$ac_delim
 GSM_INTERNAL!$GSM_INTERNAL$ac_delim
@@ -31095,7 +31130,11 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
+<<<<<<< .working
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+=======
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
+>>>>>>> .merge-right.r43273
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

Modified: team/mattf/asterisk-ss7/configure.ac
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/configure.ac?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/configure.ac (original)
+++ team/mattf/asterisk-ss7/configure.ac Tue Sep 19 11:30:27 2006
@@ -59,6 +59,26 @@
 AC_SUBST(HOST_CPU)
 AC_SUBST(HOST_VENDOR)
 AC_SUBST(HOST_OS)
+
+case "${host_os}" in
+     freebsd*)
+     OSARCH=FreeBSD
+     ;;
+     netbsd*)
+     OSARCH=NetBSD
+     ;;
+     openbsd*)
+     OSARCH=OpenBSD
+     ;;
+     solaris*)
+     OSARCH=SunOS
+     ;;
+     *)
+     OSARCH=${HOST_OS}
+     ;;
+esac
+
+AC_SUBST(OSARCH)
 
 #  check for uname
 AC_PATH_TOOL([UNAME], [uname], No)

Modified: team/mattf/asterisk-ss7/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/main/asterisk.c?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/main/asterisk.c (original)
+++ team/mattf/asterisk-ss7/main/asterisk.c Tue Sep 19 11:30:27 2006
@@ -1185,7 +1185,7 @@
 	/* Called on exit */
 	if (option_verbose && ast_opt_console)
 		ast_verbose("Asterisk %s ending (%d).\n", ast_active_channels() ? "uncleanly" : "cleanly", num);
-	else if (option_debug)
+	if (option_debug)
 		ast_log(LOG_DEBUG, "Asterisk ending (%d).\n", num);
 	manager_event(EVENT_FLAG_SYSTEM, "Shutdown", "Shutdown: %s\r\nRestart: %s\r\n", ast_active_channels() ? "Uncleanly" : "Cleanly", restart ? "True" : "False");
 	if (ast_socket > -1) {

Modified: team/mattf/asterisk-ss7/main/config.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/main/config.c?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/main/config.c (original)
+++ team/mattf/asterisk-ss7/main/config.c Tue Sep 19 11:30:27 2006
@@ -717,21 +717,21 @@
 			ast_log(LOG_WARNING, "'%s' is not a regular file, ignoring\n", fn);
 			continue;
 		}
-		if ((option_verbose > 1) && !option_debug) {
+		if (option_verbose > 1) {
 			ast_verbose(VERBOSE_PREFIX_2 "Parsing '%s': ", fn);
 			fflush(stdout);
 		}
 		if (!(f = fopen(fn, "r"))) {
 			if (option_debug)
 				ast_log(LOG_DEBUG, "No file to parse: %s\n", fn);
-			else if (option_verbose > 1)
+			if (option_verbose > 1)
 				ast_verbose( "Not found (%s)\n", strerror(errno));
 			continue;
 		}
 		count++;
 		if (option_debug)
 			ast_log(LOG_DEBUG, "Parsing %s\n", fn);
-		else if (option_verbose > 1)
+		if (option_verbose > 1)
 			ast_verbose("Found\n");
 		while(!feof(f)) {
 			lineno++;
@@ -835,7 +835,7 @@
 #else
 	if ((f = fopen(fn, "w"))) {
 #endif	    
-		if ((option_verbose > 1) && !option_debug)
+		if (option_verbose > 1)
 			ast_verbose(  VERBOSE_PREFIX_2 "Saving '%s': ", fn);
 		fprintf(f, ";!\n");
 		fprintf(f, ";! Automatically generated configuration file\n");
@@ -872,7 +872,7 @@
 	} else {
 		if (option_debug)
 			printf("Unable to open for writing: %s\n", fn);
-		else if (option_verbose > 1)
+		if (option_verbose > 1)
 			printf( "Unable to write (%s)", strerror(errno));
 		return -1;
 	}

Modified: team/mattf/asterisk-ss7/main/frame.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/main/frame.c?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/main/frame.c (original)
+++ team/mattf/asterisk-ss7/main/frame.c Tue Sep 19 11:30:27 2006
@@ -1251,24 +1251,19 @@
 
 void ast_parse_allow_disallow(struct ast_codec_pref *pref, int *mask, const char *list, int allowing) 
 {
-	char *parse;
-	char *this;
-	int format;
-	char *psize;
-	int framems;
+	char *parse = NULL, *this = NULL, *psize = NULL;
+	int format = 0, framems = 0;
 
 	parse = ast_strdupa(list);
 	while ((this = strsep(&parse, ","))) {
 		framems = 0;
 		if ((psize = strrchr(this, ':'))) {
-			*psize = '\0';
-			psize++;
+			*psize++ = '\0';
 			if (option_debug)
 				ast_log(LOG_DEBUG,"Packetization for codec: %s is %s\n", this, psize);
-			framems = strtol(psize,NULL,10);
-			if (framems == LONG_MIN || framems == LONG_MAX) {
+			framems = atoi(psize);
+			if (framems < 0)
 				framems = 0;
-			}
 		}
 		if (!(format = ast_getformatbyname(this))) {
 			ast_log(LOG_WARNING, "Cannot %s unknown format '%s'\n", allowing ? "allow" : "disallow", this);

Modified: team/mattf/asterisk-ss7/main/pbx.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/main/pbx.c?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/main/pbx.c (original)
+++ team/mattf/asterisk-ss7/main/pbx.c Tue Sep 19 11:30:27 2006
@@ -2354,14 +2354,14 @@
 				if (res == AST_PBX_KEEPALIVE) {
 					if (option_debug)
 						ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited KEEPALIVE on '%s'\n", c->context, c->exten, c->priority, c->name);
-					else if (option_verbose > 1)
+					if (option_verbose > 1)
 						ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited KEEPALIVE on '%s'\n", c->context, c->exten, c->priority, c->name);
 					error = 1;
 					break;
 				}
 				if (option_debug)
 					ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name);
-				else if (option_verbose > 1)
+				if (option_verbose > 1)
 					ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name);
 				if (c->_softhangup == AST_SOFTHANGUP_ASYNCGOTO) {
 					c->_softhangup =0;
@@ -2481,7 +2481,7 @@
 				/* Something bad happened, or a hangup has been requested. */
 				if (option_debug)
 					ast_log(LOG_DEBUG, "Spawn extension (%s,%s,%d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name);
-				else if (option_verbose > 1)
+				if (option_verbose > 1)
 					ast_verbose( VERBOSE_PREFIX_2 "Spawn extension (%s, %s, %d) exited non-zero on '%s'\n", c->context, c->exten, c->priority, c->name);
 				break;
 			}
@@ -3822,7 +3822,7 @@
 		*local_contexts = tmp;
 		if (option_debug)
 			ast_log(LOG_DEBUG, "Registered context '%s'\n", tmp->name);
-		else if (option_verbose > 2)
+		if (option_verbose > 2)
 			ast_verbose( VERBOSE_PREFIX_3 "Registered extension context '%s'\n", tmp->name);
 	}
 
@@ -4796,7 +4796,8 @@
 			ast_log(LOG_DEBUG, "Added extension '%s' priority %d to %s\n",
 				tmp->exten, tmp->priority, con->name);
 		}
-	} else if (option_verbose > 2) {
+	}
+	if (option_verbose > 2) {
 		if (tmp->matchcid) {
 			ast_verbose( VERBOSE_PREFIX_3 "Added extension '%s' priority %d (CID match '%s')to %s\n",
 				tmp->exten, tmp->priority, tmp->cidmatch, con->name);

Modified: team/mattf/asterisk-ss7/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/makeopts.in?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/makeopts.in (original)
+++ team/mattf/asterisk-ss7/makeopts.in Tue Sep 19 11:30:27 2006
@@ -30,7 +30,7 @@
 HOST_OS=@HOST_OS@
 
 PROC=@HOST_CPU@
-OSARCH=@HOST_OS@
+OSARCH=@OSARCH@
 OSREV=@PBX_OSREV@
 
 GC_CFLAGS=@GC_CFLAGS@

Modified: team/mattf/asterisk-ss7/pbx/pbx_gtkconsole.c
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/pbx/pbx_gtkconsole.c?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/pbx/pbx_gtkconsole.c (original)
+++ team/mattf/asterisk-ss7/pbx/pbx_gtkconsole.c Tue Sep 19 11:30:27 2006
@@ -495,7 +495,7 @@
 	} else {
 		if (option_debug)
 			ast_log(LOG_DEBUG, "Unable to start GTK console monitor -- ignoring\n");
-		else if (option_verbose > 1)
+		if (option_verbose > 1)
 			ast_verbose( VERBOSE_PREFIX_2 "GTK is not available -- skipping monitor\n");
 	}
 	return 0;

Modified: team/mattf/asterisk-ss7/utils/Makefile
URL: http://svn.digium.com/view/asterisk/team/mattf/asterisk-ss7/utils/Makefile?rev=43274&r1=43273&r2=43274&view=diff
==============================================================================
--- team/mattf/asterisk-ss7/utils/Makefile (original)
+++ team/mattf/asterisk-ss7/utils/Makefile Tue Sep 19 11:30:27 2006
@@ -15,7 +15,7 @@
 
 UTILS:=astman smsq stereorize streamplayer aelparse muted
 
-ifeq (${OSARCH},SunOS)
+ifeq ($(OSARCH),SunOS)
   LIBS+=-lsocket -lnsl
   UTILS:=$(filter-out muted,$(UTILS))
 endif

More information about the asterisk-commits mailing list