[asterisk-commits] jpeeler: branch jpeeler/chan_dahdi r119070 - in /team/jpeeler/chan_dahdi: app...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu May 29 15:11:08 CDT 2008
Author: jpeeler
Date: Thu May 29 15:11:08 2008
New Revision: 119070
URL: http://svn.digium.com/view/asterisk?view=rev&rev=119070
Log:
rename all applicable text instances of dahdi to DAHDI
Modified:
team/jpeeler/chan_dahdi/apps/app_dial.c
team/jpeeler/chan_dahdi/apps/app_flash.c
team/jpeeler/chan_dahdi/apps/app_meetme.c
team/jpeeler/chan_dahdi/apps/app_queue.c
team/jpeeler/chan_dahdi/apps/app_rpt.c
team/jpeeler/chan_dahdi/apps/app_zapbarge.c
team/jpeeler/chan_dahdi/apps/app_zapras.c
team/jpeeler/chan_dahdi/apps/app_zapscan.c
team/jpeeler/chan_dahdi/codecs/codec_zap.c
team/jpeeler/chan_dahdi/main/asterisk.c
Modified: team/jpeeler/chan_dahdi/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/apps/app_dial.c?view=diff&rev=119070&r1=119069&r2=119070
==============================================================================
--- team/jpeeler/chan_dahdi/apps/app_dial.c (original)
+++ team/jpeeler/chan_dahdi/apps/app_dial.c Thu May 29 15:11:08 2008
@@ -1895,7 +1895,7 @@
res = -1;
goto done;
}
- if (opermode && !strncmp(chan->tech->type, "dahdi", 3) && !strncmp(peer->name, "dahdi", 3)) {
+ if (opermode && !strncmp(chan->tech->type, "DAHDI", 3) && !strncmp(peer->name, "DAHDI", 3)) {
/* what's this special handling for dahdi <-> dahdi ?
* A: dahdi to dahdi calls are natively bridged at the kernel driver
* level, so we need to ensure that this mode gets propagated
Modified: team/jpeeler/chan_dahdi/apps/app_flash.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/apps/app_flash.c?view=diff&rev=119070&r1=119069&r2=119070
==============================================================================
--- team/jpeeler/chan_dahdi/apps/app_flash.c (original)
+++ team/jpeeler/chan_dahdi/apps/app_flash.c Thu May 29 15:11:08 2008
@@ -70,7 +70,7 @@
int x;
struct dahdi_params dahdip;
- if (strcasecmp(chan->tech->type, "dahdi")) {
+ if (strcasecmp(chan->tech->type, "DAHDI")) {
ast_log(LOG_WARNING, "%s is not a DAHDI channel\n", chan->name);
return -1;
}
Modified: team/jpeeler/chan_dahdi/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/apps/app_meetme.c?view=diff&rev=119070&r1=119069&r2=119070
==============================================================================
--- team/jpeeler/chan_dahdi/apps/app_meetme.c (original)
+++ team/jpeeler/chan_dahdi/apps/app_meetme.c Thu May 29 15:11:08 2008
@@ -843,7 +843,7 @@
cnf->dahdiconf = dahdic.confno;
/* Setup a new channel for playback of audio files */
- cnf->chan = ast_request("dahdi", AST_FORMAT_SLINEAR, "pseudo", NULL);
+ cnf->chan = ast_request("DAHDI", AST_FORMAT_SLINEAR, "pseudo", NULL);
if (cnf->chan) {
ast_set_read_format(cnf->chan, AST_FORMAT_SLINEAR);
ast_set_write_format(cnf->chan, AST_FORMAT_SLINEAR);
@@ -1645,7 +1645,7 @@
}
ast_mutex_lock(&conf->recordthreadlock);
- if ((conf->recordthread == AST_PTHREADT_NULL) && (confflags & CONFFLAG_RECORDCONF) && ((conf->lchan = ast_request("dahdi", AST_FORMAT_SLINEAR, "pseudo", NULL)))) {
+ if ((conf->recordthread == AST_PTHREADT_NULL) && (confflags & CONFFLAG_RECORDCONF) && ((conf->lchan = ast_request("DAHDI", AST_FORMAT_SLINEAR, "pseudo", NULL)))) {
ast_set_read_format(conf->lchan, AST_FORMAT_SLINEAR);
ast_set_write_format(conf->lchan, AST_FORMAT_SLINEAR);
dahdic.chan = 0;
@@ -1828,7 +1828,7 @@
goto outrun;
}
- retrydahdi = (strcasecmp(chan->tech->type, "dahdi") || (chan->audiohooks || chan->monitor) ? 1 : 0);
+ retrydahdi = (strcasecmp(chan->tech->type, "DAHDI") || (chan->audiohooks || chan->monitor) ? 1 : 0);
user->dahdichannel = !retrydahdi;
dahdiretry:
@@ -2284,7 +2284,7 @@
using_pseudo = 0;
}
ast_debug(1, "Ooh, something swapped out under us, starting over\n");
- retrydahdi = (strcasecmp(c->tech->type, "dahdi") || (c->audiohooks || c->monitor) ? 1 : 0);
+ retrydahdi = (strcasecmp(c->tech->type, "DAHDI") || (c->audiohooks || c->monitor) ? 1 : 0);
user->dahdichannel = !retrydahdi;
goto dahdiretry;
}
Modified: team/jpeeler/chan_dahdi/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/apps/app_queue.c?view=diff&rev=119070&r1=119069&r2=119070
==============================================================================
--- team/jpeeler/chan_dahdi/apps/app_queue.c (original)
+++ team/jpeeler/chan_dahdi/apps/app_queue.c Thu May 29 15:11:08 2008
@@ -3316,9 +3316,9 @@
/* Ah ha! Someone answered within the desired timeframe. Of course after this
we will always return with -1 so that it is hung up properly after the
conversation. */
- if (!strcmp(qe->chan->tech->type, "dahdi"))
+ if (!strcmp(qe->chan->tech->type, "DAHDI"))
ast_channel_setoption(qe->chan, AST_OPTION_TONE_VERIFY, &nondataquality, sizeof(nondataquality), 0);
- if (!strcmp(peer->tech->type, "dahdi"))
+ if (!strcmp(peer->tech->type, "DAHDI"))
ast_channel_setoption(peer, AST_OPTION_TONE_VERIFY, &nondataquality, sizeof(nondataquality), 0);
/* Update parameters for the queue */
time(&now);
Modified: team/jpeeler/chan_dahdi/apps/app_rpt.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/apps/app_rpt.c?view=diff&rev=119070&r1=119069&r2=119070
==============================================================================
--- team/jpeeler/chan_dahdi/apps/app_rpt.c (original)
+++ team/jpeeler/chan_dahdi/apps/app_rpt.c Thu May 29 15:11:08 2008
@@ -4002,7 +4002,7 @@
/* allocate a pseudo-channel thru asterisk */
- mychannel = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ mychannel = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!mychannel)
{
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
@@ -5293,7 +5293,7 @@
myrpt->mydtmf = 0;
/* allocate a pseudo-channel thru asterisk */
- mychannel = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ mychannel = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!mychannel)
{
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
@@ -5319,7 +5319,7 @@
pthread_exit(NULL);
}
/* allocate a pseudo-channel thru asterisk */
- genchannel = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ genchannel = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!genchannel)
{
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
@@ -5829,7 +5829,7 @@
return -1;
}
/* allocate a pseudo-channel thru asterisk */
- l->pchan = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ l->pchan = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!l->pchan){
ast_log(LOG_WARNING,"rpt connect: Sorry unable to obtain pseudo channel\n");
ast_hangup(l->chan);
@@ -10895,7 +10895,7 @@
ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_KEY);
ast_indicate(myrpt->txchannel,AST_CONTROL_RADIO_UNKEY);
/* allocate a pseudo-channel thru asterisk */
- myrpt->pchannel = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ myrpt->pchannel = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!myrpt->pchannel)
{
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
@@ -10914,7 +10914,7 @@
if (!myrpt->dahditxchannel)
{
/* allocate a pseudo-channel thru asterisk */
- myrpt->dahditxchannel = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ myrpt->dahditxchannel = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!myrpt->dahditxchannel)
{
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
@@ -10933,7 +10933,7 @@
#endif
}
/* allocate a pseudo-channel thru asterisk */
- myrpt->monchannel = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ myrpt->monchannel = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!myrpt->monchannel)
{
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
@@ -11028,7 +11028,7 @@
pthread_exit(NULL);
}
/* allocate a pseudo-channel thru asterisk */
- myrpt->parrotchannel = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ myrpt->parrotchannel = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!myrpt->parrotchannel)
{
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
@@ -11046,7 +11046,7 @@
ast_set_flag(myrpt->parrotchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
#endif
/* allocate a pseudo-channel thru asterisk */
- myrpt->voxchannel = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ myrpt->voxchannel = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!myrpt->voxchannel)
{
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
@@ -11064,7 +11064,7 @@
ast_set_flag(myrpt->voxchannel->cdr,AST_CDR_FLAG_POST_DISABLED);
#endif
/* allocate a pseudo-channel thru asterisk */
- myrpt->txpchannel = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ myrpt->txpchannel = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!myrpt->txpchannel)
{
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
@@ -13617,7 +13617,7 @@
ast_set_read_format(l->chan,AST_FORMAT_SLINEAR);
ast_set_write_format(l->chan,AST_FORMAT_SLINEAR);
/* allocate a pseudo-channel thru asterisk */
- l->pchan = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ l->pchan = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!l->pchan)
{
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
@@ -13841,7 +13841,7 @@
myrpt->dahditxchannel = myrpt->rxchannel;
}
/* allocate a pseudo-channel thru asterisk */
- myrpt->pchannel = ast_request("dahdi",AST_FORMAT_SLINEAR,"pseudo",NULL);
+ myrpt->pchannel = ast_request("DAHDI",AST_FORMAT_SLINEAR,"pseudo",NULL);
if (!myrpt->pchannel)
{
fprintf(stderr,"rpt:Sorry unable to obtain pseudo channel\n");
Modified: team/jpeeler/chan_dahdi/apps/app_zapbarge.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/apps/app_zapbarge.c?view=diff&rev=119070&r1=119069&r2=119070
==============================================================================
--- team/jpeeler/chan_dahdi/apps/app_zapbarge.c (original)
+++ team/jpeeler/chan_dahdi/apps/app_zapbarge.c Thu May 29 15:11:08 2008
@@ -115,7 +115,7 @@
goto outrun;
}
ast_indicate(chan, -1);
- retrydahdi = strcasecmp(chan->tech->type, "dahdi");
+ retrydahdi = strcasecmp(chan->tech->type, "DAHDI");
dahdiretry:
origfd = chan->fds[0];
if (retrydahdi) {
Modified: team/jpeeler/chan_dahdi/apps/app_zapras.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/apps/app_zapras.c?view=diff&rev=119070&r1=119069&r2=119070
==============================================================================
--- team/jpeeler/chan_dahdi/apps/app_zapras.c (original)
+++ team/jpeeler/chan_dahdi/apps/app_zapras.c Thu May 29 15:11:08 2008
@@ -190,7 +190,7 @@
/* Answer the channel if it's not up */
if (chan->_state != AST_STATE_UP)
ast_answer(chan);
- if (strcasecmp(chan->tech->type, "dahdi")) {
+ if (strcasecmp(chan->tech->type, "DAHDI")) {
/* If it's not a DAHDI channel, we're done. Wait a couple of
seconds and then hangup... */
ast_verb(2, "Channel %s is not a DAHDI channel\n", chan->name);
Modified: team/jpeeler/chan_dahdi/apps/app_zapscan.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/apps/app_zapscan.c?view=diff&rev=119070&r1=119069&r2=119070
==============================================================================
--- team/jpeeler/chan_dahdi/apps/app_zapscan.c (original)
+++ team/jpeeler/chan_dahdi/apps/app_zapscan.c Thu May 29 15:11:08 2008
@@ -123,7 +123,7 @@
goto outrun;
}
ast_indicate(chan, -1);
- retrydahdi = strcasecmp(chan->tech->type, "dahdi");
+ retrydahdi = strcasecmp(chan->tech->type, "DAHDI");
dahdiretry:
origfd = chan->fds[0];
if (retrydahdi) {
@@ -332,7 +332,7 @@
continue;
}
}
- if (tempchan && (!strcmp(tempchan->tech->type, "dahdi")) && (tempchan != chan)) {
+ if (tempchan && (!strcmp(tempchan->tech->type, "DAHDI")) && (tempchan != chan)) {
ast_verb(3, "DAHDI channel %s is in-use, monitoring...\n", tempchan->name);
ast_copy_string(confstr, tempchan->name, sizeof(confstr));
ast_channel_unlock(tempchan);
Modified: team/jpeeler/chan_dahdi/codecs/codec_zap.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/codecs/codec_zap.c?view=diff&rev=119070&r1=119069&r2=119070
==============================================================================
--- team/jpeeler/chan_dahdi/codecs/codec_zap.c (original)
+++ team/jpeeler/chan_dahdi/codecs/codec_zap.c Thu May 29 15:11:08 2008
@@ -312,7 +312,7 @@
if (!(dahdi = ast_calloc(1, sizeof(*dahdi))))
return -1;
- snprintf((char *) (dahdi->t.name), sizeof(dahdi->t.name), "dahdi%sto%s",
+ snprintf((char *) (dahdi->t.name), sizeof(dahdi->t.name), "DAHDI%sto%s",
ast_getformatname((1 << src)), ast_getformatname((1 << dst)));
dahdi->t.srcfmt = (1 << src);
dahdi->t.dstfmt = (1 << dst);
Modified: team/jpeeler/chan_dahdi/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/main/asterisk.c?view=diff&rev=119070&r1=119069&r2=119070
==============================================================================
--- team/jpeeler/chan_dahdi/main/asterisk.c (original)
+++ team/jpeeler/chan_dahdi/main/asterisk.c Thu May 29 15:11:08 2008
@@ -165,7 +165,7 @@
#if defined(HAVE_SYSINFO)
long option_minmemfree; /*!< Minimum amount of free system memory - stop accepting calls if free memory falls below this watermark */
#endif
-char dahdi_chan_name[AST_CHANNEL_NAME] = "Zap";
+char dahdi_chan_name[AST_CHANNEL_NAME] = "ZAP";
/*! @} */
@@ -2761,7 +2761,7 @@
#endif
} else if (!strcasecmp(v->name, "dahdichanname")) {
if (!strcasecmp(v->value, "yes")) {
- ast_copy_string(dahdi_chan_name, "dahdi", sizeof(dahdi_chan_name));
+ ast_copy_string(dahdi_chan_name, "DAHDI", sizeof(dahdi_chan_name));
}
}
}
More information about the asterisk-commits
mailing list