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

[SVN commits to the Asterisk project]

Author: jdixon
Date: Mon Oct  6 16:11:02 2008
New Revision: 146803

URL: http://svn.digium.com/view/asterisk?view=rev&rev=146803
Log:
Band-aided IAX2 lockup problem

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=146803&r1=146802&r2=146803
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_rpt.c Mon Oct  6 16:11:02 2008
@@ -22,7 +22,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.151 9/28/08 
+ *  version 0.152 10/6/08 
  * 
  * \author Jim Dixon, WB6NIL <jim at lambdatel.com>
  *
@@ -382,7 +382,7 @@
 /*! Stop the tones from playing */
 void ast_playtones_stop(struct ast_channel *chan);
 
-static  char *tdesc = "Radio Repeater / Remote Base  version 0.151  9/28/2008";
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.151  10/6/2008";
 
 static char *app = "Rpt";
 
@@ -5779,7 +5779,6 @@
 static void send_newkey(struct ast_channel *chan)
 {
 
-	/* ast_safe_sleep(chan,10); */
 	ast_sendtext(chan,newkeystr);
 	return;
 }
@@ -6026,7 +6025,6 @@
 		ast_free(l);
 		return -1;
 	}
-	usleep(5000);
 	rpt_mutex_lock(&myrpt->lock);
 	l->reconnects = reconnects;
 	/* insert at end of queue */
@@ -6037,7 +6035,6 @@
 	insque((struct qelem *)l,(struct qelem *)myrpt->links.next);
 	__kickshort(myrpt);
 	rpt_mutex_unlock(&myrpt->lock);
-	if (!l->phonemode) send_newkey(l->chan);
 	return 0;
 }
 
@@ -10797,13 +10794,11 @@
 				deststr,tele);
 		return -1;
 	}
-	usleep(5000);
 	rpt_mutex_lock(&myrpt->lock);
 	/* put back in queue */
 	insque((struct qelem *)l,(struct qelem *)myrpt->links.next);
 	rpt_mutex_unlock(&myrpt->lock);
 	ast_log(LOG_WARNING,"Reconnect Attempt to %s in process\n",l->name);
-	if (!l->phonemode) send_newkey(l->chan);
 	return 0;
 }
 
@@ -15131,7 +15126,7 @@
 
 			if(myrpt->remote){ /* Remote base ? */
 				char *loginuser, *loginlevel, *freq, *rxpl, *txpl, *modestr;
-				char offset,powerlevel,rxplon,txplon,remoteon,remmode,reportfmstuff;
+				char offset = 0,powerlevel = 0,rxplon = 0,txplon = 0,remoteon,remmode = 0,reportfmstuff;
 				char offsetc,powerlevelc;
 
 				loginuser = loginlevel = freq = rxpl = txpl = NULL;