diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-09 15:06:21 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-09 15:06:21 +0000 |
| commit | 67c6e3c37dabf65fb77a9c1f89f69550dfc319f7 (patch) | |
| tree | 867b49816ced0aa9f069da445b711c4f12978b74 /main/rtp.c | |
| parent | 51619435a4ed586a1d35d60acdfee494112c59d2 (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.1@147811 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/rtp.c')
| -rw-r--r-- | main/rtp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/rtp.c b/main/rtp.c index aa8cb7818..b71015dd8 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -675,7 +675,7 @@ int ast_stun_request(int s, struct sockaddr_in *dst, res = ast_select(s + 1, &rfds, NULL, NULL, &to); if (res <= 0) /* timeout or error */ continue; - bzero(&src, sizeof(src)); + memset(&src, '\0', sizeof(src)); srclen = sizeof(src); /* XXX pass -1 in the size, because stun_handle_packet might * write past the end of the buffer. @@ -687,7 +687,7 @@ int ast_stun_request(int s, struct sockaddr_in *dst, retry, res); continue; } - bzero(answer, sizeof(struct sockaddr_in)); + memset(answer, '\0', sizeof(struct sockaddr_in)); stun_handle_packet(s, &src, reply_buf, res, stun_get_mapped, answer); res = 0; /* signal regular exit */ |