Use IP_PORTRANGE_HIGH for BFD where available (9c89560e) · Commits · 戴 / Bird

lib/socket.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ extern int sk_priority_control; /* Suggested priority for control traffic, shou
		#define SKF_LADDR_RX 0x04 /* Report local address for RX packets */
		#define SKF_TTL_RX 0x08 /* Report TTL / Hop Limit for RX packets */
		#define SKF_BIND 0x10 /* Bind datagram socket to given source address */
		#define SKF_HIGH_PORT 0x20 /* Choose port from high range if possible */

		#define SKF_THREAD 0x100 /* Socked used in thread, Do not add to main loop */
		#define SKF_TRUNCATED 0x200 /* Received packet was truncated, set by IO layer */

+1 −1

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ bfd_open_tx_sk(struct bfd_proto p, ip_addr local, struct iface ifa)
		sk->tos = IP_PREC_INTERNET_CONTROL;
		sk->priority = sk_priority_control;
		sk->ttl = ifa ? 255 : -1;
		sk->flags = SKF_THREAD \| SKF_BIND;
		sk->flags = SKF_THREAD \| SKF_BIND \| SKF_HIGH_PORT;

		#ifdef IPV6
		sk->flags \|= SKF_V6ONLY;

+11 −5

Original line number	Diff line number	Diff line
		@@ -1399,6 +1399,14 @@ sk_open(sock *s)
		}
		#endif
		}
		#ifdef IP_PORTRANGE
		else if (s->flags & SKF_HIGH_PORT)
		{
		int range = IP_PORTRANGE_HIGH;
		if (setsockopt(fd, IPPROTO_IP, IP_PORTRANGE, &range, sizeof(range)) < 0)
		log(L_WARN "Socket error: %s%#m", "IP_PORTRANGE");
		}
		#endif

		sockaddr_fill(&sa, af, bind_addr, s->iface, bind_port);
		if (bind(fd, &sa.sa, SA_LEN(sa)) < 0)
		@@ -2026,5 +2034,3 @@ test_old_bird(char *path)
		die("I found another BIRD running.");
		close(fd);
		}