|
|
|
@ -39,6 +39,7 @@ static struct ast_cdr_beitem {
|
|
|
|
|
struct ast_cdr_beitem *next;
|
|
|
|
|
} *bes = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* We do a lot of checking here in the CDR code to try to be sure we don't ever let a CDR slip
|
|
|
|
|
* through our fingers somehow. If someone allocates a CDR, it must be completely handled normally
|
|
|
|
@ -110,7 +111,7 @@ void ast_cdr_free(struct ast_cdr *cdr)
|
|
|
|
|
while (cdr) {
|
|
|
|
|
next = cdr->next;
|
|
|
|
|
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
|
|
|
|
|
if (!cdr->posted)
|
|
|
|
|
if (!ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' not posted\n", chan);
|
|
|
|
|
if (!cdr->end.tv_sec && !cdr->end.tv_usec)
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' lacks end\n", chan);
|
|
|
|
@ -135,12 +136,14 @@ void ast_cdr_start(struct ast_cdr *cdr)
|
|
|
|
|
{
|
|
|
|
|
char *chan;
|
|
|
|
|
while (cdr) {
|
|
|
|
|
if (!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
|
|
|
|
|
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
|
|
|
|
|
if (cdr->posted)
|
|
|
|
|
if (ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
|
|
|
|
|
if (cdr->start.tv_sec || cdr->start.tv_usec)
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' already started\n", chan);
|
|
|
|
|
gettimeofday(&cdr->start, NULL);
|
|
|
|
|
}
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -150,7 +153,7 @@ void ast_cdr_answer(struct ast_cdr *cdr)
|
|
|
|
|
char *chan;
|
|
|
|
|
while (cdr) {
|
|
|
|
|
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
|
|
|
|
|
if (cdr->posted)
|
|
|
|
|
if (ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
|
|
|
|
|
if (cdr->disposition < AST_CDR_ANSWERED)
|
|
|
|
|
cdr->disposition = AST_CDR_ANSWERED;
|
|
|
|
@ -165,11 +168,13 @@ void ast_cdr_busy(struct ast_cdr *cdr)
|
|
|
|
|
{
|
|
|
|
|
char *chan;
|
|
|
|
|
while (cdr) {
|
|
|
|
|
if (!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
|
|
|
|
|
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
|
|
|
|
|
if (cdr->posted)
|
|
|
|
|
if (ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
|
|
|
|
|
if (cdr->disposition < AST_CDR_BUSY)
|
|
|
|
|
cdr->disposition = AST_CDR_BUSY;
|
|
|
|
|
}
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -179,8 +184,9 @@ void ast_cdr_failed(struct ast_cdr *cdr)
|
|
|
|
|
char *chan;
|
|
|
|
|
while (cdr) {
|
|
|
|
|
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
|
|
|
|
|
if (cdr->posted)
|
|
|
|
|
if (ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
|
|
|
|
|
if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED))
|
|
|
|
|
cdr->disposition = AST_CDR_FAILED;
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
@ -216,8 +222,9 @@ void ast_cdr_setdestchan(struct ast_cdr *cdr, char *chann)
|
|
|
|
|
char *chan;
|
|
|
|
|
while (cdr) {
|
|
|
|
|
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
|
|
|
|
|
if (cdr->posted)
|
|
|
|
|
if (ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
|
|
|
|
|
if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED))
|
|
|
|
|
strncpy(cdr->dstchannel, chann, sizeof(cdr->dstchannel) - 1);
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
@ -227,8 +234,9 @@ void ast_cdr_setapp(struct ast_cdr *cdr, char *app, char *data)
|
|
|
|
|
{
|
|
|
|
|
char *chan;
|
|
|
|
|
while (cdr) {
|
|
|
|
|
if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
|
|
|
|
|
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
|
|
|
|
|
if (cdr->posted)
|
|
|
|
|
if (ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
|
|
|
|
|
if (!app)
|
|
|
|
|
app = "";
|
|
|
|
@ -236,6 +244,7 @@ void ast_cdr_setapp(struct ast_cdr *cdr, char *app, char *data)
|
|
|
|
|
if (!data)
|
|
|
|
|
data = "";
|
|
|
|
|
strncpy(cdr->lastdata, data, sizeof(cdr->lastdata) - 1);
|
|
|
|
|
}
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -245,6 +254,7 @@ int ast_cdr_setcid(struct ast_cdr *cdr, struct ast_channel *c)
|
|
|
|
|
char tmp[AST_MAX_EXTENSION] = "";
|
|
|
|
|
char *num, *name;
|
|
|
|
|
while (cdr) {
|
|
|
|
|
if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
|
|
|
|
|
/* Grab source from ANI or normal Caller*ID */
|
|
|
|
|
if (c->ani)
|
|
|
|
|
strncpy(tmp, c->ani, sizeof(tmp) - 1);
|
|
|
|
@ -259,6 +269,7 @@ int ast_cdr_setcid(struct ast_cdr *cdr, struct ast_channel *c)
|
|
|
|
|
ast_shrink_phone_number(num);
|
|
|
|
|
strncpy(cdr->src, num, sizeof(cdr->src) - 1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
@ -270,6 +281,7 @@ int ast_cdr_init(struct ast_cdr *cdr, struct ast_channel *c)
|
|
|
|
|
char *num, *name;
|
|
|
|
|
char tmp[AST_MAX_EXTENSION] = "";
|
|
|
|
|
while (cdr) {
|
|
|
|
|
if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
|
|
|
|
|
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
|
|
|
|
|
if (!ast_strlen_zero(cdr->channel))
|
|
|
|
|
ast_log(LOG_WARNING, "CDR already initialized on '%s'\n", chan);
|
|
|
|
@ -303,6 +315,7 @@ int ast_cdr_init(struct ast_cdr *cdr, struct ast_channel *c)
|
|
|
|
|
strncpy(cdr->dcontext, c->context, sizeof(cdr->dcontext) - 1);
|
|
|
|
|
/* Unique call identifier */
|
|
|
|
|
strncpy(cdr->uniqueid, c->uniqueid, sizeof(cdr->uniqueid) - 1);
|
|
|
|
|
}
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
@ -313,7 +326,7 @@ void ast_cdr_end(struct ast_cdr *cdr)
|
|
|
|
|
char *chan;
|
|
|
|
|
while (cdr) {
|
|
|
|
|
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
|
|
|
|
|
if (cdr->posted)
|
|
|
|
|
if (ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
|
|
|
|
|
if (!cdr->start.tv_sec && !cdr->start.tv_usec)
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' has not started\n", chan);
|
|
|
|
@ -358,6 +371,7 @@ int ast_cdr_setaccount(struct ast_channel *chan, char *account)
|
|
|
|
|
|
|
|
|
|
strncpy(chan->accountcode, account, sizeof(chan->accountcode) - 1);
|
|
|
|
|
while (cdr) {
|
|
|
|
|
if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED))
|
|
|
|
|
strncpy(cdr->accountcode, chan->accountcode, sizeof(cdr->accountcode) - 1);
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
@ -369,6 +383,7 @@ int ast_cdr_setuserfield(struct ast_channel *chan, char *userfield)
|
|
|
|
|
struct ast_cdr *cdr = chan->cdr;
|
|
|
|
|
|
|
|
|
|
while (cdr) {
|
|
|
|
|
if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED))
|
|
|
|
|
strncpy(cdr->userfield, userfield, sizeof(cdr->userfield) - 1);
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
@ -381,7 +396,9 @@ int ast_cdr_appenduserfield(struct ast_channel *chan, char *userfield)
|
|
|
|
|
|
|
|
|
|
while (cdr)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
int len = strlen(cdr->userfield);
|
|
|
|
|
if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED))
|
|
|
|
|
strncpy(cdr->userfield+len, userfield, sizeof(cdr->userfield) - len - 1);
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
@ -395,6 +412,7 @@ int ast_cdr_update(struct ast_channel *c)
|
|
|
|
|
char tmp[AST_MAX_EXTENSION] = "";
|
|
|
|
|
/* Grab source from ANI or normal Caller*ID */
|
|
|
|
|
while (cdr) {
|
|
|
|
|
if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
|
|
|
|
|
if (c->ani)
|
|
|
|
|
strncpy(tmp, c->ani, sizeof(tmp) - 1);
|
|
|
|
|
else if (c->callerid && !ast_strlen_zero(c->callerid))
|
|
|
|
@ -415,8 +433,10 @@ int ast_cdr_update(struct ast_channel *c)
|
|
|
|
|
/* Destination information */
|
|
|
|
|
strncpy(cdr->dst, c->exten, sizeof(cdr->dst) - 1);
|
|
|
|
|
strncpy(cdr->dcontext, c->context, sizeof(cdr->dcontext) - 1);
|
|
|
|
|
}
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -439,7 +459,7 @@ void ast_cdr_post(struct ast_cdr *cdr)
|
|
|
|
|
struct ast_cdr_beitem *i;
|
|
|
|
|
while (cdr) {
|
|
|
|
|
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
|
|
|
|
|
if (cdr->posted)
|
|
|
|
|
if (ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
|
|
|
|
|
if (!cdr->end.tv_sec && !cdr->end.tv_usec)
|
|
|
|
|
ast_log(LOG_WARNING, "CDR on channel '%s' lacks end\n", chan);
|
|
|
|
@ -450,7 +470,7 @@ void ast_cdr_post(struct ast_cdr *cdr)
|
|
|
|
|
cdr->billsec = cdr->end.tv_sec - cdr->answer.tv_sec + (cdr->end.tv_usec - cdr->answer.tv_usec) / 1000000;
|
|
|
|
|
} else
|
|
|
|
|
cdr->billsec = 0;
|
|
|
|
|
cdr->posted = 1;
|
|
|
|
|
ast_cdr_add_flag(cdr,AST_CDR_FLAG_POSTED);
|
|
|
|
|
ast_mutex_lock(&cdrlock);
|
|
|
|
|
i = bes;
|
|
|
|
|
while(i) {
|
|
|
|
@ -471,7 +491,7 @@ void ast_cdr_reset(struct ast_cdr *cdr, int post)
|
|
|
|
|
ast_cdr_post(cdr);
|
|
|
|
|
}
|
|
|
|
|
/* Reset to initial state */
|
|
|
|
|
cdr->posted = 0;
|
|
|
|
|
cdr->flags=0;
|
|
|
|
|
memset(&cdr->start, 0, sizeof(cdr->start));
|
|
|
|
|
memset(&cdr->end, 0, sizeof(cdr->end));
|
|
|
|
|
memset(&cdr->answer, 0, sizeof(cdr->answer));
|
|
|
|
@ -482,3 +502,13 @@ void ast_cdr_reset(struct ast_cdr *cdr, int post)
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void ast_cdr_append(struct ast_cdr *cdr, struct ast_cdr *newcdr) {
|
|
|
|
|
if(cdr) {
|
|
|
|
|
while(cdr->next)
|
|
|
|
|
cdr = cdr->next;
|
|
|
|
|
cdr->next = newcdr;
|
|
|
|
|
} else
|
|
|
|
|
ast_log(LOG_ERROR, "Can't append a CDR to NULL!\n");
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|