kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-27 16:07:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@15742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-03-28 20:06:56 +00:00
parent 7a879ed598
commit fd1d8cdf10
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_iax2.c
+3 -2
View File
@@ -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)
channels/chan_sip.c
+1 -1
View File
@@ -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)) {