[asterisk-commits] jdixon: branch jdixon/chan_usbradio-1.4 r140665 - /team/jdixon/chan_usbradio-...

[SVN commits to the Asterisk project]

Author: jdixon
Date: Tue Sep  2 16:19:12 2008
New Revision: 140665

URL: http://svn.digium.com/view/asterisk?view=rev&rev=140665
Log:
New and improved stuff for irlp/echolink

Modified:
    team/jdixon/chan_usbradio-1.4/apps/app_rpt.c

Modified: team/jdixon/chan_usbradio-1.4/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/apps/app_rpt.c?view=diff&rev=140665&r1=140664&r2=140665
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_rpt.c Tue Sep  2 16:19:12 2008
@@ -22,7 +22,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.137 9/2/08 
+ *  version 0.138 9/2/08 
  * 
  * \author Jim Dixon, WB6NIL <jim at lambdatel.com>
  *
@@ -253,6 +253,7 @@
 #define	DEFAULT_CIV_ADDR 0x58
 
 #define	MAXCONNECTTIME 5000
+#define	MAXCONNECTTIME_IRLP 25000
 
 #define MAXNODESTR 300
 
@@ -5873,9 +5874,10 @@
 		if(l->chan->cid.cid_num)
 			ast_free(l->chan->cid.cid_num);
 		l->chan->cid.cid_num = ast_strdup(myrpt->name);
-		ast_call(l->chan,tele,(node[0] == '4') ? 25000 : 2000);
-	}
-	else {
+		ast_call(l->chan,tele,2000);
+	}
+	else
+	{
 		if(debug > 3) 
 			ast_log(LOG_NOTICE, "Unable to place call to %s/%s on %s\n",
 		deststr,tele,l->chan->name);
@@ -7153,7 +7155,7 @@
 		{
 			if (mylink->lastrx && 
 			    ((strncmp(mylink->chan->name,"echolink",8)) ||
-				strncmp(mylink->chan->name,"echolink",8)))
+				strncmp(mylink->chan->name,"irlp",4)))
 			{
 				mylink->lastrealrx = 0;
 				rpt_mutex_unlock(&myrpt->lock);
@@ -11875,7 +11877,7 @@
 		l = myrpt->links.next;
 		while(l != &myrpt->links)
 		{
-			int myrx;
+			int myrx,mymaxct;
 
 			if (l->voxtotimer) l->voxtotimer -= elap;
 			if (l->voxtotimer < 0) l->voxtotimer = 0;
@@ -11990,8 +11992,11 @@
 				continue;
 			}
 			l->elaptime += elap;
+			mymaxct = MAXCONNECTTIME;
+			if (l->chan && (!strncasecmp(l->chan->name,"irlp",4)))
+				mymaxct = MAXCONNECTTIME_IRLP;
 			/* if connection has taken too long */
-			if ((l->elaptime > MAXCONNECTTIME) && 
+			if ((l->elaptime > mymaxct) && 
 			   ((!l->chan) || (l->chan->_state != AST_STATE_UP)))
 			{
 				l->elaptime = 0;