summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-10-25 21:03:47 +0200
committerGitHub <noreply@github.com>2021-10-25 21:03:47 +0200
commit639b2982bbcc72b962bea740a36294ab3d88cbc3 (patch)
tree52e7e47a1dca0de1b7a836963f97d6290a35a43a /src/conf_mode
parentd0dc71d7d22be9336934e2f84873f7a052a7f824 (diff)
parent45f815928976519ffba2ecadf197f725e7640852 (diff)
downloadvyos-1x-639b2982bbcc72b962bea740a36294ab3d88cbc3.tar.gz
vyos-1x-639b2982bbcc72b962bea740a36294ab3d88cbc3.zip
Merge pull request #1042 from sever-sever/T2763
snmp: T2763: Add protocol TCP for service snmp
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/snmp.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py
index 23e45a5b7..2a420b193 100755
--- a/src/conf_mode/snmp.py
+++ b/src/conf_mode/snmp.py
@@ -52,6 +52,7 @@ default_config_data = {
'communities': [],
'smux_peers': [],
'location' : '',
+ 'protocol' : 'udp',
'description' : '',
'contact' : '',
'route_table': 'False',
@@ -151,6 +152,9 @@ def get_config():
if conf.exists('location'):
snmp['location'] = conf.return_value('location')
+ if conf.exists('protocol'):
+ snmp['protocol'] = conf.return_value('protocol')
+
if conf.exists('smux-peer'):
snmp['smux_peers'] = conf.return_values('smux-peer')
@@ -404,13 +408,14 @@ def verify(snmp):
for listen in snmp['listen_address']:
addr = listen[0]
port = listen[1]
+ protocol = snmp['protocol']
if is_ipv4(addr):
# example: udp:127.0.0.1:161
- listen = 'udp:' + addr + ':' + port
+ listen = f'{protocol}:{addr}:{port}'
elif snmp['ipv6_enabled']:
# example: udp6:[::1]:161
- listen = 'udp6:' + '[' + addr + ']' + ':' + port
+ listen = f'{protocol}6:[{addr}]:{port}'
# We only wan't to configure addresses that exist on the system.
# Hint the user if they don't exist