Fixed signalling problem with pciradio
authorJim Dixon <telesistant@hotmail.com>
Thu, 8 Sep 2005 17:29:49 +0000 (17:29 +0000)
committerJim Dixon <telesistant@hotmail.com>
Thu, 8 Sep 2005 17:29:49 +0000 (17:29 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6553 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_rpt.c
channels/chan_zap.c

index 1952b32..56fe1b5 100755 (executable)
@@ -3,7 +3,7 @@
  * Asterisk -- A telephony toolkit for Linux.
  *
  * Radio Repeater / Remote Base program 
- *  version 0.28 08/21/05
+ *  version 0.29 09/04/05
  * 
  * See http://www.zapatatelephony.org/app_rpt.html
  *
@@ -180,7 +180,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/say.h"
 #include "asterisk/localtime.h"
 
-static  char *tdesc = "Radio Repeater / Remote Base  version 0.28  08/21/2005";
+static  char *tdesc = "Radio Repeater / Remote Base  version 0.29  09/04/2005";
 
 static char *app = "Rpt";
 
@@ -4797,13 +4797,13 @@ char cmd[MAXDTMF+1] = "";
                                /* if RX key */
                                if (f->subclass == AST_CONTROL_RADIO_KEY)
                                {
-                                       if (debug) printf("@@@@ rx key\n");
+                                       if (debug) printf("@@@@ rx key1 %s\n",myrpt->name);
                                        myrpt->keyed = 1;
                                }
                                /* if RX un-key */
                                if (f->subclass == AST_CONTROL_RADIO_UNKEY)
                                {
-                                       if (debug) printf("@@@@ rx un-key\n");
+                                       if (debug) printf("@@@@ rx un-key1 %s\n",myrpt->name);
                                        if(myrpt->keyed) {
                                                rpt_telemetry(myrpt,UNKEY,NULL);
                                        }
@@ -4963,13 +4963,13 @@ char cmd[MAXDTMF+1] = "";
                                        /* if RX key */
                                        if (f->subclass == AST_CONTROL_RADIO_KEY)
                                        {
-                                               if (debug) printf("@@@@ rx key\n");
+                                               if (debug) printf("@@@@ rx key2, %s\n",l->name);
                                                l->lastrx = 1;
                                        }
                                        /* if RX un-key */
                                        if (f->subclass == AST_CONTROL_RADIO_UNKEY)
                                        {
-                                               if (debug) printf("@@@@ rx un-key\n");
+                                               if (debug) printf("@@@@ rx un-key2, %s\n",l->name);
                                                l->lastrx = 0;
                                        }
                                        if (f->subclass == AST_CONTROL_HANGUP)
@@ -5115,7 +5115,7 @@ pthread_attr_t attr;
        /* start with blank config */
        memset(&rpt_vars,0,sizeof(rpt_vars));
 
-       cfg = ast_load("rpt.conf");
+       cfg = ast_config_load("rpt.conf");
        if (!cfg) {
                ast_log(LOG_NOTICE, "Unable to open radio repeater configuration rpt.conf.  Radio Repeater disabled.\n");
                pthread_exit(NULL);
index aa212c2..ad600ca 100755 (executable)
@@ -6937,7 +6937,8 @@ static struct zt_pvt *mkintf(int channel, int signalling, int radio, struct zt_p
                        (signalling == SIG_SF_FEATD) || (signalling == SIG_SF_FEATDMF) ||
                          (signalling == SIG_SF_FEATB)) {
                        p.starttime = 250;
-               } else if (radio) {
+               }
+               if (radio) {
                        /* XXX Waiting to hear back from Jim if these should be adjustable XXX */
                        p.channo = channel;
                        p.rxwinktime = 1;