automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@15742 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 8b599d4c88e65a99c06be0886697146ebf347455..2412ca9a1c11628440cb08042aadd7bdd9a7d1da 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -40,6 +40,7 @@
 #include <sys/signal.h>
 #include <signal.h>
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
 #include <unistd.h>
 #include <netdb.h>
@@ -5294,7 +5295,7 @@ static int try_transfer(struct chan_iax2_pvt *pvt, struct iax_ies *ies)
        
        memset(&ied, 0, sizeof(ied));
        if (ies->apparent_addr)
-               memcpy(&new, ies->apparent_addr, sizeof(new));
+               bcopy(ies->apparent_addr, &new, sizeof(new));
        if (ies->callno)
                newcall = ies->callno;
        if (!newcall || !new.sin_addr.s_addr || !new.sin_port) {
@@ -5445,7 +5446,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)
-               memcpy(&us, ies->apparent_addr, sizeof(us));
+               bcopy(ies->apparent_addr, &us, sizeof(us));
        if (ies->username)
                ast_copy_string(peer, ies->username, sizeof(peer));
        if (ies->refresh)

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 19f6991e44ae6c1b219536482683fc28dd119d3e..115394d3f75b683cf2b7e7732786cb6352c12061 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -11544,7 +11544,7 @@ static int sip_poke_peer(struct sip_peer *peer)
        }
        memcpy(&p->sa, &peer->addr, sizeof(p->sa));
        memcpy(&p->recv, &peer->addr, sizeof(p->sa));
-       ast_copy_flags(peer, &global_flags, SIP_FLAGS_TO_COPY);
+       ast_copy_flags(p, peer, SIP_FLAGS_TO_COPY);
 
        /* Send OPTIONs to peer's fullcontact */
        if (!ast_strlen_zero(peer->fullcontact)) {