Update socket code to be synced with master branch. (abffa9d4) · Commits · 戴 / Bird

client/birdc.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		#include "lib/resource.h"
		#include "lib/string.h"
		#include "client/client.h"
		#include "sysdep/unix/unix.h"

		static int input_hidden_end;
		static int prompt_active;

lib/ip.h

+1 −7

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ static inline ip6_addr ip6_not(ip6_addr a)
		#define ipa_from_ip6(x) x
		#define ipa_from_u32(x) ipa_from_ip4(ip4_from_u32(x))

		#define ipa_to_ip4(x) _I3(x)
		#define ipa_to_ip4(x) _MI4(_I3(x))
		#define ipa_to_ip6(x) x
		#define ipa_to_u32(x) ip4_to_u32(ipa_to_ip4(x))

		@@ -356,12 +356,6 @@ static inline ip6_addr ipa_get_in4(struct in_addr *in)
		static inline ip6_addr ipa_get_in6(struct in6_addr *in)
		{ return ip6_ntoh((ip6_addr ) in); }

		// XXXX check callers
		static inline void ipa_put_in4(struct in_addr *in, ip6_addr a)
		{ ip6_put32_ip4(in, a); }

		static inline void ipa_put_in6(struct in6_addr *in, ip6_addr a)
		{ ip6_put32(in, a); }

lib/printf.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -222,6 +222,16 @@ int bvsnprintf(char buf, int size, const char fmt, va_list args)
		continue;

		case 'm':
		if (flags & SPECIAL) {
		if (!errno)
		continue;
		if (size < 2)
		return -1;
		*str++ = ':';
		*str++ = ' ';
		start += 2;
		size -= 2;
		}
		s = strerror(errno);
		goto str;
		case 'M':

lib/socket.h

+20 −18

Original line number	Diff line number	Diff line
		@@ -44,18 +44,21 @@ typedef struct birdsock {
		unsigned lifindex; /* local interface that received the datagram */
		/* laddr and lifindex are valid only if SKF_LADDR_RX flag is set to request it */

		int fd; /* System-dependent data */
		int af; /* Address family (AF_INET, AF_INET6 or 0 for non-IP) of fd */
		int fd; /* System-dependent data */
		int index; /* Index in poll buffer */
		int rcv_ttl; /* TTL of last received datagram */
		node n;
		void rbuf_alloc, tbuf_alloc;
		char password; / Password for MD5 authentication */
		char err; / Error message */
		} sock;

		sock sock_new(pool ); /* Allocate new socket */
		#define sk_new(X) sock_new(X) /* Wrapper to avoid name collision with OpenSSL */

		int sk_open(sock ); / Open socket */
		int sk_rx_ready(sock *s);
		int sk_send(sock , unsigned len); / Send data, <0=err, >0=ok, 0=sleep */
		int sk_send_to(sock , unsigned len, ip_addr to, unsigned port); / sk_send to given destination */
		void sk_reallocate(sock ); / Free and allocate tbuf & rbuf */
		@@ -63,33 +66,32 @@ void sk_set_rbsize(sock s, uint val); / Resize RX buffer */
		void sk_set_tbsize(sock s, uint val); / Resize TX buffer, keeping content */
		void sk_set_tbuf(sock s, void tbuf); /* Switch TX buffer, NULL-> return to internal */
		void sk_dump_all(void);
		int sk_set_ttl(sock s, int ttl); / Set transmit TTL for given socket */
		int sk_set_min_ttl(sock s, int ttl); / Set minimal accepted TTL for given socket */

		/* Add or remove security associations for given passive socket */
		int sk_set_md5_auth(sock s, ip_addr a, struct iface ifa, char *passwd);
		int sk_rx_ready(sock *s);

		/* Prepare UDP or IP socket to multicasting. s->iface and s->ttl must be set */
		int sk_setup_multicast(sock *s);
		int sk_join_group(sock *s, ip_addr maddr);
		int sk_leave_group(sock *s, ip_addr maddr);

		int sk_set_ipv6_checksum(sock *s, int offset);
		int sk_set_icmp6_filter(sock *s, int p1, int p2);
		int sk_set_broadcast(sock *s, int enable);

		static inline int sk_send_buffer_empty(sock *sk)
		{ return sk->tbuf == sk->tpos; }


		static inline int sk_is_ipv4(sock *sk)
		{ return sk->af == AF_INET; }

		static inline int sk_is_ipv6(sock *sk)
		{ return sk->af == AF_INET6; }


		int sk_setup_multicast(sock s); / Prepare UDP or IP socket for multicasting */
		int sk_join_group(sock s, ip_addr maddr); / Join multicast group on sk iface */
		int sk_leave_group(sock s, ip_addr maddr); / Leave multicast group on sk iface */
		int sk_setup_broadcast(sock *s);
		int sk_set_ttl(sock s, int ttl); / Set transmit TTL for given socket */
		int sk_set_min_ttl(sock s, int ttl); / Set minimal accepted TTL for given socket */
		int sk_set_md5_auth(sock s, ip_addr a, struct iface ifa, char *passwd);
		int sk_set_ipv6_checksum(sock *s, int offset);
		int sk_set_icmp6_filter(sock *s, int p1, int p2);
		void sk_log_error(sock s, const char p);

		extern int sk_priority_control; /* Suggested priority for control traffic, should be sysdep define */


		/* Socket flags */

		#define SKF_V4ONLY 0x01 /* Use IPv4 for IP sockets */

proto/bfd/packets.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -101,8 +101,8 @@ bfd_rx_hook(sock *sk, int len)
		uint err_val = 0;
		char fb[8];

		if ((sk->sport == BFD_CONTROL_PORT) && (sk->ttl < 255))
		DROP("wrong TTL", sk->ttl);
		if ((sk->sport == BFD_CONTROL_PORT) && (sk->rcv_ttl < 255))
		DROP("wrong TTL", sk->rcv_ttl);

		if (len < BFD_BASE_LEN)
		DROP("too short", len);
		@@ -209,6 +209,7 @@ bfd_open_rx_sk(struct bfd_proto *p, int multihop)
		return sk;

		err:
		sk_log_error(sk, p->p.name);
		rfree(sk);
		return NULL;
		}
		@@ -243,6 +244,7 @@ bfd_open_tx_sk(struct bfd_proto p, ip_addr local, struct iface ifa)
		return sk;

		err:
		sk_log_error(sk, p->p.name);
		rfree(sk);
		return NULL;
		}

Admin message