summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-04-25 19:45:30 +0200
committerGitHub <noreply@github.com>2024-04-25 19:45:30 +0200
commit854864f0dffe3d3371bb05eaaf6c470ba16598dd (patch)
treeaa13bef391ef8e4c6ea62ef34feb97f07c98aeef
parent9291c34a301c5c45ef0e466d6ef41339675177c4 (diff)
parent7824097396cad849747a594253dbaca181a62e1c (diff)
downloadvyos-1x-854864f0dffe3d3371bb05eaaf6c470ba16598dd.tar.gz
vyos-1x-854864f0dffe3d3371bb05eaaf6c470ba16598dd.zip
Merge pull request #3366 from vyos/mergify/bp/sagitta/pr-3363
T6263: Groups 224.0.0.0/24 are reserved and cannot be joined (backport #3363)
-rwxr-xr-xsrc/conf_mode/protocols_pim.py14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/conf_mode/protocols_pim.py b/src/conf_mode/protocols_pim.py
index 09c3be8df..d450d11ca 100755
--- a/src/conf_mode/protocols_pim.py
+++ b/src/conf_mode/protocols_pim.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright (C) 2020-2023 VyOS maintainers and contributors
+# Copyright (C) 2020-2024 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
@@ -16,6 +16,7 @@
import os
+from ipaddress import IPv4Address
from ipaddress import IPv4Network
from signal import SIGTERM
from sys import exit
@@ -32,6 +33,9 @@ from vyos import frr
from vyos import airbag
airbag.enable()
+RESERVED_MC_NET = '224.0.0.0/24'
+
+
def get_config(config=None):
if config:
conf = config
@@ -92,9 +96,15 @@ def verify(pim):
if 'interface' not in pim:
raise ConfigError('PIM require defined interfaces!')
- for interface in pim['interface']:
+ for interface, interface_config in pim['interface'].items():
verify_interface_exists(interface)
+ # Check join group in reserved net
+ if 'igmp' in interface_config and 'join' in interface_config['igmp']:
+ for join_addr in interface_config['igmp']['join']:
+ if IPv4Address(join_addr) in IPv4Network(RESERVED_MC_NET):
+ raise ConfigError(f'Groups within {RESERVED_MC_NET} are reserved and cannot be joined!')
+
if 'rp' in pim:
if 'address' not in pim['rp']:
raise ConfigError('PIM rendezvous point needs to be defined!')