From 70766243f6c00c77fedc00d68114c108528950d6 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Thu, 17 Jun 2021 14:03:43 +0200 Subject: Traffic scripts: Move valid_ipv* to a library No need to implement the same two functions in 5 places. Change-Id: I7bbcfaba18030a0520aaef5dcf06ed155bcf806b Signed-off-by: Vratko Polak --- GPL/traffic_scripts/nat.py | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) (limited to 'GPL/traffic_scripts/nat.py') diff --git a/GPL/traffic_scripts/nat.py b/GPL/traffic_scripts/nat.py index 9e224dbae8..3722d6b8db 100644 --- a/GPL/traffic_scripts/nat.py +++ b/GPL/traffic_scripts/nat.py @@ -27,8 +27,6 @@ import sys -import ipaddress - from scapy.layers.inet import IP, TCP, UDP from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6MLReport2, ICMPv6ND_RA from scapy.layers.l2 import Ether @@ -36,36 +34,7 @@ from scapy.packet import Raw from .PacketVerifier import RxQueue, TxQueue from .TrafficScriptArg import TrafficScriptArg - - -def valid_ipv4(ip_address): - """Check IPv4 address. - - :param ip_address: IPv4 address to check. - :type ip_address: str - :returns: True if IP address is correct. - :rtype: bool - """ - try: - ipaddress.IPv4Address(ip_address) - return True - except (AttributeError, ipaddress.AddressValueError): - return False - - -def valid_ipv6(ip_address): - """Check IPv6 address. - - :param ip_address: IPv6 address to check. - :type ip_address: str - :returns: True if IP address is correct. - :rtype: bool - """ - try: - ipaddress.IPv6Address(ip_address) - return True - except (AttributeError, ipaddress.AddressValueError): - return False +from .ValidIp import valid_ipv4, valid_ipv6 def main(): -- cgit 1.2.3-korg