kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 11:58:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge (and cleanup) anthm's CDR changes

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-06-20 22:46:42 +00:00
parent 70167380a3
commit b72227e845
2 changed files with 142 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
cdr.c
View File

@@ -39,6 +39,7 @@ static struct ast_cdr_beitem {
struct ast_cdr_beitem *next; struct ast_cdr_beitem *next;
} *bes = NULL; } *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 * 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 * 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) { while (cdr) {
next = cdr->next; next = cdr->next;
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; 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); ast_log(LOG_WARNING, "CDR on channel '%s' not posted\n", chan);
if (!cdr->end.tv_sec && !cdr->end.tv_usec) if (!cdr->end.tv_sec && !cdr->end.tv_usec)
ast_log(LOG_WARNING, "CDR on channel '%s' lacks end\n", chan); ast_log(LOG_WARNING, "CDR on channel '%s' lacks end\n", chan);
@@ -135,13 +136,15 @@ void ast_cdr_start(struct ast_cdr *cdr)
{ {
char *chan; char *chan;
while (cdr) { while (cdr) {
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; if (!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
if (cdr->posted) chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan); if (ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
if (cdr->start.tv_sec || cdr->start.tv_usec) ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
ast_log(LOG_WARNING, "CDR on channel '%s' already started\n", chan); if (cdr->start.tv_sec || cdr->start.tv_usec)
gettimeofday(&cdr->start, NULL); ast_log(LOG_WARNING, "CDR on channel '%s' already started\n", chan);
cdr = cdr->next; gettimeofday(&cdr->start, NULL);
}
cdr = cdr->next;
} }
} }
@@ -150,7 +153,7 @@ void ast_cdr_answer(struct ast_cdr *cdr)
char *chan; char *chan;
while (cdr) { while (cdr) {
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; 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); ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
if (cdr->disposition < AST_CDR_ANSWERED) if (cdr->disposition < AST_CDR_ANSWERED)
cdr->disposition = AST_CDR_ANSWERED; cdr->disposition = AST_CDR_ANSWERED;
@@ -165,11 +168,13 @@ void ast_cdr_busy(struct ast_cdr *cdr)
{ {
char *chan; char *chan;
while (cdr) { while (cdr) {
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; if (!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
if (cdr->posted) chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan); if (ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
if (cdr->disposition < AST_CDR_BUSY) ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
cdr->disposition = AST_CDR_BUSY; if (cdr->disposition < AST_CDR_BUSY)
cdr->disposition = AST_CDR_BUSY;
}
cdr = cdr->next; cdr = cdr->next;
} }
} }
@@ -179,9 +184,10 @@ void ast_cdr_failed(struct ast_cdr *cdr)
char *chan; char *chan;
while (cdr) { while (cdr) {
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; 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); ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
cdr->disposition = AST_CDR_FAILED; if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED))
cdr->disposition = AST_CDR_FAILED;
cdr = cdr->next; cdr = cdr->next;
} }
} }
@@ -216,9 +222,10 @@ void ast_cdr_setdestchan(struct ast_cdr *cdr, char *chann)
char *chan; char *chan;
while (cdr) { while (cdr) {
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; 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); ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
strncpy(cdr->dstchannel, chann, sizeof(cdr->dstchannel) - 1); if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED))
strncpy(cdr->dstchannel, chann, sizeof(cdr->dstchannel) - 1);
cdr = cdr->next; cdr = cdr->next;
} }
} }
@@ -227,15 +234,17 @@ void ast_cdr_setapp(struct ast_cdr *cdr, char *app, char *data)
{ {
char *chan; char *chan;
while (cdr) { while (cdr) {
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
if (cdr->posted) chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan); if (ast_cdr_has_flag(cdr,AST_CDR_FLAG_POSTED))
if (!app) ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
app = ""; if (!app)
strncpy(cdr->lastapp, app, sizeof(cdr->lastapp) - 1); app = "";
if (!data) strncpy(cdr->lastapp, app, sizeof(cdr->lastapp) - 1);
data = ""; if (!data)
strncpy(cdr->lastdata, data, sizeof(cdr->lastdata) - 1); data = "";
strncpy(cdr->lastdata, data, sizeof(cdr->lastdata) - 1);
}
cdr = cdr->next; cdr = cdr->next;
} }
} }
@@ -245,19 +254,21 @@ int ast_cdr_setcid(struct ast_cdr *cdr, struct ast_channel *c)
char tmp[AST_MAX_EXTENSION] = ""; char tmp[AST_MAX_EXTENSION] = "";
char *num, *name; char *num, *name;
while (cdr) { while (cdr) {
/* Grab source from ANI or normal Caller*ID */ if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
if (c->ani) /* Grab source from ANI or normal Caller*ID */
strncpy(tmp, c->ani, sizeof(tmp) - 1); if (c->ani)
else if (c->callerid) strncpy(tmp, c->ani, sizeof(tmp) - 1);
strncpy(tmp, c->callerid, sizeof(tmp) - 1); else if (c->callerid)
if (c->callerid) strncpy(tmp, c->callerid, sizeof(tmp) - 1);
strncpy(cdr->clid, c->callerid, sizeof(cdr->clid) - 1); if (c->callerid)
name = NULL; strncpy(cdr->clid, c->callerid, sizeof(cdr->clid) - 1);
num = NULL; name = NULL;
ast_callerid_parse(tmp, &name, &num); num = NULL;
if (num) { ast_callerid_parse(tmp, &name, &num);
ast_shrink_phone_number(num); if (num) {
strncpy(cdr->src, num, sizeof(cdr->src) - 1); ast_shrink_phone_number(num);
strncpy(cdr->src, num, sizeof(cdr->src) - 1);
}
} }
cdr = cdr->next; cdr = cdr->next;
} }
@@ -270,39 +281,41 @@ int ast_cdr_init(struct ast_cdr *cdr, struct ast_channel *c)
char *num, *name; char *num, *name;
char tmp[AST_MAX_EXTENSION] = ""; char tmp[AST_MAX_EXTENSION] = "";
while (cdr) { while (cdr) {
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
if (!ast_strlen_zero(cdr->channel)) chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>";
ast_log(LOG_WARNING, "CDR already initialized on '%s'\n", chan); if (!ast_strlen_zero(cdr->channel))
strncpy(cdr->channel, c->name, sizeof(cdr->channel) - 1); ast_log(LOG_WARNING, "CDR already initialized on '%s'\n", chan);
/* Grab source from ANI or normal Caller*ID */ strncpy(cdr->channel, c->name, sizeof(cdr->channel) - 1);
if (c->ani) /* Grab source from ANI or normal Caller*ID */
strncpy(tmp, c->ani, sizeof(tmp) - 1); if (c->ani)
else if (c->callerid) strncpy(tmp, c->ani, sizeof(tmp) - 1);
strncpy(tmp, c->callerid, sizeof(tmp) - 1); else if (c->callerid)
if (c->callerid) strncpy(tmp, c->callerid, sizeof(tmp) - 1);
strncpy(cdr->clid, c->callerid, sizeof(cdr->clid) - 1); if (c->callerid)
name = NULL; strncpy(cdr->clid, c->callerid, sizeof(cdr->clid) - 1);
num = NULL; name = NULL;
ast_callerid_parse(tmp, &name, &num); num = NULL;
if (num) { ast_callerid_parse(tmp, &name, &num);
ast_shrink_phone_number(num); if (num) {
strncpy(cdr->src, num, sizeof(cdr->src) - 1); ast_shrink_phone_number(num);
} strncpy(cdr->src, num, sizeof(cdr->src) - 1);
}
if (c->_state == AST_STATE_UP) if (c->_state == AST_STATE_UP)
cdr->disposition = AST_CDR_ANSWERED; cdr->disposition = AST_CDR_ANSWERED;
else else
cdr->disposition = AST_CDR_NOANSWER; cdr->disposition = AST_CDR_NOANSWER;
if (c->amaflags) if (c->amaflags)
cdr->amaflags = c->amaflags; cdr->amaflags = c->amaflags;
else else
cdr->amaflags = ast_default_amaflags; cdr->amaflags = ast_default_amaflags;
strncpy(cdr->accountcode, c->accountcode, sizeof(cdr->accountcode) - 1); strncpy(cdr->accountcode, c->accountcode, sizeof(cdr->accountcode) - 1);
/* Destination information */ /* Destination information */
strncpy(cdr->dst, c->exten, sizeof(cdr->dst) - 1); strncpy(cdr->dst, c->exten, sizeof(cdr->dst) - 1);
strncpy(cdr->dcontext, c->context, sizeof(cdr->dcontext) - 1); strncpy(cdr->dcontext, c->context, sizeof(cdr->dcontext) - 1);
/* Unique call identifier */ /* Unique call identifier */
strncpy(cdr->uniqueid, c->uniqueid, sizeof(cdr->uniqueid) - 1); strncpy(cdr->uniqueid, c->uniqueid, sizeof(cdr->uniqueid) - 1);
}
cdr = cdr->next; cdr = cdr->next;
} }
return 0; return 0;
@@ -313,7 +326,7 @@ void ast_cdr_end(struct ast_cdr *cdr)
char *chan; char *chan;
while (cdr) { while (cdr) {
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; 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); ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
if (!cdr->start.tv_sec && !cdr->start.tv_usec) if (!cdr->start.tv_sec && !cdr->start.tv_usec)
ast_log(LOG_WARNING, "CDR on channel '%s' has not started\n", chan); ast_log(LOG_WARNING, "CDR on channel '%s' has not started\n", chan);
@@ -358,7 +371,8 @@ int ast_cdr_setaccount(struct ast_channel *chan, char *account)
strncpy(chan->accountcode, account, sizeof(chan->accountcode) - 1); strncpy(chan->accountcode, account, sizeof(chan->accountcode) - 1);
while (cdr) { while (cdr) {
strncpy(cdr->accountcode, chan->accountcode, sizeof(cdr->accountcode) - 1); if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED))
strncpy(cdr->accountcode, chan->accountcode, sizeof(cdr->accountcode) - 1);
cdr = cdr->next; cdr = cdr->next;
} }
return 0; return 0;
@@ -369,7 +383,8 @@ int ast_cdr_setuserfield(struct ast_channel *chan, char *userfield)
struct ast_cdr *cdr = chan->cdr; struct ast_cdr *cdr = chan->cdr;
while (cdr) { while (cdr) {
strncpy(cdr->userfield, userfield, sizeof(cdr->userfield) - 1); if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED))
strncpy(cdr->userfield, userfield, sizeof(cdr->userfield) - 1);
cdr = cdr->next; cdr = cdr->next;
} }
return 0; return 0;
@@ -381,8 +396,10 @@ int ast_cdr_appenduserfield(struct ast_channel *chan, char *userfield)
while (cdr) while (cdr)
{ {
int len = strlen(cdr->userfield); int len = strlen(cdr->userfield);
strncpy(cdr->userfield+len, userfield, sizeof(cdr->userfield) - len - 1); if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED))
strncpy(cdr->userfield+len, userfield, sizeof(cdr->userfield) - len - 1);
cdr = cdr->next; cdr = cdr->next;
} }
return 0; return 0;
@@ -395,28 +412,31 @@ int ast_cdr_update(struct ast_channel *c)
char tmp[AST_MAX_EXTENSION] = ""; char tmp[AST_MAX_EXTENSION] = "";
/* Grab source from ANI or normal Caller*ID */ /* Grab source from ANI or normal Caller*ID */
while (cdr) { while (cdr) {
if (c->ani) if(!ast_cdr_has_flag(cdr,AST_CDR_FLAG_LOCKED)) {
strncpy(tmp, c->ani, sizeof(tmp) - 1); if (c->ani)
else if (c->callerid && !ast_strlen_zero(c->callerid)) strncpy(tmp, c->ani, sizeof(tmp) - 1);
strncpy(tmp, c->callerid, sizeof(tmp) - 1); else if (c->callerid && !ast_strlen_zero(c->callerid))
if (c->callerid && !ast_strlen_zero(c->callerid)) strncpy(tmp, c->callerid, sizeof(tmp) - 1);
strncpy(cdr->clid, c->callerid, sizeof(cdr->clid) - 1); if (c->callerid && !ast_strlen_zero(c->callerid))
else strncpy(cdr->clid, c->callerid, sizeof(cdr->clid) - 1);
strcpy(cdr->clid, ""); else
name = NULL; strcpy(cdr->clid, "");
num = NULL; name = NULL;
ast_callerid_parse(tmp, &name, &num); num = NULL;
if (num) { ast_callerid_parse(tmp, &name, &num);
ast_shrink_phone_number(num); if (num) {
strncpy(cdr->src, num, sizeof(cdr->src) - 1); ast_shrink_phone_number(num);
strncpy(cdr->src, num, sizeof(cdr->src) - 1);
}
/* Copy account code et-al */
strncpy(cdr->accountcode, c->accountcode, sizeof(cdr->accountcode) - 1);
/* Destination information */
strncpy(cdr->dst, c->exten, sizeof(cdr->dst) - 1);
strncpy(cdr->dcontext, c->context, sizeof(cdr->dcontext) - 1);
} }
/* Copy account code et-al */
strncpy(cdr->accountcode, c->accountcode, sizeof(cdr->accountcode) - 1);
/* Destination information */
strncpy(cdr->dst, c->exten, sizeof(cdr->dst) - 1);
strncpy(cdr->dcontext, c->context, sizeof(cdr->dcontext) - 1);
cdr = cdr->next; cdr = cdr->next;
} }
return 0; return 0;
} }
@@ -439,7 +459,7 @@ void ast_cdr_post(struct ast_cdr *cdr)
struct ast_cdr_beitem *i; struct ast_cdr_beitem *i;
while (cdr) { while (cdr) {
chan = !ast_strlen_zero(cdr->channel) ? cdr->channel : "<unknown>"; 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); ast_log(LOG_WARNING, "CDR on channel '%s' already posted\n", chan);
if (!cdr->end.tv_sec && !cdr->end.tv_usec) if (!cdr->end.tv_sec && !cdr->end.tv_usec)
ast_log(LOG_WARNING, "CDR on channel '%s' lacks end\n", chan); 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; cdr->billsec = cdr->end.tv_sec - cdr->answer.tv_sec + (cdr->end.tv_usec - cdr->answer.tv_usec) / 1000000;
} else } else
cdr->billsec = 0; cdr->billsec = 0;
cdr->posted = 1; ast_cdr_add_flag(cdr,AST_CDR_FLAG_POSTED);
ast_mutex_lock(&cdrlock); ast_mutex_lock(&cdrlock);
i = bes; i = bes;
while(i) { while(i) {
@@ -471,7 +491,7 @@ void ast_cdr_reset(struct ast_cdr *cdr, int post)
ast_cdr_post(cdr); ast_cdr_post(cdr);
} }
/* Reset to initial state */ /* Reset to initial state */
cdr->posted = 0; cdr->flags=0;
memset(&cdr->start, 0, sizeof(cdr->start)); memset(&cdr->start, 0, sizeof(cdr->start));
memset(&cdr->end, 0, sizeof(cdr->end)); memset(&cdr->end, 0, sizeof(cdr->end));
memset(&cdr->answer, 0, sizeof(cdr->answer)); memset(&cdr->answer, 0, sizeof(cdr->answer));
@@ -482,3 +502,13 @@ void ast_cdr_reset(struct ast_cdr *cdr, int post)
cdr = cdr->next; 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");
}

