kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-18 05:25:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge ring pulse stuff (Bug #2016)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3856 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-09-30 15:26:04 +00:00
parent ca88a7476f
commit e2318bdba9
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_zap.c
+22 -14
View File
@@ -9480,6 +9480,7 @@ static int setup_zap(void)
int i;
struct zt_ring_cadence new_cadence;
int cid_location = -1;
int firstcadencepos = 0;
char original_args[80];
int cadence_is_ok = 1;
@@ -9495,23 +9496,30 @@ static int setup_zap(void)
/* Ring cadences cannot be negative */
for (i=0;i<element_count;i++) {
if (c[i] < 1) {
if ((i % 2 == 1) && (cid_location == -1)) {
/* Silence duration, negative possibly okay */
if (c[i] == 0) {
ast_log(LOG_ERROR, "Silence duration cannot be zero: %s\n", original_args);
cadence_is_ok = 0;
} else {
cid_location = i;
if (c[i] == 0) {
ast_log(LOG_ERROR, "Ring or silence duration cannot be zero: %s\n", original_args);
cadence_is_ok = 0;
break;
} else if (c[i] < 0) {
if (i % 2 == 1) {
/* Silence duration, negative possibly okay */
if (cid_location == -1) {
cid_location = i;
c[i] *= -1;
} else {
ast_log(LOG_ERROR, "CID location specified twice: %s\n",original_args);
cadence_is_ok = 0;
break;
}
} else if (cid_location) {
ast_log(LOG_ERROR, "CID location specified twice: %s\n",original_args);
cadence_is_ok = 0;
} else {
ast_log(LOG_ERROR, "Negative or zero ring duration: %s\n",original_args);
cadence_is_ok = 0;
break;
if (firstcadencepos == 0) {
firstcadencepos = i; /* only recorded to avoid duplicate specification */
/* duration will be passed negative to the zaptel driver */
} else {
ast_log(LOG_ERROR, "First cadence position specified twice: %s\n",original_args);
cadence_is_ok = 0;
break;
}
}
}
}