From 1e980d6be0ef0e243c6fe82b5e855454b97e24a4 Mon Sep 17 00:00:00 2001
From: Yves-Alexis Perez <corsac@debian.org>
Date: Wed, 18 Nov 2015 14:49:27 +0100
Subject: Imported Upstream version 5.3.4

---
 src/libstrongswan/settings/settings.c | 25 +++++++++++++++++++++++++
 src/libstrongswan/settings/settings.h |  9 +++++++++
 2 files changed, 34 insertions(+)

(limited to 'src/libstrongswan/settings')

diff --git a/src/libstrongswan/settings/settings.c b/src/libstrongswan/settings/settings.c
index 305ebe620..56cc2f19b 100644
--- a/src/libstrongswan/settings/settings.c
+++ b/src/libstrongswan/settings/settings.c
@@ -537,6 +537,31 @@ METHOD(settings_t, get_int, int,
 	return settings_value_as_int(value, def);
 }
 
+/**
+ * Described in header
+ */
+inline u_int64_t settings_value_as_uint64(char *value, u_int64_t def)
+{
+	u_int64_t intval;
+	char *end;
+	int base = 10;
+
+	if (value)
+	{
+		errno = 0;
+		if (value[0] == '0' && value[1] == 'x')
+		{	/* manually detect 0x prefix as we want to avoid octal encoding */
+			base = 16;
+		}
+		intval = strtoull(value, &end, base);
+		if (errno == 0 && *end == 0 && end != value)
+		{
+			return intval;
+		}
+	}
+	return def;
+}
+
 /**
  * Described in header
  */
diff --git a/src/libstrongswan/settings/settings.h b/src/libstrongswan/settings/settings.h
index 4ef80d0f6..a133a3681 100644
--- a/src/libstrongswan/settings/settings.h
+++ b/src/libstrongswan/settings/settings.h
@@ -50,6 +50,15 @@ bool settings_value_as_bool(char *value, bool def);
  */
 int settings_value_as_int(char *value, int def);
 
+/**
+ * Convert a string value returned by a key/value enumerator to an u_int64_t.
+ *
+ * @see settings_t.create_key_value_enumerator()
+ * @param value			the string value
+ * @param def			the default value, if value is NULL or invalid
+ */
+u_int64_t settings_value_as_uint64(char *value, u_int64_t def);
+
 /**
  * Convert a string value returned by a key/value enumerator to a double.
  *
-- 
cgit v1.2.3