From 9311ceb8b6fe7064cffca3efda051ef1e1801642 Mon Sep 17 00:00:00 2001
From: Stefano Brivio <sbrivio@redhat.com>
Date: Fri, 21 May 2021 11:14:53 +0200
Subject: icmp: Implement lazy bind for ping sockets

It turns out that binding ICMP/ICMPv6 echo sockets takes a long
time. Instead of binding all of them (one for each possible echo
identification number, that is, 2^17) at start-up, bind them as
ICMP/ICMPv6 packets are sent by the guest.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 util.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'util.c')

diff --git a/util.c b/util.c
index 9748cbe..bcec7be 100644
--- a/util.c
+++ b/util.c
@@ -17,7 +17,6 @@
 #include <arpa/inet.h>
 #include <net/ethernet.h>
 #include <net/if.h>
-#include <netinet/ip.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 #include <sys/epoll.h>
@@ -207,6 +206,9 @@ int sock_l4(struct ctx *c, int af, uint16_t proto, uint16_t port)
 	if (proto == IPPROTO_UDP && PORT_IS_EPHEMERAL(port))
 		goto epoll_add;
 
+	if (proto == IPPROTO_ICMP || proto == IPPROTO_ICMPV6)
+		goto epoll_add;
+
 	if (bind(fd, sa, sl) < 0) {
 		/* We'll fail to bind to low ports if we don't have enough
 		 * capabilities, and we'll fail to bind on already bound ports,
-- 
cgit v1.2.3