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

[SVN commits to the Asterisk project]

Author: jdixon
Date: Mon Nov 10 01:11:25 2008
New Revision: 155707

URL: http://svn.digium.com/view/asterisk?view=rev&rev=155707
Log:
Fixed some stuff that didnt work in OLD_ASTERISK

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=155707&r1=155706&r2=155707
==============================================================================
--- team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c (original)
+++ team/jdixon/chan_usbradio-1.4/dev-temp/app_rpt.c Mon Nov 10 01:11:25 2008
@@ -22,7 +22,7 @@
 /*! \file
  *
  * \brief Radio Repeater / Remote Base program 
- *  version 0.164 11/9/08 
+ *  version 0.165 11/9/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.164  11/9/2008";
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.165  11/9/2008";
 
 static char *app = "Rpt";
 
@@ -1552,6 +1552,7 @@
 
 	if (!l->chan) return;
 	f1 = ast_frdup(f);
+	memset(&f1->frame_list,0,sizeof(f1->frame_list));
 	AST_LIST_INSERT_TAIL(&l->textq,f1,frame_list);
 	return;
 }
@@ -5970,7 +5971,7 @@
 	else mylink = (struct rpt_link *) data;
 	rpt_mutex_lock(&myrpt->lock);
 	if((mode == CONNFAIL) || (mode == REMDISC) || (mode == CONNECTED) ||
-	    (mode == LINKUNKEY) || (mode == LOCUNKEY)){
+	    (mode == LINKUNKEY)){
 		memset(&tele->mylink,0,sizeof(struct rpt_link));
 		if (mylink){
 			memcpy(&tele->mylink,mylink,sizeof(struct rpt_link));
@@ -13627,11 +13628,13 @@
 						    {
 								f1 = ast_frdup(f);
 								memset(f1->data,0,f1->datalen);
+								memset(&f1->frame_list,0,sizeof(f1->frame_list));
 								AST_LIST_INSERT_TAIL(&myrpt->txq,f1,frame_list);
 						    }
 						    myfirst = 1;
 						}
 						f1 = ast_frdup(f);
+						memset(&f1,0,sizeof(f1->frame_list));
 						AST_LIST_INSERT_TAIL(&myrpt->txq,
 							f1,frame_list);
 					} else myfirst = 0;
@@ -13852,12 +13855,14 @@
 									{
 										f1 = ast_frdup(f);
 										memset(f1->data,0,f1->datalen);
+										memset(&f1->frame_list,0,sizeof(f1->frame_list));
 										AST_LIST_INSERT_TAIL(&l->rxq,
 											f1,frame_list);
 								    }
 								    myfirst = 1;
 								}
 								f1 = ast_frdup(f);
+								memset(&f1->frame_list,0,sizeof(f1->frame_list));
 								AST_LIST_INSERT_TAIL(&l->rxq,f1,frame_list);
 							} else myfirst = 0; 
 							x = 0;
@@ -15788,12 +15793,14 @@
 						    {
 							f1 = ast_frdup(f);
 							memset(f1->data,0,f1->datalen);
-								AST_LIST_INSERT_TAIL(&myrpt->rxq,
-									f1,frame_list);
+							memset(&f1->frame_list,0,sizeof(f1->frame_list));
+							AST_LIST_INSERT_TAIL(&myrpt->rxq,
+								f1,frame_list);
 						    }
 						    myfirst = 1;
 						}
 						f1 = ast_frdup(f);
+						memset(&f1->frame_list,0,sizeof(f1->frame_list));
 						AST_LIST_INSERT_TAIL(&myrpt->rxq,f1,frame_list);
 					} else myfirst = 0; 
 					x = 0;