proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 19:37:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2911 from opensourcerouting/remove-linux24-tcp-md5

Browse Source 
lib: remove Linux 2.4 TCP-MD5 support
This commit is contained in:
Donald Sharp 2018-08-25 06:35:02 -04:00 committed by GitHub
commit 866ec83b8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -418,8 +418,6 @@ AC_ARG_ENABLE(rusage,
AS_HELP_STRING([--disable-rusage], [disable using getrusage])) AS_HELP_STRING([--disable-rusage], [disable using getrusage]))
AC_ARG_ENABLE(gcc_ultra_verbose, AC_ARG_ENABLE(gcc_ultra_verbose,
AS_HELP_STRING([--enable-gcc-ultra-verbose], [enable ultra verbose GCC warnings])) AS_HELP_STRING([--enable-gcc-ultra-verbose], [enable ultra verbose GCC warnings]))
AC_ARG_ENABLE(linux24_tcp_md5,
AS_HELP_STRING([--enable-linux24-tcp-md5], [enable support for old, Linux-2.4 RFC2385 patch]))
AC_ARG_ENABLE(backtrace, AC_ARG_ENABLE(backtrace,
AS_HELP_STRING([--disable-backtrace,], [disable crash backtraces (default autodetect)])) AS_HELP_STRING([--disable-backtrace,], [disable crash backtraces (default autodetect)]))
AC_ARG_ENABLE(time-check, AC_ARG_ENABLE(time-check,
@ -644,10 +642,6 @@ AM_CONDITIONAL([HAVE_PROTOBUF], [test "x$have_protobuf" = "xyes"])
# End of logic for protobuf support. # End of logic for protobuf support.
# #
if test "${enable_linux24_tcp_md5}" = "yes"; then
AC_DEFINE(HAVE_TCP_MD5_LINUX24,,Old Linux 2.4 TCP MD5 Signature Patch)
fi
AC_MSG_CHECKING(if zebra should be configurable to send Route Advertisements) AC_MSG_CHECKING(if zebra should be configurable to send Route Advertisements)
if test "${enable_rtadv}" != "no"; then if test "${enable_rtadv}" != "no"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)

26
lib/sockopt.c
View File

@ -580,31 +580,7 @@ int sockopt_tcp_rtt(int sock)
int sockopt_tcp_signature(int sock, union sockunion *su, const char *password) int sockopt_tcp_signature(int sock, union sockunion *su, const char *password)
{ {
#if defined(HAVE_TCP_MD5_LINUX24) && defined(GNU_LINUX) #if HAVE_DECL_TCP_MD5SIG
/* 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 {
uint8_t command; /* Command - Add/Delete */
uint32_t address; /* IPV4 address associated */
uint8_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; int ret;
#ifndef GNU_LINUX #ifndef GNU_LINUX
/* /*