kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 20:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 114617 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
r114617 | tilghman | 2008-04-24 14:24:31 -0500 (Thu, 24 Apr 2008) | 6 lines

Fix DST calculation, and fix bug in calculation of whether conf has started yet or not
(Closes issue #12292)
 Reported by: DEA
 Patches: 
       app_meetme-rt-dst-sched-fix.txt uploaded by DEA (license 3)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@114619 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-04-24 19:37:45 +00:00
parent 9668fba027
commit b4a9866bd5
1 changed files with 40 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
apps/app_meetme.c
View File

@@ -2707,36 +2707,57 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char
char useropts[32] = "";
char adminopts[32] = "";
struct ast_tm tm, etm;
struct timeval starttime = { .tv_sec = 0 }, endtime = { .tv_sec = 0 };
struct timeval endtime = { .tv_sec = 0 };
if (rt_schedule) {
now = ast_tvnow();
if (fuzzystart)
now.tv_sec += fuzzystart;
ast_localtime(&now, &tm, NULL);
ast_strftime(currenttime, sizeof(currenttime), DATE_FORMAT, &tm);
if (earlyalert) {
now.tv_sec += earlyalert;
ast_localtime(&now, &etm, NULL);
ast_strftime(eatime, sizeof(eatime), DATE_FORMAT, &etm);
} else {
ast_copy_string(eatime, currenttime, sizeof(eatime));
}
ast_debug(1, "Looking for conference %s that starts after %s\n", confno, eatime);
var = ast_load_realtime("meetme", "confno",
confno, "starttime <= ", eatime, "endtime >= ",
confno, "starttime <= ", currenttime, "endtime >= ",
currenttime, NULL);
if (!var && fuzzystart) {
now = ast_tvnow();
now.tv_sec += fuzzystart;
ast_localtime(&now, &tm, NULL);
ast_strftime(currenttime, sizeof(currenttime), DATE_FORMAT, &tm);
var = ast_load_realtime("meetme", "confno",
confno, "starttime <= ", currenttime, "endtime >= ",
currenttime, NULL);
}
if (!var && earlyalert) {
now = ast_tvnow();
now.tv_sec += earlyalert;
ast_localtime(&now, &etm, NULL);
ast_strftime(eatime, sizeof(eatime), DATE_FORMAT, &etm);
var = ast_load_realtime("meetme", "confno",
confno, "starttime <= ", eatime, "endtime >= ",
currenttime, NULL);
if (var)
*too_early = 1;
}
} else
var = ast_load_realtime("meetme", "confno", confno, NULL);
if (!var)
return NULL;
if (rt_schedule && *too_early) {
/* Announce that the caller is early and exit */
if (!ast_streamfile(chan, "conf-has-not-started", chan->language))
ast_waitstream(chan, "");
ast_variables_destroy(var);
return NULL;
}
while (var) {
if (!strcasecmp(var->name, "pin")) {
pin = ast_strdupa(var->value);
@@ -2754,32 +2775,19 @@ static struct ast_conference *find_conf_realtime(struct ast_channel *chan, char
struct tm tm;
} t = { { 0, }, };
strptime(var->value, "%Y-%m-%d %H:%M:%S", &t.tm);
/* strptime does not determine if a time is
* in DST or not. Set tm_isdst to -1 to
* allow ast_mktime to adjust for DST
* if needed */
t.tm.tm_isdst = -1;
endtime = ast_mktime(&t.atm, NULL);
} else if (!strcasecmp(var->name, "starttime")) {
union {
struct ast_tm atm;
struct tm tm;
} t = { { 0, }, };
strptime(var->value, "%Y-%m-%d %H:%M:%S", &t.tm);
starttime = ast_mktime(&t.atm, NULL);
}
var = var->next;
}
ast_variables_destroy(var);
if (earlyalert) {
now = ast_tvnow();
if (now.tv_sec + fuzzystart < starttime.tv_sec) {
/* Announce that the caller is early and exit */
if (!ast_streamfile(chan, "conf-has-not-started", chan->language))
ast_waitstream(chan, "");
*too_early = 1;
return NULL;
}
}
cnf = build_conf(confno, pin ? pin : "", pinadmin ? pinadmin : "", make, dynamic, refcount, chan);
if (cnf) {