BSD sysdep syntax errors (9030658a) · Commits · 戴 / Bird

sysdep/bsd/krt-sock.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -287,7 +287,7 @@ krt_send_route(struct krt_proto p, int cmd, rte e)
		#endif
		{
		/* Fallback for all other valid cases */
		if (!i->addr)
		if (!i->sysdep)
		{
		log(L_ERR "KRT: interface %s has no IP addess", i->name);
		return -1;
		@@ -298,7 +298,7 @@ krt_send_route(struct krt_proto p, int cmd, rte e)
		msg.rtm.rtm_flags \|= RTF_CLONING;
		#endif

		sockaddr_fill(&gate, ipa_is_ip4(i->addr->ip) ? AF_INET : AF_INET6, i->addr->ip, NULL, 0);
		sockaddr_fill(&gate, AF_INET, ipa_from_ip4(i->sysdep), NULL, 0);
		msg.rtm.rtm_addrs \|= RTA_GATEWAY;
		break;
		}
		@@ -1143,7 +1143,7 @@ kif_set_sysdep_ip(struct iface *i)
		ip4_addr addr;
		struct sockaddr_in sin = (struct sockaddr_in ) &ifr.ifr_addr;
		memcpy(&addr, &sin->sin_addr.s_addr, sizeof(ip4_addr));
		ipa_ntoh(addr);
		ip4_ntoh(addr);

		int ret = !ip4_equal(i->sysdep, addr);
		i->sysdep = addr;

+2 −2

Original line number	Diff line number	Diff line
		@@ -38,12 +38,12 @@
		*/

		#define INIT_MREQ4(maddr,ifa) \
		{ .imr_multiaddr = ipa_to_in4(maddr), .imr_interface = ipa_to_in4(ifa->addr->ip) }
		{ .imr_multiaddr = ipa_to_in4(maddr), .imr_interface = ipa_to_in4(ipa_from_ip4(ifa->sysdep)) }

		static inline int
		sk_setup_multicast4(sock *s)
		{
		struct in_addr ifa = ipa_to_in4(s->iface->addr->ip);
		struct in_addr ifa = ipa_to_in4(ipa_from_ip4(s->iface->sysdep));
		u8 ttl = s->ttl;
		u8 n = 0;