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

Callerid fix and warning cleanup (bug #367 & #356)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1621 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-10-08 21:57:43 +00:00
parent ea4aeb0c67
commit 1b19a2b1de
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
callerid.c
View File

@@ -110,8 +110,8 @@ struct callerid_state *callerid_new(void)
{ {
struct callerid_state *cid; struct callerid_state *cid;
cid = malloc(sizeof(struct callerid_state)); cid = malloc(sizeof(struct callerid_state));
memset(cid, 0, sizeof(struct callerid_state));
if (cid) { if (cid) {
memset(cid, 0, sizeof(struct callerid_state));
cid->fskd.spb = 7; /* 1200 baud */ cid->fskd.spb = 7; /* 1200 baud */
cid->fskd.hdlc = 0; /* Async */ cid->fskd.hdlc = 0; /* Async */
cid->fskd.nbit = 8; /* 8 bits */ cid->fskd.nbit = 8; /* 8 bits */

4
channels/chan_zap.c
View File

@@ -4359,6 +4359,8 @@ static void *ss_thread(void *data)
} else } else
ast_log(LOG_WARNING, "Unable to get caller ID space\n"); ast_log(LOG_WARNING, "Unable to get caller ID space\n");
} }
else
cs = NULL;
if (name && number) { if (name && number) {
snprintf(cid, sizeof(cid), "\"%s\" <%s>", name, number); snprintf(cid, sizeof(cid), "\"%s\" <%s>", name, number);
} else if (name) { } else if (name) {
@@ -4368,6 +4370,8 @@ static void *ss_thread(void *data)
} else { } else {
strcpy(cid, ""); strcpy(cid, "");
} }
if (cs)
callerid_free(cs);
if (strlen(cid)) { if (strlen(cid)) {
chan->callerid = strdup(cid); chan->callerid = strdup(cid);
chan->ani = strdup(cid); chan->ani = strdup(cid);

3
frame.c
View File

@@ -455,8 +455,7 @@ static int show_codecs(int fd, int argc, char *argv[])
return RESULT_SHOWUSAGE; return RESULT_SHOWUSAGE;
if (getenv("I_AM_NOT_AN_IDIOT") == NULL) if (getenv("I_AM_NOT_AN_IDIOT") == NULL)
ast_cli(fd, "Disclaimer: this command is for informational purposes ast_cli(fd, "Disclaimer: this command is for informational purposes only.\n\tIt does not indicate anything about your configuration.\n");
only.\n\tIt does not indicate anything about your configuration.\n");
if ((argc == 2) || (!strcasecmp(argv[1],"audio"))) { if ((argc == 2) || (!strcasecmp(argv[1],"audio"))) {
found = 1; found = 1;