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

[SVN commits to the Asterisk project]

Author: jdixon
Date: Fri Aug 22 03:25:18 2008
New Revision: 139444

URL: http://svn.digium.com/view/asterisk?view=rev&rev=139444
Log:
More stuff for 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=139444&r1=139443&r2=139444
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_rpt.c Fri Aug 22 03:25:18 2008
@@ -21,7 +21,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.125 8/21/08 2055 EDT
+ *  version 0.126 8/22/08 2055 EDT
  * 
  * \author Jim Dixon, WB6NIL <jim at lambdatel.com>
  *
@@ -374,7 +374,7 @@
 /*! Stop the tones from playing */
 void ast_playtones_stop(struct ast_channel *chan);
 
-static  char *tdesc = "Radio Repeater / Remote Base  version 0.125  8/21/2008";
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.126  8/22/2008";
 
 static char *app = "Rpt";
 
@@ -1377,6 +1377,10 @@
 }
 /*
 */
+
+
+
+
 static int linkcount(struct rpt *myrpt)
 {
 	struct	rpt_link *l;
@@ -5704,7 +5708,8 @@
 	if(!strcmp(myrpt->name,node)) /* Do not allow connections to self */
 		return -2;
 		
-	if(debug > 3){
+	if(debug > 3)
+	{
 		ast_log(LOG_NOTICE,"Connect attempt to node %s\n", node);
 		ast_log(LOG_NOTICE,"Mode: %s\n",(mode)?"Transceive":"Monitor");
 		ast_log(LOG_NOTICE,"Connection type: %s\n",(perma)?"Permalink":"Normal");
@@ -5713,7 +5718,8 @@
 	strncpy(tmp,val,sizeof(tmp) - 1);
 	s = tmp;
 	s1 = strsep(&s,",");
-	if (!strchr(s1,':') && strchr(s1,'/') && strncasecmp(s1, "local/", 6))
+	if (!strchr(s1,':') && strchr(s1,'/') && strncasecmp(s1, "local/", 6) && 
+		strncasecmp(s1,"echolink/",9))
 	{
 		sy = strchr(s1,'/');		
 		*sy = 0;
@@ -5782,13 +5788,14 @@
 	if (modechange) l->connected = 1;
 	l->hasconnected = l->perma = perma;
 #ifdef ALLOW_LOCAL_CHANNELS
-	if ((strncasecmp(s1,"iax2/", 5) == 0) || (strncasecmp(s1, "local/", 6) == 0))
+	if ((strncasecmp(s1,"iax2/", 5) == 0) || (strncasecmp(s1, "local/", 6) == 0) ||
+	    (strncasecmp(s1,"echolink/",9) == 0))
+#else
+	if ((strncasecmp(s1,"iax2/", 5) == 0) || (strncasecmp(s1,"echolink/",9) == 0))
+#endif
         	strncpy(deststr, s1, sizeof(deststr));
 	else
 	        snprintf(deststr, sizeof(deststr), "IAX2/%s", s1);
-#else
-	snprintf(deststr, sizeof(deststr), "IAX2/%s", s1);
-#endif
 	tele = strchr(deststr, '/');
 	if (!tele){
 		ast_log(LOG_WARNING,"link3:Dial number (%s) must be in format tech/number\n",deststr);
@@ -10445,6 +10452,8 @@
 	char tmp[300], deststr[300] = "";
 	char sx[320],*sy;
 
+
+	return 0;
 
 	val = node_lookup(myrpt,l->name);
 	if (!val)
@@ -12719,7 +12728,8 @@
 						if (!l->isremote) l->retries = 0;
 						if (!lconnected) 
 						{
-							rpt_telemetry(myrpt,CONNECTED,l);
+							if (strncasecmp(l->chan->name,"echolink",8))
+								rpt_telemetry(myrpt,CONNECTED,l);
 							if (myrpt->p.archivedir)
 							{
 								char str[100];
@@ -13789,7 +13799,7 @@
 			donodelog(myrpt,str);
 		}
 		if (!phone_mode) send_newkey(chan);
-		if (!strncasecmp(chan->name,"echolink",8))
+		if (!strncasecmp(l->chan->name,"echolink",8))
 			rpt_telemetry(myrpt,CONNECTED,l);
 		return AST_PBX_KEEPALIVE;
 	}