more naming changes

git-svn-id: http://svn.openzap.org/svn/openzap/branches/sangoma_boost@971 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Moises Silva committed 2010-01-15 19:56:54 +00:00
1 parent 526cb45c93
commit 1b47133795
14 files changed
+65 -65

No files matched your search

@@ -1025,7 +1025,7 @@ static L3INT ftdm_isdn_931_34(void *pvt, L2UCHAR *msg, L2INT mlen)
/*
* !! HACK ALERT !!
*
* Map OpenFTDM channel states to Q.931 states
* Map FreeTDM channel states to Q.931 states
*/
Q931ie_CallState state;
Q931ie_Cause cause;
@@ -524,7 +524,7 @@ static unsigned pika_open_range(ftdm_span_t *span, unsigned boardno, unsigned sp
chan_data->play_config.encoding = PKH_RECORD_ENCODING_MU_LAW;
chan_data->play_config.samplingRate = PKH_RECORD_SAMPLING_RATE_8KHZ;
chan_data->play_config.AGC.enabled = PK_FALSE;
ftdm_log(FTDM_LOG_INFO, "configuring device b%ds%dc%d as OpenFTDM device %d:%d\n", boardno, spanno, x, chan->span_id, chan->chan_id);
ftdm_log(FTDM_LOG_INFO, "configuring device b%ds%dc%d as FreeTDM device %d:%d\n", boardno, spanno, x, chan->span_id, chan->chan_id);
if (profile) {
ftdm_log(FTDM_LOG_INFO, "applying config profile %s to device %d:%d\n", profile->name, chan->span_id, chan->chan_id);
@@ -334,7 +334,7 @@ static unsigned wp_open_range(ftdm_span_t *span, unsigned spanno, unsigned start
ftdm_copy_string(chan->chan_number, number, sizeof(chan->chan_number));
}
configured++;
ftdm_log(FTDM_LOG_INFO, "configuring device s%dc%d as OpenFTDM device %d:%d fd:%d DTMF: %s\n",
ftdm_log(FTDM_LOG_INFO, "configuring device s%dc%d as FreeTDM device %d:%d fd:%d DTMF: %s\n",
spanno, x, chan->span_id, chan->chan_id, sockfd, dtmf);
} else {
+8 -8
View File
@@ -279,7 +279,7 @@ static unsigned zt_open_range(ftdm_span_t *span, unsigned start, unsigned end, f
binfo.numbufs = 32;
binfo.bufsize = 1024;
if (ioctl(sockfd, codes.SET_BUFINFO, &binfo)) {
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as OpenFTDM device %d:%d fd:%d\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, sockfd);
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as FreeTDM device %d:%d fd:%d\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, sockfd);
close(sockfd);
continue;
}
@@ -341,7 +341,7 @@ static unsigned zt_open_range(ftdm_span_t *span, unsigned start, unsigned end, f
cc.sigtype = ZT_SIG_CAS;
cc.idlebits = cas_bits;
if (ioctl(CONTROL_FD, codes.CHANCONFIG, &cc)) {
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as OpenFTDM device %d:%d fd:%d err:%s", chanpath, ftdmchan->span_id, ftdmchan->chan_id, sockfd, strerror(errno));
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as FreeTDM device %d:%d fd:%d err:%s", chanpath, ftdmchan->span_id, ftdmchan->chan_id, sockfd, strerror(errno));
close(sockfd);
continue;
}
@@ -350,7 +350,7 @@ static unsigned zt_open_range(ftdm_span_t *span, unsigned start, unsigned end, f
if (ftdmchan->type != FTDM_CHAN_TYPE_DQ921 && ftdmchan->type != FTDM_CHAN_TYPE_DQ931) {
len = zt_globals.codec_ms * 8;
if (ioctl(ftdmchan->sockfd, codes.SET_BLOCKSIZE, &len)) {
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as OpenFTDM device %d:%d fd:%d err:%s\n",
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as FreeTDM device %d:%d fd:%d err:%s\n",
chanpath, ftdmchan->span_id, ftdmchan->chan_id, sockfd, strerror(errno));
close(sockfd);
continue;
@@ -365,7 +365,7 @@ static unsigned zt_open_range(ftdm_span_t *span, unsigned start, unsigned end, f
}
if (ioctl(sockfd, codes.GET_PARAMS, &ztp) < 0) {
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as OpenFTDM device %d:%d fd:%d\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, sockfd);
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as FreeTDM device %d:%d fd:%d\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, sockfd);
close(sockfd);
continue;
}
@@ -376,13 +376,13 @@ static unsigned zt_open_range(ftdm_span_t *span, unsigned start, unsigned end, f
(ztp.sig_type != ZT_SIG_HDLCFCS) &&
(ztp.sig_type != ZT_SIG_HARDHDLC)
) {
ftdm_log(FTDM_LOG_ERROR, "Failure configuring device %s as OpenFTDM device %d:%d fd:%d, hardware signaling is not HDLC, fix your Zap/DAHDI configuration!\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, sockfd);
ftdm_log(FTDM_LOG_ERROR, "Failure configuring device %s as FreeTDM device %d:%d fd:%d, hardware signaling is not HDLC, fix your Zap/DAHDI configuration!\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, sockfd);
close(sockfd);
continue;
}
}
ftdm_log(FTDM_LOG_INFO, "configuring device %s channel %d as OpenFTDM device %d:%d fd:%d\n", chanpath, x, ftdmchan->span_id, ftdmchan->chan_id, sockfd);
ftdm_log(FTDM_LOG_INFO, "configuring device %s channel %d as FreeTDM device %d:%d fd:%d\n", chanpath, x, ftdmchan->span_id, ftdmchan->chan_id, sockfd);
ftdmchan->rate = 8000;
ftdmchan->physical_span_id = ztp.span_no;
@@ -411,7 +411,7 @@ static unsigned zt_open_range(ftdm_span_t *span, unsigned start, unsigned end, f
ztp.flash_time = zt_globals.flash_ms;
if (ioctl(sockfd, codes.SET_PARAMS, &ztp) < 0) {
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as OpenFTDM device %d:%d fd:%d\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, sockfd);
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as FreeTDM device %d:%d fd:%d\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, sockfd);
close(sockfd);
continue;
}
@@ -632,7 +632,7 @@ static ZIO_OPEN_FUNCTION(zt_open)
ftdm_log(FTDM_LOG_INFO, "Setting txgain to %f on channel %d\n", zt_globals.txgain, gains.chan_no);
if (ioctl(ftdmchan->sockfd, codes.SETGAINS, &gains) < 0) {
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as OpenFTDM device %d:%d fd:%d\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, ftdmchan->sockfd);
ftdm_log(FTDM_LOG_ERROR, "failure configuring device %s as FreeTDM device %d:%d fd:%d\n", chanpath, ftdmchan->span_id, ftdmchan->chan_id, ftdmchan->sockfd);
}
}
+2 -2
View File
@@ -282,11 +282,11 @@ int main(int argc, char *argv[])
ftdm_global_set_default_logger(FTDM_LOG_LEVEL_DEBUG);
if (ftdm_global_init() != FTDM_SUCCESS) {
fprintf(stderr, "Error loading OpenFTDM\n");
fprintf(stderr, "Error loading FreeTDM\n");
exit(-1);
}
printf("OpenFTDM loaded\n");
printf("FreeTDM loaded\n");
debug = PRI_DEBUG_Q931_DUMP | PRI_DEBUG_Q931_STATE;
+4 -4
View File
@@ -85,14 +85,14 @@ int main(int argc, char *argv[])
ftdm_global_set_default_logger(FTDM_LOG_LEVEL_DEBUG);
if (ftdm_global_init() != FTDM_SUCCESS) {
ftdm_log(FTDM_LOG_ERROR, "Error loading OpenFTDM\n");
ftdm_log(FTDM_LOG_ERROR, "Error loading FreeTDM\n");
exit(-1);
}
ftdm_log(FTDM_LOG_DEBUG, "OpenFTDM loaded\n");
ftdm_log(FTDM_LOG_DEBUG, "FreeTDM loaded\n");
if (ftdm_span_find(span_id, &span) != FTDM_SUCCESS) {
ftdm_log(FTDM_LOG_ERROR, "Error finding OpenFTDM span\n");
ftdm_log(FTDM_LOG_ERROR, "Error finding FreeTDM span\n");
goto done;
}
@@ -103,7 +103,7 @@ int main(int argc, char *argv[])
"max_dialstr", &max_dialstr,
TAG_END
) != FTDM_SUCCESS) {
ftdm_log(FTDM_LOG_ERROR, "Error configuring OpenFTDM span\n");
ftdm_log(FTDM_LOG_ERROR, "Error configuring FreeTDM span\n");
goto done;
}
ftdm_span_start(span);
+2 -2
View File
@@ -10,11 +10,11 @@ int main(int argc, char *argv[])
if (ftdm_global_init() != FTDM_SUCCESS) {
fprintf(stderr, "Error loading OpenFTDM\n");
fprintf(stderr, "Error loading FreeTDM\n");
exit(-1);
}
printf("OpenFTDM loaded\n");
printf("FreeTDM loaded\n");
top:
//if (ftdm_channel_open_any("wanpipe", 0, FTDM_TOP_DOWN, &chan) == FTDM_SUCCESS) {
+4 -4
View File
@@ -31,18 +31,18 @@ int main(int argc, char *argv[])
#endif
if (ftdm_global_init() != FTDM_SUCCESS) {
fprintf(stderr, "Error loading OpenFTDM\n");
fprintf(stderr, "Error loading FreeTDM\n");
exit(-1);
}
if (ftdm_global_configuration() != FTDM_SUCCESS) {
fprintf(stderr, "Error configuring OpenFTDM\n");
fprintf(stderr, "Error configuring FreeTDM\n");
exit(-1);
}
printf("OpenFTDM loaded\n");
printf("FreeTDM loaded\n");
if (ftdm_span_find_by_name("wp1", &span) != FTDM_SUCCESS) {
fprintf(stderr, "Error finding OpenFTDM span %s\n", argv[1]);
fprintf(stderr, "Error finding FreeTDM span %s\n", argv[1]);
goto done;
}
parameters[0].var = "sigmod";
+3 -3
View File
@@ -27,14 +27,14 @@ int main(int argc, char *argv[])
}
if (ftdm_global_init() != FTDM_SUCCESS) {
fprintf(stderr, "Error loading OpenFTDM\n");
fprintf(stderr, "Error loading FreeTDM\n");
exit(-1);
}
printf("OpenFTDM loaded\n");
printf("FreeTDM loaded\n");
if (ftdm_span_find(atoi(argv[1]), &span) != FTDM_SUCCESS) {
fprintf(stderr, "Error finding OpenFTDM span\n");
fprintf(stderr, "Error finding FreeTDM span\n");
goto done;
}
+3 -3
View File
@@ -29,14 +29,14 @@ int main(int argc, char *argv[])
}
if (ftdm_global_init() != FTDM_SUCCESS) {
fprintf(stderr, "Error loading OpenFTDM\n");
fprintf(stderr, "Error loading FreeTDM\n");
exit(-1);
}
printf("OpenFTDM loaded\n");
printf("FreeTDM loaded\n");
if (ftdm_span_find(atoi(argv[1]), &span) != FTDM_SUCCESS) {
fprintf(stderr, "Error finding OpenFTDM span\n");
fprintf(stderr, "Error finding FreeTDM span\n");
goto done;
}
+3 -3
View File
@@ -104,14 +104,14 @@ int main(int argc, char *argv[])
}
if (ftdm_global_init() != FTDM_SUCCESS) {
fprintf(stderr, "Error loading OpenFTDM\n");
fprintf(stderr, "Error loading FreeTDM\n");
exit(-1);
}
printf("OpenFTDM loaded\n");
printf("FreeTDM loaded\n");
if (ftdm_span_find(atoi(argv[1]), &span) != FTDM_SUCCESS) {
fprintf(stderr, "Error finding OpenFTDM span\n");
fprintf(stderr, "Error finding FreeTDM span\n");
goto done;
}
+3 -3
View File
@@ -31,14 +31,14 @@ int main(int argc, char *argv[])
}
if (ftdm_global_init() != FTDM_SUCCESS) {
fprintf(stderr, "Error loading OpenFTDM\n");
fprintf(stderr, "Error loading FreeTDM\n");
exit(-1);
}
printf("OpenFTDM loaded\n");
printf("FreeTDM loaded\n");
if (ftdm_span_find(atoi(argv[1]), &span) != FTDM_SUCCESS) {
fprintf(stderr, "Error finding OpenFTDM span\n");
fprintf(stderr, "Error finding FreeTDM span\n");
goto done;
}
+4 -4
View File
@@ -29,19 +29,19 @@ int main(int argc, char *argv[])
}
if (ftdm_global_init() != FTDM_SUCCESS) {
fprintf(stderr, "Error loading OpenFTDM\n");
fprintf(stderr, "Error loading FreeTDM\n");
exit(-1);
}
if (ftdm_global_configuration() != FTDM_SUCCESS) {
fprintf(stderr, "Error configuring OpenFTDM\n");
fprintf(stderr, "Error configuring FreeTDM\n");
exit(-1);
}
printf("OpenFTDM loaded\n");
printf("FreeTDM loaded\n");
if (ftdm_span_find(atoi(argv[1]), &span) != FTDM_SUCCESS) {
fprintf(stderr, "Error finding OpenFTDM span\n");
fprintf(stderr, "Error finding FreeTDM span\n");
goto done;
}