18
include/asterisk/cdr.h
View File

@@ -20,6 +20,10 @@
#include <asterisk/channel.h> #include <asterisk/channel.h>
#include <sys/time.h> #include <sys/time.h>
#define AST_CDR_FLAG_POSTED (1 << 1)
#define AST_CDR_FLAG_LOCKED (1 << 2)
#define AST_CDR_FLAG_CHILD (1 << 3)
#define AST_CDR_NOANSWER (1 << 0) #define AST_CDR_NOANSWER (1 << 0)
#define AST_CDR_BUSY (1 << 1) #define AST_CDR_BUSY (1 << 1)
#define AST_CDR_ANSWERED (1 << 2) #define AST_CDR_ANSWERED (1 << 2)
@@ -68,10 +72,10 @@ struct ast_cdr {
int amaflags; int amaflags;
/*! What account number to use */ /*! What account number to use */
char accountcode[20]; char accountcode[20];
/*! Whether or not the record has been posted */ /*! flags */
int posted; int flags;
/* Unique Channel Identifier */ /* Unique Channel Identifier */
char uniqueid[32]; char uniqueid[32];
/* User field */ /* User field */
char userfield[AST_MAX_USER_FIELD]; char userfield[AST_MAX_USER_FIELD];
struct ast_cdr *next; struct ast_cdr *next;
@@ -243,4 +247,10 @@ extern int ast_default_amaflags;
extern char ast_default_accountcode[20]; extern char ast_default_accountcode[20];
#define ast_cdr_has_flag(cdr, flag) ((cdr)->flags & (flag))
#define ast_cdr_add_flag(cdr, flag) ((cdr)->flags |= (flag))
#define ast_cdr_del_flag(cdr, flag) ((cdr)->flags &= ~(flag))
extern void ast_cdr_append(struct ast_cdr *cdr, struct ast_cdr *newcdr);
#endif /* _CDR_H */ #endif /* _CDR_H */