aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2012-11-12 23:38:37 +0000
committerMichael Elkins <melkins@tislabs.com>2012-11-12 23:38:37 +0000
commit99619cac0f445c65e322de5739626dd4ccb21e80 (patch)
tree0c790756cee6306d4c2631814884050feb8ede8a
parent464e28c6a642728ba93c877a53e84ef3096982ff (diff)
related to [4850], forgot to also change the code where it is actually used in addition to the validation step
svn path=/trunk/; revision=4857
-rw-r--r--rpkid/rpki/gui/app/views.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index 835bf4a5..0c905070 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -374,12 +374,12 @@ def child_add_asn(request, pk):
def add_address_callback(child, form):
address_range = form.cleaned_data.get('address_range')
- try:
- r = resource_range_ipv4.parse_str(address_range)
- version = 'IPv4'
- except BadIPResource:
+ if ':' in address_range:
r = resource_range_ipv6.parse_str(address_range)
version = 'IPv6'
+ else:
+ r = resource_range_ipv4.parse_str(address_range)
+ version = 'IPv4'
child.address_ranges.create(start_ip=str(r.min), end_ip=str(r.max),
version=version)