Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

more strncpy -> ast_copy_string conversions, fixing some buglets along the way

Browse Source 
add recommendation to CODING-GUIDELINES to use ast_copy_string instead of strncpy in new code


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@5686 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.2-netsec
Kevin P. Fleming 20 years ago
parent eaececc920
commit 9bf21dbf58
4 changed files with 237 additions and 244 deletions
Show Stats Download Patch File Download Diff File

224
channels/chan_iax2.c
Unescape View File

@ -816,7 +816,7 @@ static int iax2_getpeername(struct sockaddr_in sin, char *host, int len, int loc
while(peer) { while(peer) {
if ((peer->addr.sin_addr.s_addr == sin.sin_addr.s_addr) && if ((peer->addr.sin_addr.s_addr == sin.sin_addr.s_addr) &&
(peer->addr.sin_port == sin.sin_port)) { (peer->addr.sin_port == sin.sin_port)) {
strncpy(host, peer->name, len-1); ast_copy_string(host, peer->name, len);
res = 1; res = 1;
break; break;
} }
@ -843,9 +843,9 @@ static struct chan_iax2_pvt *new_iax(struct sockaddr_in *sin, int lockpeer, cons
tmp->autoid = -1; tmp->autoid = -1;
tmp->authid = -1; tmp->authid = -1;
tmp->initid = -1; tmp->initid = -1;
/* strncpy(tmp->context, context, sizeof(tmp->context)-1); */ /* ast_copy_string(tmp->context, context, sizeof(tmp->context)); */
strncpy(tmp->exten, "s", sizeof(tmp->exten)-1); ast_copy_string(tmp->exten, "s", sizeof(tmp->exten));
strncpy(tmp->host, host, sizeof(tmp->host)-1); ast_copy_string(tmp->host, host, sizeof(tmp->host));
#ifdef NEWJB #ifdef NEWJB
{ {
jb_info jbinfo; jb_info jbinfo;
@ -1036,7 +1036,7 @@ static int find_callno(unsigned short callno, unsigned short dcallno, struct soc
iaxs[x]->lagid = ast_sched_add(sched, lagrq_time * 1000, send_lagrq, (void *)(long)x); iaxs[x]->lagid = ast_sched_add(sched, lagrq_time * 1000, send_lagrq, (void *)(long)x);
iaxs[x]->amaflags = amaflags; iaxs[x]->amaflags = amaflags;
ast_copy_flags(iaxs[x], (&globalflags), IAX_NOTRANSFER | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF); ast_copy_flags(iaxs[x], (&globalflags), IAX_NOTRANSFER | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF);
strncpy(iaxs[x]->accountcode, accountcode, sizeof(iaxs[x]->accountcode)-1); ast_copy_string(iaxs[x]->accountcode, accountcode, sizeof(iaxs[x]->accountcode));
} else { } else {
ast_log(LOG_WARNING, "Out of resources\n"); ast_log(LOG_WARNING, "Out of resources\n");
ast_mutex_unlock(&iaxsl[x]); ast_mutex_unlock(&iaxsl[x]);
@ -1837,13 +1837,13 @@ static int iax2_show_peer(int fd, int argc, char *argv[])
ast_cli(fd, " Status : "); ast_cli(fd, " Status : ");
if (peer->lastms < 0) if (peer->lastms < 0)
strncpy(status, "UNREACHABLE", sizeof(status) - 1); ast_copy_string(status, "UNREACHABLE", sizeof(status));
else if (peer->lastms > peer->maxms) else if (peer->lastms > peer->maxms)
snprintf(status, sizeof(status), "LAGGED (%d ms)", peer->lastms); snprintf(status, sizeof(status), "LAGGED (%d ms)", peer->lastms);
else if (peer->lastms) else if (peer->lastms)
snprintf(status, sizeof(status), "OK (%d ms)", peer->lastms); snprintf(status, sizeof(status), "OK (%d ms)", peer->lastms);
else else
strncpy(status, "UNKNOWN", sizeof(status) - 1); ast_copy_string(status, "UNKNOWN", sizeof(status));
ast_cli(fd, "%s\n",status); ast_cli(fd, "%s\n",status);
ast_cli(fd,"\n"); ast_cli(fd,"\n");
if (ast_test_flag(peer, IAX_TEMPONLY)) if (ast_test_flag(peer, IAX_TEMPONLY))
@ -1931,7 +1931,7 @@ static int iax2_show_cache(int fd, int argc, char *argv[])
if (!ast_strlen_zero(tmp)) if (!ast_strlen_zero(tmp))
tmp[strlen(tmp) - 1] = '\0'; tmp[strlen(tmp) - 1] = '\0';
else else
strncpy(tmp, "(none)", sizeof(tmp) - 1); ast_copy_string(tmp, "(none)", sizeof(tmp));
y=0; y=0;
pc = strchr(dp->peercontext, '@'); pc = strchr(dp->peercontext, '@');
if (!pc) if (!pc)
@ -2664,9 +2664,9 @@ static int create_addr(struct sockaddr_in *sin, int *capability, int *sendani,
if (maxtime) if (maxtime)
*maxtime = p->maxms; /* Max time they should take */ *maxtime = p->maxms; /* Max time they should take */
if (context) if (context)
strncpy(context, p->context, AST_MAX_EXTENSION - 1); ast_copy_string(context, p->context, sizeof(context));
if (peercontext) if (peercontext)
strncpy(peercontext, p->peercontext, AST_MAX_EXTENSION - 1); ast_copy_string(peercontext, p->peercontext, sizeof(peercontext));
if (trunk) if (trunk)
*trunk = ast_test_flag(p, IAX_TRUNK); *trunk = ast_test_flag(p, IAX_TRUNK);
if (capability) if (capability)
@ -2674,7 +2674,7 @@ static int create_addr(struct sockaddr_in *sin, int *capability, int *sendani,
if (encmethods) if (encmethods)
*encmethods = p->encmethods; *encmethods = p->encmethods;
if (username) if (username)
strncpy(username, p->username, usernlen); ast_copy_string(username, p->username, usernlen);
if (p->addr.sin_addr.s_addr) { if (p->addr.sin_addr.s_addr) {
sin->sin_addr = p->addr.sin_addr; sin->sin_addr = p->addr.sin_addr;
sin->sin_port = p->addr.sin_port; sin->sin_port = p->addr.sin_port;
@ -2708,7 +2708,7 @@ static int create_addr(struct sockaddr_in *sin, int *capability, int *sendani,
p = NULL; p = NULL;
} }
} else } else
strncpy(secret, p->secret, seclen); /* safe */ ast_copy_string(secret, p->secret, seclen);
} }
if (timezone) if (timezone)
snprintf(timezone, tzlen-1, "%s", p->zonetag); snprintf(timezone, tzlen-1, "%s", p->zonetag);
@ -2802,7 +2802,7 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout)
ast_log(LOG_WARNING, "Line is already in use (%s)?\n", c->name); ast_log(LOG_WARNING, "Line is already in use (%s)?\n", c->name);
return -1; return -1;
} }
strncpy(host, dest, sizeof(host)-1); ast_copy_string(host, dest, sizeof(host));
stringp=host; stringp=host;
strsep(&stringp, "/"); strsep(&stringp, "/");
/* If no destination extension specified, use 's' */ /* If no destination extension specified, use 's' */
@ -2844,7 +2844,7 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout)
return -1; return -1;
} }
/* Keep track of the context for outgoing calls too */ /* Keep track of the context for outgoing calls too */
strncpy(c->context, context, sizeof(c->context) - 1); ast_copy_string(c->context, context, sizeof(c->context));
if (portno) { if (portno) {
sin.sin_port = htons(atoi(portno)); sin.sin_port = htons(atoi(portno));
} }
@ -2891,19 +2891,19 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout)
secret = storedsecret; secret = storedsecret;
ast_mutex_lock(&iaxsl[callno]); ast_mutex_lock(&iaxsl[callno]);
if (!ast_strlen_zero(c->context)) if (!ast_strlen_zero(c->context))
strncpy(iaxs[callno]->context, c->context, sizeof(iaxs[callno]->context) - 1); ast_copy_string(iaxs[callno]->context, c->context, sizeof(iaxs[callno]->context));
if (username) if (username)
strncpy(iaxs[callno]->username, username, sizeof(iaxs[callno]->username)-1); ast_copy_string(iaxs[callno]->username, username, sizeof(iaxs[callno]->username));
iaxs[callno]->encmethods = encmethods; iaxs[callno]->encmethods = encmethods;
if (secret) { if (secret) {
if (secret[0] == '[') { if (secret[0] == '[') {
/* This is an RSA key, not a normal secret */ /* This is an RSA key, not a normal secret */
strncpy(iaxs[callno]->outkey, secret + 1, sizeof(iaxs[callno]->secret)-1); ast_copy_string(iaxs[callno]->outkey, secret + 1, sizeof(iaxs[callno]->secret));
if (!ast_strlen_zero(iaxs[callno]->outkey)) { if (!ast_strlen_zero(iaxs[callno]->outkey)) {
iaxs[callno]->outkey[strlen(iaxs[callno]->outkey) - 1] = '\0'; iaxs[callno]->outkey[strlen(iaxs[callno]->outkey) - 1] = '\0';
} }
} else } else
strncpy(iaxs[callno]->secret, secret, sizeof(iaxs[callno]->secret)-1); ast_copy_string(iaxs[callno]->secret, secret, sizeof(iaxs[callno]->secret));
} }
iax_ie_append_int(&ied, IAX_IE_FORMAT, c->nativeformats); iax_ie_append_int(&ied, IAX_IE_FORMAT, c->nativeformats);
iax_ie_append_int(&ied, IAX_IE_CAPABILITY, iaxs[callno]->capability); iax_ie_append_int(&ied, IAX_IE_CAPABILITY, iaxs[callno]->capability);
@ -3206,7 +3206,7 @@ static int iax2_transfer(struct ast_channel *c, const char *dest)
unsigned short callno = PTR_TO_CALLNO(c->tech_pvt); unsigned short callno = PTR_TO_CALLNO(c->tech_pvt);
struct iax_ie_data ied; struct iax_ie_data ied;
char tmp[256] = "", *context; char tmp[256] = "", *context;
strncpy(tmp, dest, sizeof(tmp) - 1); ast_copy_string(tmp, dest, sizeof(tmp));
context = strchr(tmp, '@'); context = strchr(tmp, '@');
if (context) { if (context) {
*context = '\0'; *context = '\0';
@ -3274,18 +3274,18 @@ static struct ast_channel *ast_iax2_new(int callno, int state, int capability)
if (!ast_strlen_zero(i->ani)) if (!ast_strlen_zero(i->ani))
tmp->cid.cid_ani = strdup(i->ani); tmp->cid.cid_ani = strdup(i->ani);
if (!ast_strlen_zero(i->language)) if (!ast_strlen_zero(i->language))
strncpy(tmp->language, i->language, sizeof(tmp->language)-1); ast_copy_string(tmp->language, i->language, sizeof(tmp->language));
if (!ast_strlen_zero(i->dnid)) if (!ast_strlen_zero(i->dnid))
tmp->cid.cid_dnid = strdup(i->dnid); tmp->cid.cid_dnid = strdup(i->dnid);
tmp->cid.cid_pres = i->calling_pres; tmp->cid.cid_pres = i->calling_pres;
tmp->cid.cid_ton = i->calling_ton; tmp->cid.cid_ton = i->calling_ton;
tmp->cid.cid_tns = i->calling_tns; tmp->cid.cid_tns = i->calling_tns;
if (!ast_strlen_zero(i->accountcode)) if (!ast_strlen_zero(i->accountcode))
strncpy(tmp->accountcode, i->accountcode, sizeof(tmp->accountcode)-1); ast_copy_string(tmp->accountcode, i->accountcode, sizeof(tmp->accountcode));
if (i->amaflags) if (i->amaflags)
tmp->amaflags = i->amaflags; tmp->amaflags = i->amaflags;
strncpy(tmp->context, i->context, sizeof(tmp->context)-1); ast_copy_string(tmp->context, i->context, sizeof(tmp->context));
strncpy(tmp->exten, i->exten, sizeof(tmp->exten)-1); ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten));
tmp->adsicpe = i->peeradsicpe; tmp->adsicpe = i->peeradsicpe;
i->owner = tmp; i->owner = tmp;
i->capability = capability; i->capability = capability;
@ -3971,11 +3971,11 @@ static int iax2_show_users(int fd, int argc, char *argv[])
continue; continue;
if (!ast_strlen_zero(user->secret)) { if (!ast_strlen_zero(user->secret)) {
strncpy(auth,user->secret,sizeof(auth)-1); ast_copy_string(auth,user->secret,sizeof(auth));
} else if (!ast_strlen_zero(user->inkeys)) { } else if (!ast_strlen_zero(user->inkeys)) {
snprintf(auth, sizeof(auth), "Key: %-15.15s ", user->inkeys); snprintf(auth, sizeof(auth), "Key: %-15.15s ", user->inkeys);
} else } else
strncpy(auth, "-no secret-", sizeof(auth) - 1); ast_copy_string(auth, "-no secret-", sizeof(auth));
if(ast_test_flag(user,IAX_CODEC_NOCAP)) if(ast_test_flag(user,IAX_CODEC_NOCAP))
pstr = "REQ Only"; pstr = "REQ Only";
@ -4064,10 +4064,10 @@ static int iax2_show_peers(int fd, int argc, char *argv[])
if (!ast_strlen_zero(peer->username)) if (!ast_strlen_zero(peer->username))
snprintf(name, sizeof(name), "%s/%s", peer->name, peer->username); snprintf(name, sizeof(name), "%s/%s", peer->name, peer->username);
else else
strncpy(name, peer->name, sizeof(name) - 1); ast_copy_string(name, peer->name, sizeof(name));
if (peer->maxms) { if (peer->maxms) {
if (peer->lastms < 0) { if (peer->lastms < 0) {
strncpy(status, "UNREACHABLE", sizeof(status) - 1); ast_copy_string(status, "UNREACHABLE", sizeof(status));
offline_peers++; offline_peers++;
} }
else if (peer->lastms > peer->maxms) { else if (peer->lastms > peer->maxms) {
@ -4079,14 +4079,14 @@ static int iax2_show_peers(int fd, int argc, char *argv[])
online_peers++; online_peers++;
} }
else { else {
strncpy(status, "UNKNOWN", sizeof(status) - 1); ast_copy_string(status, "UNKNOWN", sizeof(status));
offline_peers++; offline_peers++;
} }
} else { } else {
strncpy(status, "Unmonitored", sizeof(status) - 1); ast_copy_string(status, "Unmonitored", sizeof(status));
unmonitored_peers++; unmonitored_peers++;
} }
strncpy(nm, ast_inet_ntoa(iabuf, sizeof(iabuf), peer->mask), sizeof(nm)-1); ast_copy_string(nm, ast_inet_ntoa(iabuf, sizeof(iabuf), peer->mask), sizeof(nm));
snprintf(srch, sizeof(srch), FORMAT, name, snprintf(srch, sizeof(srch), FORMAT, name,
peer->addr.sin_addr.s_addr ? ast_inet_ntoa(iabuf, sizeof(iabuf), peer->addr.sin_addr) : "(Unspecified)", peer->addr.sin_addr.s_addr ? ast_inet_ntoa(iabuf, sizeof(iabuf), peer->addr.sin_addr) : "(Unspecified)",
@ -4196,7 +4196,7 @@ static int iax2_show_registry(int fd, int argc, char *argv[])
if (reg->us.sin_addr.s_addr) if (reg->us.sin_addr.s_addr)
snprintf(perceived, sizeof(perceived), "%s:%d", ast_inet_ntoa(iabuf, sizeof(iabuf), reg->us.sin_addr), ntohs(reg->us.sin_port)); snprintf(perceived, sizeof(perceived), "%s:%d", ast_inet_ntoa(iabuf, sizeof(iabuf), reg->us.sin_addr), ntohs(reg->us.sin_port));
else else
strncpy(perceived, "<Unregistered>", sizeof(perceived) - 1); ast_copy_string(perceived, "<Unregistered>", sizeof(perceived));
ast_cli(fd, FORMAT, host, ast_cli(fd, FORMAT, host,
reg->username, perceived, reg->refresh, regstate2str(reg->regstate)); reg->username, perceived, reg->refresh, regstate2str(reg->regstate));
} }
@ -4585,23 +4585,23 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies
if (!iaxs[callno]) if (!iaxs[callno])
return res; return res;
if (ies->called_number) if (ies->called_number)
strncpy(iaxs[callno]->exten, ies->called_number, sizeof(iaxs[callno]->exten) - 1); ast_copy_string(iaxs[callno]->exten, ies->called_number, sizeof(iaxs[callno]->exten));
if (ies->calling_number) { if (ies->calling_number) {
ast_shrink_phone_number(ies->calling_number); ast_shrink_phone_number(ies->calling_number);
strncpy(iaxs[callno]->cid_num, ies->calling_number, sizeof(iaxs[callno]->cid_num) - 1); ast_copy_string(iaxs[callno]->cid_num, ies->calling_number, sizeof(iaxs[callno]->cid_num));
} }
if (ies->calling_name) if (ies->calling_name)
strncpy(iaxs[callno]->cid_name, ies->calling_name, sizeof(iaxs[callno]->cid_name) - 1); ast_copy_string(iaxs[callno]->cid_name, ies->calling_name, sizeof(iaxs[callno]->cid_name));
if (ies->calling_ani) if (ies->calling_ani)
strncpy(iaxs[callno]->ani, ies->calling_ani, sizeof(iaxs[callno]->ani) - 1); ast_copy_string(iaxs[callno]->ani, ies->calling_ani, sizeof(iaxs[callno]->ani));
if (ies->dnid) if (ies->dnid)
strncpy(iaxs[callno]->dnid, ies->dnid, sizeof(iaxs[callno]->dnid)-1); ast_copy_string(iaxs[callno]->dnid, ies->dnid, sizeof(iaxs[callno]->dnid));
if (ies->called_context) if (ies->called_context)
strncpy(iaxs[callno]->context, ies->called_context, sizeof(iaxs[callno]->context)-1); ast_copy_string(iaxs[callno]->context, ies->called_context, sizeof(iaxs[callno]->context));
if (ies->language) if (ies->language)
strncpy(iaxs[callno]->language, ies->language, sizeof(iaxs[callno]->language)-1); ast_copy_string(iaxs[callno]->language, ies->language, sizeof(iaxs[callno]->language));
if (ies->username) if (ies->username)
strncpy(iaxs[callno]->username, ies->username, sizeof(iaxs[callno]->username)-1); ast_copy_string(iaxs[callno]->username, ies->username, sizeof(iaxs[callno]->username));
if (ies->calling_ton > -1) if (ies->calling_ton > -1)
iaxs[callno]->calling_ton = ies->calling_ton; iaxs[callno]->calling_ton = ies->calling_ton;
if (ies->calling_tns > -1) if (ies->calling_tns > -1)
@ -4701,19 +4701,19 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies
iaxs[callno]->encmethods = user->encmethods; iaxs[callno]->encmethods = user->encmethods;
/* Store the requested username if not specified */ /* Store the requested username if not specified */
if (ast_strlen_zero(iaxs[callno]->username)) if (ast_strlen_zero(iaxs[callno]->username))
strncpy(iaxs[callno]->username, user->name, sizeof(iaxs[callno]->username)-1); ast_copy_string(iaxs[callno]->username, user->name, sizeof(iaxs[callno]->username));
/* Store whether this is a trunked call, too, of course, and move if appropriate */ /* Store whether this is a trunked call, too, of course, and move if appropriate */
ast_copy_flags(iaxs[callno], user, IAX_TRUNK); ast_copy_flags(iaxs[callno], user, IAX_TRUNK);
iaxs[callno]->capability = user->capability; iaxs[callno]->capability = user->capability;
/* And use the default context */ /* And use the default context */
if (ast_strlen_zero(iaxs[callno]->context)) { if (ast_strlen_zero(iaxs[callno]->context)) {
if (user->contexts) if (user->contexts)
strncpy(iaxs[callno]->context, user->contexts->context, sizeof(iaxs[callno]->context)-1); ast_copy_string(iaxs[callno]->context, user->contexts->context, sizeof(iaxs[callno]->context));
else else
strncpy(iaxs[callno]->context, context, sizeof(iaxs[callno]->context)-1); ast_copy_string(iaxs[callno]->context, context, sizeof(iaxs[callno]->context));
} }
/* And any input keys */ /* And any input keys */
strncpy(iaxs[callno]->inkeys, user->inkeys, sizeof(iaxs[callno]->inkeys) - 1); ast_copy_string(iaxs[callno]->inkeys, user->inkeys, sizeof(iaxs[callno]->inkeys));
/* And the permitted authentication methods */ /* And the permitted authentication methods */
iaxs[callno]->authmethods = user->authmethods; iaxs[callno]->authmethods = user->authmethods;
/* If they have callerid, override the given caller id. Always store the ANI */ /* If they have callerid, override the given caller id. Always store the ANI */
@ -4721,20 +4721,20 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies
if (ast_test_flag(user, IAX_HASCALLERID)) { if (ast_test_flag(user, IAX_HASCALLERID)) {
iaxs[callno]->calling_tns = 0; iaxs[callno]->calling_tns = 0;
iaxs[callno]->calling_ton = 0; iaxs[callno]->calling_ton = 0;
strncpy(iaxs[callno]->cid_num, user->cid_num, sizeof(iaxs[callno]->cid_num)-1); ast_copy_string(iaxs[callno]->cid_num, user->cid_num, sizeof(iaxs[callno]->cid_num));
strncpy(iaxs[callno]->cid_name, user->cid_name, sizeof(iaxs[callno]->cid_name)-1); ast_copy_string(iaxs[callno]->cid_name, user->cid_name, sizeof(iaxs[callno]->cid_name));
iaxs[callno]->calling_pres = AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN; iaxs[callno]->calling_pres = AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN;
} }
strncpy(iaxs[callno]->ani, user->cid_num, sizeof(iaxs[callno]->ani)-1); ast_copy_string(iaxs[callno]->ani, user->cid_num, sizeof(iaxs[callno]->ani));
} else { } else {
iaxs[callno]->calling_pres = AST_PRES_NUMBER_NOT_AVAILABLE; iaxs[callno]->calling_pres = AST_PRES_NUMBER_NOT_AVAILABLE;
} }
if (!ast_strlen_zero(user->accountcode)) if (!ast_strlen_zero(user->accountcode))
strncpy(iaxs[callno]->accountcode, user->accountcode, sizeof(iaxs[callno]->accountcode)-1); ast_copy_string(iaxs[callno]->accountcode, user->accountcode, sizeof(iaxs[callno]->accountcode));
if (user->amaflags) if (user->amaflags)
iaxs[callno]->amaflags = user->amaflags; iaxs[callno]->amaflags = user->amaflags;
if (!ast_strlen_zero(user->language)) if (!ast_strlen_zero(user->language))
strncpy(iaxs[callno]->language, user->language, sizeof(iaxs[callno]->language)-1); ast_copy_string(iaxs[callno]->language, user->language, sizeof(iaxs[callno]->language));
ast_copy_flags(iaxs[callno], user, IAX_NOTRANSFER | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF); ast_copy_flags(iaxs[callno], user, IAX_NOTRANSFER | IAX_USEJITTERBUF | IAX_FORCEJITTERBUF);
/* Keep this check last */ /* Keep this check last */
if (!ast_strlen_zero(user->dbsecret)) { if (!ast_strlen_zero(user->dbsecret)) {
@ -4755,7 +4755,7 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies
} }
} }
} else } else
strncpy(iaxs[callno]->secret, user->secret, sizeof(iaxs[callno]->secret) - 1); ast_copy_string(iaxs[callno]->secret, user->secret, sizeof(iaxs[callno]->secret));
res = 0; res = 0;
} }
ast_set2_flag(iaxs[callno], iax2_getpeertrunk(*sin), IAX_TRUNK); ast_set2_flag(iaxs[callno], iax2_getpeertrunk(*sin), IAX_TRUNK);
@ -4824,17 +4824,17 @@ static int authenticate_verify(struct chan_iax2_pvt *p, struct iax_ies *ies)
if (!(p->state & IAX_STATE_AUTHENTICATED)) if (!(p->state & IAX_STATE_AUTHENTICATED))
return res; return res;
if (ies->password) if (ies->password)
strncpy(secret, ies->password, sizeof(secret) - 1); ast_copy_string(secret, ies->password, sizeof(secret));
if (ies->md5_result) if (ies->md5_result)
strncpy(md5secret, ies->md5_result, sizeof(md5secret)-1); ast_copy_string(md5secret, ies->md5_result, sizeof(md5secret));
if (ies->rsa_result) if (ies->rsa_result)
strncpy(rsasecret, ies->rsa_result, sizeof(rsasecret)-1); ast_copy_string(rsasecret, ies->rsa_result, sizeof(rsasecret));
if ((p->authmethods & IAX_AUTH_RSA) && !ast_strlen_zero(rsasecret) && !ast_strlen_zero(p->inkeys)) { if ((p->authmethods & IAX_AUTH_RSA) && !ast_strlen_zero(rsasecret) && !ast_strlen_zero(p->inkeys)) {
struct ast_key *key; struct ast_key *key;
char *keyn; char *keyn;
char tmpkey[256] = ""; char tmpkey[256] = "";
char *stringp=NULL; char *stringp=NULL;
strncpy(tmpkey, p->inkeys, sizeof(tmpkey) - 1); ast_copy_string(tmpkey, p->inkeys, sizeof(tmpkey));
stringp=tmpkey; stringp=tmpkey;
keyn = strsep(&stringp, ":"); keyn = strsep(&stringp, ":");
while(keyn) { while(keyn) {
@ -4890,13 +4890,13 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
iaxs[callno]->state &= ~IAX_STATE_AUTHENTICATED; iaxs[callno]->state &= ~IAX_STATE_AUTHENTICATED;
iaxs[callno]->peer[0] = '\0'; iaxs[callno]->peer[0] = '\0';
if (ies->username) if (ies->username)
strncpy(peer, ies->username, sizeof(peer) - 1); ast_copy_string(peer, ies->username, sizeof(peer));
if (ies->password) if (ies->password)
strncpy(secret, ies->password, sizeof(secret) - 1); ast_copy_string(secret, ies->password, sizeof(secret));
if (ies->md5_result) if (ies->md5_result)
strncpy(md5secret, ies->md5_result, sizeof(md5secret)-1); ast_copy_string(md5secret, ies->md5_result, sizeof(md5secret));
if (ies->rsa_result) if (ies->rsa_result)
strncpy(rsasecret, ies->rsa_result, sizeof(rsasecret)-1); ast_copy_string(rsasecret, ies->rsa_result, sizeof(rsasecret));
if (ies->refresh) if (ies->refresh)
expire = ies->refresh; expire = ies->refresh;
@ -4931,14 +4931,14 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
destroy_peer(p); destroy_peer(p);
return -1; return -1;
} }
strncpy(iaxs[callno]->secret, p->secret, sizeof(iaxs[callno]->secret)-1); ast_copy_string(iaxs[callno]->secret, p->secret, sizeof(iaxs[callno]->secret));
strncpy(iaxs[callno]->inkeys, p->inkeys, sizeof(iaxs[callno]->inkeys)-1); ast_copy_string(iaxs[callno]->inkeys, p->inkeys, sizeof(iaxs[callno]->inkeys));
/* Check secret against what we have on file */ /* Check secret against what we have on file */
if (!ast_strlen_zero(rsasecret) && (p->authmethods & IAX_AUTH_RSA) && !ast_strlen_zero(iaxs[callno]->challenge)) { if (!ast_strlen_zero(rsasecret) && (p->authmethods & IAX_AUTH_RSA) && !ast_strlen_zero(iaxs[callno]->challenge)) {
if (!ast_strlen_zero(p->inkeys)) { if (!ast_strlen_zero(p->inkeys)) {
char tmpkeys[256] = ""; char tmpkeys[256] = "";
char *stringp=NULL; char *stringp=NULL;
strncpy(tmpkeys, p->inkeys, sizeof(tmpkeys) - 1); ast_copy_string(tmpkeys, p->inkeys, sizeof(tmpkeys));
stringp=tmpkeys; stringp=tmpkeys;
keyn = strsep(&stringp, ":"); keyn = strsep(&stringp, ":");
while(keyn) { while(keyn) {
@ -5007,7 +5007,7 @@ static int register_verify(int callno, struct sockaddr_in *sin, struct iax_ies *
destroy_peer(p); destroy_peer(p);
return -1; return -1;
} }
strncpy(iaxs[callno]->peer, peer, sizeof(iaxs[callno]->peer)-1); ast_copy_string(iaxs[callno]->peer, peer, sizeof(iaxs[callno]->peer));
/* Choose lowest expirey number */ /* Choose lowest expirey number */
if (expire && (expire < iaxs[callno]->expirey)) if (expire && (expire < iaxs[callno]->expirey))
iaxs[callno]->expirey = expire; iaxs[callno]->expirey = expire;
@ -5085,9 +5085,9 @@ static int authenticate_reply(struct chan_iax2_pvt *p, struct sockaddr_in *sin,
memset(&ied, 0, sizeof(ied)); memset(&ied, 0, sizeof(ied));
if (ies->username) if (ies->username)
strncpy(p->username, ies->username, sizeof(p->username) - 1); ast_copy_string(p->username, ies->username, sizeof(p->username));
if (ies->challenge) if (ies->challenge)
strncpy(p->challenge, ies->challenge, sizeof(p->challenge)-1); ast_copy_string(p->challenge, ies->challenge, sizeof(p->challenge));
if (ies->authmethods) if (ies->authmethods)
authmethods = ies->authmethods; authmethods = ies->authmethods;
if (authmethods & IAX_AUTH_MD5) if (authmethods & IAX_AUTH_MD5)
@ -5174,7 +5174,7 @@ static int complete_dpreply(struct chan_iax2_pvt *pvt, struct iax_ies *ies)
struct iax2_dpcache *dp, *prev; struct iax2_dpcache *dp, *prev;
if (ies->called_number) if (ies->called_number)
strncpy(exten, ies->called_number, sizeof(exten)-1); ast_copy_string(exten, ies->called_number, sizeof(exten));
if (ies->dpstatus & IAX_DPSTATUS_EXISTS) if (ies->dpstatus & IAX_DPSTATUS_EXISTS)
status = CACHE_FLAG_EXISTS; status = CACHE_FLAG_EXISTS;
@ -5296,7 +5296,7 @@ static int iax2_ack_registry(struct iax_ies *ies, struct sockaddr_in *sin, int c
if (ies->apparent_addr) if (ies->apparent_addr)
memcpy(&us, ies->apparent_addr, sizeof(us)); memcpy(&us, ies->apparent_addr, sizeof(us));
if (ies->username) if (ies->username)
strncpy(peer, ies->username, sizeof(peer) - 1); ast_copy_string(peer, ies->username, sizeof(peer));
if (ies->refresh) if (ies->refresh)
refresh = ies->refresh; refresh = ies->refresh;
if (ies->calling_number) { if (ies->calling_number) {
@ -5350,7 +5350,7 @@ static int iax2_register(char *value, int lineno)
struct ast_hostent ahp; struct hostent *hp; struct ast_hostent ahp; struct hostent *hp;
if (!value) if (!value)
return -1; return -1;
strncpy(copy, value, sizeof(copy)-1); ast_copy_string(copy, value, sizeof(copy));
stringp=copy; stringp=copy;
username = strsep(&stringp, "@"); username = strsep(&stringp, "@");
hostname = strsep(&stringp, "@"); hostname = strsep(&stringp, "@");
@ -5377,9 +5377,9 @@ static int iax2_register(char *value, int lineno)
reg = malloc(sizeof(struct iax2_registry)); reg = malloc(sizeof(struct iax2_registry));
if (reg) { if (reg) {
memset(reg, 0, sizeof(struct iax2_registry)); memset(reg, 0, sizeof(struct iax2_registry));
strncpy(reg->username, username, sizeof(reg->username)-1); ast_copy_string(reg->username, username, sizeof(reg->username));
if (secret) if (secret)
strncpy(reg->secret, secret, sizeof(reg->secret)-1); ast_copy_string(reg->secret, secret, sizeof(reg->secret));
reg->expire = -1; reg->expire = -1;
reg->refresh = IAX_DEFAULT_REG_EXPIRE; reg->refresh = IAX_DEFAULT_REG_EXPIRE;
reg->addr.sin_family = AF_INET; reg->addr.sin_family = AF_INET;
@ -5400,7 +5400,7 @@ static void register_peer_exten(struct iax2_peer *peer, int onoff)
unsigned char multi[256]=""; unsigned char multi[256]="";
char *stringp, *ext; char *stringp, *ext;
if (!ast_strlen_zero(regcontext)) { if (!ast_strlen_zero(regcontext)) {
strncpy(multi, ast_strlen_zero(peer->regexten) ? peer->name : peer->regexten, sizeof(multi) - 1); ast_copy_string(multi, ast_strlen_zero(peer->regexten) ? peer->name : peer->regexten, sizeof(multi));
stringp = multi; stringp = multi;
while((ext = strsep(&stringp, "&"))) { while((ext = strsep(&stringp, "&"))) {
if (onoff) { if (onoff) {
@ -5598,9 +5598,9 @@ static int registry_rerequest(struct iax_ies *ies, int callno, struct sockaddr_i
if (ies->authmethods) if (ies->authmethods)
authmethods = ies->authmethods; authmethods = ies->authmethods;
if (ies->username) if (ies->username)
strncpy(peer, ies->username, sizeof(peer) - 1); ast_copy_string(peer, ies->username, sizeof(peer));
if (ies->challenge) if (ies->challenge)
strncpy(challenge, ies->challenge, sizeof(challenge) - 1); ast_copy_string(challenge, ies->challenge, sizeof(challenge));
memset(&ied, 0, sizeof(ied)); memset(&ied, 0, sizeof(ied));
reg = iaxs[callno]->reg; reg = iaxs[callno]->reg;
if (reg) { if (reg) {
@ -5617,7 +5617,7 @@ static int registry_rerequest(struct iax_ies *ies, int callno, struct sockaddr_i
iax_ie_append_short(&ied, IAX_IE_REFRESH, reg->refresh); iax_ie_append_short(&ied, IAX_IE_REFRESH, reg->refresh);
if (reg->secret[0] == '[') { if (reg->secret[0] == '[') {
char tmpkey[256]; char tmpkey[256];
strncpy(tmpkey, reg->secret + 1, sizeof(tmpkey) - 1); ast_copy_string(tmpkey, reg->secret + 1, sizeof(tmpkey));
tmpkey[strlen(tmpkey) - 1] = '\0'; tmpkey[strlen(tmpkey) - 1] = '\0';
res = authenticate(challenge, NULL, tmpkey, authmethods, &ied, sin, NULL, NULL); res = authenticate(challenge, NULL, tmpkey, authmethods, &ied, sin, NULL, NULL);
} else } else
@ -5943,8 +5943,8 @@ static void spawn_dp_lookup(int callno, char *context, char *callednum, char *ca
if (dpr) { if (dpr) {
memset(dpr, 0, sizeof(struct dpreq_data)); memset(dpr, 0, sizeof(struct dpreq_data));
dpr->callno = callno; dpr->callno = callno;
strncpy(dpr->context, context, sizeof(dpr->context) - 1); ast_copy_string(dpr->context, context, sizeof(dpr->context));
strncpy(dpr->callednum, callednum, sizeof(dpr->callednum) - 1); ast_copy_string(dpr->callednum, callednum, sizeof(dpr->callednum));
if (callerid) if (callerid)
dpr->callerid = strdup(callerid); dpr->callerid = strdup(callerid);
if (ast_pthread_create(&newthread, NULL, dp_lookup_thread, dpr)) { if (ast_pthread_create(&newthread, NULL, dp_lookup_thread, dpr)) {
@ -5993,8 +5993,8 @@ static int iax_park(struct ast_channel *chan1, struct ast_channel *chan2)
chan1m->writeformat = chan1->writeformat; chan1m->writeformat = chan1->writeformat;
ast_channel_masquerade(chan1m, chan1); ast_channel_masquerade(chan1m, chan1);
/* Setup the extensions and such */ /* Setup the extensions and such */
strncpy(chan1m->context, chan1->context, sizeof(chan1m->context) - 1); ast_copy_string(chan1m->context, chan1->context, sizeof(chan1m->context));
strncpy(chan1m->exten, chan1->exten, sizeof(chan1m->exten) - 1); ast_copy_string(chan1m->exten, chan1->exten, sizeof(chan1m->exten));
chan1m->priority = chan1->priority; chan1m->priority = chan1->priority;
/* We make a clone of the peer channel too, so we can play /* We make a clone of the peer channel too, so we can play
@ -6005,8 +6005,8 @@ static int iax_park(struct ast_channel *chan1, struct ast_channel *chan2)
chan2m->writeformat = chan2->writeformat; chan2m->writeformat = chan2->writeformat;
ast_channel_masquerade(chan2m, chan2); ast_channel_masquerade(chan2m, chan2);
/* Setup the extensions and such */ /* Setup the extensions and such */
strncpy(chan2m->context, chan2->context, sizeof(chan2m->context) - 1); ast_copy_string(chan2m->context, chan2->context, sizeof(chan2m->context));
strncpy(chan2m->exten, chan2->exten, sizeof(chan2m->exten) - 1); ast_copy_string(chan2m->exten, chan2->exten, sizeof(chan2m->exten));
chan2m->priority = chan2->priority; chan2m->priority = chan2->priority;
if (ast_do_masquerade(chan2m)) { if (ast_do_masquerade(chan2m)) {
ast_log(LOG_WARNING, "Masquerade failed :(\n"); ast_log(LOG_WARNING, "Masquerade failed :(\n");
@ -7130,7 +7130,7 @@ retryowner2:
case IAX_COMMAND_DIAL: case IAX_COMMAND_DIAL:
if (iaxs[fr.callno]->state & IAX_STATE_TBD) { if (iaxs[fr.callno]->state & IAX_STATE_TBD) {
iaxs[fr.callno]->state &= ~IAX_STATE_TBD; iaxs[fr.callno]->state &= ~IAX_STATE_TBD;
strncpy(iaxs[fr.callno]->exten, ies.called_number ? ies.called_number : "s", sizeof(iaxs[fr.callno]->exten)-1); ast_copy_string(iaxs[fr.callno]->exten, ies.called_number ? ies.called_number : "s", sizeof(iaxs[fr.callno]->exten));
if (!ast_exists_extension(NULL, iaxs[fr.callno]->context, iaxs[fr.callno]->exten, 1, iaxs[fr.callno]->cid_num)) { if (!ast_exists_extension(NULL, iaxs[fr.callno]->context, iaxs[fr.callno]->exten, 1, iaxs[fr.callno]->cid_num)) {
if (authdebug) if (authdebug)
ast_log(LOG_NOTICE, "Rejected dial attempt from %s, request '%s@%s' does not exist\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), iaxs[fr.callno]->exten, iaxs[fr.callno]->context); ast_log(LOG_NOTICE, "Rejected dial attempt from %s, request '%s@%s' does not exist\n", ast_inet_ntoa(iabuf, sizeof(iabuf), sin.sin_addr), iaxs[fr.callno]->exten, iaxs[fr.callno]->context);
@ -7632,7 +7632,7 @@ static struct ast_channel *iax2_request(const char *type, int format, void *data
int usejitterbuf = ast_test_flag((&globalflags), IAX_USEJITTERBUF); int usejitterbuf = ast_test_flag((&globalflags), IAX_USEJITTERBUF);
int forcejitterbuf = ast_test_flag((&globalflags), IAX_FORCEJITTERBUF); int forcejitterbuf = ast_test_flag((&globalflags), IAX_FORCEJITTERBUF);
strncpy(s, (char *)data, sizeof(s)-1); ast_copy_string(s, (char *)data, sizeof(s));
/* FIXME The next two lines seem useless */ /* FIXME The next two lines seem useless */
stringp=s; stringp=s;
strsep(&stringp, "/"); strsep(&stringp, "/");
@ -7678,7 +7678,7 @@ static struct ast_channel *iax2_request(const char *type, int format, void *data
ast_set2_flag(iaxs[callno], usejitterbuf, IAX_USEJITTERBUF); ast_set2_flag(iaxs[callno], usejitterbuf, IAX_USEJITTERBUF);
ast_set2_flag(iaxs[callno], forcejitterbuf, IAX_FORCEJITTERBUF); ast_set2_flag(iaxs[callno], forcejitterbuf, IAX_FORCEJITTERBUF);
if (found) if (found)
strncpy(iaxs[callno]->host, hostname, sizeof(iaxs[callno]->host) - 1); ast_copy_string(iaxs[callno]->host, hostname, sizeof(iaxs[callno]->host));
c = ast_iax2_new(callno, AST_STATE_DOWN, capability); c = ast_iax2_new(callno, AST_STATE_DOWN, capability);
ast_mutex_unlock(&iaxsl[callno]); ast_mutex_unlock(&iaxsl[callno]);
if (c) { if (c) {
@ -7767,7 +7767,7 @@ static struct iax2_context *build_context(char *context)
{ {
struct iax2_context *con = malloc(sizeof(struct iax2_context)); struct iax2_context *con = malloc(sizeof(struct iax2_context));
if (con) { if (con) {
strncpy(con->context, context, sizeof(con->context)-1); ast_copy_string(con->context, context, sizeof(con->context));
con->next = NULL; con->next = NULL;
} }
return con; return con;
@ -7833,7 +7833,7 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, in
peer->encmethods = iax2_encryption; peer->encmethods = iax2_encryption;
peer->secret[0] = '\0'; peer->secret[0] = '\0';
if (!found) { if (!found) {
strncpy(peer->name, name, sizeof(peer->name)-1); ast_copy_string(peer->name, name, sizeof(peer->name));
peer->addr.sin_port = htons(IAX_DEFAULT_PORTNO); peer->addr.sin_port = htons(IAX_DEFAULT_PORTNO);
peer->expirey = expirey; peer->expirey = expirey;
} }
@ -7845,11 +7845,11 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, in
strncpy(peer->secret + strlen(peer->secret), ";", sizeof(peer->secret)-strlen(peer->secret) - 1); strncpy(peer->secret + strlen(peer->secret), ";", sizeof(peer->secret)-strlen(peer->secret) - 1);
strncpy(peer->secret + strlen(peer->secret), v->value, sizeof(peer->secret)-strlen(peer->secret) - 1); strncpy(peer->secret + strlen(peer->secret), v->value, sizeof(peer->secret)-strlen(peer->secret) - 1);
} else } else
strncpy(peer->secret, v->value, sizeof(peer->secret)-1); ast_copy_string(peer->secret, v->value, sizeof(peer->secret));
} else if (!strcasecmp(v->name, "mailbox")) { } else if (!strcasecmp(v->name, "mailbox")) {
strncpy(peer->mailbox, v->value, sizeof(peer->mailbox) - 1); ast_copy_string(peer->mailbox, v->value, sizeof(peer->mailbox));
} else if (!strcasecmp(v->name, "dbsecret")) } else if (!strcasecmp(v->name, "dbsecret"))
strncpy(peer->dbsecret, v->value, sizeof(peer->dbsecret)-1); ast_copy_string(peer->dbsecret, v->value, sizeof(peer->dbsecret));
else if (!strcasecmp(v->name, "mailboxdetail")) else if (!strcasecmp(v->name, "mailboxdetail"))
ast_set2_flag(peer, ast_true(v->value), IAX_MESSAGEDETAIL); ast_set2_flag(peer, ast_true(v->value), IAX_MESSAGEDETAIL);
else if (!strcasecmp(v->name, "trunktimestamps")) else if (!strcasecmp(v->name, "trunktimestamps"))
@ -7910,19 +7910,19 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, in
inet_aton(v->value, &peer->mask); inet_aton(v->value, &peer->mask);
} else if (!strcasecmp(v->name, "context")) { } else if (!strcasecmp(v->name, "context")) {
if (ast_strlen_zero(peer->context)) if (ast_strlen_zero(peer->context))
strncpy(peer->context, v->value, sizeof(peer->context) - 1); ast_copy_string(peer->context, v->value, sizeof(peer->context));
} else if (!strcasecmp(v->name, "regexten")) { } else if (!strcasecmp(v->name, "regexten")) {
strncpy(peer->regexten, v->value, sizeof(peer->regexten) - 1); ast_copy_string(peer->regexten, v->value, sizeof(peer->regexten));
} else if (!strcasecmp(v->name, "peercontext")) { } else if (!strcasecmp(v->name, "peercontext")) {
if (ast_strlen_zero(peer->peercontext)) if (ast_strlen_zero(peer->peercontext))
strncpy(peer->peercontext, v->value, sizeof(peer->peercontext) - 1); ast_copy_string(peer->peercontext, v->value, sizeof(peer->peercontext));
} else if (!strcasecmp(v->name, "port")) { } else if (!strcasecmp(v->name, "port")) {
if (ast_test_flag(peer, IAX_DYNAMIC)) if (ast_test_flag(peer, IAX_DYNAMIC))
peer->defaddr.sin_port = htons(atoi(v->value)); peer->defaddr.sin_port = htons(atoi(v->value));
else else
peer->addr.sin_port = htons(atoi(v->value)); peer->addr.sin_port = htons(atoi(v->value));
} else if (!strcasecmp(v->name, "username")) { } else if (!strcasecmp(v->name, "username")) {
strncpy(peer->username, v->value, sizeof(peer->username)-1); ast_copy_string(peer->username, v->value, sizeof(peer->username));
} else if (!strcasecmp(v->name, "allow")) { } else if (!strcasecmp(v->name, "allow")) {
ast_parse_allow_disallow(&peer->prefs, &peer->capability, v->value, 1); ast_parse_allow_disallow(&peer->prefs, &peer->capability, v->value, 1);
} else if (!strcasecmp(v->name, "disallow")) { } else if (!strcasecmp(v->name, "disallow")) {
@ -7934,9 +7934,9 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, in
} else if (!strcasecmp(v->name, "sendani")) { } else if (!strcasecmp(v->name, "sendani")) {
ast_set2_flag(peer, ast_true(v->value), IAX_SENDANI); ast_set2_flag(peer, ast_true(v->value), IAX_SENDANI);
} else if (!strcasecmp(v->name, "inkeys")) { } else if (!strcasecmp(v->name, "inkeys")) {
strncpy(peer->inkeys, v->value, sizeof(peer->inkeys) - 1); ast_copy_string(peer->inkeys, v->value, sizeof(peer->inkeys));
} else if (!strcasecmp(v->name, "outkey")) { } else if (!strcasecmp(v->name, "outkey")) {
strncpy(peer->outkey, v->value, sizeof(peer->outkey) - 1); ast_copy_string(peer->outkey, v->value, sizeof(peer->outkey));
} else if (!strcasecmp(v->name, "qualify")) { } else if (!strcasecmp(v->name, "qualify")) {
if (!strcasecmp(v->value, "no")) { if (!strcasecmp(v->value, "no")) {
peer->maxms = 0; peer->maxms = 0;
@ -7947,7 +7947,7 @@ static struct iax2_peer *build_peer(const char *name, struct ast_variable *v, in
peer->maxms = 0; peer->maxms = 0;
} }
} else if (!strcasecmp(v->name, "timezone")) { } else if (!strcasecmp(v->name, "timezone")) {
strncpy(peer->zonetag, v->value, sizeof(peer->zonetag)-1); ast_copy_string(peer->zonetag, v->value, sizeof(peer->zonetag));
}/* else if (strcasecmp(v->name,"type")) */ }/* else if (strcasecmp(v->name,"type")) */
/* ast_log(LOG_WARNING, "Ignoring %s\n", v->name); */ /* ast_log(LOG_WARNING, "Ignoring %s\n", v->name); */
v=v->next; v=v->next;
@ -8015,8 +8015,8 @@ static struct iax2_user *build_user(const char *name, struct ast_variable *v, in
user->prefs = prefs; user->prefs = prefs;
user->capability = iax2_capability; user->capability = iax2_capability;
user->encmethods = iax2_encryption; user->encmethods = iax2_encryption;
strncpy(user->name, name, sizeof(user->name)-1); ast_copy_string(user->name, name, sizeof(user->name));
strncpy(user->language, language, sizeof(user->language) - 1); ast_copy_string(user->language, language, sizeof(user->language));
ast_copy_flags(user, (&globalflags), IAX_USEJITTERBUF); ast_copy_flags(user, (&globalflags), IAX_USEJITTERBUF);
ast_copy_flags(user, (&globalflags), IAX_FORCEJITTERBUF); ast_copy_flags(user, (&globalflags), IAX_FORCEJITTERBUF);
ast_copy_flags(user, (&globalflags), IAX_CODEC_USER_FIRST); ast_copy_flags(user, (&globalflags), IAX_CODEC_USER_FIRST);
@ -8075,20 +8075,20 @@ static struct iax2_user *build_user(const char *name, struct ast_variable *v, in
} else if (!strcasecmp(v->name, "forcejitterbuffer")) { } else if (!strcasecmp(v->name, "forcejitterbuffer")) {
ast_set2_flag(user, ast_true(v->value), IAX_FORCEJITTERBUF); ast_set2_flag(user, ast_true(v->value), IAX_FORCEJITTERBUF);
} else if (!strcasecmp(v->name, "dbsecret")) { } else if (!strcasecmp(v->name, "dbsecret")) {
strncpy(user->dbsecret, v->value, sizeof(user->dbsecret)-1); ast_copy_string(user->dbsecret, v->value, sizeof(user->dbsecret));
} else if (!strcasecmp(v->name, "secret")) { } else if (!strcasecmp(v->name, "secret")) {
if (!ast_strlen_zero(user->secret)) { if (!ast_strlen_zero(user->secret)) {
strncpy(user->secret + strlen(user->secret), ";", sizeof(user->secret) - strlen(user->secret) - 1); strncpy(user->secret + strlen(user->secret), ";", sizeof(user->secret) - strlen(user->secret) - 1);
strncpy(user->secret + strlen(user->secret), v->value, sizeof(user->secret) - strlen(user->secret) - 1); strncpy(user->secret + strlen(user->secret), v->value, sizeof(user->secret) - strlen(user->secret) - 1);
} else } else
strncpy(user->secret, v->value, sizeof(user->secret)-1); ast_copy_string(user->secret, v->value, sizeof(user->secret));
} else if (!strcasecmp(v->name, "callerid")) { } else if (!strcasecmp(v->name, "callerid")) {
ast_callerid_split(v->value, user->cid_name, sizeof(user->cid_name), user->cid_num, sizeof(user->cid_num)); ast_callerid_split(v->value, user->cid_name, sizeof(user->cid_name), user->cid_num, sizeof(user->cid_num));
ast_set_flag(user, IAX_HASCALLERID); ast_set_flag(user, IAX_HASCALLERID);
} else if (!strcasecmp(v->name, "accountcode")) { } else if (!strcasecmp(v->name, "accountcode")) {
strncpy(user->accountcode, v->value, sizeof(user->accountcode)-1); ast_copy_string(user->accountcode, v->value, sizeof(user->accountcode));
} else if (!strcasecmp(v->name, "language")) { } else if (!strcasecmp(v->name, "language")) {
strncpy(user->language, v->value, sizeof(user->language)-1); ast_copy_string(user->language, v->value, sizeof(user->language));
} else if (!strcasecmp(v->name, "amaflags")) { } else if (!strcasecmp(v->name, "amaflags")) {
format = ast_cdr_amaflags2int(v->value); format = ast_cdr_amaflags2int(v->value);
if (format < 0) { if (format < 0) {
@ -8097,7 +8097,7 @@ static struct iax2_user *build_user(const char *name, struct ast_variable *v, in
user->amaflags = format; user->amaflags = format;
} }
} else if (!strcasecmp(v->name, "inkeys")) { } else if (!strcasecmp(v->name, "inkeys")) {
strncpy(user->inkeys, v->value, sizeof(user->inkeys) - 1); ast_copy_string(user->inkeys, v->value, sizeof(user->inkeys));
}/* else if (strcasecmp(v->name,"type")) */ }/* else if (strcasecmp(v->name,"type")) */
/* ast_log(LOG_WARNING, "Ignoring %s\n", v->name); */ /* ast_log(LOG_WARNING, "Ignoring %s\n", v->name); */
v = v->next; v = v->next;
@ -8398,7 +8398,7 @@ static int set_config(char *config_file, int reload)
} else if (!strcasecmp(v->name, "iaxcompat")) { } else if (!strcasecmp(v->name, "iaxcompat")) {
iaxcompat = ast_true(v->value); iaxcompat = ast_true(v->value);
} else if (!strcasecmp(v->name, "regcontext")) { } else if (!strcasecmp(v->name, "regcontext")) {
strncpy(regcontext, v->value, sizeof(regcontext) - 1); ast_copy_string(regcontext, v->value, sizeof(regcontext));
/* Create context if it doesn't exist already */ /* Create context if it doesn't exist already */
if (!ast_context_find(regcontext)) if (!ast_context_find(regcontext))
ast_context_create(NULL, regcontext, channeltype); ast_context_create(NULL, regcontext, channeltype);
@ -8418,7 +8418,7 @@ static int set_config(char *config_file, int reload)
else else
ast_log(LOG_WARNING, "Invalid tos value at line %d, should be 'lowdelay', 'throughput', 'reliability', 'mincost', or 'none'\n", v->lineno); ast_log(LOG_WARNING, "Invalid tos value at line %d, should be 'lowdelay', 'throughput', 'reliability', 'mincost', or 'none'\n", v->lineno);
} else if (!strcasecmp(v->name, "accountcode")) { } else if (!strcasecmp(v->name, "accountcode")) {
strncpy(accountcode, v->value, sizeof(accountcode)-1); ast_copy_string(accountcode, v->value, sizeof(accountcode));
} else if (!strcasecmp(v->name, "amaflags")) { } else if (!strcasecmp(v->name, "amaflags")) {
format = ast_cdr_amaflags2int(v->value); format = ast_cdr_amaflags2int(v->value);
if (format < 0) { if (format < 0) {
@ -8427,7 +8427,7 @@ static int set_config(char *config_file, int reload)
amaflags = format; amaflags = format;
} }
} else if (!strcasecmp(v->name, "language")) { } else if (!strcasecmp(v->name, "language")) {
strncpy(language, v->value, sizeof(language) - 1); ast_copy_string(language, v->value, sizeof(language));
} /*else if (strcasecmp(v->name,"type")) */ } /*else if (strcasecmp(v->name,"type")) */
/* ast_log(LOG_WARNING, "Ignoring %s\n", v->name); */ /* ast_log(LOG_WARNING, "Ignoring %s\n", v->name); */
v = v->next; v = v->next;
@ -8473,8 +8473,8 @@ static int reload_config(void)
char *config = "iax.conf"; char *config = "iax.conf";
struct iax2_registry *reg; struct iax2_registry *reg;
struct iax2_peer *peer; struct iax2_peer *peer;
strncpy(accountcode, "", sizeof(accountcode)-1); ast_copy_string(accountcode, "", sizeof(accountcode));
strncpy(language, "", sizeof(language)-1); ast_copy_string(language, "", sizeof(language));
amaflags = 0; amaflags = 0;
delayreject = 0; delayreject = 0;
ast_clear_flag((&globalflags), IAX_NOTRANSFER); ast_clear_flag((&globalflags), IAX_NOTRANSFER);
@ -8530,7 +8530,7 @@ static int cache_get_callno_locked(const char *data)
} }
memset(&ied, 0, sizeof(ied)); memset(&ied, 0, sizeof(ied));
/* No match found, we need to create a new one */ /* No match found, we need to create a new one */
strncpy(st, data, sizeof(st)-1); ast_copy_string(st, data, sizeof(st));
/* Grab the host */ /* Grab the host */
s = strchr(st, '/'); s = strchr(st, '/');
if (s) { if (s) {
@ -8565,7 +8565,7 @@ static int cache_get_callno_locked(const char *data)
return -1; return -1;
} }
ast_mutex_lock(&iaxsl[callno]); ast_mutex_lock(&iaxsl[callno]);
strncpy(iaxs[callno]->dproot, data, sizeof(iaxs[callno]->dproot)-1); ast_copy_string(iaxs[callno]->dproot, data, sizeof(iaxs[callno]->dproot));
iaxs[callno]->capability = IAX_CAPABILITY_FULLBANDWIDTH; iaxs[callno]->capability = IAX_CAPABILITY_FULLBANDWIDTH;
iax_ie_append_short(&ied, IAX_IE_VERSION, IAX_PROTO_VERSION); iax_ie_append_short(&ied, IAX_IE_VERSION, IAX_PROTO_VERSION);
@ -8578,7 +8578,7 @@ static int cache_get_callno_locked(const char *data)
iax_ie_append_int(&ied, IAX_IE_CAPABILITY, IAX_CAPABILITY_FULLBANDWIDTH); iax_ie_append_int(&ied, IAX_IE_CAPABILITY, IAX_CAPABILITY_FULLBANDWIDTH);
/* Keep password handy */ /* Keep password handy */
if (password) if (password)
strncpy(iaxs[callno]->secret, password, sizeof(iaxs[callno]->secret)-1); ast_copy_string(iaxs[callno]->secret, password, sizeof(iaxs[callno]->secret));
#if 0 #if 0
/* XXX Need equivalent XXX */ /* XXX Need equivalent XXX */
if (option_verbose > 2) if (option_verbose > 2)
@ -8643,8 +8643,8 @@ static struct iax2_dpcache *find_cache(struct ast_channel *chan, const char *dat
return NULL; return NULL;
} }
memset(dp, 0, sizeof(struct iax2_dpcache)); memset(dp, 0, sizeof(struct iax2_dpcache));
strncpy(dp->peercontext, data, sizeof(dp->peercontext)-1); ast_copy_string(dp->peercontext, data, sizeof(dp->peercontext));
strncpy(dp->exten, exten, sizeof(dp->exten)-1); ast_copy_string(dp->exten, exten, sizeof(dp->exten));
gettimeofday(&dp->expirey, NULL); gettimeofday(&dp->expirey, NULL);
dp->orig = dp->expirey; dp->orig = dp->expirey;
/* Expires in 30 mins by default */ /* Expires in 30 mins by default */
@ -8835,7 +8835,7 @@ static int iax2_exec(struct ast_channel *chan, const char *context, const char *
dp = find_cache(chan, data, context, exten, priority); dp = find_cache(chan, data, context, exten, priority);
if (dp) { if (dp) {
if (dp->flags & CACHE_FLAG_EXISTS) { if (dp->flags & CACHE_FLAG_EXISTS) {
strncpy(odata, data, sizeof(odata)-1); ast_copy_string(odata, data, sizeof(odata));
ncontext = strchr(odata, '/'); ncontext = strchr(odata, '/');
if (ncontext) { if (ncontext) {
*ncontext = '\0'; *ncontext = '\0';
@ -8872,7 +8872,7 @@ static int iax2_devicestate(void *data)
char tmp[256] = ""; char tmp[256] = "";
int res = AST_DEVICE_INVALID; int res = AST_DEVICE_INVALID;
strncpy(tmp, dest, sizeof(tmp) - 1); ast_copy_string(tmp, dest, sizeof(tmp));
host = strchr(tmp, '@'); host = strchr(tmp, '@');
if (host) { if (host) {
*host = '\0'; *host = '\0';

210
channels/chan_zap.c
Unescape View File

@ -1602,8 +1602,8 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
#endif #endif
char dest[256]; /* must be same length as p->dialdest */ char dest[256]; /* must be same length as p->dialdest */
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
strncpy(dest, rdest, sizeof(dest) - 1); ast_copy_string(dest, rdest, sizeof(dest));
strncpy(p->dialdest, rdest, sizeof(dest) - 1); ast_copy_string(p->dialdest, rdest, sizeof(p->dialdest));
if ((ast->_state == AST_STATE_BUSY)) { if ((ast->_state == AST_STATE_BUSY)) {
p->subs[SUB_REAL].needbusy = 1; p->subs[SUB_REAL].needbusy = 1;
ast_mutex_unlock(&p->lock); ast_mutex_unlock(&p->lock);
@ -1692,11 +1692,11 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
/* Call waiting call */ /* Call waiting call */
p->callwaitrings = 0; p->callwaitrings = 0;
if (ast->cid.cid_num) if (ast->cid.cid_num)
strncpy(p->callwait_num, ast->cid.cid_num, sizeof(p->callwait_num)-1); ast_copy_string(p->callwait_num, ast->cid.cid_num, sizeof(p->callwait_num));
else else
p->callwait_num[0] = '\0'; p->callwait_num[0] = '\0';
if (ast->cid.cid_name) if (ast->cid.cid_name)
strncpy(p->callwait_name, ast->cid.cid_name, sizeof(p->callwait_name)-1); ast_copy_string(p->callwait_name, ast->cid.cid_name, sizeof(p->callwait_name));
else else
p->callwait_name[0] = '\0'; p->callwait_name[0] = '\0';
/* Call waiting tone instead */ /* Call waiting tone instead */
@ -1712,11 +1712,11 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
n = ast->cid.cid_name; n = ast->cid.cid_name;
l = ast->cid.cid_num; l = ast->cid.cid_num;
if (l) if (l)
strncpy(p->lastcid_num, l, sizeof(p->lastcid_num) - 1); ast_copy_string(p->lastcid_num, l, sizeof(p->lastcid_num));
else else
p->lastcid_num[0] = '\0'; p->lastcid_num[0] = '\0';
if (n) if (n)
strncpy(p->lastcid_name, n, sizeof(p->lastcid_name) - 1); ast_copy_string(p->lastcid_name, n, sizeof(p->lastcid_name));
else else
p->lastcid_name[0] = '\0'; p->lastcid_name[0] = '\0';
ast_setstate(ast, AST_STATE_RINGING); ast_setstate(ast, AST_STATE_RINGING);
@ -1802,7 +1802,7 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
p->whichwink = 0; p->whichwink = 0;
} else } else
if (p->sig == SIG_E911) { if (p->sig == SIG_E911) {
strncpy(p->dop.dialstr, "M*911#", sizeof(p->dop.dialstr) - 1); ast_copy_string(p->dop.dialstr, "M*911#", sizeof(p->dop.dialstr));
} else } else
if (p->sig == SIG_FEATB) { if (p->sig == SIG_FEATB) {
snprintf(p->dop.dialstr, sizeof(p->dop.dialstr), "M*%s#", c + p->stripmsd); snprintf(p->dop.dialstr, sizeof(p->dop.dialstr), "M*%s#", c + p->stripmsd);
@ -2134,12 +2134,12 @@ static int zt_hangup(struct ast_channel *ast)
zt_confmute(p, 0); zt_confmute(p, 0);
restore_gains(p); restore_gains(p);
if (p->origcid_num) { if (p->origcid_num) {
strncpy(p->cid_num, p->origcid_num, sizeof(p->cid_num) - 1); ast_copy_string(p->cid_num, p->origcid_num, sizeof(p->cid_num));
free(p->origcid_num); free(p->origcid_num);
p->origcid_num = NULL; p->origcid_num = NULL;
} }
if (p->origcid_name) { if (p->origcid_name) {
strncpy(p->cid_name, p->origcid_name, sizeof(p->cid_name) - 1); ast_copy_string(p->cid_name, p->origcid_name, sizeof(p->cid_name));
free(p->origcid_name); free(p->origcid_name);
p->origcid_name = NULL; p->origcid_name = NULL;
} }
@ -3330,7 +3330,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
zt_enable_ec(p); zt_enable_ec(p);
if (p->echobreak) { if (p->echobreak) {
zt_train_ec(p); zt_train_ec(p);
strncpy(p->dop.dialstr, p->echorest, sizeof(p->dop.dialstr) - 1); ast_copy_string(p->dop.dialstr, p->echorest, sizeof(p->dop.dialstr));
p->dop.op = ZT_DIAL_OP_REPLACE; p->dop.op = ZT_DIAL_OP_REPLACE;
res = ioctl(p->subs[SUB_REAL].zfd, ZT_DIAL, &p->dop); res = ioctl(p->subs[SUB_REAL].zfd, ZT_DIAL, &p->dop);
p->echobreak = 0; p->echobreak = 0;
@ -3511,7 +3511,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
else else
c = p->dialdest; c = p->dialdest;
if (*c) snprintf(p->dop.dialstr, sizeof(p->dop.dialstr), "M*0%s#", c); if (*c) snprintf(p->dop.dialstr, sizeof(p->dop.dialstr), "M*0%s#", c);
else strncpy(p->dop.dialstr,"M*2#", sizeof(p->dop.dialstr) - 1); else ast_copy_string(p->dop.dialstr,"M*2#", sizeof(p->dop.dialstr));
if (strlen(p->dop.dialstr) > 4) { if (strlen(p->dop.dialstr) > 4) {
memset(p->echorest, 'w', sizeof(p->echorest) - 1); memset(p->echorest, 'w', sizeof(p->echorest) - 1);
strcpy(p->echorest + (p->echotraining / 401) + 1, p->dop.dialstr + strlen(p->dop.dialstr) - 2); strcpy(p->echorest + (p->echotraining / 401) + 1, p->dop.dialstr + strlen(p->dop.dialstr) - 2);
@ -3711,9 +3711,9 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
if (p->threewaycalling && !check_for_conference(p)) { if (p->threewaycalling && !check_for_conference(p)) {
if (p->zaptrcallerid && p->owner) { if (p->zaptrcallerid && p->owner) {
if (p->owner->cid.cid_num) if (p->owner->cid.cid_num)
strncpy(cid_num, p->owner->cid.cid_num, sizeof(cid_num) - 1); ast_copy_string(cid_num, p->owner->cid.cid_num, sizeof(cid_num));
if (p->owner->cid.cid_name) if (p->owner->cid.cid_name)
strncpy(cid_name, p->owner->cid.cid_name, sizeof(cid_name) - 1); ast_copy_string(cid_name, p->owner->cid.cid_name, sizeof(cid_name));
} }
/* XXX This section needs much more error checking!!! XXX */ /* XXX This section needs much more error checking!!! XXX */
/* Start a 3-way call if feasible */ /* Start a 3-way call if feasible */
@ -3724,24 +3724,12 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
/* Make new channel */ /* Make new channel */
chan = zt_new(p, AST_STATE_RESERVED, 0, SUB_THREEWAY, 0, 0); chan = zt_new(p, AST_STATE_RESERVED, 0, SUB_THREEWAY, 0, 0);
if (p->zaptrcallerid) { if (p->zaptrcallerid) {
if (!p->origcid_num) { if (!p->origcid_num)
p->origcid_num = malloc(strlen(p->cid_num) + 1); p->origcid_num = strdup(p->cid_num);
if (p->origcid_num) { if (!p->origcid_name)
strncpy(p->origcid_num, p->cid_num, strlen(p->cid_num)); /* safe */ p->origcid_name = strdup(p->cid_name);
/* make sure p->origcallerid is terminated */ ast_copy_string(p->cid_num, cid_num, sizeof(p->cid_num));
p->origcid_num[strlen(p->cid_num)] = '\0'; ast_copy_string(p->cid_name, cid_name, sizeof(p->cid_name));
}
}
if (!p->origcid_name) {
p->origcid_name = malloc(strlen(p->cid_name) + 1);
if (p->origcid_name) {
strncpy(p->origcid_name, p->cid_name, strlen(p->cid_name)); /* safe */
/* make sure p->origcallerid is terminated */
p->origcid_name[strlen(p->cid_name)] = '\0';
}
}
strncpy(p->cid_num, cid_num, sizeof(p->cid_num) -1);
strncpy(p->cid_name, cid_name, sizeof(p->cid_name) -1);
} }
/* Swap things around between the three-way and real call */ /* Swap things around between the three-way and real call */
swap_subs(p, SUB_THREEWAY, SUB_REAL); swap_subs(p, SUB_THREEWAY, SUB_REAL);
@ -3852,7 +3840,7 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
snprintf(p->dop.dialstr, sizeof(p->dop.dialstr), "M*%d%s#", p->owner->cid.cid_ani2, p->owner->cid.cid_ani); snprintf(p->dop.dialstr, sizeof(p->dop.dialstr), "M*%d%s#", p->owner->cid.cid_ani2, p->owner->cid.cid_ani);
break; break;
case 1: case 1:
strncpy(p->dop.dialstr, p->finaldial, sizeof(p->dop.dialstr)); ast_copy_string(p->dop.dialstr, p->finaldial, sizeof(p->dop.dialstr));
break; break;
case 2: case 2:
ast_log(LOG_WARNING, "Received unexpected wink on channel of type SIG_FEATDMF_TA\n"); ast_log(LOG_WARNING, "Received unexpected wink on channel of type SIG_FEATDMF_TA\n");
@ -4787,24 +4775,24 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
tmp->pickupgroup = i->pickupgroup; tmp->pickupgroup = i->pickupgroup;
} }
if (!ast_strlen_zero(i->language)) if (!ast_strlen_zero(i->language))
strncpy(tmp->language, i->language, sizeof(tmp->language)-1); ast_copy_string(tmp->language, i->language, sizeof(tmp->language));
if (!ast_strlen_zero(i->musicclass)) if (!ast_strlen_zero(i->musicclass))
strncpy(tmp->musicclass, i->musicclass, sizeof(tmp->musicclass)-1); ast_copy_string(tmp->musicclass, i->musicclass, sizeof(tmp->musicclass));
if (!i->owner) if (!i->owner)
i->owner = tmp; i->owner = tmp;
if (!ast_strlen_zero(i->accountcode)) if (!ast_strlen_zero(i->accountcode))
strncpy(tmp->accountcode, i->accountcode, sizeof(tmp->accountcode)-1); ast_copy_string(tmp->accountcode, i->accountcode, sizeof(tmp->accountcode));
if (i->amaflags) if (i->amaflags)
tmp->amaflags = i->amaflags; tmp->amaflags = i->amaflags;
i->subs[index].owner = tmp; i->subs[index].owner = tmp;
strncpy(tmp->context, i->context, sizeof(tmp->context)-1); ast_copy_string(tmp->context, i->context, sizeof(tmp->context));
/* Copy call forward info */ /* Copy call forward info */
strncpy(tmp->call_forward, i->call_forward, sizeof(tmp->call_forward) - 1); ast_copy_string(tmp->call_forward, i->call_forward, sizeof(tmp->call_forward));
/* If we've been told "no ADSI" then enforce it */ /* If we've been told "no ADSI" then enforce it */
if (!i->adsi) if (!i->adsi)
tmp->adsicpe = AST_ADSI_UNAVAILABLE; tmp->adsicpe = AST_ADSI_UNAVAILABLE;
if (!ast_strlen_zero(i->exten)) if (!ast_strlen_zero(i->exten))
strncpy(tmp->exten, i->exten, sizeof(tmp->exten)-1); ast_copy_string(tmp->exten, i->exten, sizeof(tmp->exten));
if (!ast_strlen_zero(i->rdnis)) if (!ast_strlen_zero(i->rdnis))
tmp->cid.cid_rdnis = strdup(i->rdnis); tmp->cid.cid_rdnis = strdup(i->rdnis);
if (!ast_strlen_zero(i->dnid)) if (!ast_strlen_zero(i->dnid))
@ -4944,7 +4932,7 @@ static void *ss_thread(void *data)
#ifdef ZAPATA_PRI #ifdef ZAPATA_PRI
case SIG_PRI: case SIG_PRI:
/* Now loop looking for an extension */ /* Now loop looking for an extension */
strncpy(exten, p->exten, sizeof(exten) - 1); ast_copy_string(exten, p->exten, sizeof(exten));
len = strlen(exten); len = strlen(exten);
res = 0; res = 0;
while((len < AST_MAX_EXTENSION-1) && ast_matchmore_extension(chan, chan->context, exten, 1, p->cid_num)) { while((len < AST_MAX_EXTENSION-1) && ast_matchmore_extension(chan, chan->context, exten, 1, p->cid_num)) {
@ -4969,7 +4957,7 @@ static void *ss_thread(void *data)
tone_zone_play_tone(p->subs[index].zfd, -1); tone_zone_play_tone(p->subs[index].zfd, -1);
if (ast_exists_extension(chan, chan->context, exten, 1, p->cid_num)) { if (ast_exists_extension(chan, chan->context, exten, 1, p->cid_num)) {
/* Start the real PBX */ /* Start the real PBX */
strncpy(chan->exten, exten, sizeof(chan->exten) - 1); ast_copy_string(chan->exten, exten, sizeof(chan->exten));
ast_dsp_digitreset(p->dsp); ast_dsp_digitreset(p->dsp);
ast_setstate(chan, AST_STATE_RING); ast_setstate(chan, AST_STATE_RING);
res = ast_pbx_run(chan); res = ast_pbx_run(chan);
@ -5060,14 +5048,14 @@ static void *ss_thread(void *data)
ast_hangup(chan); ast_hangup(chan);
return NULL; return NULL;
} }
strncpy(exten, dtmfbuf, sizeof(exten)-1); ast_copy_string(exten, dtmfbuf, sizeof(exten));
if (ast_strlen_zero(exten)) if (ast_strlen_zero(exten))
strncpy(exten, "s", sizeof(exten)-1); ast_copy_string(exten, "s", sizeof(exten));
if (p->sig == SIG_FEATD || p->sig == SIG_EMWINK) { if (p->sig == SIG_FEATD || p->sig == SIG_EMWINK) {
/* Look for Feature Group D on all E&M Wink and Feature Group D trunks */ /* Look for Feature Group D on all E&M Wink and Feature Group D trunks */
if (exten[0] == '*') { if (exten[0] == '*') {
char *stringp=NULL; char *stringp=NULL;
strncpy(exten2, exten, sizeof(exten2)-1); ast_copy_string(exten2, exten, sizeof(exten2));
/* Parse out extension and callerid */ /* Parse out extension and callerid */
stringp=exten2 +1; stringp=exten2 +1;
s1 = strsep(&stringp, "*"); s1 = strsep(&stringp, "*");
@ -5077,16 +5065,16 @@ static void *ss_thread(void *data)
ast_set_callerid(chan, p->cid_num, NULL, p->cid_num); ast_set_callerid(chan, p->cid_num, NULL, p->cid_num);
else else
ast_set_callerid(chan, s1, NULL, s1); ast_set_callerid(chan, s1, NULL, s1);
strncpy(exten, s2, sizeof(exten)-1); ast_copy_string(exten, s2, sizeof(exten));
} else } else
strncpy(exten, s1, sizeof(exten)-1); ast_copy_string(exten, s1, sizeof(exten));
} else if (p->sig == SIG_FEATD) } else if (p->sig == SIG_FEATD)
ast_log(LOG_WARNING, "Got a non-Feature Group D input on channel %d. Assuming E&M Wink instead\n", p->channel); ast_log(LOG_WARNING, "Got a non-Feature Group D input on channel %d. Assuming E&M Wink instead\n", p->channel);
} }
if (p->sig == SIG_FEATDMF) { if (p->sig == SIG_FEATDMF) {
if (exten[0] == '*') { if (exten[0] == '*') {
char *stringp=NULL; char *stringp=NULL;
strncpy(exten2, exten, sizeof(exten2)-1); ast_copy_string(exten2, exten, sizeof(exten2));
/* Parse out extension and callerid */ /* Parse out extension and callerid */
stringp=exten2 +1; stringp=exten2 +1;
s1 = strsep(&stringp, "#"); s1 = strsep(&stringp, "#");
@ -5097,16 +5085,16 @@ static void *ss_thread(void *data)
else else
if(*(s1 + 2)) if(*(s1 + 2))
ast_set_callerid(chan, s1 + 2, NULL, s1 + 2); ast_set_callerid(chan, s1 + 2, NULL, s1 + 2);
strncpy(exten, s2 + 1, sizeof(exten)-1); ast_copy_string(exten, s2 + 1, sizeof(exten));
} else } else
strncpy(exten, s1 + 2, sizeof(exten)-1); ast_copy_string(exten, s1 + 2, sizeof(exten));
} else } else
ast_log(LOG_WARNING, "Got a non-Feature Group D input on channel %d. Assuming E&M Wink instead\n", p->channel); ast_log(LOG_WARNING, "Got a non-Feature Group D input on channel %d. Assuming E&M Wink instead\n", p->channel);
} }
if (p->sig == SIG_E911) { if (p->sig == SIG_E911) {
if (exten[0] == '*') { if (exten[0] == '*') {
char *stringp=NULL; char *stringp=NULL;
strncpy(exten2, exten, sizeof(exten2)-1); ast_copy_string(exten2, exten, sizeof(exten2));
/* Parse out extension and callerid */ /* Parse out extension and callerid */
stringp=exten2 +1; stringp=exten2 +1;
s1 = strsep(&stringp, "#"); s1 = strsep(&stringp, "#");
@ -5115,8 +5103,8 @@ static void *ss_thread(void *data)
if(*(s2 + 2)) if(*(s2 + 2))
ast_set_callerid(chan, s2 + 2, NULL, s2 + 2); ast_set_callerid(chan, s2 + 2, NULL, s2 + 2);
} }
if (s1) strncpy(exten, s1, sizeof(exten)-1); if (s1) ast_copy_string(exten, s1, sizeof(exten));
else strncpy(exten, "911", sizeof(exten) - 1); else ast_copy_string(exten, "911", sizeof(exten));
printf("E911: exten: %s, ANI: %s\n",exten, chan->cid.cid_ani); printf("E911: exten: %s, ANI: %s\n",exten, chan->cid.cid_ani);
} else } else
ast_log(LOG_WARNING, "Got a non-E911 input on channel %d. Assuming E&M Wink instead\n", p->channel); ast_log(LOG_WARNING, "Got a non-E911 input on channel %d. Assuming E&M Wink instead\n", p->channel);
@ -5124,11 +5112,11 @@ static void *ss_thread(void *data)
if (p->sig == SIG_FEATB) { if (p->sig == SIG_FEATB) {
if (exten[0] == '*') { if (exten[0] == '*') {
char *stringp=NULL; char *stringp=NULL;
strncpy(exten2, exten, sizeof(exten2)-1); ast_copy_string(exten2, exten, sizeof(exten2));
/* Parse out extension and callerid */ /* Parse out extension and callerid */
stringp=exten2 +1; stringp=exten2 +1;
s1 = strsep(&stringp, "#"); s1 = strsep(&stringp, "#");
strncpy(exten, exten2 + 1, sizeof(exten)-1); ast_copy_string(exten, exten2 + 1, sizeof(exten));
} else } else
ast_log(LOG_WARNING, "Got a non-Feature Group B input on channel %d. Assuming E&M Wink instead\n", p->channel); ast_log(LOG_WARNING, "Got a non-Feature Group B input on channel %d. Assuming E&M Wink instead\n", p->channel);
} }
@ -5139,7 +5127,7 @@ static void *ss_thread(void *data)
if ((p->sig == SIG_FEATDMF) || (p->sig == SIG_E911) || (p->sig == SIG_FEATB)) if ((p->sig == SIG_FEATDMF) || (p->sig == SIG_E911) || (p->sig == SIG_FEATB))
ast_dsp_digitmode(p->dsp,DSP_DIGITMODE_DTMF | p->dtmfrelax); ast_dsp_digitmode(p->dsp,DSP_DIGITMODE_DTMF | p->dtmfrelax);
if (ast_exists_extension(chan, chan->context, exten, 1, chan->cid.cid_num)) { if (ast_exists_extension(chan, chan->context, exten, 1, chan->cid.cid_num)) {
strncpy(chan->exten, exten, sizeof(chan->exten)-1); ast_copy_string(chan->exten, exten, sizeof(chan->exten));
ast_dsp_digitreset(p->dsp); ast_dsp_digitreset(p->dsp);
res = ast_pbx_run(chan); res = ast_pbx_run(chan);
if (res) { if (res) {
@ -5198,7 +5186,7 @@ static void *ss_thread(void *data)
if (!res || !ast_matchmore_extension(chan, chan->context, exten, 1, p->cid_num)) { if (!res || !ast_matchmore_extension(chan, chan->context, exten, 1, p->cid_num)) {
if (getforward) { if (getforward) {
/* Record this as the forwarding extension */ /* Record this as the forwarding extension */
strncpy(p->call_forward, exten, sizeof(p->call_forward) - 1); ast_copy_string(p->call_forward, exten, sizeof(p->call_forward));
if (option_verbose > 2) if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "Setting call forward to '%s' on channel %d\n", p->call_forward, p->channel); ast_verbose(VERBOSE_PREFIX_3 "Setting call forward to '%s' on channel %d\n", p->call_forward, p->channel);
res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL); res = tone_zone_play_tone(p->subs[index].zfd, ZT_TONE_DIALRECALL);
@ -5213,7 +5201,7 @@ static void *ss_thread(void *data)
getforward = 0; getforward = 0;
} else { } else {
res = tone_zone_play_tone(p->subs[index].zfd, -1); res = tone_zone_play_tone(p->subs[index].zfd, -1);
strncpy(chan->exten, exten, sizeof(chan->exten)-1); ast_copy_string(chan->exten, exten, sizeof(chan->exten));
if (!ast_strlen_zero(p->cid_num)) { if (!ast_strlen_zero(p->cid_num)) {
if (!p->hidecallerid) if (!p->hidecallerid)
ast_set_callerid(chan, p->cid_num, NULL, p->cid_num); ast_set_callerid(chan, p->cid_num, NULL, p->cid_num);
@ -5605,8 +5593,8 @@ static void *ss_thread(void *data)
counter1 = 0; counter1 = 0;
/* Check to see if context is what it should be, if not set to be. */ /* Check to see if context is what it should be, if not set to be. */
if (strcmp(p->context,p->defcontext) != 0) { if (strcmp(p->context,p->defcontext) != 0) {
strncpy(p->context, p->defcontext, sizeof(p->context)-1); ast_copy_string(p->context, p->defcontext, sizeof(p->context));
strncpy(chan->context,p->defcontext,sizeof(chan->context)-1); ast_copy_string(chan->context,p->defcontext,sizeof(chan->context));
} }
for(;;) { for(;;) {
@ -5664,8 +5652,8 @@ static void *ss_thread(void *data)
} }
if (distMatches == 3) { if (distMatches == 3) {
/* The ring matches, set the context to whatever is for distinctive ring.. */ /* The ring matches, set the context to whatever is for distinctive ring.. */
strncpy(p->context, p->drings.ringContext[counter].contextData, sizeof(p->context)-1); ast_copy_string(p->context, p->drings.ringContext[counter].contextData, sizeof(p->context));
strncpy(chan->context, p->drings.ringContext[counter].contextData, sizeof(chan->context)-1); ast_copy_string(chan->context, p->drings.ringContext[counter].contextData, sizeof(chan->context));
if(option_verbose > 2) if(option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Distinctive Ring matched context %s\n",p->context); ast_verbose( VERBOSE_PREFIX_3 "Distinctive Ring matched context %s\n",p->context);
break; break;
@ -5707,8 +5695,8 @@ static void *ss_thread(void *data)
counter1 = 0; counter1 = 0;
/* Check to see if context is what it should be, if not set to be. */ /* Check to see if context is what it should be, if not set to be. */
if (strcmp(p->context,p->defcontext) != 0) { if (strcmp(p->context,p->defcontext) != 0) {
strncpy(p->context, p->defcontext, sizeof(p->context)-1); ast_copy_string(p->context, p->defcontext, sizeof(p->context));
strncpy(chan->context,p->defcontext,sizeof(chan->context)-1); ast_copy_string(chan->context,p->defcontext,sizeof(chan->context));
} }
/* Take out of linear mode for Caller*ID processing */ /* Take out of linear mode for Caller*ID processing */
@ -5778,8 +5766,8 @@ static void *ss_thread(void *data)
} }
if (distMatches == 3) { if (distMatches == 3) {
/* The ring matches, set the context to whatever is for distinctive ring.. */ /* The ring matches, set the context to whatever is for distinctive ring.. */
strncpy(p->context, p->drings.ringContext[counter].contextData, sizeof(p->context)-1); ast_copy_string(p->context, p->drings.ringContext[counter].contextData, sizeof(p->context));
strncpy(chan->context, p->drings.ringContext[counter].contextData, sizeof(chan->context)-1); ast_copy_string(chan->context, p->drings.ringContext[counter].contextData, sizeof(chan->context));
if(option_verbose > 2) if(option_verbose > 2)
ast_verbose( VERBOSE_PREFIX_3 "Distinctive Ring matched context %s\n",p->context); ast_verbose( VERBOSE_PREFIX_3 "Distinctive Ring matched context %s\n",p->context);
break; break;
@ -6661,13 +6649,13 @@ static struct zt_pvt *mkintf(int channel, int signalling, int radio, struct zt_p
pris[span].minidle = minidle; pris[span].minidle = minidle;
pris[span].overlapdial = overlapdial; pris[span].overlapdial = overlapdial;
pris[span].facilityenable = facilityenable; pris[span].facilityenable = facilityenable;
strncpy(pris[span].idledial, idledial, sizeof(pris[span].idledial) - 1); ast_copy_string(pris[span].idledial, idledial, sizeof(pris[span].idledial));
strncpy(pris[span].idleext, idleext, sizeof(pris[span].idleext) - 1); ast_copy_string(pris[span].idleext, idleext, sizeof(pris[span].idleext));
strncpy(pris[span].internationalprefix, internationalprefix, sizeof(pris[span].internationalprefix)-1); ast_copy_string(pris[span].internationalprefix, internationalprefix, sizeof(pris[span].internationalprefix));
strncpy(pris[span].nationalprefix, nationalprefix, sizeof(pris[span].nationalprefix)-1); ast_copy_string(pris[span].nationalprefix, nationalprefix, sizeof(pris[span].nationalprefix));
strncpy(pris[span].localprefix, localprefix, sizeof(pris[span].localprefix)-1); ast_copy_string(pris[span].localprefix, localprefix, sizeof(pris[span].localprefix));
strncpy(pris[span].privateprefix, privateprefix, sizeof(pris[span].privateprefix)-1); ast_copy_string(pris[span].privateprefix, privateprefix, sizeof(pris[span].privateprefix));
strncpy(pris[span].unknownprefix, unknownprefix, sizeof(pris[span].unknownprefix)-1); ast_copy_string(pris[span].unknownprefix, unknownprefix, sizeof(pris[span].unknownprefix));
pris[span].resetinterval = resetinterval; pris[span].resetinterval = resetinterval;
tmp->pri = &pris[span]; tmp->pri = &pris[span];
@ -6819,7 +6807,7 @@ static struct zt_pvt *mkintf(int channel, int signalling, int radio, struct zt_p
} }
} }
strncpy(tmp->accountcode, accountcode, sizeof(tmp->accountcode)-1); ast_copy_string(tmp->accountcode, accountcode, sizeof(tmp->accountcode));
tmp->amaflags = amaflags; tmp->amaflags = amaflags;
if (!here) { if (!here) {
tmp->confno = -1; tmp->confno = -1;
@ -6827,14 +6815,14 @@ static struct zt_pvt *mkintf(int channel, int signalling, int radio, struct zt_p
} }
tmp->canpark = canpark; tmp->canpark = canpark;
tmp->transfer = transfer; tmp->transfer = transfer;
strncpy(tmp->defcontext,context,sizeof(tmp->defcontext)-1); ast_copy_string(tmp->defcontext,context,sizeof(tmp->defcontext));
strncpy(tmp->language, language, sizeof(tmp->language)-1); ast_copy_string(tmp->language, language, sizeof(tmp->language));
strncpy(tmp->musicclass, musicclass, sizeof(tmp->musicclass)-1); ast_copy_string(tmp->musicclass, musicclass, sizeof(tmp->musicclass));
strncpy(tmp->context, context, sizeof(tmp->context)-1); ast_copy_string(tmp->context, context, sizeof(tmp->context));
strncpy(tmp->cid_num, cid_num, sizeof(tmp->cid_num)-1); ast_copy_string(tmp->cid_num, cid_num, sizeof(tmp->cid_num));
tmp->cid_ton = 0; tmp->cid_ton = 0;
strncpy(tmp->cid_name, cid_name, sizeof(tmp->cid_name)-1); ast_copy_string(tmp->cid_name, cid_name, sizeof(tmp->cid_name));
strncpy(tmp->mailbox, mailbox, sizeof(tmp->mailbox)-1); ast_copy_string(tmp->mailbox, mailbox, sizeof(tmp->mailbox));
tmp->msgstate = -1; tmp->msgstate = -1;
tmp->group = cur_group; tmp->group = cur_group;
tmp->callgroup=cur_callergroup; tmp->callgroup=cur_callergroup;
@ -7443,8 +7431,8 @@ static void *do_idle_thread(void *vchan)
switch(f->subclass) { switch(f->subclass) {
case AST_CONTROL_ANSWER: case AST_CONTROL_ANSWER:
/* Launch the PBX */ /* Launch the PBX */
strncpy(chan->exten, pvt->pri->idleext, sizeof(chan->exten) - 1); ast_copy_string(chan->exten, pvt->pri->idleext, sizeof(chan->exten));
strncpy(chan->context, pvt->pri->idlecontext, sizeof(chan->context) - 1); ast_copy_string(chan->context, pvt->pri->idlecontext, sizeof(chan->context));
chan->priority = 1; chan->priority = 1;
if (option_verbose > 3) if (option_verbose > 3)
ast_verbose(VERBOSE_PREFIX_3 "Idle channel '%s' answered, sending to %s@%s\n", chan->name, chan->exten, chan->context); ast_verbose(VERBOSE_PREFIX_3 "Idle channel '%s' answered, sending to %s@%s\n", chan->name, chan->exten, chan->context);
@ -7581,7 +7569,7 @@ static void *pri_dchannel(void *vpri)
if (cc) { if (cc) {
*cc = '\0'; *cc = '\0';
cc++; cc++;
strncpy(pri->idlecontext, cc, sizeof(pri->idlecontext) - 1); ast_copy_string(pri->idlecontext, cc, sizeof(pri->idlecontext));
#if 0 #if 0
/* Extensions may not be loaded yet */ /* Extensions may not be loaded yet */
if (!ast_exists_extension(NULL, pri->idlecontext, pri->idleext, 1, NULL)) if (!ast_exists_extension(NULL, pri->idlecontext, pri->idleext, 1, NULL))
@ -7965,15 +7953,15 @@ static void *pri_dchannel(void *vpri)
} }
if (pri->pvts[chanpos]->use_callerid) { if (pri->pvts[chanpos]->use_callerid) {
ast_shrink_phone_number(plancallingnum); ast_shrink_phone_number(plancallingnum);
strncpy(pri->pvts[chanpos]->cid_num, plancallingnum, sizeof(pri->pvts[chanpos]->cid_num)-1); ast_copy_string(pri->pvts[chanpos]->cid_num, plancallingnum, sizeof(pri->pvts[chanpos]->cid_num));
strncpy(pri->pvts[chanpos]->cid_name, e->ring.callingname, sizeof(pri->pvts[chanpos]->cid_name)-1); ast_copy_string(pri->pvts[chanpos]->cid_name, e->ring.callingname, sizeof(pri->pvts[chanpos]->cid_name));
pri->pvts[chanpos]->cid_ton = e->ring.callingplan; /* this is the callingplan (TON/NPI), e->ring.callingplan>>4 would be the TON */ pri->pvts[chanpos]->cid_ton = e->ring.callingplan; /* this is the callingplan (TON/NPI), e->ring.callingplan>>4 would be the TON */
} else { } else {
pri->pvts[chanpos]->cid_num[0] = '\0'; pri->pvts[chanpos]->cid_num[0] = '\0';
pri->pvts[chanpos]->cid_name[0] = '\0'; pri->pvts[chanpos]->cid_name[0] = '\0';
pri->pvts[chanpos]->cid_ton = 0; pri->pvts[chanpos]->cid_ton = 0;
} }
strncpy(pri->pvts[chanpos]->rdnis, e->ring.redirectingnum, sizeof(pri->pvts[chanpos]->rdnis) - 1); ast_copy_string(pri->pvts[chanpos]->rdnis, e->ring.redirectingnum, sizeof(pri->pvts[chanpos]->rdnis));
/* If immediate=yes go to s|1 */ /* If immediate=yes go to s|1 */
if (pri->pvts[chanpos]->immediate) { if (pri->pvts[chanpos]->immediate) {
if (option_verbose > 2) if (option_verbose > 2)
@ -7983,13 +7971,13 @@ static void *pri_dchannel(void *vpri)
} }
/* Get called number */ /* Get called number */
else if (!ast_strlen_zero(e->ring.callednum)) { else if (!ast_strlen_zero(e->ring.callednum)) {
strncpy(pri->pvts[chanpos]->exten, e->ring.callednum, sizeof(pri->pvts[chanpos]->exten)-1); ast_copy_string(pri->pvts[chanpos]->exten, e->ring.callednum, sizeof(pri->pvts[chanpos]->exten));
strncpy(pri->pvts[chanpos]->dnid, e->ring.callednum, sizeof(pri->pvts[chanpos]->dnid) - 1); ast_copy_string(pri->pvts[chanpos]->dnid, e->ring.callednum, sizeof(pri->pvts[chanpos]->dnid));
} else } else
pri->pvts[chanpos]->exten[0] = '\0'; pri->pvts[chanpos]->exten[0] = '\0';
/* Set DNID on all incoming calls -- even immediate */ /* Set DNID on all incoming calls -- even immediate */
if (!ast_strlen_zero(e->ring.callednum)) if (!ast_strlen_zero(e->ring.callednum))
strncpy(pri->pvts[chanpos]->dnid, e->ring.callednum, sizeof(pri->pvts[chanpos]->dnid) - 1); ast_copy_string(pri->pvts[chanpos]->dnid, e->ring.callednum, sizeof(pri->pvts[chanpos]->dnid));
/* No number yet, but received "sending complete"? */ /* No number yet, but received "sending complete"? */
if (e->ring.complete && (ast_strlen_zero(e->ring.callednum))) { if (e->ring.complete && (ast_strlen_zero(e->ring.callednum))) {
if (option_verbose > 2) if (option_verbose > 2)
@ -8246,8 +8234,8 @@ static void *pri_dchannel(void *vpri)
} else { } else {
/* Re-use *69 field for PRI */ /* Re-use *69 field for PRI */
ast_mutex_lock(&pri->pvts[chanpos]->lock); ast_mutex_lock(&pri->pvts[chanpos]->lock);
strncpy(pri->pvts[chanpos]->lastcid_num, e->facname.callingnum, sizeof(pri->pvts[chanpos]->lastcid_num) - 1); ast_copy_string(pri->pvts[chanpos]->lastcid_num, e->facname.callingnum, sizeof(pri->pvts[chanpos]->lastcid_num));
strncpy(pri->pvts[chanpos]->lastcid_name, e->facname.callingname, sizeof(pri->pvts[chanpos]->lastcid_name) - 1); ast_copy_string(pri->pvts[chanpos]->lastcid_name, e->facname.callingname, sizeof(pri->pvts[chanpos]->lastcid_name));
pri->pvts[chanpos]->subs[SUB_REAL].needcallerid =1; pri->pvts[chanpos]->subs[SUB_REAL].needcallerid =1;
zt_enable_ec(pri->pvts[chanpos]); zt_enable_ec(pri->pvts[chanpos]);
ast_mutex_unlock(&pri->pvts[chanpos]->lock); ast_mutex_unlock(&pri->pvts[chanpos]->lock);
@ -8694,7 +8682,7 @@ static int handle_pri_set_debug_file(int fd, int argc, char **argv)
close(pridebugfd); close(pridebugfd);
pridebugfd = myfd; pridebugfd = myfd;
strncpy(pridebugfilename,argv[4],sizeof(pridebugfilename)-1); ast_copy_string(pridebugfilename,argv[4],sizeof(pridebugfilename));
ast_mutex_unlock(&pridebugfdlock); ast_mutex_unlock(&pridebugfdlock);
@ -9065,7 +9053,7 @@ static int zap_show_channels(int fd, int argc, char **argv)
if (tmp->channel > 0) { if (tmp->channel > 0) {
snprintf(tmps, sizeof(tmps), "%d", tmp->channel); snprintf(tmps, sizeof(tmps), "%d", tmp->channel);
} else } else
strncpy(tmps, "pseudo", sizeof(tmps) - 1); ast_copy_string(tmps, "pseudo", sizeof(tmps));
ast_cli(fd, FORMAT, tmps, tmp->exten, tmp->context, tmp->language, tmp->musicclass); ast_cli(fd, FORMAT, tmps, tmp->exten, tmp->context, tmp->language, tmp->musicclass);
tmp = tmp->next; tmp = tmp->next;
} }
@ -9753,11 +9741,11 @@ static int setup_zap(int reload)
if (ast_true(v->value)) if (ast_true(v->value))
usedistinctiveringdetection = 1; usedistinctiveringdetection = 1;
} else if (!strcasecmp(v->name, "dring1context")) { } else if (!strcasecmp(v->name, "dring1context")) {
strncpy(drings.ringContext[0].contextData,v->value,sizeof(drings.ringContext[0].contextData)-1); ast_copy_string(drings.ringContext[0].contextData,v->value,sizeof(drings.ringContext[0].contextData));
} else if (!strcasecmp(v->name, "dring2context")) { } else if (!strcasecmp(v->name, "dring2context")) {
strncpy(drings.ringContext[1].contextData,v->value,sizeof(drings.ringContext[1].contextData)-1); ast_copy_string(drings.ringContext[1].contextData,v->value,sizeof(drings.ringContext[1].contextData));
} else if (!strcasecmp(v->name, "dring3context")) { } else if (!strcasecmp(v->name, "dring3context")) {
strncpy(drings.ringContext[2].contextData,v->value,sizeof(drings.ringContext[2].contextData)-1); ast_copy_string(drings.ringContext[2].contextData,v->value,sizeof(drings.ringContext[2].contextData));
} else if (!strcasecmp(v->name, "dring1")) { } else if (!strcasecmp(v->name, "dring1")) {
ringc = v->value; ringc = v->value;
sscanf(ringc, "%d,%d,%d", &drings.ringnum[0].ring[0], &drings.ringnum[0].ring[1], &drings.ringnum[0].ring[2]); sscanf(ringc, "%d,%d,%d", &drings.ringnum[0].ring[0], &drings.ringnum[0].ring[1], &drings.ringnum[0].ring[2]);
@ -9795,7 +9783,7 @@ static int setup_zap(int reload)
else else
relaxdtmf = 0; relaxdtmf = 0;
} else if (!strcasecmp(v->name, "mailbox")) { } else if (!strcasecmp(v->name, "mailbox")) {
strncpy(mailbox, v->value, sizeof(mailbox) -1); ast_copy_string(mailbox, v->value, sizeof(mailbox));
} else if (!strcasecmp(v->name, "adsi")) { } else if (!strcasecmp(v->name, "adsi")) {
adsi = ast_true(v->value); adsi = ast_true(v->value);
} else if (!strcasecmp(v->name, "transfer")) { } else if (!strcasecmp(v->name, "transfer")) {
@ -9858,13 +9846,13 @@ static int setup_zap(int reload)
} else if (!strcasecmp(v->name, "callwaitingcallerid")) { } else if (!strcasecmp(v->name, "callwaitingcallerid")) {
callwaitingcallerid = ast_true(v->value); callwaitingcallerid = ast_true(v->value);
} else if (!strcasecmp(v->name, "context")) { } else if (!strcasecmp(v->name, "context")) {
strncpy(context, v->value, sizeof(context)-1); ast_copy_string(context, v->value, sizeof(context));
} else if (!strcasecmp(v->name, "language")) { } else if (!strcasecmp(v->name, "language")) {
strncpy(language, v->value, sizeof(language)-1); ast_copy_string(language, v->value, sizeof(language));
} else if (!strcasecmp(v->name, "progzone")) { } else if (!strcasecmp(v->name, "progzone")) {
strncpy(progzone, v->value, sizeof(progzone)-1); ast_copy_string(progzone, v->value, sizeof(progzone));
} else if (!strcasecmp(v->name, "musiconhold")) { } else if (!strcasecmp(v->name, "musiconhold")) {
strncpy(musicclass, v->value, sizeof(musicclass)-1); ast_copy_string(musicclass, v->value, sizeof(musicclass));
} else if (!strcasecmp(v->name, "stripmsd")) { } else if (!strcasecmp(v->name, "stripmsd")) {
stripmsd = atoi(v->value); stripmsd = atoi(v->value);
} else if (!strcasecmp(v->name, "jitterbuffers")) { } else if (!strcasecmp(v->name, "jitterbuffers")) {
@ -9903,7 +9891,7 @@ static int setup_zap(int reload)
} else if (!strcasecmp(v->name, "usecallingpres")) { } else if (!strcasecmp(v->name, "usecallingpres")) {
use_callingpres = ast_true(v->value); use_callingpres = ast_true(v->value);
} else if (!strcasecmp(v->name, "accountcode")) { } else if (!strcasecmp(v->name, "accountcode")) {
strncpy(accountcode, v->value, sizeof(accountcode)-1); ast_copy_string(accountcode, v->value, sizeof(accountcode));
} else if (!strcasecmp(v->name, "amaflags")) { } else if (!strcasecmp(v->name, "amaflags")) {
y = ast_cdr_amaflags2int(v->value); y = ast_cdr_amaflags2int(v->value);
if (y < 0) if (y < 0)
@ -10115,15 +10103,15 @@ static int setup_zap(int reload)
ast_log(LOG_WARNING, "'%s' is not a valid pri indication value, should be 'inband' or 'outofband' at line %d\n", ast_log(LOG_WARNING, "'%s' is not a valid pri indication value, should be 'inband' or 'outofband' at line %d\n",
v->value, v->lineno); v->value, v->lineno);
} else if (!strcasecmp(v->name, "internationalprefix")) { } else if (!strcasecmp(v->name, "internationalprefix")) {
strncpy(internationalprefix, v->value, sizeof(internationalprefix)-1); ast_copy_string(internationalprefix, v->value, sizeof(internationalprefix));
} else if (!strcasecmp(v->name, "nationalprefix")) { } else if (!strcasecmp(v->name, "nationalprefix")) {
strncpy(nationalprefix, v->value, sizeof(nationalprefix)-1); ast_copy_string(nationalprefix, v->value, sizeof(nationalprefix));
} else if (!strcasecmp(v->name, "localprefix")) { } else if (!strcasecmp(v->name, "localprefix")) {
strncpy(localprefix, v->value, sizeof(localprefix)-1); ast_copy_string(localprefix, v->value, sizeof(localprefix));
} else if (!strcasecmp(v->name, "privateprefix")) { } else if (!strcasecmp(v->name, "privateprefix")) {
strncpy(privateprefix, v->value, sizeof(privateprefix)-1); ast_copy_string(privateprefix, v->value, sizeof(privateprefix));
} else if (!strcasecmp(v->name, "unknownprefix")) { } else if (!strcasecmp(v->name, "unknownprefix")) {
strncpy(unknownprefix, v->value, sizeof(unknownprefix)-1); ast_copy_string(unknownprefix, v->value, sizeof(unknownprefix));
} else if (!strcasecmp(v->name, "resetinterval")) { } else if (!strcasecmp(v->name, "resetinterval")) {
if (!strcasecmp(v->value, "never")) if (!strcasecmp(v->value, "never"))
resetinterval = -1; resetinterval = -1;
@ -10135,9 +10123,9 @@ static int setup_zap(int reload)
} else if (!strcasecmp(v->name, "minunused")) { } else if (!strcasecmp(v->name, "minunused")) {
minunused = atoi(v->value); minunused = atoi(v->value);
} else if (!strcasecmp(v->name, "idleext")) { } else if (!strcasecmp(v->name, "idleext")) {
strncpy(idleext, v->value, sizeof(idleext) - 1); ast_copy_string(idleext, v->value, sizeof(idleext));
} else if (!strcasecmp(v->name, "idledial")) { } else if (!strcasecmp(v->name, "idledial")) {
strncpy(idledial, v->value, sizeof(idledial) - 1); ast_copy_string(idledial, v->value, sizeof(idledial));
} else if (!strcasecmp(v->name, "overlapdial")) { } else if (!strcasecmp(v->name, "overlapdial")) {
overlapdial = ast_true(v->value); overlapdial = ast_true(v->value);
} else if (!strcasecmp(v->name, "pritimer")) { } else if (!strcasecmp(v->name, "pritimer")) {
@ -10173,7 +10161,7 @@ static int setup_zap(int reload)
char original_args[80]; char original_args[80];
int cadence_is_ok = 1; int cadence_is_ok = 1;
strncpy(original_args, v->value, sizeof(original_args) - 1); ast_copy_string(original_args, v->value, sizeof(original_args));
/* 16 cadences allowed (8 pairs) */ /* 16 cadences allowed (8 pairs) */
element_count = sscanf(v->value, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d", &c[0], &c[1], &c[2], &c[3], &c[4], &c[5], &c[6], &c[7], &c[8], &c[9], &c[10], &c[11], &c[12], &c[13], &c[14], &c[15]); element_count = sscanf(v->value, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d", &c[0], &c[1], &c[2], &c[3], &c[4], &c[5], &c[6], &c[7], &c[8], &c[9], &c[10], &c[11], &c[12], &c[13], &c[14], &c[15]);
@ -10271,9 +10259,9 @@ static int setup_zap(int reload)
} else if (!strcasecmp(v->name, "sendcalleridafter")) { } else if (!strcasecmp(v->name, "sendcalleridafter")) {
sendcalleridafter = atoi(v->value); sendcalleridafter = atoi(v->value);
} else if (!strcasecmp(v->name, "defaultcic")) { } else if (!strcasecmp(v->name, "defaultcic")) {
strncpy(defaultcic, v->value, sizeof(defaultcic)); ast_copy_string(defaultcic, v->value, sizeof(defaultcic));
} else if (!strcasecmp(v->name, "defaultozz")) { } else if (!strcasecmp(v->name, "defaultozz")) {
strncpy(defaultozz, v->value, sizeof(defaultozz)); ast_copy_string(defaultozz, v->value, sizeof(defaultozz));
} }
} else } else
ast_log(LOG_WARNING, "Ignoring %s\n", v->name); ast_log(LOG_WARNING, "Ignoring %s\n", v->name);

7
doc/CODING-GUIDELINES
Unescape View File

@ -164,6 +164,11 @@ if (name && (len = strlen(name) + strlen(prefix) + strlen(postfix) + 3) && (newn
Use const on pointers which your function will not be modifying, as this Use const on pointers which your function will not be modifying, as this
allows the compiler to make certain optimizations. allows the compiler to make certain optimizations.
Don't use strncpy for copying whole strings; it does not guarantee that the
output buffer will be null-terminated. Use ast_copy_string instead, which
is also slightly more efficient (and allows passing the actual buffer
size, which makes the code clearer).
== CLI Commands == == CLI Commands ==
New CLI commands should be named using the module's name, followed by a verb New CLI commands should be named using the module's name, followed by a verb
@ -190,5 +195,5 @@ Applications are registered and invoked using the
ast_register_application function; see the apps/app_skel.c file for an ast_register_application function; see the apps/app_skel.c file for an
example. example.
Functions are registered using 'struct ast_custom_function_obj' Functions are registered using 'struct ast_custom_function'
structures and the ast_custom_function_register function. structures and the ast_custom_function_register function.

40
res/res_features.c
Unescape View File

@ -293,18 +293,18 @@ int ast_park_call(struct ast_channel *chan, struct ast_channel *peer, int timeou
if (extout) if (extout)
*extout = x; *extout = x;
if (peer) { if (peer) {
strncpy(pu->peername,peer->name,sizeof(pu->peername) - 1); ast_copy_string(pu->peername,peer->name,sizeof(pu->peername));
} }
/* Remember what had been dialed, so that if the parking /* Remember what had been dialed, so that if the parking
expires, we try to come back to the same place */ expires, we try to come back to the same place */
if (!ast_strlen_zero(chan->macrocontext)) if (!ast_strlen_zero(chan->macrocontext))
strncpy(pu->context, chan->macrocontext, sizeof(pu->context)-1); ast_copy_string(pu->context, chan->macrocontext, sizeof(pu->context));
else else
strncpy(pu->context, chan->context, sizeof(pu->context)-1); ast_copy_string(pu->context, chan->context, sizeof(pu->context));
if (!ast_strlen_zero(chan->macroexten)) if (!ast_strlen_zero(chan->macroexten))
strncpy(pu->exten, chan->macroexten, sizeof(pu->exten)-1); ast_copy_string(pu->exten, chan->macroexten, sizeof(pu->exten));
else else
strncpy(pu->exten, chan->exten, sizeof(pu->exten)-1); ast_copy_string(pu->exten, chan->exten, sizeof(pu->exten));
if (chan->macropriority) if (chan->macropriority)
pu->priority = chan->macropriority; pu->priority = chan->macropriority;
else else
@ -387,8 +387,8 @@ int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, int
chan->writeformat = rchan->writeformat; chan->writeformat = rchan->writeformat;
ast_channel_masquerade(chan, rchan); ast_channel_masquerade(chan, rchan);
/* Setup the extensions and such */ /* Setup the extensions and such */
strncpy(chan->context, rchan->context, sizeof(chan->context) - 1); ast_copy_string(chan->context, rchan->context, sizeof(chan->context));
strncpy(chan->exten, rchan->exten, sizeof(chan->exten) - 1); ast_copy_string(chan->exten, rchan->exten, sizeof(chan->exten));
chan->priority = rchan->priority; chan->priority = rchan->priority;
/* Make the masq execute */ /* Make the masq execute */
f = ast_read(chan); f = ast_read(chan);
@ -597,8 +597,8 @@ static int builtin_blindtransfer(struct ast_channel *chan, struct ast_channel *p
res = -1; res = -1;
} else { } else {
/* Set the channel's new extension, since it exists, using transferer context */ /* Set the channel's new extension, since it exists, using transferer context */
strncpy(transferee->exten, newext, sizeof(transferee->exten)-1); ast_copy_string(transferee->exten, newext, sizeof(transferee->exten));
strncpy(transferee->context, transferer_real_context, sizeof(transferee->context)-1); ast_copy_string(transferee->context, transferer_real_context, sizeof(transferee->context));
transferee->priority = 0; transferee->priority = 0;
} }
check_goto_on_transfer(transferer); check_goto_on_transfer(transferer);
@ -852,7 +852,7 @@ static int remap_feature(const char *name, const char *value)
int res = -1; int res = -1;
for (x=0;x<FEATURES_COUNT;x++) { for (x=0;x<FEATURES_COUNT;x++) {
if (!strcasecmp(name, builtin_features[x].sname)) { if (!strcasecmp(name, builtin_features[x].sname)) {
strncpy(builtin_features[x].exten, value, sizeof(builtin_features[x].exten) - 1); ast_copy_string(builtin_features[x].exten, value, sizeof(builtin_features[x].exten));
if (option_verbose > 1) if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "Remapping feature %s (%s) to sequence '%s'\n", builtin_features[x].fname, builtin_features[x].sname, builtin_features[x].exten); ast_verbose(VERBOSE_PREFIX_2 "Remapping feature %s (%s) to sequence '%s'\n", builtin_features[x].fname, builtin_features[x].sname, builtin_features[x].exten);
res = 0; res = 0;
@ -1178,15 +1178,15 @@ static void *do_parking_thread(void *ignore)
snprintf(returnexten, sizeof(returnexten), "%s||t", peername); snprintf(returnexten, sizeof(returnexten), "%s||t", peername);
ast_add_extension2(con, 1, peername, 1, NULL, NULL, "Dial", strdup(returnexten), FREE, registrar); ast_add_extension2(con, 1, peername, 1, NULL, NULL, "Dial", strdup(returnexten), FREE, registrar);
} }
strncpy(pu->chan->exten, peername, sizeof(pu->chan->exten) - 1); ast_copy_string(pu->chan->exten, peername, sizeof(pu->chan->exten));
strncpy(pu->chan->context, parking_con_dial, sizeof(pu->chan->context) - 1); ast_copy_string(pu->chan->context, parking_con_dial, sizeof(pu->chan->context));
pu->chan->priority = 1; pu->chan->priority = 1;
} else { } else {
/* They've been waiting too long, send them back to where they came. Theoretically they /* They've been waiting too long, send them back to where they came. Theoretically they
should have their original extensions and such, but we copy to be on the safe side */ should have their original extensions and such, but we copy to be on the safe side */
strncpy(pu->chan->exten, pu->exten, sizeof(pu->chan->exten)-1); ast_copy_string(pu->chan->exten, pu->exten, sizeof(pu->chan->exten));
strncpy(pu->chan->context, pu->context, sizeof(pu->chan->context)-1); ast_copy_string(pu->chan->context, pu->context, sizeof(pu->chan->context));
pu->chan->priority = pu->priority; pu->chan->priority = pu->priority;
} }
@ -1570,9 +1570,9 @@ static int load_config(void)
var = ast_variable_browse(cfg, "general"); var = ast_variable_browse(cfg, "general");
while(var) { while(var) {
if (!strcasecmp(var->name, "parkext")) { if (!strcasecmp(var->name, "parkext")) {
strncpy(parking_ext, var->value, sizeof(parking_ext) - 1); ast_copy_string(parking_ext, var->value, sizeof(parking_ext));
} else if (!strcasecmp(var->name, "context")) { } else if (!strcasecmp(var->name, "context")) {
strncpy(parking_con, var->value, sizeof(parking_con) - 1); ast_copy_string(parking_con, var->value, sizeof(parking_con));
} else if (!strcasecmp(var->name, "parkingtime")) { } else if (!strcasecmp(var->name, "parkingtime")) {
if ((sscanf(var->value, "%d", &parkingtime) != 1) || (parkingtime < 1)) { if ((sscanf(var->value, "%d", &parkingtime) != 1) || (parkingtime < 1)) {
ast_log(LOG_WARNING, "%s is not a valid parkingtime\n", var->value); ast_log(LOG_WARNING, "%s is not a valid parkingtime\n", var->value);
@ -1602,13 +1602,13 @@ static int load_config(void)
featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT; featuredigittimeout = DEFAULT_FEATURE_DIGIT_TIMEOUT;
} }
} else if (!strcasecmp(var->name, "courtesytone")) { } else if (!strcasecmp(var->name, "courtesytone")) {
strncpy(courtesytone, var->value, sizeof(courtesytone) - 1); ast_copy_string(courtesytone, var->value, sizeof(courtesytone));
} else if (!strcasecmp(var->name, "xfersound")) { } else if (!strcasecmp(var->name, "xfersound")) {
strncpy(xfersound, var->value, sizeof(xfersound) - 1); ast_copy_string(xfersound, var->value, sizeof(xfersound));
} else if (!strcasecmp(var->name, "xferfailsound")) { } else if (!strcasecmp(var->name, "xferfailsound")) {
strncpy(xferfailsound, var->value, sizeof(xferfailsound) - 1); ast_copy_string(xferfailsound, var->value, sizeof(xferfailsound));
} else if (!strcasecmp(var->name, "pickupexten")) { } else if (!strcasecmp(var->name, "pickupexten")) {
strncpy(pickup_ext, var->value, sizeof(pickup_ext) - 1); ast_copy_string(pickup_ext, var->value, sizeof(pickup_ext));
} }
var = var->next; var = var->next;
} }

Write Preview
Loading…
Cancel
Save