From 3453a7122c1d585ad789ed0f63deb90cc5e89fae Mon Sep 17 00:00:00 2001 From: Paul Jakma Date: Fri, 12 Jun 2009 14:21:02 +0100 Subject: [bgpd] Add support for the old Linux 2.4, TCP_MD5_AUTH RFC2385 patch * configure.ac: Add a --enable-linux24-tcp-md5 argument, to compile in support for the old TCP-MD5 patch for Linux 2.4 systems. This overrides auto-detection of TCP-MD5 supported by the target system. * lib/sockopt.c: (sockopt_tcp_signature) add in a variant for the old Linux 2.4, TCP_MD5_AUTH variant of TCP-MD5 support, conditional on the previous configure arg. --- lib/sockopt.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/sockopt.c b/lib/sockopt.c index 4ba7e874..d25d371b 100644 --- a/lib/sockopt.c +++ b/lib/sockopt.c @@ -498,7 +498,30 @@ sockopt_iphdrincl_swab_systoh (struct ip *iph) int sockopt_tcp_signature (int sock, union sockunion *su, const char *password) { -#if HAVE_DECL_TCP_MD5SIG +#if defined(HAVE_TCP_MD5_LINUX24) && defined(GNU_LINUX) + /* Support for the old Linux 2.4 TCP-MD5 patch, taken from Hasso Tepper's + * version of the Quagga patch (based on work by Rick Payne, and Bruce + * Simpson) + */ +#define TCP_MD5_AUTH 13 +#define TCP_MD5_AUTH_ADD 1 +#define TCP_MD5_AUTH_DEL 2 + struct tcp_rfc2385_cmd { + u_int8_t command; /* Command - Add/Delete */ + u_int32_t address; /* IPV4 address associated */ + u_int8_t keylen; /* MD5 Key len (do NOT assume 0 terminated ascii) */ + void *key; /* MD5 Key */ + } cmd; + struct in_addr *addr = &su->sin.sin_addr; + + cmd.command = (password != NULL ? TCP_MD5_AUTH_ADD : TCP_MD5_AUTH_DEL); + cmd.address = addr->s_addr; + cmd.keylen = (password != NULL ? strlen (password) : 0); + cmd.key = password; + + return setsockopt (sock, IPPROTO_TCP, TCP_MD5_AUTH, &cmd, sizeof cmd); + +#elif HAVE_DECL_TCP_MD5SIG int ret; #ifndef GNU_LINUX /* @@ -559,5 +582,5 @@ sockopt_tcp_signature (int sock, union sockunion *su, const char *password) return ret; #else /* HAVE_TCP_MD5SIG */ return -2; -#endif /* HAVE_TCP_MD5SIG */ +#endif /* !HAVE_TCP_MD5SIG */ } -- cgit v1.2.1