[svn-commits] jdixon: branch jdixon/chan_usbradio-1.4 r141624 - /team/jdixon/chan_usbradio-...

[SVN commits to the Digium repositories]

Author: jdixon
Date: Sat Sep  6 18:44:50 2008
New Revision: 141624

URL: http://svn.digium.com/view/asterisk?view=rev&rev=141624
Log:
Fixed irlp announcement destinations, I hope

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=141624&r1=141623&r2=141624
==============================================================================
--- team/jdixon/chan_usbradio-1.4/apps/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/apps/app_rpt.c Sat Sep  6 18:44:50 2008
@@ -22,7 +22,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.144 9/6/08 
+ *  version 0.145 9/6/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.144  9/6/2008";
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.145  9/6/2008";
 
 static char *app = "Rpt";
 
@@ -5759,7 +5759,7 @@
 
 static int connect_link(struct rpt *myrpt, char* node, int mode, int perma)
 {
-	char *val, *s, *s1, *s2, *tele,*cp,*tel1;
+	char *val, *s, *s1, *s2, *tele,*cp;
 	char lstr[MAXLINKLIST],*strs[MAXLINKLIST];
 	char tmp[300], deststr[300] = "",modechange = 0;
 	char sx[320],*sy;
@@ -5906,12 +5906,21 @@
 	if ((!strncasecmp(deststr,"echolink",8)) ||
 	    (!strncasecmp(deststr,"irlp",4)))
 	{
-		tel1 = strdup(tele);
+		char tel1[100];
+
+		strncpy(tel1,tele,sizeof(tel1) - 1);
 		cp = strchr(tel1,'/');
 		if (cp) cp++; else cp = tel1;
-		strcpy(cp,node + 1);
+		if (!strncasecmp(deststr,"irlp",4))
+		{
+			snprintf(cp,sizeof(tel1) - 1,"%s/%s",
+				myrpt->name,node + 1);
+		}
+		else
+		{
+			strcpy(cp,node + 1);
+		}
 		l->chan = ast_request(deststr, AST_FORMAT_SLINEAR,  tel1,NULL);
-		free(tel1);
 	}
 	else
 	{