summaryrefslogtreecommitdiff
path: root/main/netsock2.c
diff options
context:
space:
mode:
authorMatthew Nicholson <mnicholson@digium.com>2011-01-26 20:44:47 +0000
committerMatthew Nicholson <mnicholson@digium.com>2011-01-26 20:44:47 +0000
commit48a9694ed0772d09229919031effbb56ed253be2 (patch)
tree700b71361d4a128f480482d2b4d272b3b81bdfa2 /main/netsock2.c
parent8db5da18cff776045ddb8d00e1d4d161b39aa299 (diff)
Merged revisions 304245 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8 ................ r304245 | mnicholson | 2011-01-26 14:43:27 -0600 (Wed, 26 Jan 2011) | 20 lines Merged revisions 304244 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ................ r304244 | mnicholson | 2011-01-26 14:42:16 -0600 (Wed, 26 Jan 2011) | 13 lines Merged revisions 304241 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r304241 | mnicholson | 2011-01-26 14:38:22 -0600 (Wed, 26 Jan 2011) | 6 lines This patch modifies chan_sip to route responses to the address the request came from. It also modifies chan_sip to respect the maddr parameter in the Via header. ABE-2664 Review: https://reviewboard.asterisk.org/r/1059/ ........ ................ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304246 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/netsock2.c')
-rw-r--r--main/netsock2.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/netsock2.c b/main/netsock2.c
index e575bcfa2..6f55b3b3b 100644
--- a/main/netsock2.c
+++ b/main/netsock2.c
@@ -381,6 +381,11 @@ int ast_sockaddr_is_ipv4_mapped(const struct ast_sockaddr *addr)
return addr->len && IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr);
}
+int ast_sockaddr_is_ipv4_multicast(const struct ast_sockaddr *addr)
+{
+ return ((ast_sockaddr_ipv4(addr) & 0xf0000000) == 0xe0000000);
+}
+
int ast_sockaddr_is_ipv6(const struct ast_sockaddr *addr)
{
return addr->ss.ss_family == AF_INET6 &&