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

[SVN commits to the Asterisk project]

Author: jdixon
Date: Tue Sep  9 12:10:34 2008
New Revision: 142145

URL: http://svn.digium.com/view/asterisk?view=rev&rev=142145
Log:
Fixed bug with improper reporting of disconnection

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=142145&r1=142144&r2=142145
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_rpt.c Tue Sep  9 12:10:34 2008
@@ -22,7 +22,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.147 9/8/08 
+ *  version 0.148 9/9/08 
  * 
  * \author Jim Dixon, WB6NIL <jim at lambdatel.com>
  *
@@ -380,7 +380,7 @@
 /*! Stop the tones from playing */
 void ast_playtones_stop(struct ast_channel *chan);
 
-static  char *tdesc = "Radio Repeater / Remote Base  version 0.147  9/8/2008";
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.148  9/9/2008";
 
 static char *app = "Rpt";
 
@@ -6100,6 +6100,7 @@
 				strncpy(myrpt->lastlinknode,digitbuf,MAXNODESTR - 1);
 				l->retries = l->max_retries + 1;
 				l->disced = 1;
+				l->hasconnected = 1;
 				rpt_mutex_unlock(&myrpt->lock);
 				wf.frametype = AST_FRAME_TEXT;
 				wf.subclass = 0;
@@ -12178,22 +12179,22 @@
 			}
             if ((!l->chan) && (!l->disctime) && (!l->outbound))
             {
-				if(debug)ast_log(LOG_NOTICE, "LINKDISC AA\n");
+		if(debug) ast_log(LOG_NOTICE, "LINKDISC AA\n");
                 /* remove from queue */
                 remque((struct qelem *) l);
-				if(myrpt->links.next==&myrpt->links)channel_revert(myrpt);
+		if (myrpt->links.next==&myrpt->links) channel_revert(myrpt);
                 if (!strcmp(myrpt->cmdnode,l->name))myrpt->cmdnode[0] = 0;
                 rpt_mutex_unlock(&myrpt->lock);
-				if (l->name[0] != '0') 
-				{
+		if (l->name[0] != '0') 
+		{
 	            	rpt_telemetry(myrpt,REMDISC,l);
-				}
-				if (myrpt->p.archivedir)
-				{
-					char str[100];
-					sprintf(str,"LINKDISC,%s",l->name);
-					donodelog(myrpt,str);
-				}
+		}
+		if (myrpt->p.archivedir)
+		{
+			char str[100];
+			sprintf(str,"LINKDISC,%s",l->name);
+			donodelog(myrpt,str);
+		}
                 /* hang-up on call to device */
                 ast_hangup(l->pchan);
                 ast_free(l);