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

[SVN commits to the Asterisk project]

Author: jdixon
Date: Thu Nov  6 17:06:48 2008
New Revision: 155126

URL: http://svn.digium.com/view/asterisk?view=rev&rev=155126
Log:
Added a little clean-up stuff

Modified:
    team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c

Modified: team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c?view=diff&rev=155126&r1=155125&r2=155126
==============================================================================
--- team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c Thu Nov  6 17:06:48 2008
@@ -22,7 +22,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.160 11/6/08 
+ *  version 0.161 11/6/08 
  * 
  * \author Jim Dixon, WB6NIL <jim at lambdatel.com>
  *
@@ -408,7 +408,7 @@
 /*! Stop the tones from playing */
 void ast_playtones_stop(struct ast_channel *chan);
 
-static  char *tdesc = "Radio Repeater / Remote Base  version 0.160  11/6/2008";
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.161  11/6/2008";
 
 static char *app = "Rpt";
 
@@ -6515,6 +6515,7 @@
 	l->hasconnected = l->perma = perma;
 	l->newkeytimer = NEWKEYTIME;
 	l->newkey = 2;
+	if ((strncasecmp(s1,"echolink/",9) == 0) || (strncasecmp(s1,"irlp/",5) == 0)) l->newkey = 0;
 #ifdef ALLOW_LOCAL_CHANNELS
 	if ((strncasecmp(s1,"iax2/", 5) == 0) || (strncasecmp(s1, "local/", 6) == 0) ||
 	    (strncasecmp(s1,"echolink/",9) == 0) || (strncasecmp(s1,"irlp/",5) == 0))
@@ -11497,6 +11498,7 @@
 	char *val, *s, *s1, *s2, *tele;
 	char tmp[300], deststr[300] = "";
 	char sx[320],*sy;
+	struct ast_frame *f1;
 
 
 	val = node_lookup(myrpt,l->name);
@@ -11543,6 +11545,7 @@
 	l->rxlingertimer = RX_LINGER_TIME;
 	l->newkeytimer = NEWKEYTIME;
 	l->newkey = 2;
+	while((f1 = AST_LIST_REMOVE_HEAD(&l->textq,frame_list))) ast_frfree(f1);
 	if (l->chan){
 		ast_set_read_format(l->chan, AST_FORMAT_SLINEAR);
 		ast_set_write_format(l->chan, AST_FORMAT_SLINEAR);
@@ -13588,7 +13591,7 @@
 					}
 				}
 				else
-				{
+				{	
 					while((f1 = AST_LIST_REMOVE_HEAD(&myrpt->txq,
 						frame_list))) ast_frfree(f1);
 				}