summaryrefslogtreecommitdiffstats
path: root/lib/ipaddr.h
diff options
context:
space:
mode:
authorvivek <vivek@cumulusnetworks.com>2018-03-06 23:19:24 +0100
committervivek <vivek@cumulusnetworks.com>2018-03-06 23:19:24 +0100
commitbfd498f0dab9a1937c6036cd35ed020b64a69e8f (patch)
treedfb478c984f1aeb74f0c35c9c7b8b11577cb9833 /lib/ipaddr.h
parentlib, zebra: Fix warnings (diff)
parentMerge pull request #1811 from donaldsharp/nht_send_type (diff)
downloadfrr-bfd498f0dab9a1937c6036cd35ed020b64a69e8f.tar.xz
frr-bfd498f0dab9a1937c6036cd35ed020b64a69e8f.zip
Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing
Conflicts: zebra/zserv.c
Diffstat (limited to 'lib/ipaddr.h')
-rw-r--r--lib/ipaddr.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ipaddr.h b/lib/ipaddr.h
index e8dbe9cf0..44bde45ad 100644
--- a/lib/ipaddr.h
+++ b/lib/ipaddr.h
@@ -86,6 +86,12 @@ static inline char *ipaddr2str(struct ipaddr *ip, char *buf, int size)
return buf;
}
+/*
+ * Convert IPv4 address to IPv4-mapped IPv6 address which is of the
+ * form ::FFFF:<IPv4 address> (RFC 4291). This IPv6 address can then
+ * be used to represent the IPv4 address, wherever only an IPv6 address
+ * is required.
+ */
static inline void ipv4_to_ipv4_mapped_ipv6(struct in6_addr *in6,
struct in_addr in)
{