kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't complain that wait4 is unkown and make sure that we won't segfault if chan->cdr is NULL

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1522 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Martin Pycko
2003-09-17 04:21:56 +00:00
parent 4e13099add
commit a2894c1114
2 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
asterisk.c
View File

@@ -38,6 +38,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <sys/select.h> #include <sys/select.h>
#include <sys/wait.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <ctype.h> #include <ctype.h>

72
cdr.c
View File

@@ -351,30 +351,28 @@ int ast_cdr_update(struct ast_channel *c)
char *name, *num; char *name, *num;
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 */
if (!cdr) { if (cdr) {
ast_log(LOG_NOTICE, "The cdr pointer is not set\n"); if (c->ani)
return -1; strncpy(tmp, c->ani, sizeof(tmp) - 1);
else if (c->callerid && strlen(c->callerid))
strncpy(tmp, c->callerid, sizeof(tmp) - 1);
if (c->callerid && strlen(c->callerid))
strncpy(cdr->clid, c->callerid, sizeof(cdr->clid) - 1);
else
strcpy(cdr->clid, "");
name = NULL;
num = NULL;
ast_callerid_parse(tmp, &name, &num);
if (num) {
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);
} }
if (c->ani)
strncpy(tmp, c->ani, sizeof(tmp) - 1);
else if (c->callerid && strlen(c->callerid))
strncpy(tmp, c->callerid, sizeof(tmp) - 1);
if (c->callerid && strlen(c->callerid))
strncpy(cdr->clid, c->callerid, sizeof(cdr->clid) - 1);
else
strcpy(cdr->clid, "");
name = NULL;
num = NULL;
ast_callerid_parse(tmp, &name, &num);
if (num) {
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);
return 0; return 0;
} }
@@ -421,18 +419,20 @@ void ast_cdr_post(struct ast_cdr *cdr)
void ast_cdr_reset(struct ast_cdr *cdr, int post) void ast_cdr_reset(struct ast_cdr *cdr, int post)
{ {
/* Post if requested */ if (cdr) {
if (post) { /* Post if requested */
ast_cdr_end(cdr); if (post) {
ast_cdr_post(cdr); ast_cdr_end(cdr);
ast_cdr_post(cdr);
}
/* Reset to initial state */
cdr->posted = 0;
memset(&cdr->start, 0, sizeof(cdr->start));
memset(&cdr->end, 0, sizeof(cdr->end));
memset(&cdr->answer, 0, sizeof(cdr->answer));
cdr->billsec = 0;
cdr->duration = 0;
ast_cdr_start(cdr);
cdr->disposition = AST_CDR_NOANSWER;
} }
/* Reset to initial state */
cdr->posted = 0;
memset(&cdr->start, 0, sizeof(cdr->start));
memset(&cdr->end, 0, sizeof(cdr->end));
memset(&cdr->answer, 0, sizeof(cdr->answer));
cdr->billsec = 0;
cdr->duration = 0;
ast_cdr_start(cdr);
cdr->disposition = AST_CDR_NOANSWER;
} }