diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-09 14:56:51 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-09 14:56:51 +0000 |
| commit | f0d32fcc57029c07755a1616c1948c1ed9433495 (patch) | |
| tree | dbc9ae3a6c64f0fdeb58465fce49d4fc6fae7fe0 /channels/chan_iax2.c | |
| parent | ecde53ad3cfed686b0174bfa65574fd452f6e54c (diff) | |
Merged revisions 147807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r147807 | murf | 2008-10-09 08:17:33 -0600 (Thu, 09 Oct 2008) | 15 lines
(closes issue #13557)
Reported by: nickpeirson
Patches:
pbx.c.patch uploaded by nickpeirson (license 579)
replace_bzero+bcopy.patch uploaded by nickpeirson (license 579)
Tested by: nickpeirson, murf
1. replaced all refs to bzero and bcopy to memset and memmove instead.
2. added a note to the CODING-GUIDELINES
3. add two macros to asterisk.h to prevent bzero, bcopy from creeping
back into the source
4. removed bzero from configure, configure.ac, autoconfig.h.in
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@147809 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
| -rw-r--r-- | channels/chan_iax2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 0c6fa73ee..aea0c5b7a 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -6483,7 +6483,7 @@ static int try_transfer(struct chan_iax2_pvt *pvt, struct iax_ies *ies) memset(&ied, 0, sizeof(ied)); if (ies->apparent_addr) - bcopy(ies->apparent_addr, &new, sizeof(new)); + memmove(&new, ies->apparent_addr, sizeof(new)); if (ies->callno) newcall = ies->callno; if (!newcall || !new.sin_addr.s_addr || !new.sin_port) { @@ -6619,7 +6619,7 @@ static int iax2_ack_registry(struct iax_ies *ies, struct sockaddr_in *sin, int c memset(&us, 0, sizeof(us)); if (ies->apparent_addr) - bcopy(ies->apparent_addr, &us, sizeof(us)); + memmove(&us, ies->apparent_addr, sizeof(us)); if (ies->username) ast_copy_string(peer, ies->username, sizeof(peer)); if (ies->refresh) |