[asterisk-commits] moy: branch moy/dahdi-tap-trunk r220628 - /team/moy/dahdi-tap-trunk/channels/

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sat Sep 26 21:26:07 CDT 2009


Author: moy
Date: Sat Sep 26 21:26:03 2009
New Revision: 220628

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=220628
Log:
remove warning from configuration when specifying anything else than next or prev for tappingpeerpos

Modified:
    team/moy/dahdi-tap-trunk/channels/chan_dahdi.c

Modified: team/moy/dahdi-tap-trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/moy/dahdi-tap-trunk/channels/chan_dahdi.c?view=diff&rev=220628&r1=220627&r2=220628
==============================================================================
--- team/moy/dahdi-tap-trunk/channels/chan_dahdi.c (original)
+++ team/moy/dahdi-tap-trunk/channels/chan_dahdi.c Sat Sep 26 21:26:03 2009
@@ -11138,6 +11138,9 @@
 								pris[span].pri.tappingpeer = &pris[span-1].pri;
 								pris[span-1].pri.tappingpeer = &pris[span].pri;
 							}
+						} else {
+							pris[span].pri.tappingpeerpos = TAP_PEER_NONE;
+							pris[span].pri.tappingpeer = NULL;
 						}
 #ifdef HAVE_PRI_SERVICE_MESSAGES
 						pris[span].pri.enable_service_message_support = conf->pri.pri.enable_service_message_support;
@@ -16020,13 +16023,10 @@
 			} else if (!strcasecmp(v->name, "tappingpeerpos")) {
 				if (!strcasecmp(v->value, "prev")) {
 					confp->pri.pri.tappingpeerpos = TAP_PEER_PREV;
-				} else if (!strcasecmp(v->value, "next")) {
+				} else if (ast_true(v->value) || !strcasecmp(v->value, "next")) {
 					confp->pri.pri.tappingpeerpos = TAP_PEER_NEXT;
 				} else {
 					confp->pri.pri.tappingpeerpos = TAP_PEER_NONE;
-					ast_log(LOG_ERROR, "'%s' is not a valid tappingpeerpos value at line %d. "
-							"(tappingpeerpos must be either 'prev' or 'next')\n",
-							v->value, v->lineno);
 				}
 #endif /* HAVE_PRI */
 #ifdef HAVE_SS7




More information about the asterisk-commits mailing list