CentOS Sources
2 years ago
committed by
MSVSphere Packaging Team
commit
8bf92c8b91
@ -0,0 +1,2 @@
|
|||||||
|
dfc756dfd123360d1e1a760d66821e47f9a6afed SOURCES/frr-7.5.1.tar.gz
|
||||||
|
e25979fad0e873cd0196e528cae570ba18c11a8f SOURCES/frr.if
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
SOURCES/frr-7.5.1.tar.gz
|
||||||
|
SOURCES/frr.if
|
||||||
@ -0,0 +1,55 @@
|
|||||||
|
diff --git a/Makefile.am b/Makefile.am
|
||||||
|
index 5be3264..33abc1d 100644
|
||||||
|
--- a/Makefile.am
|
||||||
|
+++ b/Makefile.am
|
||||||
|
@@ -130,8 +130,6 @@ include ospf6d/subdir.am
|
||||||
|
include ospfclient/subdir.am
|
||||||
|
include isisd/subdir.am
|
||||||
|
include nhrpd/subdir.am
|
||||||
|
-include ldpd/subdir.am
|
||||||
|
-include babeld/subdir.am
|
||||||
|
include eigrpd/subdir.am
|
||||||
|
include sharpd/subdir.am
|
||||||
|
include pimd/subdir.am
|
||||||
|
@@ -182,7 +180,6 @@ EXTRA_DIST += \
|
||||||
|
snapcraft/defaults \
|
||||||
|
snapcraft/helpers \
|
||||||
|
snapcraft/snap \
|
||||||
|
- babeld/Makefile \
|
||||||
|
bgpd/Makefile \
|
||||||
|
bgpd/rfp-example/librfp/Makefile \
|
||||||
|
bgpd/rfp-example/rfptest/Makefile \
|
||||||
|
@@ -193,7 +190,6 @@ EXTRA_DIST += \
|
||||||
|
fpm/Makefile \
|
||||||
|
grpc/Makefile \
|
||||||
|
isisd/Makefile \
|
||||||
|
- ldpd/Makefile \
|
||||||
|
lib/Makefile \
|
||||||
|
nhrpd/Makefile \
|
||||||
|
ospf6d/Makefile \
|
||||||
|
diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons
|
||||||
|
index f6d512b..6d4831d 100644
|
||||||
|
--- a/tools/etc/frr/daemons
|
||||||
|
+++ b/tools/etc/frr/daemons
|
||||||
|
@@ -21,10 +21,8 @@ ripd=no
|
||||||
|
ripngd=no
|
||||||
|
isisd=no
|
||||||
|
pimd=no
|
||||||
|
-ldpd=no
|
||||||
|
nhrpd=no
|
||||||
|
eigrpd=no
|
||||||
|
-babeld=no
|
||||||
|
sharpd=no
|
||||||
|
pbrd=no
|
||||||
|
bfdd=no
|
||||||
|
@@ -45,10 +43,8 @@ ripd_options=" -A 127.0.0.1"
|
||||||
|
ripngd_options=" -A ::1"
|
||||||
|
isisd_options=" -A 127.0.0.1"
|
||||||
|
pimd_options=" -A 127.0.0.1"
|
||||||
|
-ldpd_options=" -A 127.0.0.1"
|
||||||
|
nhrpd_options=" -A 127.0.0.1"
|
||||||
|
eigrpd_options=" -A 127.0.0.1"
|
||||||
|
-babeld_options=" -A 127.0.0.1"
|
||||||
|
sharpd_options=" -A 127.0.0.1"
|
||||||
|
pbrd_options=" -A 127.0.0.1"
|
||||||
|
staticd_options="-A 127.0.0.1"
|
||||||
@ -0,0 +1,20 @@
|
|||||||
|
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
|
||||||
|
index 208fb11..0692adc 100755
|
||||||
|
--- a/tools/frr-reload.py
|
||||||
|
+++ b/tools/frr-reload.py
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/usr/bin/python
|
||||||
|
+#!/usr/bin/python3
|
||||||
|
# Frr Reloader
|
||||||
|
# Copyright (C) 2014 Cumulus Networks, Inc.
|
||||||
|
#
|
||||||
|
diff --git a/tools/generate_support_bundle.py b/tools/generate_support_bundle.py
|
||||||
|
index 540b7a1..0876ebb 100755
|
||||||
|
--- a/tools/generate_support_bundle.py
|
||||||
|
+++ b/tools/generate_support_bundle.py
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-#!/usr/bin/python
|
||||||
|
+#!/usr/bin/python3
|
||||||
|
|
||||||
|
########################################################
|
||||||
|
### Python Script to generate the FRR support bundle ###
|
||||||
@ -0,0 +1,86 @@
|
|||||||
|
diff --git a/lib/subdir.am b/lib/subdir.am
|
||||||
|
index 0b7af18..0533e24 100644
|
||||||
|
--- a/lib/subdir.am
|
||||||
|
+++ b/lib/subdir.am
|
||||||
|
@@ -41,7 +41,6 @@ lib_libfrr_la_SOURCES = \
|
||||||
|
lib/log.c \
|
||||||
|
lib/log_filter.c \
|
||||||
|
lib/log_vty.c \
|
||||||
|
- lib/md5.c \
|
||||||
|
lib/memory.c \
|
||||||
|
lib/mlag.c \
|
||||||
|
lib/module.c \
|
||||||
|
diff --git a/lib/subdir.am b/lib/subdir.am
|
||||||
|
index 0533e24..b3d3700 100644
|
||||||
|
--- a/lib/subdir.am
|
||||||
|
+++ b/lib/subdir.am
|
||||||
|
@@ -170,7 +170,6 @@ pkginclude_HEADERS += \
|
||||||
|
lib/linklist.h \
|
||||||
|
lib/log.h \
|
||||||
|
lib/log_vty.h \
|
||||||
|
- lib/md5.h \
|
||||||
|
lib/memory.h \
|
||||||
|
lib/module.h \
|
||||||
|
lib/monotime.h \
|
||||||
|
diff --git a/lib/subdir.am b/lib/subdir.am
|
||||||
|
index 53f7115..cea866f 100644
|
||||||
|
--- a/lib/subdir.am
|
||||||
|
+++ b/lib/subdir.am
|
||||||
|
@@ -64,7 +64,6 @@ lib_libfrr_la_SOURCES = \
|
||||||
|
lib/routemap_northbound.c \
|
||||||
|
lib/sbuf.c \
|
||||||
|
lib/seqlock.c \
|
||||||
|
- lib/sha256.c \
|
||||||
|
lib/sigevent.c \
|
||||||
|
lib/skiplist.c \
|
||||||
|
lib/sockopt.c \
|
||||||
|
@@ -191,7 +190,6 @@ pkginclude_HEADERS += \
|
||||||
|
lib/routemap.h \
|
||||||
|
lib/sbuf.h \
|
||||||
|
lib/seqlock.h \
|
||||||
|
- lib/sha256.h \
|
||||||
|
lib/sigevent.h \
|
||||||
|
lib/skiplist.h \
|
||||||
|
lib/smux.h \
|
||||||
|
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
|
||||||
|
index 1991666..2e4fe55 100644
|
||||||
|
--- a/isisd/isis_lsp.c
|
||||||
|
+++ b/isisd/isis_lsp.c
|
||||||
|
@@ -35,7 +35,9 @@
|
||||||
|
#include "hash.h"
|
||||||
|
#include "if.h"
|
||||||
|
#include "checksum.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
+#endif
|
||||||
|
#include "table.h"
|
||||||
|
#include "srcdest_table.h"
|
||||||
|
#include "lib_errors.h"
|
||||||
|
diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c
|
||||||
|
index 9c63311..7cf594c 100644
|
||||||
|
--- a/isisd/isis_pdu.c
|
||||||
|
+++ b/isisd/isis_pdu.c
|
||||||
|
@@ -33,7 +33,9 @@
|
||||||
|
#include "prefix.h"
|
||||||
|
#include "if.h"
|
||||||
|
#include "checksum.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
+#endif
|
||||||
|
#include "lib_errors.h"
|
||||||
|
|
||||||
|
#include "isisd/isis_constants.h"
|
||||||
|
diff --git a/isisd/isis_te.c b/isisd/isis_te.c
|
||||||
|
index 4ea6c2c..72ff0d2 100644
|
||||||
|
--- a/isisd/isis_te.c
|
||||||
|
+++ b/isisd/isis_te.c
|
||||||
|
@@ -38,7 +38,9 @@
|
||||||
|
#include "if.h"
|
||||||
|
#include "vrf.h"
|
||||||
|
#include "checksum.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
+#endif
|
||||||
|
#include "sockunion.h"
|
||||||
|
#include "network.h"
|
||||||
|
#include "sbuf.h"
|
||||||
@ -0,0 +1,252 @@
|
|||||||
|
diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c
|
||||||
|
index bedaf15..8dc09bf 100644
|
||||||
|
--- a/eigrpd/eigrp_packet.c
|
||||||
|
+++ b/eigrpd/eigrp_packet.c
|
||||||
|
@@ -40,8 +40,10 @@
|
||||||
|
#include "log.h"
|
||||||
|
#include "sockopt.h"
|
||||||
|
#include "checksum.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
#include "sha256.h"
|
||||||
|
+#endif
|
||||||
|
#include "lib_errors.h"
|
||||||
|
|
||||||
|
#include "eigrpd/eigrp_structs.h"
|
||||||
|
@@ -95,8 +97,12 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s,
|
||||||
|
struct key *key = NULL;
|
||||||
|
struct keychain *keychain;
|
||||||
|
|
||||||
|
+
|
||||||
|
unsigned char digest[EIGRP_AUTH_TYPE_MD5_LEN];
|
||||||
|
+#ifdef CRYPTO_OPENSSL
|
||||||
|
+#elif CRYPTO_INTERNAL
|
||||||
|
MD5_CTX ctx;
|
||||||
|
+#endif
|
||||||
|
uint8_t *ibuf;
|
||||||
|
size_t backup_get, backup_end;
|
||||||
|
struct TLV_MD5_Authentication_Type *auth_TLV;
|
||||||
|
@@ -119,6 +125,9 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s,
|
||||||
|
return EIGRP_AUTH_TYPE_NONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef CRYPTO_OPENSSL
|
||||||
|
+//TBD when this is fixed in upstream
|
||||||
|
+#elif CRYPTO_INTERNAL
|
||||||
|
memset(&ctx, 0, sizeof(ctx));
|
||||||
|
MD5Init(&ctx);
|
||||||
|
|
||||||
|
@@ -146,7 +155,7 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s,
|
||||||
|
}
|
||||||
|
|
||||||
|
MD5Final(digest, &ctx);
|
||||||
|
-
|
||||||
|
+#endif
|
||||||
|
/* Append md5 digest to the end of the stream. */
|
||||||
|
memcpy(auth_TLV->digest, digest, EIGRP_AUTH_TYPE_MD5_LEN);
|
||||||
|
|
||||||
|
@@ -162,7 +171,10 @@ int eigrp_check_md5_digest(struct stream *s,
|
||||||
|
struct TLV_MD5_Authentication_Type *authTLV,
|
||||||
|
struct eigrp_neighbor *nbr, uint8_t flags)
|
||||||
|
{
|
||||||
|
+#ifdef CRYPTO_OPENSSL
|
||||||
|
+#elif CRYPTO_INTERNAL
|
||||||
|
MD5_CTX ctx;
|
||||||
|
+#endif
|
||||||
|
unsigned char digest[EIGRP_AUTH_TYPE_MD5_LEN];
|
||||||
|
unsigned char orig[EIGRP_AUTH_TYPE_MD5_LEN];
|
||||||
|
struct key *key = NULL;
|
||||||
|
@@ -203,6 +215,9 @@ int eigrp_check_md5_digest(struct stream *s,
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef CRYPTO_OPENSSL
|
||||||
|
+ //TBD when eigrpd crypto is fixed in upstream
|
||||||
|
+#elif CRYPTO_INTERNAL
|
||||||
|
memset(&ctx, 0, sizeof(ctx));
|
||||||
|
MD5Init(&ctx);
|
||||||
|
|
||||||
|
@@ -230,6 +245,7 @@ int eigrp_check_md5_digest(struct stream *s,
|
||||||
|
}
|
||||||
|
|
||||||
|
MD5Final(digest, &ctx);
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* compare the two */
|
||||||
|
if (memcmp(orig, digest, EIGRP_AUTH_TYPE_MD5_LEN) != 0) {
|
||||||
|
@@ -254,7 +270,11 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s,
|
||||||
|
unsigned char digest[EIGRP_AUTH_TYPE_SHA256_LEN];
|
||||||
|
unsigned char buffer[1 + PLAINTEXT_LENGTH + 45 + 1] = {0};
|
||||||
|
|
||||||
|
+#ifdef CRYPTO_OPENSSL
|
||||||
|
+ //TBD when eigrpd crypto is fixed in upstream
|
||||||
|
+#elif CRYPTO_INTERNAL
|
||||||
|
HMAC_SHA256_CTX ctx;
|
||||||
|
+#endif
|
||||||
|
void *ibuf;
|
||||||
|
size_t backup_get, backup_end;
|
||||||
|
struct TLV_SHA256_Authentication_Type *auth_TLV;
|
||||||
|
@@ -283,6 +303,9 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s,
|
||||||
|
|
||||||
|
inet_ntop(AF_INET, &ei->address.u.prefix4, source_ip, PREFIX_STRLEN);
|
||||||
|
|
||||||
|
+#ifdef CRYPTO_OPENSSL
|
||||||
|
+ //TBD when eigrpd crypto is fixed in upstream
|
||||||
|
+#elif CRYPTO_INTERNAL
|
||||||
|
memset(&ctx, 0, sizeof(ctx));
|
||||||
|
buffer[0] = '\n';
|
||||||
|
memcpy(buffer + 1, key, strlen(key->string));
|
||||||
|
@@ -291,7 +314,7 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s,
|
||||||
|
1 + strlen(key->string) + strlen(source_ip));
|
||||||
|
HMAC__SHA256_Update(&ctx, ibuf, strlen(ibuf));
|
||||||
|
HMAC__SHA256_Final(digest, &ctx);
|
||||||
|
-
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
/* Put hmac-sha256 digest to it's place */
|
||||||
|
memcpy(auth_TLV->digest, digest, EIGRP_AUTH_TYPE_SHA256_LEN);
|
||||||
|
diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c
|
||||||
|
index 93eed94..f1c7347 100644
|
||||||
|
--- a/eigrpd/eigrp_filter.c
|
||||||
|
+++ b/eigrpd/eigrp_filter.c
|
||||||
|
@@ -47,7 +47,9 @@
|
||||||
|
#include "if_rmap.h"
|
||||||
|
#include "plist.h"
|
||||||
|
#include "distribute.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
+#endif
|
||||||
|
#include "keychain.h"
|
||||||
|
#include "privs.h"
|
||||||
|
#include "vrf.h"
|
||||||
|
diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c
|
||||||
|
index dacd5ca..b232cc5 100644
|
||||||
|
--- a/eigrpd/eigrp_hello.c
|
||||||
|
+++ b/eigrpd/eigrp_hello.c
|
||||||
|
@@ -43,7 +43,9 @@
|
||||||
|
#include "sockopt.h"
|
||||||
|
#include "checksum.h"
|
||||||
|
#include "vty.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#include "eigrpd/eigrp_structs.h"
|
||||||
|
#include "eigrpd/eigrpd.h"
|
||||||
|
diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c
|
||||||
|
index 84dcf5e..a2575e3 100644
|
||||||
|
--- a/eigrpd/eigrp_query.c
|
||||||
|
+++ b/eigrpd/eigrp_query.c
|
||||||
|
@@ -38,7 +38,9 @@
|
||||||
|
#include "log.h"
|
||||||
|
#include "sockopt.h"
|
||||||
|
#include "checksum.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
+#endif
|
||||||
|
#include "vty.h"
|
||||||
|
|
||||||
|
#include "eigrpd/eigrp_structs.h"
|
||||||
|
diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c
|
||||||
|
index ccf0496..2902365 100644
|
||||||
|
--- a/eigrpd/eigrp_reply.c
|
||||||
|
+++ b/eigrpd/eigrp_reply.c
|
||||||
|
@@ -42,7 +42,9 @@
|
||||||
|
#include "log.h"
|
||||||
|
#include "sockopt.h"
|
||||||
|
#include "checksum.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
+#endif
|
||||||
|
#include "vty.h"
|
||||||
|
#include "keychain.h"
|
||||||
|
#include "plist.h"
|
||||||
|
diff --git a/eigrpd/eigrp_siaquery.c b/eigrpd/eigrp_siaquery.c
|
||||||
|
index ff38325..09b9369 100644
|
||||||
|
--- a/eigrpd/eigrp_siaquery.c
|
||||||
|
+++ b/eigrpd/eigrp_siaquery.c
|
||||||
|
@@ -38,7 +38,9 @@
|
||||||
|
#include "log.h"
|
||||||
|
#include "sockopt.h"
|
||||||
|
#include "checksum.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
+#endif
|
||||||
|
#include "vty.h"
|
||||||
|
|
||||||
|
#include "eigrpd/eigrp_structs.h"
|
||||||
|
diff --git a/eigrpd/eigrp_siareply.c b/eigrpd/eigrp_siareply.c
|
||||||
|
index d3dd123..f6a2bd6 100644
|
||||||
|
--- a/eigrpd/eigrp_siareply.c
|
||||||
|
+++ b/eigrpd/eigrp_siareply.c
|
||||||
|
@@ -37,7 +37,9 @@
|
||||||
|
#include "log.h"
|
||||||
|
#include "sockopt.h"
|
||||||
|
#include "checksum.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
+#endif
|
||||||
|
#include "vty.h"
|
||||||
|
|
||||||
|
#include "eigrpd/eigrp_structs.h"
|
||||||
|
diff --git a/eigrpd/eigrp_snmp.c b/eigrpd/eigrp_snmp.c
|
||||||
|
index 21c9238..cfb8890 100644
|
||||||
|
--- a/eigrpd/eigrp_snmp.c
|
||||||
|
+++ b/eigrpd/eigrp_snmp.c
|
||||||
|
@@ -42,7 +42,9 @@
|
||||||
|
#include "log.h"
|
||||||
|
#include "sockopt.h"
|
||||||
|
#include "checksum.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
+#endif
|
||||||
|
#include "keychain.h"
|
||||||
|
#include "smux.h"
|
||||||
|
|
||||||
|
diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c
|
||||||
|
index 8db4903..2a4f0bb 100644
|
||||||
|
--- a/eigrpd/eigrp_update.c
|
||||||
|
+++ b/eigrpd/eigrp_update.c
|
||||||
|
@@ -42,7 +42,9 @@
|
||||||
|
#include "log.h"
|
||||||
|
#include "sockopt.h"
|
||||||
|
#include "checksum.h"
|
||||||
|
+#ifdef CRYPTO_INTERNAL
|
||||||
|
#include "md5.h"
|
||||||
|
+#endif
|
||||||
|
#include "vty.h"
|
||||||
|
#include "plist.h"
|
||||||
|
#include "plist_int.h"
|
||||||
|
diff --git a/eigrpd/eigrp_cli.c b/eigrpd/eigrp_cli.c
|
||||||
|
index a93d4c8..b01e121 100644
|
||||||
|
--- a/eigrpd/eigrp_cli.c
|
||||||
|
+++ b/eigrpd/eigrp_cli.c
|
||||||
|
@@ -25,6 +25,7 @@
|
||||||
|
#include "lib/command.h"
|
||||||
|
#include "lib/log.h"
|
||||||
|
#include "lib/northbound_cli.h"
|
||||||
|
+#include "lib/libfrr.h"
|
||||||
|
|
||||||
|
#include "eigrp_structs.h"
|
||||||
|
#include "eigrpd.h"
|
||||||
|
@@ -726,6 +726,20 @@ DEFPY(
|
||||||
|
"Keyed message digest\n"
|
||||||
|
"HMAC SHA256 algorithm \n")
|
||||||
|
{
|
||||||
|
+ //EIGRP authentication is currently broken in FRR
|
||||||
|
+ switch (frr_get_cli_mode()) {
|
||||||
|
+ case FRR_CLI_CLASSIC:
|
||||||
|
+ vty_out(vty, "%% Eigrp Authentication is disabled\n\n");
|
||||||
|
+ break;
|
||||||
|
+ case FRR_CLI_TRANSACTIONAL:
|
||||||
|
+ vty_out(vty,
|
||||||
|
+ "%% Failed to edit candidate configuration - "
|
||||||
|
+ "Eigrp Authentication is disabled.\n\n");
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ return CMD_WARNING_CONFIG_FAILED;
|
||||||
|
+
|
||||||
|
char xpath[XPATH_MAXLEN], xpath_auth[XPATH_MAXLEN + 64];
|
||||||
|
|
||||||
|
snprintf(xpath, sizeof(xpath), "./frr-eigrpd:eigrp/instance[asn='%s']",
|
||||||
@ -0,0 +1,103 @@
|
|||||||
|
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
|
||||||
|
index 631465f..e084ff3 100644
|
||||||
|
--- a/ospfd/ospf_vty.c
|
||||||
|
+++ b/ospfd/ospf_vty.c
|
||||||
|
@@ -1136,6 +1136,11 @@ DEFUN (ospf_area_vlink,
|
||||||
|
|
||||||
|
if (argv_find(argv, argc, "message-digest", &idx)) {
|
||||||
|
/* authentication message-digest */
|
||||||
|
+ if(FIPS_mode())
|
||||||
|
+ {
|
||||||
|
+ vty_out(vty, "FIPS mode is enabled, md5 authentication is disabled\n");
|
||||||
|
+ return CMD_WARNING_CONFIG_FAILED;
|
||||||
|
+ }
|
||||||
|
vl_config.auth_type = OSPF_AUTH_CRYPTOGRAPHIC;
|
||||||
|
} else if (argv_find(argv, argc, "null", &idx)) {
|
||||||
|
/* "authentication null" */
|
||||||
|
@@ -1993,6 +1998,15 @@ DEFUN (ospf_area_authentication_message_digest,
|
||||||
|
? OSPF_AUTH_NULL
|
||||||
|
: OSPF_AUTH_CRYPTOGRAPHIC;
|
||||||
|
|
||||||
|
+ if(area->auth_type == OSPF_AUTH_CRYPTOGRAPHIC)
|
||||||
|
+ {
|
||||||
|
+ if(FIPS_mode())
|
||||||
|
+ {
|
||||||
|
+ vty_out(vty, "FIPS mode is enabled, md5 authentication is disabled\n");
|
||||||
|
+ return CMD_WARNING_CONFIG_FAILED;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
return CMD_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -6665,6 +6679,11 @@ DEFUN (ip_ospf_authentication_args,
|
||||||
|
|
||||||
|
/* Handle message-digest authentication */
|
||||||
|
if (argv[idx_encryption]->arg[0] == 'm') {
|
||||||
|
+ if(FIPS_mode())
|
||||||
|
+ {
|
||||||
|
+ vty_out(vty, "FIPS mode is enabled, md5 authentication is disabled\n");
|
||||||
|
+ return CMD_WARNING_CONFIG_FAILED;
|
||||||
|
+ }
|
||||||
|
SET_IF_PARAM(params, auth_type);
|
||||||
|
params->auth_type = OSPF_AUTH_CRYPTOGRAPHIC;
|
||||||
|
return CMD_SUCCESS;
|
||||||
|
@@ -6971,6 +6990,11 @@ DEFUN (ip_ospf_message_digest_key,
|
||||||
|
"The OSPF password (key)\n"
|
||||||
|
"Address of interface\n")
|
||||||
|
{
|
||||||
|
+ if(FIPS_mode())
|
||||||
|
+ {
|
||||||
|
+ vty_out(vty, "FIPS mode is enabled, md5 authentication is disabled\n");
|
||||||
|
+ return CMD_WARNING_CONFIG_FAILED;
|
||||||
|
+ }
|
||||||
|
VTY_DECLVAR_CONTEXT(interface, ifp);
|
||||||
|
struct crypt_key *ck;
|
||||||
|
uint8_t key_id;
|
||||||
|
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
|
||||||
|
index 81b4b39..cce33d9 100644
|
||||||
|
--- a/isisd/isis_circuit.c
|
||||||
|
+++ b/isisd/isis_circuit.c
|
||||||
|
@@ -1318,6 +1318,10 @@ static int isis_circuit_passwd_set(struct isis_circuit *circuit,
|
||||||
|
return ferr_code_bug(
|
||||||
|
"circuit password too long (max 254 chars)");
|
||||||
|
|
||||||
|
+ //When in FIPS mode, the password never gets set in MD5
|
||||||
|
+ if((passwd_type == ISIS_PASSWD_TYPE_HMAC_MD5) && FIPS_mode())
|
||||||
|
+ return ferr_cfg_invalid("FIPS mode is enabled, md5 authentication is disabled");
|
||||||
|
+
|
||||||
|
circuit->passwd.len = len;
|
||||||
|
strlcpy((char *)circuit->passwd.passwd, passwd,
|
||||||
|
sizeof(circuit->passwd.passwd));
|
||||||
|
diff --git a/isisd/isisd.c b/isisd/isisd.c
|
||||||
|
index 419127c..a6c36af 100644
|
||||||
|
--- a/isisd/isisd.c
|
||||||
|
+++ b/isisd/isisd.c
|
||||||
|
@@ -1638,6 +1638,10 @@ static int isis_area_passwd_set(struct isis_area *area, int level,
|
||||||
|
if (len > 254)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
+ //When in FIPS mode, the password never get set in MD5
|
||||||
|
+ if ((passwd_type == ISIS_PASSWD_TYPE_HMAC_MD5) && (FIPS_mode()))
|
||||||
|
+ return ferr_cfg_invalid("FIPS mode is enabled, md5 authentication is disabled");
|
||||||
|
+
|
||||||
|
modified.len = len;
|
||||||
|
strlcpy((char *)modified.passwd, passwd,
|
||||||
|
sizeof(modified.passwd));
|
||||||
|
diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c
|
||||||
|
index 5bb81ef..02a09ef 100644
|
||||||
|
--- a/ripd/rip_cli.c
|
||||||
|
+++ b/ripd/rip_cli.c
|
||||||
|
@@ -796,6 +796,12 @@ DEFPY (ip_rip_authentication_mode,
|
||||||
|
value = "20";
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if(strmatch(mode, "md5") && FIPS_mode())
|
||||||
|
+ {
|
||||||
|
+ vty_out(vty, "FIPS mode is enabled, md5 authentication id disabled\n");
|
||||||
|
+ return CMD_WARNING_CONFIG_FAILED;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
nb_cli_enqueue_change(vty, "./authentication-scheme/mode", NB_OP_MODIFY,
|
||||||
|
strmatch(mode, "md5") ? "md5" : "plain-text");
|
||||||
|
if (strmatch(mode, "md5"))
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
diff --git a/tools/frr.in b/tools/frr.in
|
||||||
|
index b860797..eb64a93 100755
|
||||||
|
--- a/tools/frr.in
|
||||||
|
+++ b/tools/frr.in
|
||||||
|
@@ -105,10 +105,12 @@ check_daemon()
|
||||||
|
if [ ! -r "$C_PATH/$1-$2.conf" ]; then
|
||||||
|
touch "$C_PATH/$1-$2.conf"
|
||||||
|
chownfrr "$C_PATH/$1-$2.conf"
|
||||||
|
+ chmod 0600 "$C_PATH/$1-$2.conf"
|
||||||
|
fi
|
||||||
|
elif [ ! -r "$C_PATH/$1.conf" ]; then
|
||||||
|
touch "$C_PATH/$1.conf"
|
||||||
|
chownfrr "$C_PATH/$1.conf"
|
||||||
|
+ chmod 0600 "$C_PATH/$1.conf"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
@ -0,0 +1,31 @@
|
|||||||
|
diff --git a/tools/frrinit.sh.in b/tools/frrinit.sh.in
|
||||||
|
index 539ab7d..d27d1be 100644
|
||||||
|
--- a/tools/frrinit.sh.in
|
||||||
|
+++ b/tools/frrinit.sh.in
|
||||||
|
@@ -43,7 +43,7 @@ fi
|
||||||
|
case "$1" in
|
||||||
|
start)
|
||||||
|
daemon_list daemons
|
||||||
|
- watchfrr_options="$watchfrr_options $daemons"
|
||||||
|
+ watchfrr_options="$daemons"
|
||||||
|
daemon_start watchfrr
|
||||||
|
;;
|
||||||
|
stop)
|
||||||
|
@@ -57,7 +57,7 @@ restart|force-reload)
|
||||||
|
all_stop --reallyall
|
||||||
|
|
||||||
|
daemon_list daemons
|
||||||
|
- watchfrr_options="$watchfrr_options $daemons"
|
||||||
|
+ watchfrr_options="$daemons"
|
||||||
|
daemon_start watchfrr
|
||||||
|
;;
|
||||||
|
|
||||||
|
@@ -87,7 +87,7 @@ reload)
|
||||||
|
# restart watchfrr to pick up added daemons.
|
||||||
|
# NB: This will NOT cause the other daemons to be restarted.
|
||||||
|
daemon_list daemons
|
||||||
|
- watchfrr_options="$watchfrr_options $daemons"
|
||||||
|
+ watchfrr_options="$daemons"
|
||||||
|
daemon_stop watchfrr && \
|
||||||
|
daemon_start watchfrr
|
||||||
|
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
|
||||||
|
index 69a3e4587..57ef6029a 100644
|
||||||
|
--- a/ospfd/ospf_vty.c
|
||||||
|
+++ b/ospfd/ospf_vty.c
|
||||||
|
@@ -3737,6 +3737,28 @@ static void show_ip_ospf_interface_sub(struct vty *vty, struct ospf *ospf,
|
||||||
|
vty_out(vty,
|
||||||
|
" No backup designated router on this network\n");
|
||||||
|
} else {
|
||||||
|
+ nbr = ospf_nbr_lookup_by_addr(oi->nbrs, &DR(oi));
|
||||||
|
+ if (nbr) {
|
||||||
|
+ if (use_json) {
|
||||||
|
+ json_object_string_add(
|
||||||
|
+ json_interface_sub, "drId",
|
||||||
|
+ inet_ntoa(nbr->router_id));
|
||||||
|
+ json_object_string_add(
|
||||||
|
+ json_interface_sub, "drAddress",
|
||||||
|
+ inet_ntoa(nbr->address.u
|
||||||
|
+ .prefix4));
|
||||||
|
+ } else {
|
||||||
|
+ vty_out(vty,
|
||||||
|
+ " Designated Router (ID) %s",
|
||||||
|
+ inet_ntoa(nbr->router_id));
|
||||||
|
+ vty_out(vty,
|
||||||
|
+ " Interface Address %s\n",
|
||||||
|
+ inet_ntoa(nbr->address.u
|
||||||
|
+ .prefix4));
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ nbr = NULL;
|
||||||
|
+
|
||||||
|
nbr = ospf_nbr_lookup_by_addr(oi->nbrs, &BDR(oi));
|
||||||
|
if (nbr == NULL) {
|
||||||
|
if (!use_json)
|
||||||
@ -0,0 +1,25 @@
|
|||||||
|
diff --git a/lib/routemap.c b/lib/routemap.c
|
||||||
|
index a90443a..0b594b2 100644
|
||||||
|
--- a/lib/routemap.c
|
||||||
|
+++ b/lib/routemap.c
|
||||||
|
@@ -1649,9 +1649,9 @@ static struct list *route_map_get_index_list(struct route_node **rn,
|
||||||
|
*/
|
||||||
|
static struct route_map_index *
|
||||||
|
route_map_get_index(struct route_map *map, const struct prefix *prefix,
|
||||||
|
- route_map_object_t type, void *object, uint8_t *match_ret)
|
||||||
|
+ route_map_object_t type, void *object, enum route_map_cmd_result_t *match_ret)
|
||||||
|
{
|
||||||
|
- int ret = 0;
|
||||||
|
+ enum route_map_cmd_result_t ret = RMAP_NOMATCH;
|
||||||
|
struct list *candidate_rmap_list = NULL;
|
||||||
|
struct route_node *rn = NULL;
|
||||||
|
struct listnode *ln = NULL, *nn = NULL;
|
||||||
|
@@ -2399,7 +2399,7 @@ route_map_result_t route_map_apply(struct route_map *map,
|
||||||
|
if ((!map->optimization_disabled)
|
||||||
|
&& (map->ipv4_prefix_table || map->ipv6_prefix_table)) {
|
||||||
|
index = route_map_get_index(map, prefix, type, object,
|
||||||
|
- (uint8_t *)&match_ret);
|
||||||
|
+ &match_ret);
|
||||||
|
if (index) {
|
||||||
|
if (rmap_debug)
|
||||||
|
zlog_debug(
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
diff --git a/tools/frr.service b/tools/frr.service
|
||||||
|
index aa45f42..a3f0103 100644
|
||||||
|
--- a/tools/frr.service
|
||||||
|
+++ b/tools/frr.service
|
||||||
|
@@ -17,9 +17,9 @@ WatchdogSec=60s
|
||||||
|
RestartSec=5
|
||||||
|
Restart=on-abnormal
|
||||||
|
LimitNOFILE=1024
|
||||||
|
-ExecStart=/usr/lib/frr/frrinit.sh start
|
||||||
|
-ExecStop=/usr/lib/frr/frrinit.sh stop
|
||||||
|
-ExecReload=/usr/lib/frr/frrinit.sh reload
|
||||||
|
+ExecStart=/usr/libexec/frr/frrinit.sh start
|
||||||
|
+ExecStop=/usr/libexec/frr/frrinit.sh stop
|
||||||
|
+ExecReload=/usr/libexec/frr/frrinit.sh reload
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=multi-user.target
|
||||||
|
diff --git a/tools/frrcommon.sh.in b/tools/frrcommon.sh.in
|
||||||
|
index 9a144b2..a334d95 100644
|
||||||
|
--- a/tools/frrcommon.sh.in
|
||||||
|
+++ b/tools/frrcommon.sh.in
|
||||||
|
@@ -59,6 +59,9 @@ chownfrr() {
|
||||||
|
[ -n "$FRR_USER" ] && chown "$FRR_USER" "$1"
|
||||||
|
[ -n "$FRR_GROUP" ] && chgrp "$FRR_GROUP" "$1"
|
||||||
|
[ -n "$FRR_CONFIG_MODE" ] && chmod "$FRR_CONFIG_MODE" "$1"
|
||||||
|
+ if [ -d "$1" ]; then
|
||||||
|
+ chmod gu+x "$1"
|
||||||
|
+ fi
|
||||||
|
}
|
||||||
|
|
||||||
|
vtysh_b () {
|
||||||
|
@@ -152,7 +155,7 @@ daemon_start() {
|
||||||
|
daemon_prep "$daemon" "$inst" || return 1
|
||||||
|
if test ! -d "$V_PATH"; then
|
||||||
|
mkdir -p "$V_PATH"
|
||||||
|
- chown frr "$V_PATH"
|
||||||
|
+ chownfrr "$V_PATH"
|
||||||
|
fi
|
||||||
|
|
||||||
|
eval wrap="\$${daemon}_wrap"
|
||||||
@ -0,0 +1,77 @@
|
|||||||
|
diff --git a/tools/frr-reload.py b/tools/frr-reload.py
|
||||||
|
index 9979c8b..1c24f90 100755
|
||||||
|
--- a/tools/frr-reload.py
|
||||||
|
+++ b/tools/frr-reload.py
|
||||||
|
@@ -785,6 +785,48 @@ def line_exist(lines, target_ctx_keys, target_line, exact_match=True):
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
+def delete_bgp_bfd(lines_to_add, lines_to_del):
|
||||||
|
+ """
|
||||||
|
+ When 'neighbor <peer> bfd profile <profile>' is present without a
|
||||||
|
+ 'neighbor <peer> bfd' line, FRR explicitily adds it to the running
|
||||||
|
+ configuration. When the new configuration drops the bfd profile
|
||||||
|
+ line, the user's intent is to delete any bfd configuration on the
|
||||||
|
+ peer. On reload, deleting the bfd profile line after the bfd line
|
||||||
|
+ will re-enable BFD with the default BFD profile. Move the bfd line
|
||||||
|
+ to the end, if it exists in the new configuration.
|
||||||
|
+
|
||||||
|
+ Example:
|
||||||
|
+
|
||||||
|
+ neighbor 10.0.0.1 bfd
|
||||||
|
+ neighbor 10.0.0.1 bfd profile bfd-profile-1
|
||||||
|
+
|
||||||
|
+ Move to end:
|
||||||
|
+ neighbor 10.0.0.1 bfd profile bfd-profile-1
|
||||||
|
+ ...
|
||||||
|
+
|
||||||
|
+ neighbor 10.0.0.1 bfd
|
||||||
|
+
|
||||||
|
+ """
|
||||||
|
+ lines_to_del_to_app = []
|
||||||
|
+ for (ctx_keys, line) in lines_to_del:
|
||||||
|
+ if (
|
||||||
|
+ ctx_keys[0].startswith("router bgp")
|
||||||
|
+ and line
|
||||||
|
+ and line.startswith("neighbor ")
|
||||||
|
+ ):
|
||||||
|
+ # 'no neighbor [peer] bfd>'
|
||||||
|
+ nb_bfd = "neighbor (\S+) .*bfd$"
|
||||||
|
+ re_nb_bfd = re.search(nb_bfd, line)
|
||||||
|
+ if re_nb_bfd:
|
||||||
|
+ lines_to_del_to_app.append((ctx_keys, line))
|
||||||
|
+
|
||||||
|
+ for (ctx_keys, line) in lines_to_del_to_app:
|
||||||
|
+ lines_to_del.remove((ctx_keys, line))
|
||||||
|
+ lines_to_del.append((ctx_keys, line))
|
||||||
|
+
|
||||||
|
+ return (lines_to_add, lines_to_del)
|
||||||
|
+
|
||||||
|
+
|
||||||
|
def check_for_exit_vrf(lines_to_add, lines_to_del):
|
||||||
|
|
||||||
|
# exit-vrf is a bit tricky. If the new config is missing it but we
|
||||||
|
@@ -1248,6 +1290,7 @@ def compare_context_objects(newconf, running):
|
||||||
|
for line in newconf_ctx.lines:
|
||||||
|
lines_to_add.append((newconf_ctx_keys, line))
|
||||||
|
|
||||||
|
+ (lines_to_add, lines_to_del) = delete_bgp_bfd(lines_to_add, lines_to_del)
|
||||||
|
(lines_to_add, lines_to_del) = check_for_exit_vrf(lines_to_add, lines_to_del)
|
||||||
|
(lines_to_add, lines_to_del) = ignore_delete_re_add_lines(lines_to_add, lines_to_del)
|
||||||
|
(lines_to_add, lines_to_del) = ignore_unconfigurable_lines(lines_to_add, lines_to_del)
|
||||||
|
diff --git a/bgpd/bgp_bfd.c b/bgpd/bgp_bfd.c
|
||||||
|
index b566b0e..1bd6249 100644
|
||||||
|
--- a/bgpd/bgp_bfd.c
|
||||||
|
+++ b/bgpd/bgp_bfd.c
|
||||||
|
@@ -686,9 +686,9 @@ void bgp_bfd_peer_config_write(struct vty *vty, struct peer *peer, char *addr)
|
||||||
|
|
||||||
|
if (!CHECK_FLAG(bfd_info->flags, BFD_FLAG_PARAM_CFG)
|
||||||
|
&& (bfd_info->type == BFD_TYPE_NOT_CONFIGURED)) {
|
||||||
|
- vty_out(vty, " neighbor %s bfd", addr);
|
||||||
|
+ vty_out(vty, " neighbor %s bfd\n", addr);
|
||||||
|
if (bfd_info->profile[0])
|
||||||
|
- vty_out(vty, " profile %s", bfd_info->profile);
|
||||||
|
+ vty_out(vty, " neighbor %s bfd profile %s", addr, bfd_info->profile);
|
||||||
|
vty_out(vty, "\n");
|
||||||
|
}
|
||||||
|
|
||||||
@ -0,0 +1,79 @@
|
|||||||
|
From 12f9f8472d0f8cfc026352906b8e5342df2846cc Mon Sep 17 00:00:00 2001
|
||||||
|
From: Donatas Abraitis <donatas@opensourcerouting.org>
|
||||||
|
Date: Tue, 27 Sep 2022 17:30:16 +0300
|
||||||
|
Subject: [PATCH] bgpd: Do not send Deconfig/Shutdown message when restarting
|
||||||
|
|
||||||
|
We might disable sending unconfig/shutdown notifications when
|
||||||
|
Graceful-Restart is enabled and negotiated.
|
||||||
|
|
||||||
|
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
|
||||||
|
---
|
||||||
|
bgpd/bgpd.c | 35 ++++++++++++++++++++++++++---------
|
||||||
|
1 file changed, 26 insertions(+), 9 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
|
||||||
|
index 3d4ef7c..f8089c6 100644
|
||||||
|
--- a/bgpd/bgpd.c
|
||||||
|
+++ b/bgpd/bgpd.c
|
||||||
|
@@ -2564,11 +2564,34 @@ int peer_group_remote_as(struct bgp *bgp, const char *group_name, as_t *as,
|
||||||
|
|
||||||
|
void peer_notify_unconfig(struct peer *peer)
|
||||||
|
{
|
||||||
|
+ if (BGP_PEER_GRACEFUL_RESTART_CAPABLE(peer)) {
|
||||||
|
+ if (bgp_debug_neighbor_events(peer))
|
||||||
|
+ zlog_debug(
|
||||||
|
+ "%pBP configured Graceful-Restart, skipping unconfig notification",
|
||||||
|
+ peer);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (BGP_IS_VALID_STATE_FOR_NOTIF(peer->status))
|
||||||
|
bgp_notify_send(peer, BGP_NOTIFY_CEASE,
|
||||||
|
BGP_NOTIFY_CEASE_PEER_UNCONFIG);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static void peer_notify_shutdown(struct peer *peer)
|
||||||
|
+{
|
||||||
|
+ if (BGP_PEER_GRACEFUL_RESTART_CAPABLE(peer)) {
|
||||||
|
+ if (bgp_debug_neighbor_events(peer))
|
||||||
|
+ zlog_debug(
|
||||||
|
+ "%pBP configured Graceful-Restart, skipping shutdown notification",
|
||||||
|
+ peer);
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (BGP_IS_VALID_STATE_FOR_NOTIF(peer->status))
|
||||||
|
+ bgp_notify_send(peer, BGP_NOTIFY_CEASE,
|
||||||
|
+ BGP_NOTIFY_CEASE_ADMIN_SHUTDOWN);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void peer_group_notify_unconfig(struct peer_group *group)
|
||||||
|
{
|
||||||
|
struct peer *peer, *other;
|
||||||
|
@@ -3380,11 +3403,8 @@ int bgp_delete(struct bgp *bgp)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Inform peers we're going down. */
|
||||||
|
- for (ALL_LIST_ELEMENTS(bgp->peer, node, next, peer)) {
|
||||||
|
- if (BGP_IS_VALID_STATE_FOR_NOTIF(peer->status))
|
||||||
|
- bgp_notify_send(peer, BGP_NOTIFY_CEASE,
|
||||||
|
- BGP_NOTIFY_CEASE_ADMIN_SHUTDOWN);
|
||||||
|
- }
|
||||||
|
+ for (ALL_LIST_ELEMENTS(bgp->peer, node, next, peer))
|
||||||
|
+ peer_notify_shutdown(peer);
|
||||||
|
|
||||||
|
/* Delete static routes (networks). */
|
||||||
|
bgp_static_delete(bgp);
|
||||||
|
@@ -7238,11 +7258,7 @@ void bgp_terminate(void)
|
||||||
|
|
||||||
|
for (ALL_LIST_ELEMENTS(bm->bgp, mnode, mnnode, bgp))
|
||||||
|
for (ALL_LIST_ELEMENTS(bgp->peer, node, nnode, peer))
|
||||||
|
- if (peer->status == Established
|
||||||
|
- || peer->status == OpenSent
|
||||||
|
- || peer->status == OpenConfirm)
|
||||||
|
- bgp_notify_send(peer, BGP_NOTIFY_CEASE,
|
||||||
|
- BGP_NOTIFY_CEASE_PEER_UNCONFIG);
|
||||||
|
+ peer_notify_unconfig(peer);
|
||||||
|
|
||||||
|
if (bm->process_main_queue)
|
||||||
|
work_queue_free_and_null(&bm->process_main_queue);
|
||||||
@ -0,0 +1,32 @@
|
|||||||
|
From ff6db1027f8f36df657ff2e5ea167773752537ed Mon Sep 17 00:00:00 2001
|
||||||
|
From: Donald Sharp <sharpd@nvidia.com>
|
||||||
|
Date: Thu, 21 Jul 2022 08:11:58 -0400
|
||||||
|
Subject: [PATCH] bgpd: Make sure hdr length is at a minimum of what is
|
||||||
|
expected
|
||||||
|
|
||||||
|
Ensure that if the capability length specified is enough data.
|
||||||
|
|
||||||
|
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
|
||||||
|
---
|
||||||
|
bgpd/bgp_packet.c | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
|
||||||
|
index dbf6c0b2e99..45752a8ab6d 100644
|
||||||
|
--- a/bgpd/bgp_packet.c
|
||||||
|
+++ b/bgpd/bgp_packet.c
|
||||||
|
@@ -2620,6 +2620,14 @@ static int bgp_capability_msg_parse(struct peer *peer, uint8_t *pnt,
|
||||||
|
"%s CAPABILITY has action: %d, code: %u, length %u",
|
||||||
|
peer->host, action, hdr->code, hdr->length);
|
||||||
|
|
||||||
|
+ if (hdr->length < sizeof(struct capability_mp_data)) {
|
||||||
|
+ zlog_info(
|
||||||
|
+ "%pBP Capability structure is not properly filled out, expected at least %zu bytes but header length specified is %d",
|
||||||
|
+ peer, sizeof(struct capability_mp_data),
|
||||||
|
+ hdr->length);
|
||||||
|
+ return BGP_Stop;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* Capability length check. */
|
||||||
|
if ((pnt + hdr->length + 3) > end) {
|
||||||
|
zlog_info("%s Capability length error", peer->host);
|
||||||
@ -0,0 +1 @@
|
|||||||
|
d /run/frr 0755 frr frr -
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
/usr/libexec/frr/(.*)? gen_context(system_u:object_r:frr_exec_t,s0)
|
||||||
|
|
||||||
|
/usr/lib/systemd/system/frr.* gen_context(system_u:object_r:frr_unit_file_t,s0)
|
||||||
|
|
||||||
|
/etc/frr(/.*)? gen_context(system_u:object_r:frr_conf_t,s0)
|
||||||
|
|
||||||
|
/var/log/frr(/.*)? gen_context(system_u:object_r:frr_log_t,s0)
|
||||||
|
/var/tmp/frr(/.*)? gen_context(system_u:object_r:frr_tmp_t,s0)
|
||||||
|
|
||||||
|
/var/lock/subsys/bfdd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/bgpd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/eigrpd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/fabricd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/isisd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/nhrpd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/ospf6d -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/ospfd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/pbrd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/pimd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/ripd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/ripngd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/staticd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/zebra -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
/var/lock/subsys/vrrpd -- gen_context(system_u:object_r:frr_lock_t,s0)
|
||||||
|
|
||||||
|
/var/run/frr(/.*)? gen_context(system_u:object_r:frr_var_run_t,s0)
|
||||||
|
|
||||||
|
/usr/bin/vtysh -- gen_context(system_u:object_r:frr_exec_t,s0)
|
||||||
@ -0,0 +1,124 @@
|
|||||||
|
policy_module(frr, 1.0.0)
|
||||||
|
|
||||||
|
########################################
|
||||||
|
#
|
||||||
|
# Declarations
|
||||||
|
#
|
||||||
|
|
||||||
|
type frr_t;
|
||||||
|
type frr_exec_t;
|
||||||
|
init_daemon_domain(frr_t, frr_exec_t)
|
||||||
|
|
||||||
|
type frr_log_t;
|
||||||
|
logging_log_file(frr_log_t)
|
||||||
|
|
||||||
|
type frr_tmp_t;
|
||||||
|
files_tmp_file(frr_tmp_t)
|
||||||
|
|
||||||
|
type frr_lock_t;
|
||||||
|
files_lock_file(frr_lock_t)
|
||||||
|
|
||||||
|
type frr_conf_t;
|
||||||
|
files_config_file(frr_conf_t)
|
||||||
|
|
||||||
|
type frr_unit_file_t;
|
||||||
|
systemd_unit_file(frr_unit_file_t)
|
||||||
|
|
||||||
|
type frr_var_run_t;
|
||||||
|
files_pid_file(frr_var_run_t)
|
||||||
|
|
||||||
|
########################################
|
||||||
|
#
|
||||||
|
# frr local policy
|
||||||
|
#
|
||||||
|
allow frr_t self:capability { fowner fsetid chown dac_override dac_read_search kill net_bind_service net_raw setgid setuid net_admin };
|
||||||
|
allow frr_t self:netlink_route_socket rw_netlink_socket_perms;
|
||||||
|
allow frr_t self:packet_socket create;
|
||||||
|
allow frr_t self:process { setcap setpgid };
|
||||||
|
allow frr_t self:rawip_socket create_socket_perms;
|
||||||
|
allow frr_t self:tcp_socket { connect connected_stream_socket_perms };
|
||||||
|
allow frr_t self:udp_socket create_socket_perms;
|
||||||
|
allow frr_t self:unix_stream_socket connectto;
|
||||||
|
|
||||||
|
allow frr_t frr_conf_t:dir list_dir_perms;
|
||||||
|
manage_files_pattern(frr_t, frr_conf_t, frr_conf_t)
|
||||||
|
read_lnk_files_pattern(frr_t, frr_conf_t, frr_conf_t)
|
||||||
|
|
||||||
|
manage_dirs_pattern(frr_t, frr_log_t, frr_log_t)
|
||||||
|
manage_files_pattern(frr_t, frr_log_t, frr_log_t)
|
||||||
|
manage_lnk_files_pattern(frr_t, frr_log_t, frr_log_t)
|
||||||
|
logging_log_filetrans(frr_t, frr_log_t, { dir file lnk_file })
|
||||||
|
|
||||||
|
allow frr_t frr_tmp_t:file map;
|
||||||
|
manage_dirs_pattern(frr_t, frr_tmp_t, frr_tmp_t)
|
||||||
|
manage_files_pattern(frr_t, frr_tmp_t, frr_tmp_t)
|
||||||
|
files_tmp_filetrans(frr_t, frr_tmp_t, { file dir })
|
||||||
|
|
||||||
|
manage_files_pattern(frr_t, frr_lock_t, frr_lock_t)
|
||||||
|
manage_lnk_files_pattern(frr_t, frr_lock_t, frr_lock_t)
|
||||||
|
files_lock_filetrans(frr_t, frr_lock_t, { file lnk_file })
|
||||||
|
|
||||||
|
manage_dirs_pattern(frr_t, frr_var_run_t, frr_var_run_t)
|
||||||
|
manage_files_pattern(frr_t, frr_var_run_t, frr_var_run_t)
|
||||||
|
manage_lnk_files_pattern(frr_t, frr_var_run_t, frr_var_run_t)
|
||||||
|
manage_sock_files_pattern(frr_t, frr_var_run_t, frr_var_run_t)
|
||||||
|
files_pid_filetrans(frr_t, frr_var_run_t, { dir file lnk_file })
|
||||||
|
|
||||||
|
allow frr_t frr_exec_t:dir search_dir_perms;
|
||||||
|
can_exec(frr_t, frr_exec_t)
|
||||||
|
|
||||||
|
kernel_read_network_state(frr_t)
|
||||||
|
kernel_rw_net_sysctls(frr_t)
|
||||||
|
kernel_read_system_state(frr_t)
|
||||||
|
|
||||||
|
auth_use_nsswitch(frr_t)
|
||||||
|
|
||||||
|
corecmd_exec_bin(frr_t)
|
||||||
|
|
||||||
|
corenet_tcp_bind_appswitch_emp_port(frr_t)
|
||||||
|
corenet_udp_bind_bfd_control_port(frr_t)
|
||||||
|
corenet_udp_bind_bfd_echo_port(frr_t)
|
||||||
|
corenet_tcp_bind_bgp_port(frr_t)
|
||||||
|
corenet_tcp_connect_bgp_port(frr_t)
|
||||||
|
corenet_udp_bind_all_unreserved_ports(frr_t);
|
||||||
|
corenet_tcp_bind_generic_port(frr_t)
|
||||||
|
corenet_tcp_bind_firepower_port(frr_t)
|
||||||
|
corenet_tcp_bind_priority_e_com_port(frr_t)
|
||||||
|
corenet_udp_bind_router_port(frr_t)
|
||||||
|
corenet_tcp_bind_qpasa_agent_port(frr_t)
|
||||||
|
corenet_tcp_bind_smntubootstrap_port(frr_t)
|
||||||
|
corenet_tcp_bind_versa_tek_port(frr_t)
|
||||||
|
corenet_tcp_bind_zebra_port(frr_t)
|
||||||
|
|
||||||
|
domain_use_interactive_fds(frr_t)
|
||||||
|
|
||||||
|
fs_read_nsfs_files(frr_t)
|
||||||
|
fs_search_cgroup_dirs(frr_t)
|
||||||
|
|
||||||
|
sysnet_exec_ifconfig(frr_t)
|
||||||
|
|
||||||
|
userdom_read_admin_home_files(frr_t)
|
||||||
|
|
||||||
|
init_signal(frr_t)
|
||||||
|
init_signal_script(frr_t)
|
||||||
|
init_signull_script(frr_t)
|
||||||
|
|
||||||
|
optional_policy(`
|
||||||
|
logging_send_syslog_msg(frr_t)
|
||||||
|
')
|
||||||
|
|
||||||
|
optional_policy(`
|
||||||
|
modutils_exec_kmod(frr_t)
|
||||||
|
modutils_getattr_module_deps(frr_t)
|
||||||
|
modutils_read_module_config(frr_t)
|
||||||
|
modutils_read_module_deps_files(frr_t)
|
||||||
|
')
|
||||||
|
|
||||||
|
optional_policy(`
|
||||||
|
networkmanager_read_state(frr_t)
|
||||||
|
')
|
||||||
|
|
||||||
|
optional_policy(`
|
||||||
|
userdom_admin_home_dir_filetrans(frr_t, frr_conf_t, file, ".history_frr")
|
||||||
|
userdom_inherit_append_admin_home_files(frr_t, frr_conf_t, file, ".history_frr")
|
||||||
|
')
|
||||||
@ -0,0 +1,361 @@
|
|||||||
|
%global frrversion 7.5.1
|
||||||
|
%global frr_libdir /usr/libexec/frr
|
||||||
|
|
||||||
|
%global _hardened_build 1
|
||||||
|
%global selinuxtype targeted
|
||||||
|
%bcond_without selinux
|
||||||
|
|
||||||
|
Name: frr
|
||||||
|
Version: 7.5.1
|
||||||
|
Release: 7%{?checkout}%{?dist}
|
||||||
|
Summary: Routing daemon
|
||||||
|
License: GPLv2+
|
||||||
|
URL: http://www.frrouting.org
|
||||||
|
Source0: https://github.com/FRRouting/frr/releases/download/%{name}-%{frrversion}/%{name}-%{frrversion}.tar.gz
|
||||||
|
Source1: %{name}-tmpfiles.conf
|
||||||
|
Source2: frr.fc
|
||||||
|
Source3: frr.te
|
||||||
|
Source4: frr.if
|
||||||
|
BuildRequires: perl-generators
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: net-snmp-devel
|
||||||
|
BuildRequires: texinfo libcap-devel autoconf automake libtool patch groff
|
||||||
|
BuildRequires: readline readline-devel ncurses ncurses-devel
|
||||||
|
BuildRequires: git pam-devel c-ares-devel
|
||||||
|
BuildRequires: json-c-devel bison >= 2.7 flex perl-XML-LibXML
|
||||||
|
BuildRequires: python3-devel python3-sphinx python3-pytest
|
||||||
|
BuildRequires: systemd systemd-devel
|
||||||
|
BuildRequires: libyang-devel >= 1.0.184
|
||||||
|
Requires: net-snmp ncurses
|
||||||
|
Requires(post): systemd /sbin/install-info
|
||||||
|
Requires(preun): systemd /sbin/install-info
|
||||||
|
Requires(postun): systemd
|
||||||
|
Requires: iproute
|
||||||
|
Requires: initscripts
|
||||||
|
|
||||||
|
%if 0%{?with_selinux}
|
||||||
|
Requires: (%{name}-selinux = %{version}-%{release} if selinux-policy-%{selinuxtype})
|
||||||
|
%endif
|
||||||
|
|
||||||
|
Provides: routingdaemon = %{version}-%{release}
|
||||||
|
Obsoletes: frr-sysvinit quagga frr-contrib
|
||||||
|
|
||||||
|
Patch0000: 0000-remove-babeld-and-ldpd.patch
|
||||||
|
Patch0001: 0001-use-python3.patch
|
||||||
|
Patch0002: 0002-enable-openssl.patch
|
||||||
|
Patch0003: 0003-disable-eigrp-crypto.patch
|
||||||
|
Patch0004: 0004-fips-mode.patch
|
||||||
|
Patch0006: 0006-CVE-2020-12831.patch
|
||||||
|
Patch0007: 0007-frrinit.patch
|
||||||
|
Patch0008: 0008-designated-router.patch
|
||||||
|
Patch0009: 0009-routemap.patch
|
||||||
|
Patch0010: 0010-moving-executables.patch
|
||||||
|
Patch0011: 0011-reload-bfd-profile.patch
|
||||||
|
Patch0012: 0012-graceful-restart.patch
|
||||||
|
Patch0013: 0013-CVE-2022-37032.patch
|
||||||
|
|
||||||
|
%description
|
||||||
|
FRRouting is free software that manages TCP/IP based routing protocols. It takes
|
||||||
|
a multi-server and multi-threaded approach to resolve the current complexity
|
||||||
|
of the Internet.
|
||||||
|
|
||||||
|
FRRouting supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, NHRP, PBR, EIGRP and BFD.
|
||||||
|
|
||||||
|
FRRouting is a fork of Quagga.
|
||||||
|
|
||||||
|
%if 0%{?with_selinux}
|
||||||
|
%package selinux
|
||||||
|
Summary: Selinux policy for FRR
|
||||||
|
BuildArch: noarch
|
||||||
|
Requires: selinux-policy-%{selinuxtype}
|
||||||
|
Requires(post): selinux-policy-%{selinuxtype}
|
||||||
|
BuildRequires: selinux-policy-devel
|
||||||
|
%{?selinux_requires}
|
||||||
|
|
||||||
|
%description selinux
|
||||||
|
SELinux policy modules for FRR package
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -S git
|
||||||
|
#SELinux
|
||||||
|
mkdir selinux
|
||||||
|
cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} selinux
|
||||||
|
|
||||||
|
%build
|
||||||
|
autoreconf -ivf
|
||||||
|
|
||||||
|
%configure \
|
||||||
|
--sbindir=%{frr_libdir} \
|
||||||
|
--sysconfdir=%{_sysconfdir}/frr \
|
||||||
|
--libdir=%{_libdir}/frr \
|
||||||
|
--libexecdir=%{_libexecdir}/frr \
|
||||||
|
--localstatedir=%{_localstatedir}/run/frr \
|
||||||
|
--enable-snmp=agentx \
|
||||||
|
--enable-multipath=64 \
|
||||||
|
--enable-vtysh=yes \
|
||||||
|
--enable-ospfclient=no \
|
||||||
|
--enable-ospfapi=no \
|
||||||
|
--enable-user=frr \
|
||||||
|
--enable-group=frr \
|
||||||
|
--enable-vty-group=frrvty \
|
||||||
|
--enable-rtadv \
|
||||||
|
--disable-exampledir \
|
||||||
|
--enable-systemd=yes \
|
||||||
|
--enable-static=no \
|
||||||
|
--disable-ldpd \
|
||||||
|
--disable-babeld \
|
||||||
|
--with-moduledir=%{_libdir}/frr/modules \
|
||||||
|
--with-crypto=openssl \
|
||||||
|
--enable-fpm
|
||||||
|
|
||||||
|
%make_build MAKEINFO="makeinfo --no-split" PYTHON=%{__python3}
|
||||||
|
|
||||||
|
pushd doc
|
||||||
|
make info
|
||||||
|
popd
|
||||||
|
|
||||||
|
#SELinux policy
|
||||||
|
%if 0%{?with_selinux}
|
||||||
|
make -C selinux -f %{_datadir}/selinux/devel/Makefile %{name}.pp
|
||||||
|
bzip2 -9 selinux/%{name}.pp
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%install
|
||||||
|
mkdir -p %{buildroot}/etc/{frr,rc.d/init.d,sysconfig,logrotate.d,pam.d,default} \
|
||||||
|
%{buildroot}/var/log/frr %{buildroot}%{_infodir} \
|
||||||
|
%{buildroot}%{_unitdir}
|
||||||
|
|
||||||
|
mkdir -p -m 0755 %{buildroot}%{_libdir}/frr
|
||||||
|
mkdir -p %{buildroot}%{_tmpfilesdir}
|
||||||
|
|
||||||
|
%make_install
|
||||||
|
|
||||||
|
# Remove this file, as it is uninstalled and causes errors when building on RH9
|
||||||
|
rm -rf %{buildroot}/usr/share/info/dir
|
||||||
|
|
||||||
|
install -p -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||||
|
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/tools/etc/frr/daemons %{buildroot}/etc/frr/daemons
|
||||||
|
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/tools/frr.service %{buildroot}%{_unitdir}/frr.service
|
||||||
|
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/frrinit.sh %{buildroot}%{frr_libdir}/frr
|
||||||
|
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/frrcommon.sh %{buildroot}%{frr_libdir}/frrcommon.sh
|
||||||
|
install -p -m 755 %{_builddir}/%{name}-%{frrversion}/tools/watchfrr.sh %{buildroot}%{frr_libdir}/watchfrr.sh
|
||||||
|
|
||||||
|
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/redhat/frr.logrotate %{buildroot}/etc/logrotate.d/frr
|
||||||
|
install -p -m 644 %{_builddir}/%{name}-%{frrversion}/redhat/frr.pam %{buildroot}/etc/pam.d/frr
|
||||||
|
install -d -m 775 %{buildroot}/run/frr
|
||||||
|
|
||||||
|
%if 0%{?with_selinux}
|
||||||
|
install -D -m 644 selinux/%{name}.pp.bz2 \
|
||||||
|
%{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
|
||||||
|
install -D -m 644 selinux/%{name}.if %{buildroot}%{_datadir}/selinux/devel/include/distributed/%{name}.if
|
||||||
|
%endif
|
||||||
|
|
||||||
|
rm %{buildroot}%{_libdir}/frr/*.la
|
||||||
|
rm %{buildroot}%{_libdir}/frr/modules/*.la
|
||||||
|
|
||||||
|
#Upstream does not maintain a stable API, these headers from -devel subpackage are no longer needed
|
||||||
|
rm %{buildroot}%{_libdir}/frr/*.so
|
||||||
|
rm -r %{buildroot}%{_includedir}/frr/
|
||||||
|
|
||||||
|
%pre
|
||||||
|
getent group fttvty >/dev/null 2>&1 || groupadd -r frrvty >/dev/null 2>&1 || :
|
||||||
|
getent group frr >/dev/null 2>&1 || groupadd -r frr >/dev/null 2>&1 || :
|
||||||
|
getent passwd frr >/dev/null 2>&1 || useradd -M -r -g frr -s /sbin/nologin \
|
||||||
|
-c "FRRouting suite" -d %{_localstatedir}/run/frr frr || :
|
||||||
|
usermod -aG frrvty frr
|
||||||
|
|
||||||
|
%post
|
||||||
|
#Because we move files to /usr/libexec, we need to reload .service files as well
|
||||||
|
/usr/bin/systemctl daemon-reload
|
||||||
|
%systemd_post frr.service
|
||||||
|
|
||||||
|
if [ -f %{_infodir}/%{name}.inf* ]; then
|
||||||
|
install-info %{_infodir}/frr.info %{_infodir}/dir || :
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create dummy files if they don't exist so basic functions can be used.
|
||||||
|
if [ ! -e %{_sysconfdir}/frr/zebra.conf ]; then
|
||||||
|
echo "hostname `hostname`" > %{_sysconfdir}/frr/zebra.conf
|
||||||
|
chown frr:frr %{_sysconfdir}/frr/zebra.conf
|
||||||
|
chmod 640 %{_sysconfdir}/frr/zebra.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ ! -e %{_sysconfdir}/frr/vtysh.conf ]; then
|
||||||
|
echo 'no service integrated-vtysh-config' > %{_sysconfdir}/frr/vtysh.conf
|
||||||
|
chmod 640 %{_sysconfdir}/frr/vtysh.conf
|
||||||
|
chown frr:frrvty %{_sysconfdir}/frr/vtysh.conf
|
||||||
|
fi
|
||||||
|
|
||||||
|
#Making sure that the old format of config file still works
|
||||||
|
#Checking whether .rpmnew conf file is present - in that case I want to change the old config
|
||||||
|
if [ -e %{_sysconfdir}/frr/daemons.rpmnew ]; then
|
||||||
|
sed -i s'/watchfrr_/#watchfrr_/g' %{_sysconfdir}/frr/daemons
|
||||||
|
sed -i s'/zebra=/#zebra=/g' %{_sysconfdir}/frr/daemons
|
||||||
|
fi
|
||||||
|
|
||||||
|
%postun
|
||||||
|
%systemd_postun_with_restart frr.service
|
||||||
|
|
||||||
|
#only when removing the package
|
||||||
|
if [ $1 -ge 0 ]; then
|
||||||
|
if [ -f %{_infodir}/%{name}.inf* ]; then
|
||||||
|
install-info --delete %{_infodir}/frr.info %{_infodir}/dir || :
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
%preun
|
||||||
|
%systemd_preun frr.service
|
||||||
|
|
||||||
|
#SELinux
|
||||||
|
%if 0%{?with_selinux}
|
||||||
|
%pre selinux
|
||||||
|
%selinux_relabel_pre -s %{selinuxtype}
|
||||||
|
|
||||||
|
%post selinux
|
||||||
|
%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.bz2
|
||||||
|
%selinux_relabel_post -s %{selinuxtype}
|
||||||
|
#/var/tmp and /var/run need to be relabeled as well if FRR is running before upgrade
|
||||||
|
if [ $1 == 2 ]; then
|
||||||
|
%{_sbindir}/restorecon -R /var/tmp/frr &> /dev/null
|
||||||
|
%{_sbindir}/restorecon -R /var/run/frr &> /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
%postun selinux
|
||||||
|
if [ $1 -eq 0 ]; then
|
||||||
|
%selinux_modules_uninstall -s %{selinuxtype} %{name}
|
||||||
|
%selinux_relabel_post -s %{selinuxtype}
|
||||||
|
fi
|
||||||
|
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%check
|
||||||
|
make check PYTHON=%{__python3}
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%license COPYING
|
||||||
|
%doc zebra/zebra.conf.sample
|
||||||
|
%doc isisd/isisd.conf.sample
|
||||||
|
%doc ripd/ripd.conf.sample
|
||||||
|
%doc bgpd/bgpd.conf.sample*
|
||||||
|
%doc ospfd/ospfd.conf.sample
|
||||||
|
%doc ospf6d/ospf6d.conf.sample
|
||||||
|
%doc ripngd/ripngd.conf.sample
|
||||||
|
%doc pimd/pimd.conf.sample
|
||||||
|
%doc doc/mpls
|
||||||
|
%dir %attr(740,frr,frr) %{_sysconfdir}/frr
|
||||||
|
%dir %attr(755,frr,frr) /var/log/frr
|
||||||
|
%dir %attr(755,frr,frr) /run/frr
|
||||||
|
%{_infodir}/*info*
|
||||||
|
%{_mandir}/man*/*
|
||||||
|
%dir %{frr_libdir}/
|
||||||
|
%{frr_libdir}/*
|
||||||
|
%{_bindir}/*
|
||||||
|
%dir %{_libdir}/frr
|
||||||
|
%{_libdir}/frr/*.so.*
|
||||||
|
%dir %{_libdir}/frr/modules/
|
||||||
|
%{_libdir}/frr/modules/*
|
||||||
|
%config(noreplace) %attr(644,root,root) /etc/logrotate.d/frr
|
||||||
|
%config(noreplace) %attr(644,frr,frr) /etc/frr/daemons
|
||||||
|
%config(noreplace) /etc/pam.d/frr
|
||||||
|
%{_unitdir}/*.service
|
||||||
|
%dir /usr/share/yang
|
||||||
|
/usr/share/yang/*.yang
|
||||||
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
|
|
||||||
|
%if 0%{?with_selinux}
|
||||||
|
%files selinux
|
||||||
|
%{_datadir}/selinux/packages/%{selinuxtype}/%{name}.pp.*
|
||||||
|
%{_datadir}/selinux/devel/include/distributed/%{name}.if
|
||||||
|
%ghost %verify(not md5 size mode mtime) %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{name}
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Wed Nov 30 2022 Michal Ruprich <mruprich@redhat.com> - 7.5.1-7
|
||||||
|
- Resolves: #2128737 - out-of-bounds read in the BGP daemon may lead to information disclosure or denial of service
|
||||||
|
|
||||||
|
* Tue Nov 29 2022 Michal Ruprich <mruprich@redhat.com> - 7.5.1-6
|
||||||
|
- Resolves: #1939516 - frr service cannot reload itself, due to executing in the wrong SELinux context
|
||||||
|
|
||||||
|
* Mon Nov 14 2022 Michal Ruprich <mruprich@redhat.com> - 7.5.1-5
|
||||||
|
- Resolves: #2127140 - Frr is unable to push routes to the system routing table
|
||||||
|
|
||||||
|
* Mon Nov 14 2022 Michal Ruprich <mruprich@redhat.com> - 7.5.1-4
|
||||||
|
- Resolves: #1948422 - BGP incorrectly withdraws routes on graceful restart capable routers
|
||||||
|
|
||||||
|
* Thu Aug 25 2022 Michal Ruprich <mruprich@redhat.com> - 7.5.1-3
|
||||||
|
- Resolves: #2054160 - FRR reloader does not disable BFD when unsetting BFD profile
|
||||||
|
|
||||||
|
* Wed Aug 24 2022 Michal Ruprich <mruprich@redhat.com> - 7.5.1-2
|
||||||
|
- Resolves: #1941765 - AVCs while running frr tests on RHEL 8.4.0 Beta-1.2
|
||||||
|
- Resolves: #1714984 - SELinux policy (daemons) changes required for package
|
||||||
|
|
||||||
|
* Wed May 11 2022 Michal Ruprich <mruprich@redhat.com> - 7.5.1-1
|
||||||
|
- Resolves: #2018451 - Rebase of frr to version 7.5.1
|
||||||
|
- Resolves: #1975361 - the dynamic routing setup does not work any more
|
||||||
|
|
||||||
|
* Wed Jan 05 2022 Michal Ruprich <mruprich@redhat.com> - 7.5-11
|
||||||
|
- Resolves: #2034328 - Bfdd crash in metallb CI
|
||||||
|
|
||||||
|
* Tue Jan 04 2022 Michal Ruprich <mruprich@redhat.com> - 7.5-10
|
||||||
|
- Resolves: #2020878 - frr ospfd show ip ospf interface does not show designated router info
|
||||||
|
|
||||||
|
* Fri Dec 10 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-9
|
||||||
|
- Resolves: #2029958 - FRR reloader generating invalid BFD configurations, exits with error
|
||||||
|
|
||||||
|
* Tue Nov 16 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-8
|
||||||
|
- Resolves: #2021819 - Rebuilding for the new json-c
|
||||||
|
|
||||||
|
* Thu Sep 30 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-7
|
||||||
|
- Related: #1917269 - Wrong value in gating file
|
||||||
|
|
||||||
|
* Fri Sep 17 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-6
|
||||||
|
- Related: #1917269 - Incomplete patch, adding gating rules
|
||||||
|
|
||||||
|
* Thu Sep 16 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-5
|
||||||
|
- Resolves: #1979426 - Unable to configure OSPF in multi-instance mode
|
||||||
|
- Resolves: #1917269 - vtysh running-config output not showing bgp ttl-security hops option
|
||||||
|
|
||||||
|
* Tue Jan 12 2021 root - 7.5-4
|
||||||
|
- Related: #1889323 - Fixing start-up with old config file
|
||||||
|
|
||||||
|
* Mon Jan 11 2021 root - 7.5-3
|
||||||
|
- Related: #1889323 - Reverting to non-integrated cofiguration
|
||||||
|
|
||||||
|
* Thu Jan 07 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-2
|
||||||
|
- Related: #1889323 - Obsoleting frr-contrib
|
||||||
|
|
||||||
|
* Thu Jan 07 2021 Michal Ruprich <mruprich@redhat.com> - 7.5-1
|
||||||
|
- Resolves: #1889323 - [RFE] Rebase FRR to 7.5
|
||||||
|
|
||||||
|
* Thu Aug 20 2020 Michal Ruprich <mruprich@redhat.com> - 7.0-10
|
||||||
|
- Resolves: #1867793 - FRR does not conform to the source port range specified in RFC5881
|
||||||
|
|
||||||
|
* Thu Aug 20 2020 Michal Ruprich <mruprich@redhat.com> - 7.0-9
|
||||||
|
- Resolves: #1852476 - default permission issue eases information leaks
|
||||||
|
|
||||||
|
* Tue May 05 2020 Michal Ruprich <mruprich@redhat.com> - 7.0-8
|
||||||
|
- Resolves: #1819319 - frr fails to start start if the initscripts package is missing
|
||||||
|
|
||||||
|
* Mon May 04 2020 Michal Ruprich <mruprich@redhat.com> - 7.0-7
|
||||||
|
- Resolves: #1758544 - IGMPv3 queries may lead to DoS
|
||||||
|
|
||||||
|
* Tue Mar 10 2020 Michal Ruprich <mruprich@redhat.com> - 7.0-6
|
||||||
|
- Resolves: #1776342 - frr has missing dependency on iproute
|
||||||
|
|
||||||
|
* Tue Sep 03 2019 Michal Ruprich <mruprich@redhat.com> - 7.0-5
|
||||||
|
- Resolves: #1719465 - Removal of component Frr or its crypto
|
||||||
|
|
||||||
|
* Wed Jun 19 2019 Michal Ruprich <mruprich@redhat.com> - 7.0-4
|
||||||
|
- Related: #1657029 - frr-contrib is back, it is breaking the rpmdeplint test
|
||||||
|
|
||||||
|
* Wed Jun 19 2019 Michal Ruprich <mruprich@redhat.com> - 7.0-3
|
||||||
|
- Related: #1657029 - more cleanup, removed frr-contrib, frrvt changed to frrvty
|
||||||
|
|
||||||
|
* Wed Jun 19 2019 Michal Ruprich <mruprich@redhat.com> - 7.0-2
|
||||||
|
- Related: #1657029 - cleaning specfile, adding Requires on libyang-devel
|
||||||
|
|
||||||
|
* Wed May 29 2019 Michal Ruprich <mruprich@redhat.com> - 7.0-1
|
||||||
|
- Resolves: #1657029 - Add FRR as a replacement of Quagga in RHEL 8
|
||||||
Loading…
Reference in new issue