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

[SVN commits to the Asterisk project]

Author: jdixon
Date: Sun Nov  2 18:42:30 2008
New Revision: 153744

URL: http://svn.digium.com/view/asterisk?view=rev&rev=153744
Log:
Fixes to app_Rpt

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=153744&r1=153743&r2=153744
==============================================================================
--- team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c Sun Nov  2 18:42:30 2008
@@ -22,7 +22,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.156 10/28/08 
+ *  version 0.157 11/2/08 
  * 
  * \author Jim Dixon, WB6NIL <jim at lambdatel.com>
  *
@@ -407,7 +407,7 @@
 /*! Stop the tones from playing */
 void ast_playtones_stop(struct ast_channel *chan);
 
-static  char *tdesc = "Radio Repeater / Remote Base  version 0.156  10/28/2008";
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.157  11/2/2008";
 
 static char *app = "Rpt";
 
@@ -1524,6 +1524,7 @@
 {
 	if (!myrpt) return(0);
 	if (!mylink) return(0);
+	if (!mylink->chan) return(0);
 	/* if doesnt qual as a foreign link */
 	if ((mylink->name[0] != '0') && (!mylink->phonemode) &&
 	    strncasecmp(mylink->chan->name,"echolink",8) &&
@@ -5731,6 +5732,7 @@
 time_t	t;
 struct rpt_link *l;
 
+
 	if(debug > 6)
 		ast_log(LOG_NOTICE,"mode=%i  data=%s\n",mode, (char *)data);
 
@@ -5761,7 +5763,7 @@
 	}
 	l = myrpt->links.next;
 	res = 0;
-	if (l != &myrpt->links)
+	if (l && (l != &myrpt->links))
 	{
 		if (l->chan && (l->name[0] != '0') && (l->newkey == 1)) res = 1;
 		l = l->next;
@@ -11377,6 +11379,8 @@
                 return 0;
         }
 
+	if (tmp[0] == 'T') return 0;
+
 #ifndef	DO_NOT_NOTIFY_MDC1200_ON_REMOTE_BASES
 	if (tmp[0] == 'I')
 	{
@@ -15865,7 +15869,7 @@
 			}
 			if (f->frametype == AST_FRAME_CONTROL)
 			{
-				if (f->subclass == AST_CONTROL_HANGUP)
+ 				if (f->subclass == AST_CONTROL_HANGUP)
 				{
 					if (debug) printf("@@@@ rpt:Hung Up\n");
 					ast_frfree(f);