summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2011-11-28 18:04:30 -0800
committerBob Gilligan <gilligan@vyatta.com>2011-11-28 18:04:30 -0800
commitb66f30dba1a164db329371efb1a91b6d8c532402 (patch)
treede8b8ddd8b0894a18c1be4357aee719a463e9cc5
parentcd3c58e14e497d85945c56a684e08a02539ebf42 (diff)
parent600338aaa2ec27429e29362ad65ab8870f67a58c (diff)
downloadvyatta-cfg-b66f30dba1a164db329371efb1a91b6d8c532402.tar.gz
vyatta-cfg-b66f30dba1a164db329371efb1a91b6d8c532402.zip
Merge branch 'oxnard' of http://git.vyatta.com/vyatta-cfg into oxnard
-rw-r--r--debian/changelog7
-rwxr-xr-xlib/Vyatta/Misc.pm3
2 files changed, 9 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index e3033fd..524b9c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-cfg (0.99.55) unstable; urgency=low
+
+ * Bug 7411: exporting isValidPortNumber API from Misc.pm, used in
+ conntrack for validating ports entered
+
+ -- Gaurav Sinha <gaurav.sinha@vyatta.com> Mon, 14 Nov 2011 16:26:26 -0800
+
vyatta-cfg (0.99.54) unstable; urgency=low
[ Stig Thormodsrud ]
diff --git a/lib/Vyatta/Misc.pm b/lib/Vyatta/Misc.pm
index 4818e65..6579da7 100755
--- a/lib/Vyatta/Misc.pm
+++ b/lib/Vyatta/Misc.pm
@@ -27,7 +27,8 @@ our @ISA = qw(Exporter);
our @EXPORT = qw(getInterfaces getIP getNetAddIP get_sysfs_value
is_address_enabled is_dhcp_enabled get_ipaddr_intf_hash
isIpAddress is_ip_v4_or_v6 interface_description
- is_local_address is_primary_address get_ipnet_intf_hash);
+ is_local_address is_primary_address get_ipnet_intf_hash
+ isValidPortNumber);
our @EXPORT_OK = qw(generate_dhclient_intf_files
getInterfacesIPadresses
getPortRuleString