Merge lp:~thomas-voss/location-service/generalize-glue-code-for-agps-operation into lp:location-service/trunk

[Thomas Voß]

This is the first MP in a series to generalize AGPS behavior. Here, we wire up
incoming RIL-specific requests and respond to them by reaching out to our Ofono-based telephony stack.

This is the first MP in a series to generalize AGPS behavior. Here, we wire up
incoming RIL-specific requests and respond to them by reaching out to our Ofono-based telephony stack.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:229
http://jenkins.qa.ubuntu.com/job/location-service-ci/417/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/89/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/417/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/location-service/generalize-glue-code-for-agps-operation]

230. By Thomas Voß on 2016-03-11

Log individual imsi/msisdn callback invocations.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:230
http://jenkins.qa.ubuntu.com/job/location-service-ci/422/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/94/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/422/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/location-service/generalize-glue-code-for-agps-operation]

231. By Thomas Voß on 2016-03-15

Extend runtime test cases to cover agps use cases.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:231
http://jenkins.qa.ubuntu.com/job/location-service-ci/423/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/95/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/95/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/423/rebuild

review: Needs Fixing (continuous-integration)

[lp:~thomas-voss/location-service/generalize-glue-code-for-agps-operation]

232. By Thomas Voß on 2016-03-17

Clean up event connections after each trial.
Adjust terminal output.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:232
http://jenkins.qa.ubuntu.com/job/location-service-ci/426/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-amd64-ci/98/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-armhf-ci/98/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/location-service-vivid-i386-ci/98/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/location-service-ci/426/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

232. By Thomas Voß on 2016-03-17

Clean up event connections after each trial.
Adjust terminal output.

231. By Thomas Voß on 2016-03-15

Extend runtime test cases to cover agps use cases.

230. By Thomas Voß on 2016-03-11

Log individual imsi/msisdn callback invocations.

229. By Thomas Voß on 2016-03-10

Wire up ril request callbacks.

=== added directory '3rd-party'
=== added directory '3rd-party/boost'
=== added directory '3rd-party/boost/core'
=== added file '3rd-party/boost/core/scoped_enum.hpp'
--- 3rd-party/boost/core/scoped_enum.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/core/scoped_enum.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,192 @@
+//  scoped_enum.hpp  ---------------------------------------------------------//
+
+//  Copyright Beman Dawes, 2009
+//  Copyright (C) 2011-2012 Vicente J. Botet Escriba
+//  Copyright (C) 2012 Anthony Williams
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  See http://www.boost.org/LICENSE_1_0.txt
+
+#ifndef BOOST_CORE_SCOPED_ENUM_HPP
+#define BOOST_CORE_SCOPED_ENUM_HPP
+
+#include <boost/config.hpp>
+
+#ifdef BOOST_HAS_PRAGMA_ONCE
+#pragma once
+#endif
+
+namespace boost
+{
+
+#ifdef BOOST_NO_CXX11_SCOPED_ENUMS
+
+  /**
+   * Meta-function to get the native enum type associated to an enum class or its emulation.
+   */
+  template <typename EnumType>
+  struct native_type
+  {
+    /**
+     * The member typedef type names the native enum type associated to the scoped enum,
+     * which is it self if the compiler supports scoped enums or EnumType::enum_type if it is an emulated scoped enum.
+     */
+    typedef typename EnumType::enum_type type;
+  };
+
+  /**
+   * Casts a scoped enum to its underlying type.
+   *
+   * This function is useful when working with scoped enum classes, which doens't implicitly convert to the underlying type.
+   * @param v A scoped enum.
+   * @returns The underlying type.
+   * @throws No-throws.
+   */
+  template <typename UnderlyingType, typename EnumType>
+  UnderlyingType underlying_cast(EnumType v)
+  {
+    return v.get_underlying_value_();
+  }
+
+  /**
+   * Casts a scoped enum to its native enum type.
+   *
+   * This function is useful to make programs portable when the scoped enum emulation can not be use where native enums can.
+   *
+   * EnumType the scoped enum type
+   *
+   * @param v A scoped enum.
+   * @returns The native enum value.
+   * @throws No-throws.
+   */
+  template <typename EnumType>
+  inline
+  typename EnumType::enum_type native_value(EnumType e)
+  {
+    return e.get_native_value_();
+  }
+
+#else  // BOOST_NO_CXX11_SCOPED_ENUMS
+
+  template <typename EnumType>
+  struct native_type
+  {
+    typedef EnumType type;
+  };
+
+  template <typename UnderlyingType, typename EnumType>
+  UnderlyingType underlying_cast(EnumType v)
+  {
+    return static_cast<UnderlyingType>(v);
+  }
+
+  template <typename EnumType>
+  inline
+  EnumType native_value(EnumType e)
+  {
+    return e;
+  }
+
+#endif // BOOST_NO_CXX11_SCOPED_ENUMS
+}
+
+
+#ifdef BOOST_NO_CXX11_SCOPED_ENUMS
+
+#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
+
+#define BOOST_SCOPED_ENUM_UT_DECLARE_CONVERSION_OPERATOR \
+     explicit operator underlying_type() const BOOST_NOEXCEPT { return get_underlying_value_(); }
+
+#else
+
+#define BOOST_SCOPED_ENUM_UT_DECLARE_CONVERSION_OPERATOR
+
+#endif
+
+/**
+ * Start a declaration of a scoped enum.
+ *
+ * @param EnumType The new scoped enum.
+ * @param UnderlyingType The underlying type.
+ */
+#define BOOST_SCOPED_ENUM_UT_DECLARE_BEGIN(EnumType, UnderlyingType)    \
+    struct EnumType {                                                   \
+        typedef void is_boost_scoped_enum_tag;                          \
+        typedef UnderlyingType underlying_type;                         \
+        EnumType() BOOST_NOEXCEPT {}                                    \
+        explicit EnumType(underlying_type v) BOOST_NOEXCEPT : v_(v) {}                 \
+        underlying_type get_underlying_value_() const BOOST_NOEXCEPT { return v_; }    \
+        BOOST_SCOPED_ENUM_UT_DECLARE_CONVERSION_OPERATOR                \
+    private:                                                            \
+        underlying_type v_;                                             \
+        typedef EnumType self_type;                                     \
+    public:                                                             \
+        enum enum_type
+
+#define BOOST_SCOPED_ENUM_DECLARE_END2() \
+        enum_type get_native_value_() const BOOST_NOEXCEPT { return enum_type(v_); } \
+        friend bool operator ==(self_type lhs, self_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)==enum_type(rhs.v_); } \
+        friend bool operator ==(self_type lhs, enum_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)==rhs; } \
+        friend bool operator ==(enum_type lhs, self_type rhs) BOOST_NOEXCEPT { return lhs==enum_type(rhs.v_); } \
+        friend bool operator !=(self_type lhs, self_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)!=enum_type(rhs.v_); } \
+        friend bool operator !=(self_type lhs, enum_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)!=rhs; } \
+        friend bool operator !=(enum_type lhs, self_type rhs) BOOST_NOEXCEPT { return lhs!=enum_type(rhs.v_); } \
+        friend bool operator <(self_type lhs, self_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)<enum_type(rhs.v_); } \
+        friend bool operator <(self_type lhs, enum_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)<rhs; } \
+        friend bool operator <(enum_type lhs, self_type rhs) BOOST_NOEXCEPT { return lhs<enum_type(rhs.v_); } \
+        friend bool operator <=(self_type lhs, self_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)<=enum_type(rhs.v_); } \
+        friend bool operator <=(self_type lhs, enum_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)<=rhs; } \
+        friend bool operator <=(enum_type lhs, self_type rhs) BOOST_NOEXCEPT { return lhs<=enum_type(rhs.v_); } \
+        friend bool operator >(self_type lhs, self_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)>enum_type(rhs.v_); } \
+        friend bool operator >(self_type lhs, enum_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)>rhs; } \
+        friend bool operator >(enum_type lhs, self_type rhs) BOOST_NOEXCEPT { return lhs>enum_type(rhs.v_); } \
+        friend bool operator >=(self_type lhs, self_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)>=enum_type(rhs.v_); } \
+        friend bool operator >=(self_type lhs, enum_type rhs) BOOST_NOEXCEPT { return enum_type(lhs.v_)>=rhs; } \
+        friend bool operator >=(enum_type lhs, self_type rhs) BOOST_NOEXCEPT { return lhs>=enum_type(rhs.v_); } \
+    };
+
+#define BOOST_SCOPED_ENUM_DECLARE_END(EnumType) \
+    ; \
+    EnumType(enum_type v) BOOST_NOEXCEPT : v_(v) {}                 \
+    BOOST_SCOPED_ENUM_DECLARE_END2()
+
+/**
+ * Starts a declaration of a scoped enum with the default int underlying type.
+ *
+ * @param EnumType The new scoped enum.
+ */
+#define BOOST_SCOPED_ENUM_DECLARE_BEGIN(EnumType) \
+  BOOST_SCOPED_ENUM_UT_DECLARE_BEGIN(EnumType,int)
+
+/**
+ * Name of the native enum type.
+ *
+ * @param EnumType The new scoped enum.
+ */
+#define BOOST_SCOPED_ENUM_NATIVE(EnumType) EnumType::enum_type
+/**
+ * Forward declares an scoped enum.
+ *
+ * @param EnumType The scoped enum.
+ */
+#define BOOST_SCOPED_ENUM_FORWARD_DECLARE(EnumType) struct EnumType
+
+#else  // BOOST_NO_CXX11_SCOPED_ENUMS
+
+#define BOOST_SCOPED_ENUM_UT_DECLARE_BEGIN(EnumType,UnderlyingType) enum class EnumType : UnderlyingType
+#define BOOST_SCOPED_ENUM_DECLARE_BEGIN(EnumType) enum class EnumType
+#define BOOST_SCOPED_ENUM_DECLARE_END2()
+#define BOOST_SCOPED_ENUM_DECLARE_END(EnumType) ;
+
+#define BOOST_SCOPED_ENUM_NATIVE(EnumType) EnumType
+#define BOOST_SCOPED_ENUM_FORWARD_DECLARE(EnumType) enum class EnumType
+
+#endif  // BOOST_NO_CXX11_SCOPED_ENUMS
+
+// Deprecated macros
+#define BOOST_SCOPED_ENUM_START(name) BOOST_SCOPED_ENUM_DECLARE_BEGIN(name)
+#define BOOST_SCOPED_ENUM_END BOOST_SCOPED_ENUM_DECLARE_END2()
+#define BOOST_SCOPED_ENUM(name) BOOST_SCOPED_ENUM_NATIVE(name)
+
+#endif  // BOOST_CORE_SCOPED_ENUM_HPP

=== added directory '3rd-party/boost/endian'
=== added file '3rd-party/boost/endian/arithmetic.hpp'
--- 3rd-party/boost/endian/arithmetic.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/endian/arithmetic.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,413 @@
+//  boost/endian/arithmetic.hpp  -------------------------------------------------------//
+
+//  (C) Copyright Darin Adler 2000
+//  (C) Copyright Beman Dawes 2006, 2009, 2014
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  See http://www.boost.org/LICENSE_1_0.txt
+
+//  See library home page at http://www.boost.org/libs/endian
+
+//--------------------------------------------------------------------------------------//
+
+//  Original design developed by Darin Adler based on classes developed by Mark
+//  Borgerding. Four original class templates were combined into a single endian
+//  class template by Beman Dawes, who also added the unrolled_byte_loops sign
+//  partial specialization to correctly extend the sign when cover integer size
+//  differs from endian representation size.
+
+// TODO: When a compiler supporting constexpr becomes available, try possible uses.
+
+#ifndef BOOST_ENDIAN_ARITHMETIC_HPP
+#define BOOST_ENDIAN_ARITHMETIC_HPP
+
+#if defined(_MSC_VER)  
+# pragma warning(push)  
+# pragma warning(disable:4365)  // conversion ... signed/unsigned mismatch
+#endif
+
+#ifdef BOOST_ENDIAN_LOG
+# include <iostream>
+#endif
+
+#if defined(__BORLANDC__) || defined( __CODEGEARC__)
+# pragma pack(push, 1)
+#endif
+
+#include <boost/config.hpp>
+#include <boost/predef/detail/endian_compat.h>
+#include <boost/endian/conversion.hpp>
+#include <boost/endian/buffers.hpp>
+#define  BOOST_ENDIAN_MINIMAL_COVER_OPERATORS
+#include <boost/endian/detail/cover_operators.hpp>
+#undef   BOOST_ENDIAN_MINIMAL_COVER_OPERATORS
+#include <boost/type_traits/is_signed.hpp>
+#include <boost/cstdint.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/core/scoped_enum.hpp>
+#include <iosfwd>
+#include <climits>
+
+# if CHAR_BIT != 8
+#   error Platforms with CHAR_BIT != 8 are not supported
+# endif
+
+# ifdef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#   define BOOST_ENDIAN_DEFAULT_CONSTRUCT {}          // C++03
+# else
+#   define BOOST_ENDIAN_DEFAULT_CONSTRUCT = default;  // C++0x
+# endif
+
+# if defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && defined(BOOST_ENDIAN_FORCE_PODNESS)
+#   define BOOST_ENDIAN_NO_CTORS
+# endif
+
+# ifndef BOOST_ENDIAN_EXPLICIT_CTORS
+#   define BOOST_ENDIAN_EXPLICIT_OPT
+# else
+#   define BOOST_ENDIAN_EXPLICIT_OPT explicit
+# endif
+
+//----------------------------------  synopsis  ----------------------------------------//
+
+namespace boost
+{
+namespace endian
+{
+
+  template <BOOST_SCOPED_ENUM(order) Order, class T, std::size_t n_bits,
+    BOOST_SCOPED_ENUM(align) A = align::no>
+      class endian_arithmetic;
+
+  // big endian signed integer aligned types
+  typedef endian_arithmetic<order::big, int8_t, 8, align::yes>        big_int8_at;
+  typedef endian_arithmetic<order::big, int16_t, 16, align::yes>      big_int16_at;
+  typedef endian_arithmetic<order::big, int32_t, 32, align::yes>      big_int32_at;
+  typedef endian_arithmetic<order::big, int64_t, 64, align::yes>      big_int64_at;
+
+  // big endian unsigned integer aligned types
+  typedef endian_arithmetic<order::big, uint8_t, 8, align::yes>       big_uint8_at;
+  typedef endian_arithmetic<order::big, uint16_t, 16, align::yes>     big_uint16_at;
+  typedef endian_arithmetic<order::big, uint32_t, 32, align::yes>     big_uint32_at;
+  typedef endian_arithmetic<order::big, uint64_t, 64, align::yes>     big_uint64_at;
+
+  // little endian signed integer aligned types
+  typedef endian_arithmetic<order::little, int8_t, 8, align::yes>     little_int8_at;
+  typedef endian_arithmetic<order::little, int16_t, 16, align::yes>   little_int16_at;
+  typedef endian_arithmetic<order::little, int32_t, 32, align::yes>   little_int32_at;
+  typedef endian_arithmetic<order::little, int64_t, 64, align::yes>   little_int64_at;
+
+  // little endian unsigned integer aligned types
+  typedef endian_arithmetic<order::little, uint8_t, 8, align::yes>    little_uint8_at;
+  typedef endian_arithmetic<order::little, uint16_t, 16, align::yes>  little_uint16_at;
+  typedef endian_arithmetic<order::little, uint32_t, 32, align::yes>  little_uint32_at;
+  typedef endian_arithmetic<order::little, uint64_t, 64, align::yes>  little_uint64_at;
+
+  // aligned native endian typedefs are not provided because
+  // <cstdint> types are superior for this use case
+
+  // big endian signed integer unaligned types
+  typedef endian_arithmetic<order::big, int_least8_t, 8>        big_int8_t;
+  typedef endian_arithmetic<order::big, int_least16_t, 16>      big_int16_t;
+  typedef endian_arithmetic<order::big, int_least32_t, 24>      big_int24_t;
+  typedef endian_arithmetic<order::big, int_least32_t, 32>      big_int32_t;
+  typedef endian_arithmetic<order::big, int_least64_t, 40>      big_int40_t;
+  typedef endian_arithmetic<order::big, int_least64_t, 48>      big_int48_t;
+  typedef endian_arithmetic<order::big, int_least64_t, 56>      big_int56_t;
+  typedef endian_arithmetic<order::big, int_least64_t, 64>      big_int64_t;
+
+  // big endian unsigned integer unaligned types
+  typedef endian_arithmetic<order::big, uint_least8_t, 8>       big_uint8_t;
+  typedef endian_arithmetic<order::big, uint_least16_t, 16>     big_uint16_t;
+  typedef endian_arithmetic<order::big, uint_least32_t, 24>     big_uint24_t;
+  typedef endian_arithmetic<order::big, uint_least32_t, 32>     big_uint32_t;
+  typedef endian_arithmetic<order::big, uint_least64_t, 40>     big_uint40_t;
+  typedef endian_arithmetic<order::big, uint_least64_t, 48>     big_uint48_t;
+  typedef endian_arithmetic<order::big, uint_least64_t, 56>     big_uint56_t;
+  typedef endian_arithmetic<order::big, uint_least64_t, 64>     big_uint64_t;
+
+  // little endian signed integer unaligned types
+  typedef endian_arithmetic<order::little, int_least8_t, 8>     little_int8_t;
+  typedef endian_arithmetic<order::little, int_least16_t, 16>   little_int16_t;
+  typedef endian_arithmetic<order::little, int_least32_t, 24>   little_int24_t;
+  typedef endian_arithmetic<order::little, int_least32_t, 32>   little_int32_t;
+  typedef endian_arithmetic<order::little, int_least64_t, 40>   little_int40_t;
+  typedef endian_arithmetic<order::little, int_least64_t, 48>   little_int48_t;
+  typedef endian_arithmetic<order::little, int_least64_t, 56>   little_int56_t;
+  typedef endian_arithmetic<order::little, int_least64_t, 64>   little_int64_t;
+
+  // little endian unsigned integer unaligned types
+  typedef endian_arithmetic<order::little, uint_least8_t, 8>    little_uint8_t;
+  typedef endian_arithmetic<order::little, uint_least16_t, 16>  little_uint16_t;
+  typedef endian_arithmetic<order::little, uint_least32_t, 24>  little_uint24_t;
+  typedef endian_arithmetic<order::little, uint_least32_t, 32>  little_uint32_t;
+  typedef endian_arithmetic<order::little, uint_least64_t, 40>  little_uint40_t;
+  typedef endian_arithmetic<order::little, uint_least64_t, 48>  little_uint48_t;
+  typedef endian_arithmetic<order::little, uint_least64_t, 56>  little_uint56_t;
+  typedef endian_arithmetic<order::little, uint_least64_t, 64>  little_uint64_t;
+
+# ifdef BOOST_BIG_ENDIAN
+  // native endian signed integer unaligned types
+  typedef big_int8_t   native_int8_t;
+  typedef big_int16_t  native_int16_t;
+  typedef big_int24_t  native_int24_t;
+  typedef big_int32_t  native_int32_t;
+  typedef big_int40_t  native_int40_t;
+  typedef big_int48_t  native_int48_t;
+  typedef big_int56_t  native_int56_t;
+  typedef big_int64_t  native_int64_t;
+
+  // native endian unsigned integer unaligned types
+  typedef big_uint8_t   native_uint8_t;
+  typedef big_uint16_t  native_uint16_t;
+  typedef big_uint24_t  native_uint24_t;
+  typedef big_uint32_t  native_uint32_t;
+  typedef big_uint40_t  native_uint40_t;
+  typedef big_uint48_t  native_uint48_t;
+  typedef big_uint56_t  native_uint56_t;
+  typedef big_uint64_t  native_uint64_t;
+# else
+  // native endian signed integer unaligned types
+  typedef little_int8_t   native_int8_t;
+  typedef little_int16_t  native_int16_t;
+  typedef little_int24_t  native_int24_t;
+  typedef little_int32_t  native_int32_t;
+  typedef little_int40_t  native_int40_t;
+  typedef little_int48_t  native_int48_t;
+  typedef little_int56_t  native_int56_t;
+  typedef little_int64_t  native_int64_t;
+
+  // native endian unsigned integer unaligned types
+  typedef little_uint8_t   native_uint8_t;
+  typedef little_uint16_t  native_uint16_t;
+  typedef little_uint24_t  native_uint24_t;
+  typedef little_uint32_t  native_uint32_t;
+  typedef little_uint40_t  native_uint40_t;
+  typedef little_uint48_t  native_uint48_t;
+  typedef little_uint56_t  native_uint56_t;
+  typedef little_uint64_t  native_uint64_t;
+# endif
+
+# ifdef BOOST_ENDIAN_DEPRECATED_NAMES
+
+  typedef order endianness;
+  typedef align alignment;
+
+# ifndef  BOOST_NO_CXX11_TEMPLATE_ALIASES
+  template <BOOST_SCOPED_ENUM(order) Order, class T, std::size_t n_bits,
+    BOOST_SCOPED_ENUM(align) Align = align::no>
+  using endian = endian_arithmetic<Order, T, n_bits, Align>;
+# endif
+
+  // unaligned big endian signed integer types
+  typedef endian_arithmetic< order::big, int_least8_t, 8 >           big8_t;
+  typedef endian_arithmetic< order::big, int_least16_t, 16 >         big16_t;
+  typedef endian_arithmetic< order::big, int_least32_t, 24 >         big24_t;
+  typedef endian_arithmetic< order::big, int_least32_t, 32 >         big32_t;
+  typedef endian_arithmetic< order::big, int_least64_t, 40 >         big40_t;
+  typedef endian_arithmetic< order::big, int_least64_t, 48 >         big48_t;
+  typedef endian_arithmetic< order::big, int_least64_t, 56 >         big56_t;
+  typedef endian_arithmetic< order::big, int_least64_t, 64 >         big64_t;
+
+  // unaligned big endian_arithmetic unsigned integer types
+  typedef endian_arithmetic< order::big, uint_least8_t, 8 >          ubig8_t;
+  typedef endian_arithmetic< order::big, uint_least16_t, 16 >        ubig16_t;
+  typedef endian_arithmetic< order::big, uint_least32_t, 24 >        ubig24_t;
+  typedef endian_arithmetic< order::big, uint_least32_t, 32 >        ubig32_t;
+  typedef endian_arithmetic< order::big, uint_least64_t, 40 >        ubig40_t;
+  typedef endian_arithmetic< order::big, uint_least64_t, 48 >        ubig48_t;
+  typedef endian_arithmetic< order::big, uint_least64_t, 56 >        ubig56_t;
+  typedef endian_arithmetic< order::big, uint_least64_t, 64 >        ubig64_t;
+
+  // unaligned little endian_arithmetic signed integer types
+  typedef endian_arithmetic< order::little, int_least8_t, 8 >        little8_t;
+  typedef endian_arithmetic< order::little, int_least16_t, 16 >      little16_t;
+  typedef endian_arithmetic< order::little, int_least32_t, 24 >      little24_t;
+  typedef endian_arithmetic< order::little, int_least32_t, 32 >      little32_t;
+  typedef endian_arithmetic< order::little, int_least64_t, 40 >      little40_t;
+  typedef endian_arithmetic< order::little, int_least64_t, 48 >      little48_t;
+  typedef endian_arithmetic< order::little, int_least64_t, 56 >      little56_t;
+  typedef endian_arithmetic< order::little, int_least64_t, 64 >      little64_t;
+
+  // unaligned little endian_arithmetic unsigned integer types
+  typedef endian_arithmetic< order::little, uint_least8_t, 8 >       ulittle8_t;
+  typedef endian_arithmetic< order::little, uint_least16_t, 16 >     ulittle16_t;
+  typedef endian_arithmetic< order::little, uint_least32_t, 24 >     ulittle24_t;
+  typedef endian_arithmetic< order::little, uint_least32_t, 32 >     ulittle32_t;
+  typedef endian_arithmetic< order::little, uint_least64_t, 40 >     ulittle40_t;
+  typedef endian_arithmetic< order::little, uint_least64_t, 48 >     ulittle48_t;
+  typedef endian_arithmetic< order::little, uint_least64_t, 56 >     ulittle56_t;
+  typedef endian_arithmetic< order::little, uint_least64_t, 64 >     ulittle64_t;
+
+  // unaligned native endian_arithmetic signed integer types
+  typedef endian_arithmetic< order::native, int_least8_t, 8 >        native8_t;
+  typedef endian_arithmetic< order::native, int_least16_t, 16 >      native16_t;
+  typedef endian_arithmetic< order::native, int_least32_t, 24 >      native24_t;
+  typedef endian_arithmetic< order::native, int_least32_t, 32 >      native32_t;
+  typedef endian_arithmetic< order::native, int_least64_t, 40 >      native40_t;
+  typedef endian_arithmetic< order::native, int_least64_t, 48 >      native48_t;
+  typedef endian_arithmetic< order::native, int_least64_t, 56 >      native56_t;
+  typedef endian_arithmetic< order::native, int_least64_t, 64 >      native64_t;
+
+  // unaligned native endian_arithmetic unsigned integer types
+  typedef endian_arithmetic< order::native, uint_least8_t, 8 >       unative8_t;
+  typedef endian_arithmetic< order::native, uint_least16_t, 16 >     unative16_t;
+  typedef endian_arithmetic< order::native, uint_least32_t, 24 >     unative24_t;
+  typedef endian_arithmetic< order::native, uint_least32_t, 32 >     unative32_t;
+  typedef endian_arithmetic< order::native, uint_least64_t, 40 >     unative40_t;
+  typedef endian_arithmetic< order::native, uint_least64_t, 48 >     unative48_t;
+  typedef endian_arithmetic< order::native, uint_least64_t, 56 >     unative56_t;
+  typedef endian_arithmetic< order::native, uint_least64_t, 64 >     unative64_t;
+
+  //     aligned native endian_arithmetic typedefs are not provided because
+  //     <cstdint> types are superior for this use case
+
+  typedef endian_arithmetic< order::big, int16_t, 16, align::yes >      aligned_big16_t;
+  typedef endian_arithmetic< order::big, uint16_t, 16, align::yes >     aligned_ubig16_t;
+  typedef endian_arithmetic< order::little, int16_t, 16, align::yes >   aligned_little16_t;
+  typedef endian_arithmetic< order::little, uint16_t, 16, align::yes >  aligned_ulittle16_t;
+
+  typedef endian_arithmetic< order::big, int32_t, 32, align::yes >      aligned_big32_t;
+  typedef endian_arithmetic< order::big, uint32_t, 32, align::yes >     aligned_ubig32_t;
+  typedef endian_arithmetic< order::little, int32_t, 32, align::yes >   aligned_little32_t;
+  typedef endian_arithmetic< order::little, uint32_t, 32, align::yes >  aligned_ulittle32_t;
+
+  typedef endian_arithmetic< order::big, int64_t, 64, align::yes >      aligned_big64_t;
+  typedef endian_arithmetic< order::big, uint64_t, 64, align::yes >     aligned_ubig64_t;
+  typedef endian_arithmetic< order::little, int64_t, 64, align::yes >   aligned_little64_t;
+  typedef endian_arithmetic< order::little, uint64_t, 64, align::yes >  aligned_ulittle64_t;
+
+# endif
+
+//----------------------------------  end synopsis  ------------------------------------//
+
+//  endian class template specializations  ---------------------------------------------//
+
+    //  Specializations that represent unaligned bytes.
+    //  Taking an integer type as a parameter provides a nice way to pass both
+    //  the size and signness of the desired integer and get the appropriate
+    //  corresponding integer type for the interface.
+
+    //  unaligned integer big endian specialization
+    template <typename T, std::size_t n_bits>
+    class endian_arithmetic< order::big, T, n_bits, align::no >
+      : public endian_buffer< order::big, T, n_bits, align::no >,
+        cover_operators<endian_arithmetic<order::big, T, n_bits>, T>
+    {
+        BOOST_STATIC_ASSERT( (n_bits/8)*8 == n_bits );
+      public:
+        typedef T value_type;
+#     ifndef BOOST_ENDIAN_NO_CTORS
+        endian_arithmetic() BOOST_ENDIAN_DEFAULT_CONSTRUCT
+        BOOST_ENDIAN_EXPLICIT_OPT endian_arithmetic(T val) BOOST_NOEXCEPT
+        { 
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "big, unaligned, " << n_bits << "-bits, construct(" << val << ")\n";
+#       endif
+          detail::store_big_endian<T, n_bits/8>(this->m_value, val);
+        }
+#     endif
+        endian_arithmetic& operator=(T val) BOOST_NOEXCEPT
+          { detail::store_big_endian<T, n_bits/8>(this->m_value, val); return *this; }
+        operator value_type() const BOOST_NOEXCEPT { return this->value(); }
+    };
+
+    //  unaligned little endian specialization
+    template <typename T, std::size_t n_bits>
+    class endian_arithmetic< order::little, T, n_bits, align::no >
+      : public endian_buffer< order::little, T, n_bits, align::no >,
+        cover_operators< endian_arithmetic< order::little, T, n_bits >, T >
+    {
+        BOOST_STATIC_ASSERT( (n_bits/8)*8 == n_bits );
+      public:
+        typedef T value_type;
+#     ifndef BOOST_ENDIAN_NO_CTORS
+        endian_arithmetic() BOOST_ENDIAN_DEFAULT_CONSTRUCT
+        BOOST_ENDIAN_EXPLICIT_OPT endian_arithmetic(T val) BOOST_NOEXCEPT
+        { 
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "little, unaligned, " << n_bits << "-bits, construct(" << val << ")\n";
+#       endif
+          detail::store_little_endian<T, n_bits/8>(this->m_value, val);
+        }
+#     endif
+        endian_arithmetic& operator=(T val) BOOST_NOEXCEPT
+          { detail::store_little_endian<T, n_bits/8>(this->m_value, val); return *this; }
+        operator value_type() const BOOST_NOEXCEPT { return this->value(); }
+    };
+
+  //  align::yes specializations; only n_bits == 16/32/64 supported
+
+    //  aligned big endian specialization
+    template <typename T, std::size_t n_bits>
+    class endian_arithmetic<order::big, T, n_bits, align::yes>
+      : public endian_buffer< order::big, T, n_bits, align::yes >,
+        cover_operators<endian_arithmetic<order::big, T, n_bits, align::yes>, T>
+    {
+        BOOST_STATIC_ASSERT( (n_bits/8)*8 == n_bits );
+        BOOST_STATIC_ASSERT( sizeof(T) == n_bits/8 );
+      public:
+        typedef T value_type;
+#     ifndef BOOST_ENDIAN_NO_CTORS
+        endian_arithmetic() BOOST_ENDIAN_DEFAULT_CONSTRUCT
+        BOOST_ENDIAN_EXPLICIT_OPT endian_arithmetic(T val) BOOST_NOEXCEPT
+        {
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "big, aligned, " << n_bits << "-bits, construct(" << val << ")\n";
+#       endif
+          this->m_value = ::boost::endian::native_to_big(val);
+        }
+
+#     endif  
+        endian_arithmetic& operator=(T val) BOOST_NOEXCEPT
+        {
+          this->m_value = ::boost::endian::native_to_big(val);
+          return *this;
+        }
+        operator value_type() const BOOST_NOEXCEPT { return this->value(); }
+    };
+
+    //  aligned little endian specialization
+    template <typename T, std::size_t n_bits>
+    class endian_arithmetic<order::little, T, n_bits, align::yes>
+      : public endian_buffer< order::little, T, n_bits, align::yes >,
+        cover_operators<endian_arithmetic<order::little, T, n_bits, align::yes>, T>
+    {
+        BOOST_STATIC_ASSERT( (n_bits/8)*8 == n_bits );
+        BOOST_STATIC_ASSERT( sizeof(T) == n_bits/8 );
+      public:
+        typedef T value_type;
+#     ifndef BOOST_ENDIAN_NO_CTORS
+        endian_arithmetic() BOOST_ENDIAN_DEFAULT_CONSTRUCT
+        BOOST_ENDIAN_EXPLICIT_OPT endian_arithmetic(T val) BOOST_NOEXCEPT
+        {
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "little, aligned, " << n_bits << "-bits, construct(" << val << ")\n";
+#       endif
+          this->m_value = ::boost::endian::native_to_little(val);
+        }
+#     endif  
+        endian_arithmetic& operator=(T val) BOOST_NOEXCEPT
+        {
+          this->m_value = ::boost::endian::native_to_little(val);
+          return *this;
+        }
+        operator value_type() const BOOST_NOEXCEPT { return this->value(); }
+    };
+
+} // namespace endian
+} // namespace boost
+
+#if defined(__BORLANDC__) || defined( __CODEGEARC__)
+# pragma pack(pop)
+#endif
+
+#if defined(_MSC_VER)  
+# pragma warning(pop)  
+#endif 
+
+#endif // BOOST_ENDIAN_ARITHMETIC_HPP

=== added file '3rd-party/boost/endian/buffers.hpp'
--- 3rd-party/boost/endian/buffers.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/endian/buffers.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,515 @@
+//  boost/endian/buffers.hpp  ----------------------------------------------------------//
+
+//  (C) Copyright Darin Adler 2000
+//  (C) Copyright Beman Dawes 2006, 2009, 2014
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  See http://www.boost.org/LICENSE_1_0.txt
+
+//  See library home page at http://www.boost.org/libs/endian
+
+//--------------------------------------------------------------------------------------//
+
+//  Original design developed by Darin Adler based on classes developed by Mark
+//  Borgerding. Four original class templates were combined into a single endian
+//  class template by Beman Dawes, who also added the unrolled_byte_loops sign
+//  partial specialization to correctly extend the sign when cover integer size
+//  differs from endian representation size.
+
+// TODO: When a compiler supporting constexpr becomes available, try possible uses.
+
+#ifndef BOOST_ENDIAN_BUFFERS_HPP
+#define BOOST_ENDIAN_BUFFERS_HPP
+
+#if defined(_MSC_VER)  
+# pragma warning(push)  
+# pragma warning(disable:4365)  // conversion ... signed/unsigned mismatch
+#endif
+
+#ifdef BOOST_ENDIAN_LOG
+# include <iostream>
+#endif
+
+#if defined(__BORLANDC__) || defined( __CODEGEARC__)
+# pragma pack(push, 1)
+#endif
+
+#include <boost/config.hpp>
+#include <boost/predef/detail/endian_compat.h>
+#include <boost/endian/conversion.hpp>
+#include <boost/type_traits/is_signed.hpp>
+#include <boost/cstdint.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/core/scoped_enum.hpp>
+#include <iosfwd>
+#include <climits>
+
+# if CHAR_BIT != 8
+#   error Platforms with CHAR_BIT != 8 are not supported
+# endif
+
+# ifdef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS
+#   define BOOST_ENDIAN_DEFAULT_CONSTRUCT {}          // C++03
+# else
+#   define BOOST_ENDIAN_DEFAULT_CONSTRUCT = default;  // C++0x
+# endif
+
+# if defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && defined(BOOST_ENDIAN_FORCE_PODNESS)
+#   define BOOST_ENDIAN_NO_CTORS
+# endif
+
+//----------------------------------  synopsis  ----------------------------------------//
+
+namespace boost
+{
+namespace endian
+{
+
+  BOOST_SCOPED_ENUM_START(align)
+  {no, yes
+#   ifdef BOOST_ENDIAN_DEPRECATED_NAMES
+      , unaligned = no, aligned = yes
+#   endif
+  }; BOOST_SCOPED_ENUM_END
+
+  template <BOOST_SCOPED_ENUM(order) Order, class T, std::size_t n_bits,
+    BOOST_SCOPED_ENUM(align) A = align::no>
+      class endian_buffer;
+
+  // aligned big endian signed integer buffers
+  typedef endian_buffer<order::big, int8_t, 8, align::yes>       big_int8_buf_at;
+  typedef endian_buffer<order::big, int16_t, 16, align::yes>     big_int16_buf_at;
+  typedef endian_buffer<order::big, int32_t, 32, align::yes>     big_int32_buf_at;
+  typedef endian_buffer<order::big, int64_t, 64, align::yes>     big_int64_buf_at;
+
+  // aligned big endian unsigned integer buffers
+  typedef endian_buffer<order::big, uint8_t, 8, align::yes>      big_uint8_buf_at;
+  typedef endian_buffer<order::big, uint16_t, 16, align::yes>    big_uint16_buf_at;
+  typedef endian_buffer<order::big, uint32_t, 32, align::yes>    big_uint32_buf_at;
+  typedef endian_buffer<order::big, uint64_t, 64, align::yes>    big_uint64_buf_at;
+
+  // aligned little endian signed integer buffers
+  typedef endian_buffer<order::little, int8_t, 8, align::yes>    little_int8_buf_at;
+  typedef endian_buffer<order::little, int16_t, 16, align::yes>  little_int16_buf_at;
+  typedef endian_buffer<order::little, int32_t, 32, align::yes>  little_int32_buf_at;
+  typedef endian_buffer<order::little, int64_t, 64, align::yes>  little_int64_buf_at;
+
+  // aligned little endian unsigned integer buffers
+  typedef endian_buffer<order::little, uint8_t, 8, align::yes>   little_uint8_buf_at;
+  typedef endian_buffer<order::little, uint16_t, 16, align::yes> little_uint16_buf_at;
+  typedef endian_buffer<order::little, uint32_t, 32, align::yes> little_uint32_buf_at;
+  typedef endian_buffer<order::little, uint64_t, 64, align::yes> little_uint64_buf_at;
+
+  // aligned native endian typedefs are not provided because
+  // <cstdint> types are superior for this use case
+
+  // unaligned big endian signed integer buffers
+  typedef endian_buffer<order::big, int_least8_t, 8>        big_int8_buf_t;
+  typedef endian_buffer<order::big, int_least16_t, 16>      big_int16_buf_t;
+  typedef endian_buffer<order::big, int_least32_t, 24>      big_int24_buf_t;
+  typedef endian_buffer<order::big, int_least32_t, 32>      big_int32_buf_t;
+  typedef endian_buffer<order::big, int_least64_t, 40>      big_int40_buf_t;
+  typedef endian_buffer<order::big, int_least64_t, 48>      big_int48_buf_t;
+  typedef endian_buffer<order::big, int_least64_t, 56>      big_int56_buf_t;
+  typedef endian_buffer<order::big, int_least64_t, 64>      big_int64_buf_t;
+
+  // unaligned big endian unsigned integer buffers
+  typedef endian_buffer<order::big, uint_least8_t, 8>       big_uint8_buf_t;
+  typedef endian_buffer<order::big, uint_least16_t, 16>     big_uint16_buf_t;
+  typedef endian_buffer<order::big, uint_least32_t, 24>     big_uint24_buf_t;
+  typedef endian_buffer<order::big, uint_least32_t, 32>     big_uint32_buf_t;
+  typedef endian_buffer<order::big, uint_least64_t, 40>     big_uint40_buf_t;
+  typedef endian_buffer<order::big, uint_least64_t, 48>     big_uint48_buf_t;
+  typedef endian_buffer<order::big, uint_least64_t, 56>     big_uint56_buf_t;
+  typedef endian_buffer<order::big, uint_least64_t, 64>     big_uint64_buf_t;
+
+  // unaligned little endian signed integer buffers
+  typedef endian_buffer<order::little, int_least8_t, 8>     little_int8_buf_t;
+  typedef endian_buffer<order::little, int_least16_t, 16>   little_int16_buf_t;
+  typedef endian_buffer<order::little, int_least32_t, 24>   little_int24_buf_t;
+  typedef endian_buffer<order::little, int_least32_t, 32>   little_int32_buf_t;
+  typedef endian_buffer<order::little, int_least64_t, 40>   little_int40_buf_t;
+  typedef endian_buffer<order::little, int_least64_t, 48>   little_int48_buf_t;
+  typedef endian_buffer<order::little, int_least64_t, 56>   little_int56_buf_t;
+  typedef endian_buffer<order::little, int_least64_t, 64>   little_int64_buf_t;
+
+  // unaligned little endian unsigned integer buffers
+  typedef endian_buffer<order::little, uint_least8_t, 8>    little_uint8_buf_t;
+  typedef endian_buffer<order::little, uint_least16_t, 16>  little_uint16_buf_t;
+  typedef endian_buffer<order::little, uint_least32_t, 24>  little_uint24_buf_t;
+  typedef endian_buffer<order::little, uint_least32_t, 32>  little_uint32_buf_t;
+  typedef endian_buffer<order::little, uint_least64_t, 40>  little_uint40_buf_t;
+  typedef endian_buffer<order::little, uint_least64_t, 48>  little_uint48_buf_t;
+  typedef endian_buffer<order::little, uint_least64_t, 56>  little_uint56_buf_t;
+  typedef endian_buffer<order::little, uint_least64_t, 64>  little_uint64_buf_t;
+
+# ifdef BOOST_BIG_ENDIAN
+  // unaligned native endian signed integer buffers
+  typedef big_int8_buf_t   native_int8_buf_t;
+  typedef big_int16_buf_t  native_int16_buf_t;
+  typedef big_int24_buf_t  native_int24_buf_t;
+  typedef big_int32_buf_t  native_int32_buf_t;
+  typedef big_int40_buf_t  native_int40_buf_t;
+  typedef big_int48_buf_t  native_int48_buf_t;
+  typedef big_int56_buf_t  native_int56_buf_t;
+  typedef big_int64_buf_t  native_int64_buf_t;
+
+  // unaligned native endian unsigned integer buffers
+  typedef big_uint8_buf_t   native_uint8_buf_t;
+  typedef big_uint16_buf_t  native_uint16_buf_t;
+  typedef big_uint24_buf_t  native_uint24_buf_t;
+  typedef big_uint32_buf_t  native_uint32_buf_t;
+  typedef big_uint40_buf_t  native_uint40_buf_t;
+  typedef big_uint48_buf_t  native_uint48_buf_t;
+  typedef big_uint56_buf_t  native_uint56_buf_t;
+  typedef big_uint64_buf_t  native_uint64_buf_t;
+# else
+  // unaligned native endian signed integer buffers
+  typedef little_int8_buf_t   native_int8_buf_t;
+  typedef little_int16_buf_t  native_int16_buf_t;
+  typedef little_int24_buf_t  native_int24_buf_t;
+  typedef little_int32_buf_t  native_int32_buf_t;
+  typedef little_int40_buf_t  native_int40_buf_t;
+  typedef little_int48_buf_t  native_int48_buf_t;
+  typedef little_int56_buf_t  native_int56_buf_t;
+  typedef little_int64_buf_t  native_int64_buf_t;
+
+  // unaligned native endian unsigned integer buffers
+  typedef little_uint8_buf_t   native_uint8_buf_t;
+  typedef little_uint16_buf_t  native_uint16_buf_t;
+  typedef little_uint24_buf_t  native_uint24_buf_t;
+  typedef little_uint32_buf_t  native_uint32_buf_t;
+  typedef little_uint40_buf_t  native_uint40_buf_t;
+  typedef little_uint48_buf_t  native_uint48_buf_t;
+  typedef little_uint56_buf_t  native_uint56_buf_t;
+  typedef little_uint64_buf_t  native_uint64_buf_t;
+# endif
+
+  // Stream inserter
+  template <class charT, class traits, BOOST_SCOPED_ENUM(order) Order, class T,
+    std::size_t n_bits, BOOST_SCOPED_ENUM(align) A>
+  std::basic_ostream<charT, traits>&
+    operator<<(std::basic_ostream<charT, traits>& os,
+      const endian_buffer<Order, T, n_bits, A>& x)
+  {
+    return os << x.value();
+  }
+
+  // Stream extractor 
+  template <class charT, class traits, BOOST_SCOPED_ENUM(order) Order, class T,
+    std::size_t n_bits, BOOST_SCOPED_ENUM(align) A>
+  std::basic_istream<charT, traits>&
+    operator>>(std::basic_istream<charT, traits>& is,
+      endian_buffer<Order, T, n_bits, A>& x)
+  {
+    T i;
+    if (is >> i)
+      x = i;
+    return is;
+  }
+
+//----------------------------------  end synopsis  ------------------------------------//
+
+  namespace detail
+  {
+
+    // Unrolled loops for loading and storing streams of bytes.
+
+    template <typename T, std::size_t n_bytes,
+      bool sign=boost::is_signed<T>::value >
+    struct unrolled_byte_loops
+    {
+      typedef unrolled_byte_loops<T, n_bytes - 1, sign> next;
+
+      static T load_big(const unsigned char* bytes) BOOST_NOEXCEPT
+        { return static_cast<T>(*(bytes - 1) | (next::load_big(bytes - 1) << 8)); }
+      static T load_little(const unsigned char* bytes) BOOST_NOEXCEPT
+        { return static_cast<T>(*bytes | (next::load_little(bytes + 1) << 8)); }
+
+      static void store_big(char* bytes, T value) BOOST_NOEXCEPT
+        {
+          *(bytes - 1) = static_cast<char>(value);
+          next::store_big(bytes - 1, static_cast<T>(value >> 8));
+        }
+      static void store_little(char* bytes, T value) BOOST_NOEXCEPT
+        {
+          *bytes = static_cast<char>(value);
+          next::store_little(bytes + 1, static_cast<T>(value >> 8));
+        }
+    };
+
+    template <typename T>
+    struct unrolled_byte_loops<T, 1, false>
+    {
+      static T load_big(const unsigned char* bytes) BOOST_NOEXCEPT
+        { return *(bytes - 1); }
+      static T load_little(const unsigned char* bytes) BOOST_NOEXCEPT
+        { return *bytes; }
+      static void store_big(char* bytes, T value) BOOST_NOEXCEPT
+        { *(bytes - 1) = static_cast<char>(value); }
+      static void store_little(char* bytes, T value) BOOST_NOEXCEPT
+        { *bytes = static_cast<char>(value); }
+
+    };
+
+    template <typename T>
+    struct unrolled_byte_loops<T, 1, true>
+    {
+      static T load_big(const unsigned char* bytes) BOOST_NOEXCEPT
+        { return *reinterpret_cast<const signed char*>(bytes - 1); }
+      static T load_little(const unsigned char* bytes) BOOST_NOEXCEPT
+        { return *reinterpret_cast<const signed char*>(bytes); }
+      static void store_big(char* bytes, T value)  BOOST_NOEXCEPT
+        { *(bytes - 1) = static_cast<char>(value); }
+      static void store_little(char* bytes, T value) BOOST_NOEXCEPT
+        { *bytes = static_cast<char>(value); }
+    };
+
+    template <typename T, std::size_t n_bytes>
+    inline
+    T load_big_endian(const void* bytes) BOOST_NOEXCEPT
+    {
+      return unrolled_byte_loops<T, n_bytes>::load_big
+        (static_cast<const unsigned char*>(bytes) + n_bytes);
+    }
+
+    template <typename T, std::size_t n_bytes>
+    inline
+    T load_little_endian(const void* bytes) BOOST_NOEXCEPT
+    {
+#   if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
+      // On x86 (which is little endian), unaligned loads are permitted
+      if (sizeof(T) == n_bytes)  // GCC 4.9, VC++ 14.0, and probably others, elide this
+                                 // test and generate code only for the applicable return
+                                 // case since sizeof(T) and n_bytes are known at compile
+                                 // time.
+      {
+        return *reinterpret_cast<T const *>(bytes);
+      }
+#   endif
+      return unrolled_byte_loops<T, n_bytes>::load_little
+        (static_cast<const unsigned char*>(bytes));
+    }
+
+    template <typename T, std::size_t n_bytes>
+    inline
+    void store_big_endian(void* bytes, T value) BOOST_NOEXCEPT
+    {
+      unrolled_byte_loops<T, n_bytes>::store_big
+        (static_cast<char*>(bytes) + n_bytes, value);
+    }
+
+    template <typename T, std::size_t n_bytes>
+    inline
+    void store_little_endian(void* bytes, T value) BOOST_NOEXCEPT
+    {
+#     if defined(__x86_64__) || defined(_M_X64) || defined(__i386) || defined(_M_IX86)
+      // On x86 (which is little endian), unaligned stores are permitted
+      if (sizeof(T) == n_bytes)  // GCC 4.9, VC++ 14.0, and probably others, elide this
+                                 // test and generate code only for the applicable return
+                                 // case since sizeof(T) and n_bytes are known at compile
+                                 // time.
+      {
+        *reinterpret_cast<T *>(bytes) = value;
+        return;
+      }
+#     endif
+      unrolled_byte_loops<T, n_bytes>::store_little
+        (static_cast<char*>(bytes), value);
+    }
+
+  } // namespace detail
+
+# ifdef BOOST_ENDIAN_LOG
+    bool endian_log(true);
+# endif
+
+//  endian_buffer class template specializations  --------------------------------------//
+
+    //  Specializations that represent unaligned bytes.
+    //  Taking an integer type as a parameter provides a nice way to pass both
+    //  the size and signedness of the desired integer and get the appropriate
+    //  corresponding integer type for the interface.
+
+    // Q: Should endian_buffer supply "value_type operator value_type() const noexcept"?
+    // A: No. The rationale for endian_buffers is to prevent high-cost hidden
+    //    conversions. If an implicit conversion operator is supplied, hidden conversions
+    //    can occur.
+
+    //  unaligned big endian_buffer specialization
+    template <typename T, std::size_t n_bits>
+    class endian_buffer< order::big, T, n_bits, align::no >
+    {
+        BOOST_STATIC_ASSERT( (n_bits/8)*8 == n_bits );
+      public:
+        typedef T value_type;
+#     ifndef BOOST_ENDIAN_NO_CTORS
+        endian_buffer() BOOST_ENDIAN_DEFAULT_CONSTRUCT
+        explicit endian_buffer(T val) BOOST_NOEXCEPT
+        { 
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "big, unaligned, "
+              << n_bits << "-bits, construct(" << val << ")\n";
+#       endif
+          detail::store_big_endian<T, n_bits/8>(m_value, val);
+        }
+#     endif
+        endian_buffer & operator=(T val) BOOST_NOEXCEPT
+        {
+#       ifdef BOOST_ENDIAN_LOG
+          if (endian_log)
+            std::cout << "big, unaligned, " << n_bits << "-bits, assign(" << val << ")\n";
+#       endif
+          detail::store_big_endian<T, n_bits/8>(m_value, val);
+          return *this;
+        }
+        value_type value() const BOOST_NOEXCEPT
+        { 
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "big, unaligned, " << n_bits << "-bits, convert("
+              << detail::load_big_endian<T, n_bits/8>(m_value) << ")\n";
+#       endif
+          return detail::load_big_endian<T, n_bits/8>(m_value);
+        }
+        const char* data() const BOOST_NOEXCEPT  { return m_value; }
+      protected:
+        char m_value[n_bits/8];
+    };
+
+    //  unaligned little endian_buffer specialization
+    template <typename T, std::size_t n_bits>
+    class endian_buffer< order::little, T, n_bits, align::no >
+    {
+        BOOST_STATIC_ASSERT( (n_bits/8)*8 == n_bits );
+      public:
+        typedef T value_type;
+#     ifndef BOOST_ENDIAN_NO_CTORS
+        endian_buffer() BOOST_ENDIAN_DEFAULT_CONSTRUCT
+        explicit endian_buffer(T val) BOOST_NOEXCEPT
+        { 
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "little, unaligned, " << n_bits << "-bits, construct("
+              << val << ")\n";
+#       endif
+          detail::store_little_endian<T, n_bits/8>(m_value, val);
+        }
+#     endif
+        endian_buffer & operator=(T val) BOOST_NOEXCEPT
+          { detail::store_little_endian<T, n_bits/8>(m_value, val); return *this; }
+        value_type value() const BOOST_NOEXCEPT
+        { 
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "little, unaligned, " << n_bits << "-bits, convert("
+              << detail::load_little_endian<T, n_bits/8>(m_value) << ")\n";
+#       endif
+          return detail::load_little_endian<T, n_bits/8>(m_value);
+        }
+        const char* data() const BOOST_NOEXCEPT  { return m_value; }
+      protected:
+        char m_value[n_bits/8];
+    };
+
+  //  align::yes specializations; only n_bits == 16/32/64 supported
+
+    //  aligned big endian_buffer specialization
+    template <typename T, std::size_t n_bits>
+    class endian_buffer<order::big, T, n_bits, align::yes>
+    {
+        BOOST_STATIC_ASSERT( (n_bits/8)*8 == n_bits );
+        BOOST_STATIC_ASSERT( sizeof(T) == n_bits/8 );
+      public:
+        typedef T value_type;
+#     ifndef BOOST_ENDIAN_NO_CTORS
+        endian_buffer() BOOST_ENDIAN_DEFAULT_CONSTRUCT
+        explicit endian_buffer(T val) BOOST_NOEXCEPT
+        {
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "big, aligned, " << n_bits
+              << "-bits, construct(" << val << ")\n";
+#       endif
+          m_value = ::boost::endian::native_to_big(val);
+        }
+
+#     endif  
+        endian_buffer& operator=(T val) BOOST_NOEXCEPT
+        {
+          m_value = ::boost::endian::native_to_big(val);
+          return *this;
+        }
+        //operator value_type() const BOOST_NOEXCEPT
+        //{                                                                       
+        //  return ::boost::endian::big_to_native(m_value);
+        //}
+        value_type value() const BOOST_NOEXCEPT
+        {
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "big, aligned, " << n_bits << "-bits, convert("
+              << ::boost::endian::big_to_native(m_value) << ")\n";
+#       endif
+          return ::boost::endian::big_to_native(m_value);
+        }
+        const char* data() const BOOST_NOEXCEPT
+          {return reinterpret_cast<const char*>(&m_value);}
+      protected:
+        T m_value;
+    };
+
+    //  aligned little endian_buffer specialization
+    template <typename T, std::size_t n_bits>
+    class endian_buffer<order::little, T, n_bits, align::yes>
+    {
+        BOOST_STATIC_ASSERT( (n_bits/8)*8 == n_bits );
+        BOOST_STATIC_ASSERT( sizeof(T) == n_bits/8 );
+      public:
+        typedef T value_type;
+#     ifndef BOOST_ENDIAN_NO_CTORS
+        endian_buffer() BOOST_ENDIAN_DEFAULT_CONSTRUCT
+        explicit endian_buffer(T val) BOOST_NOEXCEPT
+        {
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "little, aligned, " << n_bits
+              << "-bits, construct(" << val << ")\n";
+#       endif
+          m_value = ::boost::endian::native_to_little(val);
+        }
+
+#     endif  
+        endian_buffer& operator=(T val) BOOST_NOEXCEPT
+        {
+          m_value = ::boost::endian::native_to_little(val);
+          return *this;
+        }
+        value_type value() const BOOST_NOEXCEPT
+        {
+#       ifdef BOOST_ENDIAN_LOG
+          if ( endian_log )
+            std::cout << "little, aligned, " << n_bits << "-bits, convert("
+              << ::boost::endian::little_to_native(m_value) << ")\n";
+#       endif
+          return ::boost::endian::little_to_native(m_value);
+        }
+        const char* data() const BOOST_NOEXCEPT
+          {return reinterpret_cast<const char*>(&m_value);}
+      protected:
+        T m_value;
+    };
+
+} // namespace endian
+} // namespace boost
+
+#if defined(__BORLANDC__) || defined( __CODEGEARC__)
+# pragma pack(pop)
+#endif
+
+#if defined(_MSC_VER)  
+# pragma warning(pop)  
+#endif 
+
+#endif // BOOST_ENDIAN_BUFFERS_HPP

=== added file '3rd-party/boost/endian/conversion.hpp'
--- 3rd-party/boost/endian/conversion.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/endian/conversion.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,487 @@
+//  boost/endian/conversion.hpp  -------------------------------------------------------//
+
+//  Copyright Beman Dawes 2010, 2011, 2014
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  http://www.boost.org/LICENSE_1_0.txt
+
+#ifndef BOOST_ENDIAN_CONVERSION_HPP
+#define BOOST_ENDIAN_CONVERSION_HPP
+
+#include <boost/config.hpp>
+#include <boost/predef/detail/endian_compat.h>
+#include <boost/cstdint.hpp>
+#include <boost/endian/detail/intrinsic.hpp>
+#include <boost/core/scoped_enum.hpp>
+#include <boost/static_assert.hpp>
+#include <algorithm>
+#include <cstring>  // for memcpy
+
+//------------------------------------- synopsis ---------------------------------------//
+
+namespace boost
+{
+namespace endian
+{
+#ifndef BOOST_ENDIAN_ORDER_ENUM_DEFINED
+  BOOST_SCOPED_ENUM_START(order)
+  {
+    big, little,
+# ifdef  BOOST_BIG_ENDIAN
+      native = big
+# else
+      native = little
+# endif
+  }; BOOST_SCOPED_ENUM_END
+# define BOOST_ENDIAN_ORDER_ENUM_DEFINED
+#endif
+
+//--------------------------------------------------------------------------------------//
+//                                                                                      //
+//                             return-by-value interfaces                               //
+//                             suggested by Phil Endecott                               //
+//                                                                                      //
+//                             user-defined types (UDTs)                                //
+//                                                                                      //
+//  All return-by-value conversion function templates are required to be implemented in //
+//  terms of an unqualified call to "endian_reverse(x)", a function returning the       //
+//  value of x with endianness reversed. This provides a customization point for any    //
+//  UDT that provides a "endian_reverse" free-function meeting the requirements.        //
+//  It must be defined in the same namespace as the UDT itself so that it will be found //
+//  by argument dependent lookup (ADL).                                                 //
+//                                                                                      //
+//--------------------------------------------------------------------------------------//
+  
+  //  customization for exact-length arithmetic types. See doc/conversion.html/#FAQ
+  inline int8_t   endian_reverse(int8_t x) BOOST_NOEXCEPT;
+  inline int16_t  endian_reverse(int16_t x) BOOST_NOEXCEPT;
+  inline int32_t  endian_reverse(int32_t x) BOOST_NOEXCEPT;
+  inline int64_t  endian_reverse(int64_t x) BOOST_NOEXCEPT;
+  inline uint8_t  endian_reverse(uint8_t x) BOOST_NOEXCEPT;
+  inline uint16_t endian_reverse(uint16_t x) BOOST_NOEXCEPT;
+  inline uint32_t endian_reverse(uint32_t x) BOOST_NOEXCEPT;
+  inline uint64_t endian_reverse(uint64_t x) BOOST_NOEXCEPT;
+
+  //  reverse byte order unless native endianness is big
+  template <class EndianReversible >
+    inline EndianReversible  big_to_native(EndianReversible  x) BOOST_NOEXCEPT;
+    //  Returns: x if native endian order is big, otherwise endian_reverse(x)
+  template <class EndianReversible >
+    inline EndianReversible  native_to_big(EndianReversible  x) BOOST_NOEXCEPT;
+    //  Returns: x if native endian order is big, otherwise endian_reverse(x)
+
+  //  reverse byte order unless native endianness is little
+  template <class EndianReversible >
+    inline EndianReversible  little_to_native(EndianReversible  x) BOOST_NOEXCEPT;
+    //  Returns: x if native endian order is little, otherwise endian_reverse(x)
+  template <class EndianReversible >
+    inline EndianReversible  native_to_little(EndianReversible  x) BOOST_NOEXCEPT;
+    //  Returns: x if native endian order is little, otherwise endian_reverse(x)
+
+  //  generic conditional reverse byte order
+  template <BOOST_SCOPED_ENUM(order) From, BOOST_SCOPED_ENUM(order) To,
+    class EndianReversible>
+      inline EndianReversible  conditional_reverse(EndianReversible from) BOOST_NOEXCEPT;
+    //  Returns: If From == To have different values, from.
+    //           Otherwise endian_reverse(from).
+    //  Remarks: The From == To test, and as a consequence which form the return takes, is
+    //           is determined at compile time.
+
+  //  runtime conditional reverse byte order
+  template <class EndianReversible >
+    inline EndianReversible  conditional_reverse(EndianReversible from,
+      BOOST_SCOPED_ENUM(order) from_order, BOOST_SCOPED_ENUM(order) to_order)
+        BOOST_NOEXCEPT;
+      //  Returns: from_order == to_order ? from : endian_reverse(from).
+
+  //------------------------------------------------------------------------------------//
+
+
+  //  Q: What happended to bswap, htobe, and the other synonym functions based on names
+  //     popularized by BSD, OS X, and Linux?
+  //  A: Turned out these may be implemented as macros on some systems. Ditto POSIX names
+  //     for such functionality. Since macros would cause endless problems with functions
+  //     of the same names, and these functions are just synonyms anyhow, they have been
+  //     removed.
+
+
+  //------------------------------------------------------------------------------------//
+  //                                                                                    //
+  //                            reverse in place interfaces                             //
+  //                                                                                    //
+  //                             user-defined types (UDTs)                              //
+  //                                                                                    //
+  //  All reverse in place function templates are required to be implemented in terms   // 
+  //  of an unqualified call to "endian_reverse_inplace(x)", a function reversing       //
+  //  the endianness of x, which is a non-const reference. This provides a              //
+  //  customization point for any UDT that provides a "reverse_inplace" free-function   //
+  //  meeting the requirements. The free-function must be declared in the same          //
+  //  namespace as the UDT itself so that it will be found by argument-dependent        //
+  //   lookup (ADL).                                                                    //
+  //                                                                                    //
+  //------------------------------------------------------------------------------------//
+
+  //  reverse in place
+  template <class EndianReversible>
+    inline void endian_reverse_inplace(EndianReversible& x) BOOST_NOEXCEPT;
+    //  Effects: x = endian_reverse(x)
+
+  //  reverse in place unless native endianness is big
+  template <class EndianReversibleInplace>
+    inline void big_to_native_inplace(EndianReversibleInplace& x) BOOST_NOEXCEPT;
+    //  Effects: none if native byte-order is big, otherwise endian_reverse_inplace(x)
+  template <class EndianReversibleInplace>
+    inline void native_to_big_inplace(EndianReversibleInplace& x) BOOST_NOEXCEPT;
+    //  Effects: none if native byte-order is big, otherwise endian_reverse_inplace(x)
+
+  //  reverse in place unless native endianness is little
+  template <class EndianReversibleInplace>
+    inline void little_to_native_inplace(EndianReversibleInplace& x) BOOST_NOEXCEPT;
+    //  Effects: none if native byte-order is little, otherwise endian_reverse_inplace(x);
+  template <class EndianReversibleInplace>
+    inline void native_to_little_inplace(EndianReversibleInplace& x) BOOST_NOEXCEPT;
+    //  Effects: none if native byte-order is little, otherwise endian_reverse_inplace(x);
+
+  //  generic conditional reverse in place
+  template <BOOST_SCOPED_ENUM(order) From, BOOST_SCOPED_ENUM(order) To,
+    class EndianReversibleInplace>
+  inline void conditional_reverse_inplace(EndianReversibleInplace& x) BOOST_NOEXCEPT; 
+
+  //  runtime reverse in place
+  template <class EndianReversibleInplace>
+  inline void conditional_reverse_inplace(EndianReversibleInplace& x,
+    BOOST_SCOPED_ENUM(order) from_order,  BOOST_SCOPED_ENUM(order) to_order)
+    BOOST_NOEXCEPT;
+
+//----------------------------------- end synopsis -------------------------------------//
+
+  namespace detail
+  {
+    //  generic reverse function template implementation approach using std::reverse
+    //  suggested by Mathias Gaunard. Primary motivation for inclusion is to have an
+    //  independent implementation to test against.
+
+    template <class T>
+    inline T std_endian_reverse(T x) BOOST_NOEXCEPT
+    {
+      T tmp(x);
+      std::reverse(
+        reinterpret_cast<unsigned char*>(&tmp),
+        reinterpret_cast<unsigned char*>(&tmp) + sizeof(T));
+      return tmp;
+    }
+
+    //  conditional unaligned reverse copy, patterned after std::reverse_copy
+    template <class T>
+      inline void big_reverse_copy(T from, char* to) BOOST_NOEXCEPT;
+    template <class T>
+      inline void big_reverse_copy(const char* from, T& to) BOOST_NOEXCEPT;
+    template <class T>
+      inline void little_reverse_copy(T from, char* to) BOOST_NOEXCEPT;
+    template <class T>
+      inline void little_reverse_copy(const char* from, T& to) BOOST_NOEXCEPT;
+  }  // namespace detail
+
+//--------------------------------------------------------------------------------------//
+//                                                                                      //
+//                            return-by-value implementation                            //
+//                                                                                      //
+//    -- portable approach suggested by tymofey, with avoidance of undefined behavior   //
+//       as suggested by Giovanni Piero Deretta, with a further refinement suggested    //
+//       by Pyry Jahkola.                                                               //
+//    -- intrinsic approach suggested by reviewers, and by David Stone, who provided    //
+//       his Boost licensed macro implementation (detail/intrinsic.hpp)                 //
+//                                                                                      //
+//--------------------------------------------------------------------------------------//
+
+  inline int8_t endian_reverse(int8_t x) BOOST_NOEXCEPT
+  {
+    return x;
+  }
+                                                
+  inline int16_t endian_reverse(int16_t x) BOOST_NOEXCEPT
+  {
+# ifdef BOOST_ENDIAN_NO_INTRINSICS  
+    return (static_cast<uint16_t>(x) << 8)
+      | (static_cast<uint16_t>(x) >> 8);
+# else
+    return BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_2(static_cast<uint16_t>(x));
+# endif
+  }
+
+  inline int32_t endian_reverse(int32_t x) BOOST_NOEXCEPT
+  {
+# ifdef BOOST_ENDIAN_NO_INTRINSICS  
+    uint32_t step16;
+    step16 = static_cast<uint32_t>(x) << 16 | static_cast<uint32_t>(x) >> 16;
+    return
+        ((static_cast<uint32_t>(step16) << 8) & 0xff00ff00)
+      | ((static_cast<uint32_t>(step16) >> 8) & 0x00ff00ff);
+# else
+    return BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_4(static_cast<uint32_t>(x));
+# endif
+  }
+
+  inline int64_t endian_reverse(int64_t x) BOOST_NOEXCEPT
+  {
+# ifdef BOOST_ENDIAN_NO_INTRINSICS  
+    uint64_t step32, step16;
+    step32 = static_cast<uint64_t>(x) << 32 | static_cast<uint64_t>(x) >> 32;
+    step16 = (step32 & 0x0000FFFF0000FFFFULL) << 16
+           | (step32 & 0xFFFF0000FFFF0000ULL) >> 16;
+    return static_cast<int64_t>((step16 & 0x00FF00FF00FF00FFULL) << 8
+           | (step16 & 0xFF00FF00FF00FF00ULL) >> 8);
+# else
+    return BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_8(static_cast<uint64_t>(x));
+# endif
+  }
+  
+  inline uint8_t endian_reverse(uint8_t x) BOOST_NOEXCEPT
+  {
+    return x;
+  }
+
+  inline uint16_t endian_reverse(uint16_t x) BOOST_NOEXCEPT
+  {
+# ifdef BOOST_ENDIAN_NO_INTRINSICS  
+    return (x << 8)
+      | (x >> 8);
+# else
+    return BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_2(x);
+# endif
+  }
+
+  inline uint32_t endian_reverse(uint32_t x) BOOST_NOEXCEPT                           
+  {
+# ifdef BOOST_ENDIAN_NO_INTRINSICS  
+    uint32_t step16;
+    step16 = x << 16 | x >> 16;
+    return
+        ((step16 << 8) & 0xff00ff00)
+      | ((step16 >> 8) & 0x00ff00ff);
+# else
+    return BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_4(x);
+# endif
+  }
+
+  inline uint64_t endian_reverse(uint64_t x) BOOST_NOEXCEPT
+  {
+# ifdef BOOST_ENDIAN_NO_INTRINSICS  
+    uint64_t step32, step16;
+    step32 = x << 32 | x >> 32;
+    step16 = (step32 & 0x0000FFFF0000FFFFULL) << 16
+           | (step32 & 0xFFFF0000FFFF0000ULL) >> 16;
+    return (step16 & 0x00FF00FF00FF00FFULL) << 8
+           | (step16 & 0xFF00FF00FF00FF00ULL) >> 8;
+# else
+    return BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_8(x);
+# endif
+  }
+
+  template <class EndianReversible >
+  inline EndianReversible  big_to_native(EndianReversible  x) BOOST_NOEXCEPT
+  {
+#   ifdef BOOST_BIG_ENDIAN
+    return x;
+#   else
+    return endian_reverse(x);
+#   endif
+  }
+
+  template <class EndianReversible >
+  inline EndianReversible  native_to_big(EndianReversible  x) BOOST_NOEXCEPT
+  {
+#   ifdef BOOST_BIG_ENDIAN
+    return x;
+#   else
+    return endian_reverse(x);
+#   endif
+  }
+
+  template <class EndianReversible >
+  inline EndianReversible  little_to_native(EndianReversible  x) BOOST_NOEXCEPT
+  {
+#   ifdef BOOST_LITTLE_ENDIAN
+    return x;
+#   else
+    return endian_reverse(x);
+#   endif
+  }
+
+  template <class EndianReversible >
+  inline EndianReversible  native_to_little(EndianReversible  x) BOOST_NOEXCEPT
+  {
+#   ifdef BOOST_LITTLE_ENDIAN
+    return x;
+#   else
+    return endian_reverse(x);
+#   endif
+  }
+
+  namespace detail
+  {
+    //  Primary template and specializations to support endian_reverse().
+    //  See rationale in endian_reverse() below.
+    template <BOOST_SCOPED_ENUM(order) From, BOOST_SCOPED_ENUM(order) To,
+        class EndianReversible>
+      class value_converter ;  // primary template
+    template <class T> class value_converter <order::big, order::big, T>
+      {public: T operator()(T x) BOOST_NOEXCEPT {return x;}};
+    template <class T> class value_converter <order::little, order::little, T>
+      {public: T operator()(T x) BOOST_NOEXCEPT {return x;}};
+    template <class T> class value_converter <order::big, order::little, T>
+      {public: T operator()(T x) BOOST_NOEXCEPT {return endian_reverse(x);}};
+    template <class T> class value_converter <order::little, order::big, T>
+      {public: T operator()(T x) BOOST_NOEXCEPT {return endian_reverse(x);}};
+  }
+
+  //  generic conditional reverse
+  template <BOOST_SCOPED_ENUM(order) From, BOOST_SCOPED_ENUM(order) To,
+    class EndianReversible>
+  inline EndianReversible  conditional_reverse(EndianReversible from) BOOST_NOEXCEPT  {
+    //  work around lack of function template partial specialization by instantiating
+    //  a function object of a class that is partially specialized on the two order
+    //  template parameters, and then calling its operator().
+    detail::value_converter <From, To, EndianReversible> tmp;
+    return tmp(from);
+  }
+
+  //  runtime conditional reverse
+  template <class EndianReversible >
+  inline EndianReversible  conditional_reverse(EndianReversible  from,
+    BOOST_SCOPED_ENUM(order) from_order, BOOST_SCOPED_ENUM(order) to_order) BOOST_NOEXCEPT
+  {
+    return from_order == to_order ? from : endian_reverse(from);
+  }
+
+//--------------------------------------------------------------------------------------//
+//                           reverse-in-place implementation                            //
+//--------------------------------------------------------------------------------------//
+
+  //  reverse in place
+  template <class EndianReversible>
+  inline void endian_reverse_inplace(EndianReversible& x) BOOST_NOEXCEPT
+  {
+    x = endian_reverse(x);
+  }
+
+  template <class EndianReversibleInplace>
+#   ifdef BOOST_BIG_ENDIAN
+  inline void big_to_native_inplace(EndianReversibleInplace&) BOOST_NOEXCEPT {}
+#   else
+  inline void big_to_native_inplace(EndianReversibleInplace& x) BOOST_NOEXCEPT
+    { endian_reverse_inplace(x); }
+#   endif
+  template <class EndianReversibleInplace>
+#   ifdef BOOST_BIG_ENDIAN
+  inline void native_to_big_inplace(EndianReversibleInplace&) BOOST_NOEXCEPT {}
+#   else
+  inline void native_to_big_inplace(EndianReversibleInplace& x) BOOST_NOEXCEPT
+  {
+    endian_reverse_inplace(x);
+  }
+#   endif
+
+  template <class EndianReversibleInplace>
+#   ifdef BOOST_LITTLE_ENDIAN
+  inline void little_to_native_inplace(EndianReversibleInplace&) BOOST_NOEXCEPT {}
+#   else
+  inline void little_to_native_inplace(EndianReversibleInplace& x) BOOST_NOEXCEPT
+    { endian_reverse_inplace(x); }
+#   endif
+  template <class EndianReversibleInplace>
+#   ifdef BOOST_LITTLE_ENDIAN
+  inline void native_to_little_inplace(EndianReversibleInplace&) BOOST_NOEXCEPT {}
+#   else
+  inline void native_to_little_inplace(EndianReversibleInplace& x) BOOST_NOEXCEPT
+  {
+    endian_reverse_inplace(x);
+  }
+#   endif
+
+  namespace detail
+  {
+    //  Primary template and specializations support generic 
+    //  endian_reverse_inplace().
+    //  See rationale in endian_reverse_inplace() below.
+    template <BOOST_SCOPED_ENUM(order) From, BOOST_SCOPED_ENUM(order) To,
+        class EndianReversibleInplace>
+      class converter;  // primary template
+    template <class T> class converter<order::big, order::big, T>
+      {public: void operator()(T&) BOOST_NOEXCEPT {/*no effect*/}};
+    template <class T> class converter<order::little, order::little, T>
+      {public: void operator()(T&) BOOST_NOEXCEPT {/*no effect*/}};
+    template <class T> class converter<order::big, order::little, T>
+      {public: void operator()(T& x) BOOST_NOEXCEPT { endian_reverse_inplace(x); }};
+    template <class T> class converter<order::little, order::big, T>
+      {public: void operator()(T& x) BOOST_NOEXCEPT { endian_reverse_inplace(x); }};
+  }  // namespace detail
+
+  //  generic conditional reverse in place
+  template <BOOST_SCOPED_ENUM(order) From, BOOST_SCOPED_ENUM(order) To,
+    class EndianReversibleInplace>
+  inline void conditional_reverse_inplace(EndianReversibleInplace& x) BOOST_NOEXCEPT
+  {
+    //  work around lack of function template partial specialization by instantiating
+    //  a function object of a class that is partially specialized on the two order
+    //  template parameters, and then calling its operator().
+    detail::converter<From, To, EndianReversibleInplace> tmp;
+    tmp(x);  // call operator ()
+  }
+
+  //  runtime reverse in place
+  template <class EndianReversibleInplace>
+  inline void conditional_reverse_inplace(EndianReversibleInplace& x,
+    BOOST_SCOPED_ENUM(order) from_order,  BOOST_SCOPED_ENUM(order) to_order)
+    BOOST_NOEXCEPT
+  {
+    if (from_order != to_order)
+      endian_reverse_inplace(x);
+  }
+
+
+  namespace detail
+  {
+    template <class T>
+    inline void big_reverse_copy(T from, char* to) BOOST_NOEXCEPT
+    {
+#     ifdef BOOST_BIG_ENDIAN
+      std::memcpy(to, reinterpret_cast<const char*>(&from), sizeof(T));
+#     else
+      std::reverse_copy(reinterpret_cast<const char*>(&from),
+        reinterpret_cast<const char*>(&from) + sizeof(T), to);
+#     endif
+    }
+    template <class T>
+    inline void big_reverse_copy(const char* from, T& to) BOOST_NOEXCEPT
+    {
+#     ifdef BOOST_BIG_ENDIAN
+      std::memcpy(reinterpret_cast<char*>(&to), from, sizeof(T));
+#     else
+      std::reverse_copy(from, from + sizeof(T), reinterpret_cast<char*>(&to));
+#     endif
+    }
+    template <class T>
+    inline void little_reverse_copy(T from, char* to) BOOST_NOEXCEPT
+    {
+#     ifdef BOOST_LITTLE_ENDIAN
+      std::memcpy(to, reinterpret_cast<const char*>(&from), sizeof(T));
+#     else
+      std::reverse_copy(reinterpret_cast<const char*>(&from),
+        reinterpret_cast<const char*>(&from) + sizeof(T), to);
+#     endif
+    }
+    template <class T>
+    inline void little_reverse_copy(const char* from, T& to) BOOST_NOEXCEPT
+    {
+#     ifdef BOOST_LITTLE_ENDIAN
+      std::memcpy(reinterpret_cast<char*>(&to), from, sizeof(T));
+#     else
+      std::reverse_copy(from, from + sizeof(T), reinterpret_cast<char*>(&to));
+#     endif
+    }
+  }  // namespace detail
+}  // namespace endian
+}  // namespace boost
+
+#endif // BOOST_ENDIAN_CONVERSION_HPP

=== added directory '3rd-party/boost/endian/detail'
=== added file '3rd-party/boost/endian/detail/config.hpp'
--- 3rd-party/boost/endian/detail/config.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/endian/detail/config.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,62 @@
+//  boost/endian/detail/config.hpp  ----------------------------------------------------//
+
+//  Copyright Beman Dawes 2003, 2010
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  See http://www.boost.org/LICENSE_1_0.txt
+
+//--------------------------------------------------------------------------------------// 
+
+#ifndef BOOST_ENDIAN_CONFIG_HPP
+#define BOOST_ENDIAN_CONFIG_HPP
+
+// This header implements separate compilation features as described in
+// http://www.boost.org/more/separate_compilation.html
+
+#include <boost/config.hpp>
+#include <boost/system/api_config.hpp>  // for BOOST_POSIX_API or BOOST_WINDOWS_API
+
+//  throw an exception  ----------------------------------------------------------------//
+//
+//  Exceptions were originally thrown via boost::throw_exception().
+//  As throw_exception() became more complex, it caused user error reporting
+//  to be harder to interpret, since the exception reported became much more complex.
+//  The immediate fix was to throw directly, wrapped in a macro to make any later change
+//  easier.
+
+#define BOOST_ENDIAN_THROW(EX) throw EX
+
+//  enable dynamic linking -------------------------------------------------------------//
+
+#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_ENDIAN_DYN_LINK)
+# if defined(BOOST_ENDIAN_SOURCE)
+#   define BOOST_ENDIAN_DECL BOOST_SYMBOL_EXPORT
+# else 
+#   define BOOST_ENDIAN_DECL BOOST_SYMBOL_IMPORT
+# endif
+#else
+# define BOOST_ENDIAN_DECL
+#endif
+
+//  enable automatic library variant selection  ----------------------------------------// 
+
+#if !defined(BOOST_ENDIAN_SOURCE) && !defined(BOOST_ALL_NO_LIB) \
+  && !defined(BOOST_ENDIAN_NO_LIB)
+//
+// Set the name of our library, this will get undef'ed by auto_link.hpp
+// once it's done with it:
+//
+#define BOOST_LIB_NAME boost_endian
+//
+// If we're importing code from a dll, then tell auto_link.hpp about it:
+//
+#if defined(BOOST_ALL_DYN_LINK) || defined(BOOST_ENDIAN_DYN_LINK)
+#  define BOOST_DYN_LINK
+#endif
+//
+// And include the header that does the work:
+//
+#include <boost/config/auto_link.hpp>
+#endif  // auto-linking disabled
+
+#endif // BOOST_ENDIAN_CONFIG_HPP

=== added file '3rd-party/boost/endian/detail/cover_operators.hpp'
--- 3rd-party/boost/endian/detail/cover_operators.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/endian/detail/cover_operators.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,142 @@
+//  boost/endian/detail/cover_operators.hpp ----------------------------------//
+
+//  Copyright Darin Adler 2000
+//  Copyright Beman Dawes 2008
+
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_ENDIAN_COVER_OPERATORS_HPP
+#define BOOST_ENDIAN_COVER_OPERATORS_HPP
+
+#if defined(_MSC_VER)  
+# pragma warning(push)  
+# pragma warning(disable:4365)  // conversion ... signed/unsigned mismatch
+#endif
+
+# ifndef BOOST_ENDIAN_MINIMAL_COVER_OPERATORS
+#   include <boost/operators.hpp>
+# endif
+
+#include <boost/config.hpp>
+#include <iosfwd>
+
+namespace boost
+{
+  namespace endian
+  {
+
+//--------------------------------------------------------------------------------------//
+
+//  A class that adds arithmetic operators to an arithmetic cover class
+//
+//  Uses the curiously recurring template pattern (CRTP).
+//
+//  If the class being covered has a non-explicit conversion to an integer type
+//  then a smaller number of cover operations are needed. Define the macro
+//  BOOST_ENDIAN_MINIMAL_COVER_OPERATORS to indicate this.
+//
+//  Define BOOST_NO_IO_COVER_OPERATORS if I/O cover operations are not desired.
+
+//--------------------------------------------------------------------------------------//
+
+    template <class D,   // D is the CRTP derived type, i.e. the cover class
+              class ArithmeticT>
+    class cover_operators
+#    ifndef BOOST_ENDIAN_MINIMAL_COVER_OPERATORS
+      : boost::operators<D>
+#    endif
+    {
+      // The other operations take advantage of the type conversion that's
+      // built into unary +.
+
+      // Unary operations.
+      friend ArithmeticT operator+(const D& x) BOOST_NOEXCEPT { return x; }
+#   ifndef BOOST_ENDIAN_MINIMAL_COVER_OPERATORS
+      friend ArithmeticT operator-(const D& x) BOOST_NOEXCEPT { return -+x; }
+      friend ArithmeticT operator~(const D& x) BOOST_NOEXCEPT { return ~+x; }
+      friend ArithmeticT operator!(const D& x) BOOST_NOEXCEPT { return !+x; }
+
+      // The basic ordering operations.
+      friend bool operator==(const D& x, ArithmeticT y) BOOST_NOEXCEPT { return +x == y; }
+      friend bool operator<(const D& x, ArithmeticT y) BOOST_NOEXCEPT { return +x < y; }
+#   endif
+      
+      // The basic arithmetic operations.
+      friend D& operator+=(D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return x = static_cast<ArithmeticT>(+x + y); }
+      friend D& operator-=(D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return x = static_cast<ArithmeticT>(+x - y); }
+      friend D& operator*=(D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return x = static_cast<ArithmeticT>(+x * y); }
+      friend D& operator/=(D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return x = static_cast<ArithmeticT>(+x / y); }
+      friend D& operator%=(D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return x = static_cast<ArithmeticT>(+x % y); }
+      friend D& operator&=(D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return x = static_cast<ArithmeticT>(+x & y); }
+      friend D& operator|=(D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return x = static_cast<ArithmeticT>(+x | y); }
+      friend D& operator^=(D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return x = static_cast<ArithmeticT>(+x ^ y); }
+      friend D& operator<<=(D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return x = static_cast<ArithmeticT>(+x << y); }
+      friend D& operator>>=(D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return x = static_cast<ArithmeticT>(+x >> y); }
+      
+      // A few binary arithmetic operations not covered by operators base class.
+      friend ArithmeticT operator<<(const D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return static_cast<ArithmeticT>(+x << y); }
+      friend ArithmeticT operator>>(const D& x, ArithmeticT y) BOOST_NOEXCEPT
+        { return static_cast<ArithmeticT>(+x >> y); }
+      
+      // Auto-increment and auto-decrement can be defined in terms of the
+      // arithmetic operations.
+      friend D& operator++(D& x) BOOST_NOEXCEPT { return x += 1; }
+      friend D& operator--(D& x) BOOST_NOEXCEPT { return x -= 1; }
+
+#   ifdef BOOST_ENDIAN_MINIMAL_COVER_OPERATORS
+      friend D operator++(D& x, int) BOOST_NOEXCEPT
+      { 
+        D tmp(x);
+        x += 1;
+        return tmp;
+      }
+      friend D operator--(D& x, int) BOOST_NOEXCEPT
+      { 
+        D tmp(x);
+        x -= 1;
+        return tmp;
+      }
+#   endif
+
+#   ifndef BOOST_NO_IO_COVER_OPERATORS
+
+      // Stream inserter
+      template <class charT, class traits>
+      friend std::basic_ostream<charT, traits>&
+        operator<<(std::basic_ostream<charT, traits>& os, const D& x)
+      {
+        return os << +x; 
+      }
+
+      // Stream extractor 
+      template <class charT, class traits>
+      friend std::basic_istream<charT, traits>&
+        operator>>(std::basic_istream<charT, traits>& is, D& x)
+      {
+        ArithmeticT i;
+        if (is >> i)
+          x = i;
+        return is;
+      }
+#   endif
+    };
+  } // namespace endian
+} // namespace boost
+
+#if defined(_MSC_VER)  
+# pragma warning(pop)  
+#endif 
+
+#endif // BOOST_ENDIAN_COVER_OPERATORS_HPP

=== added file '3rd-party/boost/endian/detail/disable_warnings.hpp'
--- 3rd-party/boost/endian/detail/disable_warnings.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/endian/detail/disable_warnings.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,33 @@
+//  disable_warnings.hpp  --------------------------------------------------------------//
+
+//  Copyright Beman Dawes 2011
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  See http://www.boost.org/LICENSE_1_0.txt
+
+//--------------------------------------------------------------------------------------//
+
+#ifdef  _MSC_VER
+
+#ifndef _SCL_SECURE_NO_WARNINGS
+# define _SCL_SECURE_NO_WARNINGS
+#endif
+
+#ifndef _CRT_SECURE_NO_WARNINGS
+# define _CRT_SECURE_NO_WARNINGS
+#endif
+
+# pragma warning(push)
+
+// triggered by boost/detail/lightweight_test.hpp
+# pragma warning( disable : 4640 )  // ... construction of local static object is not thread-safe
+
+// triggered by Microsoft's own headers, so disable
+# pragma warning( disable : 4820 )  // padding added after data member
+# pragma warning( disable : 4548 )  // expression before comma has no effect
+# pragma warning( disable : 4668 )  // ... is not defined as a preprocessor macro
+# pragma warning( disable : 4514 )  // ... unreferenced inline function has been removed
+# pragma warning( disable : 4710 )  // ... function not inlined
+# pragma warning( disable : 4986 )  // ... exception specification does not match previous declaration
+# pragma warning( disable : 4711 )  // ... selected for automatic inline expansion
+#endif

=== added file '3rd-party/boost/endian/detail/disable_warnings_pop.hpp'
--- 3rd-party/boost/endian/detail/disable_warnings_pop.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/endian/detail/disable_warnings_pop.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,12 @@
+//  disable_warnings_pop.hpp  ----------------------------------------------------------//
+
+//  Copyright Beman Dawes 2011
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  See http://www.boost.org/LICENSE_1_0.txt
+
+//--------------------------------------------------------------------------------------//
+
+#ifdef  _MSC_VER
+# pragma warning(push)
+#endif

=== added file '3rd-party/boost/endian/detail/intrinsic.hpp'
--- 3rd-party/boost/endian/detail/intrinsic.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/endian/detail/intrinsic.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,64 @@
+//  endian/detail/intrinsic.hpp  -------------------------------------------------------//
+
+//  Copyright (C) 2012 David Stone
+//  Copyright Beman Dawes 2013
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  http://www.boost.org/LICENSE_1_0.txt
+
+#ifndef BOOST_ENDIAN_INTRINSIC_HPP
+#define BOOST_ENDIAN_INTRINSIC_HPP
+
+//  Allow user to force BOOST_ENDIAN_NO_INTRINSICS in case they aren't available for a
+//  particular platform/compiler combination. Please report such platform/compiler
+//  combinations to the Boost mailing list.
+#ifndef BOOST_ENDIAN_NO_INTRINSICS
+
+#ifndef __has_builtin         // Optional of course
+  #define __has_builtin(x) 0  // Compatibility with non-clang compilers
+#endif
+
+//  GCC and Clang recent versions provide intrinsic byte swaps via builtins
+#if (defined(__clang__) && __has_builtin(__builtin_bswap32) && __has_builtin(__builtin_bswap64)) \
+  || (defined(__GNUC__ ) && \
+  (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)))
+# define BOOST_ENDIAN_INTRINSIC_MSG "__builtin_bswap16, etc."
+// prior to 4.8, gcc did not provide __builtin_bswap16 on some platforms so we emulate it
+// see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52624
+// Clang has a similar problem, but their feature test macros make it easier to detect
+# if (defined(__clang__) && __has_builtin(__builtin_bswap16)) \
+  || (defined(__GNUC__) &&(__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)))
+#   define BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) __builtin_bswap16(x)
+# else
+#   define BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) __builtin_bswap32((x) << 16)
+# endif
+# define BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_4(x) __builtin_bswap32(x)
+# define BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_8(x) __builtin_bswap64(x)
+
+//  Linux systems provide the byteswap.h header, with 
+#elif defined(__linux__)
+//  don't check for obsolete forms defined(linux) and defined(__linux) on the theory that
+//  compilers that predefine only these are so old that byteswap.h probably isn't present.
+# define BOOST_ENDIAN_INTRINSIC_MSG "byteswap.h bswap_16, etc."
+# include <byteswap.h>
+# define BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) bswap_16(x)
+# define BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_4(x) bswap_32(x)
+# define BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_8(x) bswap_64(x)
+
+#elif defined(_MSC_VER)
+//  Microsoft documents these as being compatible since Windows 95 and specificly
+//  lists runtime library support since Visual Studio 2003 (aka 7.1).
+# define BOOST_ENDIAN_INTRINSIC_MSG "cstdlib _byteswap_ushort, etc."
+# include <cstdlib>
+# define BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_2(x) _byteswap_ushort(x)
+# define BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_4(x) _byteswap_ulong(x)
+# define BOOST_ENDIAN_INTRINSIC_BYTE_SWAP_8(x) _byteswap_uint64(x)
+#else
+# define BOOST_ENDIAN_NO_INTRINSICS
+# define BOOST_ENDIAN_INTRINSIC_MSG "no byte swap intrinsics"
+#endif
+
+#elif !defined(BOOST_ENDIAN_INTRINSIC_MSG)
+# define BOOST_ENDIAN_INTRINSIC_MSG "no byte swap intrinsics"
+#endif  // BOOST_ENDIAN_NO_INTRINSICS
+#endif  // BOOST_ENDIAN_INTRINSIC_HPP

=== added file '3rd-party/boost/endian/detail/lightweight_test.hpp'
--- 3rd-party/boost/endian/detail/lightweight_test.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/endian/detail/lightweight_test.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,223 @@
+// boost/endian/detail/lightweight_test.hpp --------------------------------------------//
+
+#ifndef BOOST_ENDIAN_LIGHTWEIGHT_TEST_HPP
+#define BOOST_ENDIAN_LIGHTWEIGHT_TEST_HPP
+
+// MS compatible compilers support #pragma once
+
+#if defined(_MSC_VER)
+# pragma once
+#endif
+
+//
+//  Copyright (c) 2002, 2009, 2014 Peter Dimov
+//  Copyright (2) Beman Dawes 2010, 2011, 2015
+//  Copyright (3) Ion Gaztanaga 2013
+//
+//  Distributed under the Boost Software License, Version 1.0.
+//  See http://www.boost.org/LICENSE_1_0.txt
+//
+
+#include <boost/assert.hpp>
+#include <boost/current_function.hpp>
+#include <boost/core/no_exceptions_support.hpp>
+#include <cstring>    // for memcmp
+#include <iostream>
+
+//  IDE's like Visual Studio perform better if output goes to std::cout or
+//  some other stream, so allow user to configure output stream:
+#ifndef BOOST_LIGHTWEIGHT_TEST_OSTREAM
+# define BOOST_LIGHTWEIGHT_TEST_OSTREAM std::cerr
+#endif
+
+namespace boost
+{
+namespace endian
+{
+namespace detail
+{
+
+struct report_errors_reminder
+{
+    bool called_report_errors_function;
+
+    report_errors_reminder() : called_report_errors_function(false) {}
+
+    ~report_errors_reminder()
+    {
+        BOOST_ASSERT(called_report_errors_function);  // verify report_errors() was called  
+    }
+};
+
+inline report_errors_reminder& report_errors_remind()
+{
+    static report_errors_reminder r;
+    return r;
+}
+
+inline int & test_errors()
+{
+    static int x = 0;
+    report_errors_remind();
+    return x;
+}
+
+inline void test_failed_impl(char const * expr, char const * file, int line, char const * function)
+{
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM
+      << file << "(" << line << "): test '" << expr << "' failed in function '"
+      << function << "'" << std::endl;
+    ++test_errors();
+}
+
+inline void error_impl(char const * msg, char const * file, int line, char const * function)
+{
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM
+      << file << "(" << line << "): " << msg << " in function '"
+      << function << "'" << std::endl;
+    ++test_errors();
+}
+
+inline void throw_failed_impl(char const * excep, char const * file, int line, char const * function)
+{
+   BOOST_LIGHTWEIGHT_TEST_OSTREAM
+    << file << "(" << line << "): Exception '" << excep << "' not thrown in function '"
+    << function << "'" << std::endl;
+   ++test_errors();
+}
+
+template<class T, class U> inline void test_eq_impl( char const * expr1, char const * expr2,
+  char const * file, int line, char const * function, T const & t, U const & u )
+{
+    if( t == u )
+    {
+        report_errors_remind();
+    }
+    else
+    {
+        BOOST_LIGHTWEIGHT_TEST_OSTREAM
+            << file << "(" << line << "): test '" << expr1 << " == " << expr2
+            << "' failed in function '" << function << "': "
+            << "'" << t << "' != '" << u << "'" << std::endl;
+        ++test_errors();
+    }
+}
+
+template<class T, class U> inline void test_ne_impl( char const * expr1, char const * expr2,
+  char const * file, int line, char const * function, T const & t, U const & u )
+{
+    if( t != u )
+    {
+        report_errors_remind();
+    }
+    else
+    {
+        BOOST_LIGHTWEIGHT_TEST_OSTREAM
+            << file << "(" << line << "): test '" << expr1 << " != " << expr2
+            << "' failed in function '" << function << "': "
+            << "'" << t << "' == '" << u << "'" << std::endl;
+        ++test_errors();
+    }
+}
+
+template <class T>
+std::string to_hex(const T& x)
+{
+  const char hex[] = { '0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f' };
+  std::string tmp;
+  const unsigned char* p = reinterpret_cast<const unsigned char*>(&x);
+  const unsigned char* e = p + sizeof(T);
+
+  for (; p < e; ++p)
+  {
+    tmp += hex[*p >> 4];    // high-order nibble
+    tmp += hex[*p & 0x0f];  // low-order nibble
+  }
+  return tmp;
+}
+
+template<class T, class U> inline bool test_memcmp_eq_impl(char const * expr1,
+  char const * expr2, char const * file, int line, char const * function, T const & t,
+  U const & u)
+{
+  BOOST_ASSERT(sizeof(T) == sizeof(U));
+  if (sizeof(T) == sizeof(U)
+    && std::memcmp(&t, &u, sizeof(T)) == 0)
+  {
+    report_errors_remind();
+    return true;
+  }
+  else
+  {
+    BOOST_LIGHTWEIGHT_TEST_OSTREAM
+      << file << "(" << line << "): test 'std::memcmp(" << expr1 << ", " << expr2
+      << ") == 0' fails in function '" << function << "': "
+      << " with values '" << to_hex(t) << "' and '" << to_hex(u) << "'" << std::endl;
+    ++test_errors();
+    return false;
+  }
+}
+
+} // namespace detail
+
+inline int report_errors()
+{
+    boost::endian::detail::report_errors_remind().called_report_errors_function = true;
+
+    int errors = boost::endian::detail::test_errors();
+
+    if( errors == 0 )
+    {
+        BOOST_LIGHTWEIGHT_TEST_OSTREAM
+          << "No errors detected." << std::endl;
+        return 0;
+    }
+    else
+    {
+        BOOST_LIGHTWEIGHT_TEST_OSTREAM
+          << errors << " error" << (errors == 1? "": "s") << " detected." << std::endl;
+        return 1;
+    }
+}
+
+} // namespace endian
+} // namespace boost
+
+//////////////////////////////////////////////////////////////////////////////////////////
+//  TODO: Should all test macros return bool?  See BOOST_TEST_MEM_EQ usage in fp_exaustive_test,cpp
+//////////////////////////////////////////////////////////////////////////////////////////
+
+
+#define BOOST_TEST(expr) \
+  ((expr)? (void)0: ::boost::endian::detail::test_failed_impl(#expr, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION))
+
+#define BOOST_ERROR(msg) \
+  ( ::boost::endian::detail::error_impl(msg, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION) )
+
+#define BOOST_TEST_EQ(expr1,expr2) \
+  ( ::boost::endian::detail::test_eq_impl(#expr1, #expr2, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expr1, expr2) )
+#define BOOST_TEST_NE(expr1,expr2) \
+  ( ::boost::endian::detail::test_ne_impl(#expr1, #expr2, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expr1, expr2) )
+
+#define BOOST_TEST_MEM_EQ(expr1,expr2) \
+  (::boost::endian::detail::test_memcmp_eq_impl(#expr1, #expr2, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, expr1, expr2))
+
+#ifndef BOOST_NO_EXCEPTIONS
+   #define BOOST_TEST_THROWS( EXPR, EXCEP )                    \
+      try {                                                    \
+         EXPR;                                                 \
+         ::boost::detail::throw_failed_impl                    \
+         (#EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
+      }                                                        \
+      catch(EXCEP const&) {                                    \
+      }                                                        \
+      catch(...) {                                             \
+         ::boost::detail::throw_failed_impl                    \
+         (#EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
+      }                                                        \
+   //
+#else
+   #define BOOST_TEST_THROWS( EXPR, EXCEP )
+#endif
+
+#endif // #ifndef BOOST_ENDIAN_LIGHTWEIGHT_TEST_HPP

=== added file '3rd-party/boost/endian/endian.hpp'
--- 3rd-party/boost/endian/endian.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/endian/endian.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,19 @@
+//  boost/endian/endian.hpp  -----------------------------------------------------------//
+
+//  Copyright Beman Dawes 2015
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  See http://www.boost.org/LICENSE_1_0.txt
+
+//  See library home page at http://www.boost.org/libs/endian
+
+#ifndef BOOST_ENDIAN_ENDIAN_HPP
+#define BOOST_ENDIAN_ENDIAN_HPP
+
+#ifndef BOOST_ENDIAN_DEPRECATED_NAMES
+# error "<boost/endian/endian.hpp> is deprecated. Define BOOST_ENDIAN_DEPRECATED_NAMES to use."
+#endif
+
+#include <boost/endian/arithmetic.hpp>
+
+#endif  //BOOST_ENDIAN_ENDIAN_HPP

=== added file '3rd-party/boost/endian/std_pair.hpp'
--- 3rd-party/boost/endian/std_pair.hpp	1970-01-01 00:00:00 +0000
+++ 3rd-party/boost/endian/std_pair.hpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,38 @@
+//  boost/endian/std_pair.hpp  ---------------------------------------------------------//
+
+//  Copyright Beman Dawes 2013
+
+//  Distributed under the Boost Software License, Version 1.0.
+//  http://www.boost.org/LICENSE_1_0.txt
+
+//--------------------------------------------------------------------------------------//
+
+#ifndef BOOST_ENDIAN_STD_PAIR_HPP
+#define BOOST_ENDIAN_STD_PAIR_HPP
+
+#include <boost/endian/conversion.hpp>
+#include <utility>
+
+namespace boost
+{
+namespace endian
+{
+  template <class ReversibleValueT, class ReversibleValueU>
+  std::pair<ReversibleValueT, ReversibleValueU>
+    reverse_value(std::pair<ReversibleValueT, ReversibleValueU> x)
+  {
+    return std::pair<ReversibleValueT, ReversibleValueU>(reverse_value(x.first),
+      reverse_value(x.second));
+  }
+
+  template <class ReversibleT, class ReversibleU>
+  void reverse(std::pair<ReversibleT, ReversibleU>& x)
+  {
+    reverse(x.first);
+    reverse(x.second);
+  }
+
+}
+}
+
+#endif  // BOOST_ENDIAN_STD_PAIR_HPP

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-17 09:08:50 +0000
+++ CMakeLists.txt	2016-03-17 09:08:50 +0000
@@ -34,6 +34,7 @@
 pkg_check_modules(PROCESS_CPP process-cpp REQUIRED)
 pkg_check_modules(PROPERTIES_CPP properties-cpp REQUIRED)
 pkg_check_modules(TRUST_STORE trust-store REQUIRED)
+pkg_check_modules(UBUNTU_PLATFORM_HARDWARE_API ubuntu-platform-hardware-api)
 #####################################################################
 # Enable code coverage calculation with gcov/gcovr/lcov
 # Usage:
@@ -69,6 +70,8 @@
 endif()
 
 include_directories(
+  3rd-party/
+
   ${Boost_INCLUDE_DIRS}
   ${DBUS_INCLUDE_DIRS}
   ${DBUS_CPP_INCLUDE_DIRS}

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-17 09:08:50 +0000
+++ debian/changelog	2016-03-17 09:08:50 +0000
@@ -38,6 +38,29 @@
  -- CI Train Bot <[e-mail]>  Thu, 28 May 2015 11:40:58 +0000
 
 =======
+location-service (2.1+15.04.20160106-0ubuntu1) vivid; urgency=medium
+
+  [ Alberto Mardegan ]
+  * Set debian source format to "3.0 (native)"
+
+  [ Scott Sweeny ]
+  * Allow providers to register themselves asynchronously (LP: #1415029)
+
+ -- Thomas Voß <[e-mail]>  Wed, 06 Jan 2016 16:15:29 +0000
+
+location-service (2.1+15.04.20151211-0ubuntu1) vivid; urgency=medium
+
+  * Account for changes in trust-store w.r.t. assembling the description
+    of a trust prompt.
+
+ -- Thomas Voß <[e-mail]>  Fri, 11 Dec 2015 08:57:44 +0000
+
+location-service (2.1+15.04.20151209-0ubuntu1) vivid; urgency=medium
+
+  * Fix settings not being applied correctly.
+
+ -- Thomas Voß <[e-mail]>  Wed, 09 Dec 2015 15:22:22 +0000
+
 location-service (2.1+15.04.20151202.1-0ubuntu1) vivid; urgency=medium
 
   * Ensure that event connections are cleaned up on destruction. (LP:

=== modified file 'debian/source/format'
--- debian/source/format	2014-07-30 14:15:06 +0000
+++ debian/source/format	2016-03-17 09:08:50 +0000
@@ -1,1 +1,1 @@
-3.0 (quilt)
+3.0 (native)

=== modified file 'examples/service/service.cpp'
--- examples/service/service.cpp	2014-11-14 11:26:45 +0000
+++ examples/service/service.cpp	2016-03-17 09:08:50 +0000
@@ -99,7 +99,10 @@
     auto selected_providers = options.value_for_key<std::vector<std::string>>("provider");
 
     std::map<std::string, cul::ProviderFactory::Configuration> config_lut;
-    std::set<cul::Provider::Ptr> instantiated_providers;
+
+    culs::DefaultConfiguration config;
+    auto settings = std::make_shared<cul::BoostPtreeSettings>(options.value_for_key<std::string>("config-file"));
+    auto engine = config.the_engine(std::set<cul::Provider::Ptr>{}, config.the_provider_selection_policy(), settings);
 
     for (const std::string& provider : selected_providers)
     {
@@ -129,15 +132,15 @@
 
         try
         {
-            auto p = cul::ProviderFactory::instance().create_provider_for_name_with_config(
-                provider, 
-                config_lut[provider]);
-
-            if (p)
-                instantiated_providers.insert(p);
-            else
-                throw std::runtime_error("Problem instantiating provider");
-            
+            auto result = std::async(std::launch::async, [provider, config_lut, engine] {
+                return cul::ProviderFactory::instance().create_provider_for_name_with_config(
+                    provider,
+                    config_lut.at(provider),
+                    [engine](cul::Provider::Ptr provider)
+                    {
+                        engine->add_provider(provider);
+                    });
+            });
         } catch(const std::runtime_error& e)
         {
             std::cerr << "Exception instantiating provider: " << e.what() << " ... Aborting now." << std::endl;
@@ -163,15 +166,11 @@
     };
     outgoing->install_executor(dbus::asio::make_executor(outgoing));
 
-    auto settings = std::make_shared<cul::BoostPtreeSettings>(options.value_for_key<std::string>("config-file"));
-
-    culs::DefaultConfiguration config;
-
     culs::Implementation::Configuration configuration
     {
         incoming,
         outgoing,
-        config.the_engine(instantiated_providers, config.the_provider_selection_policy(), settings),
+        engine,
         config.the_permission_manager(incoming),
         culs::Harvester::Configuration
         {

=== modified file 'include/location_service/com/ubuntu/location/connectivity/manager.h'
--- include/location_service/com/ubuntu/location/connectivity/manager.h	2014-07-10 16:44:26 +0000
+++ include/location_service/com/ubuntu/location/connectivity/manager.h	2016-03-17 09:08:50 +0000
@@ -219,6 +219,27 @@
     Manager() = default;
 };
 
+/** @brief ExtendedManager extends the Manager interface in an ABI-stable way. */
+class ExtendedManager : public Manager
+{
+public:
+    /**
+     * @brief ismis requests enumeration of the imsis of all SIMs installed in the device.
+     */
+    virtual void enumerate_imsis(const std::function<void(const std::string&)>&) const = 0;
+
+    /**
+     * @brief msisdns requests enumeration of all mobile station international subscriber directory numbers
+     * of all SIMs installed in the device.
+     */
+    virtual void enumerate_msisdns(const std::function<void(const std::string&)>&) const = 0;
+
+protected:
+    /** @cond */
+    ExtendedManager() = default;
+    /** @endcond */
+};
+
 /**
  * @brief Provides access to a platform-specific implementation/instance of a connectivity manager.
  * @throw Manager::Errors::ConnectivityManagementNotSupported.

=== modified file 'include/location_service/com/ubuntu/location/provider_factory.h'
--- include/location_service/com/ubuntu/location/provider_factory.h	2014-10-27 21:58:16 +0000
+++ include/location_service/com/ubuntu/location/provider_factory.h	2016-03-17 09:08:50 +0000
@@ -54,6 +54,9 @@
     // --provider=remote::Provider@gps --remote::Provider@gps::name="com.ubuntu.android.gps.Provider" --remote::Provider@gps::path="/com/ubuntu/android/gps/Provider"
     Provider::Ptr create_provider_for_name_with_config(const std::string& name, const Configuration& config);
 
+    // Async version of above.
+    void create_provider_for_name_with_config(const std::string& name, const Configuration& config, const std::function<void(Provider::Ptr)>& cb);
+
     void enumerate(const std::function<void(const std::string&, const Factory&)>& enumerator);
 
   private:

=== modified file 'po/ubuntu-location-service.pot'
--- po/ubuntu-location-service.pot	2014-09-19 09:06:30 +0000
+++ po/ubuntu-location-service.pot	2016-03-17 09:08:50 +0000
@@ -1,13 +1,14 @@
-# Copyright (C) 2014 Canonical Ltd.
-# This file is distributed under the same license as the ubuntu-location-service package.
-# Thomas Voß <[e-mail]>, 2014.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical Ltd.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: ubuntu-location-service\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-09-19 01:04+0200\n"
+"POT-Creation-Date: 2015-11-27 14:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -16,11 +17,6 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:170
-msgid "An unconfined application wants to access your current location."
-msgstr ""
-
-#: /tmp/i18n/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:173
-#, boost-format
-msgid "%1% wants to access your current location."
+#: /home/tvoss/ubuntu/scratch/fix-prompt-string/src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp:149
+msgid "wants to access your current location."
 msgstr ""

=== modified file 'src/location_service/com/ubuntu/location/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/CMakeLists.txt	2016-03-17 09:08:50 +0000
+++ src/location_service/com/ubuntu/location/CMakeLists.txt	2016-03-17 09:08:50 +0000
@@ -1,3 +1,7 @@
+if (UBUNTU_PLATFORM_HARDWARE_API_FOUND)
+  add_definitions(-DCOM_UBUNTU_LOCATION_SERVICE_HAVE_UBUNTU_PLATFORM_HARDWARE_API)
+endif()
+
 if (NET_CPP_FOUND)
   add_definitions(-DCOM_UBUNTU_LOCATION_SERVICE_HAVE_NET_CPP=1)
 
@@ -10,6 +14,8 @@
   service/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/service/config.h @ONLY
 )
 
+include_directories(${UBUNTU_PLATFORM_HARDWARE_API_INCLUDE_DIRS})
+
 add_library(
   ubuntu-location-service SHARED
 
@@ -29,6 +35,7 @@
   settings.cpp
   time_based_update_policy.cpp
   set_name_for_thread.cpp
+  time_since_boot.cpp
   wifi_and_cell_reporting_state.cpp
 
   boost_ptree_settings.cpp
@@ -126,6 +133,7 @@
   ${LIBAPPARMOR_LDFLAGS}
   ${NET_CPP_LDFLAGS}
   ${TRUST_STORE_LDFLAGS}
+  ${UBUNTU_PLATFORM_HARDWARE_API_LDFLAGS}
   ${GLog_LIBRARY}
   ${GFlags_LIBRARY}
 )

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono.h'
--- src/location_service/com/ubuntu/location/connectivity/ofono.h	2015-01-06 12:35:02 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono.h	2016-03-17 09:08:50 +0000
@@ -640,6 +640,118 @@
             } signals;
         };
 
+        struct SimManager
+        {
+            static const std::string& name()
+            {
+                static const std::string s{"org.ofono.SimManager"};
+                return s;
+            }
+
+            struct GetProperties
+            {
+                static const std::string& name()
+                {
+                    static const std::string s{"GetProperties"};
+                    return s;
+                }
+
+                typedef SimManager Interface;
+                typedef std::map<std::string, core::dbus::types::Variant> ValueType;
+
+                static std::chrono::milliseconds default_timeout()
+                {
+                    return std::chrono::seconds{1};
+                }
+            };
+
+            struct PropertyChanged
+            {
+                inline static std::string name()
+                {
+                    return "PropertyChanged";
+                }
+
+                typedef SimManager Interface;
+
+                typedef std::tuple<std::string, core::dbus::types::Variant> ArgumentType;
+            };
+
+            struct Present
+            {
+                static const std::string& name()
+                {
+                    static const std::string s{"Present"};
+                    return s;
+                }
+
+                typedef SimManager Interface;
+                typedef bool ValueType;
+                static const bool readable = true;
+                static const bool writable = false;
+            };
+
+            struct SubscriberIdentity
+            {
+                static const std::string& name()
+                {
+                    static const std::string s{"SubscriberIdentity"};
+                    return s;
+                }
+
+                typedef SimManager Interface;
+                typedef std::string ValueType;
+                static const bool readable = true;
+                static const bool writable = false;
+            };
+
+            struct SubscriberNumbers
+            {
+                static const std::string& name()
+                {
+                    static const std::string s{"SubscriberNumbers"};
+                    return s;
+                }
+
+                typedef SimManager Interface;
+                typedef std::vector<std::string> ValueType;
+                static const bool readable = true;
+                static const bool writable = false;
+            };
+
+            SimManager(const std::shared_ptr<core::dbus::Object>& object)
+                : object(object)
+            {
+            }
+
+            template<typename Property>
+            void async_get(const std::function<void(const typename Property::ValueType& result)>& cb) const
+            {
+                object->invoke_method_asynchronously_with_callback<GetProperties, GetProperties::ValueType>(
+                            [cb](const core::dbus::Result<GetProperties::ValueType>& result)
+                            {
+                                if (result.is_error())
+                                {
+                                    LOG(WARNING) << "Failed to query properties: " << result.error().print();
+                                    return;
+                                }
+
+                                auto properties = result.value();
+                                auto it = properties.find(Property::name());
+
+                                if (it == properties.end())
+                                {
+                                    VLOG(1) << "Could not find property for name " << Property::name();
+                                    return;
+                                }
+
+                                cb(it->second.template as<typename Property::ValueType>());
+                            });
+            }
+
+            std::shared_ptr<core::dbus::Object> object;
+        };
+
         Modem(const std::shared_ptr<core::dbus::Service>& service,
               const std::shared_ptr<core::dbus::Object>& object)
             : service(service),
@@ -648,7 +760,8 @@
               {
                   object->get_signal<PropertyChanged>()
               },
-              network_registration{object}
+              network_registration{object},
+              sim_manager{object}
         {
         }
 
@@ -661,6 +774,7 @@
         } signals;
 
         NetworkRegistration network_registration;
+        SimManager sim_manager;
     };
 
     Manager(const core::dbus::Bus::Ptr& bus)

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp'
--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2016-03-17 09:08:50 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.cpp	2016-03-17 09:08:50 +0000
@@ -126,6 +126,33 @@
     return d.active_connection_characteristics;
 }
 
+void connectivity::OfonoNmConnectivityManager::enumerate_imsis(const std::function<void(const std::string&)>& cb) const
+{
+    std::lock_guard<std::mutex> lg(d.cached.guard);
+
+    for (const auto& modem : d.cached.modems)
+    {
+        modem.second.sim_manager.async_get<org::Ofono::Manager::Modem::SimManager::SubscriberIdentity>([cb](const std::string& imsi)
+        {
+            cb(imsi);
+        });
+    }
+}
+
+void connectivity::OfonoNmConnectivityManager::enumerate_msisdns(const std::function<void(const std::string&)>& cb) const
+{
+    std::lock_guard<std::mutex> lg(d.cached.guard);
+
+    for (const auto& modem : d.cached.modems)
+    {
+        modem.second.sim_manager.async_get<org::Ofono::Manager::Modem::SimManager::SubscriberNumbers>([cb](const std::vector<std::string>& msisdns)
+        {
+            for (const auto& nr : msisdns)
+                cb(nr);
+        });
+    }
+}
+
 connectivity::OfonoNmConnectivityManager::Private::Private(const core::dbus::Bus::Ptr& bus)
     : bus{bus},
       bus_daemon{std::make_shared<core::dbus::DBus>(bus)}
@@ -340,11 +367,12 @@
     auto itt = cached.cells.find(path);
     const bool has_cell_for_modem = itt != cached.cells.end();
 
-    auto it = std::find(
+    auto itnr = std::find(
                 interfaces.begin(),
                 interfaces.end(),
                 std::string{org::Ofono::Manager::Modem::Properties::Interfaces::network_registration});
-    const bool modem_has_network_registration = it != interfaces.end();
+
+    const bool modem_has_network_registration = itnr != interfaces.end();
 
     if (has_cell_for_modem and not modem_has_network_registration)
     {

=== modified file 'src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h'
--- src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h	2015-04-27 15:44:40 +0000
+++ src/location_service/com/ubuntu/location/connectivity/ofono_nm_connectivity_manager.h	2016-03-17 09:08:50 +0000
@@ -52,7 +52,7 @@
 namespace dbus = core::dbus;
 
 namespace com { namespace ubuntu { namespace location { namespace connectivity {
-struct OfonoNmConnectivityManager : public com::ubuntu::location::connectivity::Manager
+struct OfonoNmConnectivityManager : public com::ubuntu::location::connectivity::ExtendedManager
 {
     // Creates an instance of the manager, resolving services on the given bus.
     OfonoNmConnectivityManager(const core::dbus::Bus::Ptr& bus);
@@ -82,6 +82,10 @@
 
     const core::Property<com::ubuntu::location::connectivity::Characteristics>& active_connection_characteristics() const;
 
+    void enumerate_imsis(const std::function<void(const std::string&)>&) const override;
+
+    void enumerate_msisdns(const std::function<void(const std::string&)>&) const override;
+
     struct Private
     {
         Private(const core::dbus::Bus::Ptr& bus);

=== modified file 'src/location_service/com/ubuntu/location/provider_factory.cpp'
--- src/location_service/com/ubuntu/location/provider_factory.cpp	2014-10-27 21:58:16 +0000
+++ src/location_service/com/ubuntu/location/provider_factory.cpp	2016-03-17 09:08:50 +0000
@@ -52,6 +52,20 @@
     return cul::Provider::Ptr{factory_store.at(undecorated_name)(config)};
 }
 
+void cul::ProviderFactory::create_provider_for_name_with_config(
+    const std::string& name,
+    const cul::ProviderFactory::Configuration& config,
+    const std::function<void(Provider::Ptr)>& cb)
+{
+    auto undecorated_name = name.substr(0, name.find("@"));
+
+    std::lock_guard<std::mutex> lg(guard);
+    if (factory_store.count(undecorated_name) == 0)
+        return;
+
+    cb(cul::Provider::Ptr{factory_store.at(undecorated_name)(config)});
+}
+
 void cul::ProviderFactory::enumerate(
     const std::function<void(const std::string&, const cul::ProviderFactory::Factory&)>& enumerator)
 {

=== modified file 'src/location_service/com/ubuntu/location/providers/config.cpp'
--- src/location_service/com/ubuntu/location/providers/config.cpp	2014-09-15 08:58:50 +0000
+++ src/location_service/com/ubuntu/location/providers/config.cpp	2016-03-17 09:08:50 +0000
@@ -19,6 +19,7 @@
 #include <com/ubuntu/location/provider_factory.h>
 
 #include "dummy/provider.h"
+#include "dummy/delayed_provider.h"
 
 #include <map>
 
@@ -41,6 +42,12 @@
     com::ubuntu::location::providers::dummy::Provider::create_instance
 };
 
+static FactoryInjector dummy_delayed_injector
+{
+    "dummy::DelayedProvider",
+    com::ubuntu::location::providers::dummy::DelayedProvider::create_instance
+};
+
 #include <com/ubuntu/location/providers/remote/provider.h>
 static FactoryInjector remote_injector
 {

=== modified file 'src/location_service/com/ubuntu/location/providers/dummy/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/providers/dummy/CMakeLists.txt	2014-02-07 17:16:49 +0000
+++ src/location_service/com/ubuntu/location/providers/dummy/CMakeLists.txt	2016-03-17 09:08:50 +0000
@@ -2,7 +2,9 @@
   dummy
   
   provider.h
-  provider.cpp)
+  provider.cpp
+  delayed_provider.h
+  delayed_provider.cpp)
 
 set(
   ENABLED_PROVIDER_TARGETS

=== added file 'src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.cpp'
--- src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.cpp	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.cpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Scott Sweeny <[e-mail]>
+ */
+
+#include <com/ubuntu/location/logging.h>
+
+#include <chrono>
+#include <thread>
+
+#include "delayed_provider.h"
+
+namespace location = com::ubuntu::location;
+namespace dummy = com::ubuntu::location::providers::dummy;
+
+std::string dummy::DelayedProvider::class_name()
+{
+    return "dummy::DelayedProvider";
+}
+
+location::Provider::Ptr dummy::DelayedProvider::create_instance(const ProviderFactory::Configuration& config)
+{
+    int delay = config.get(dummy::DelayConfiguration::Keys::delay, 0);
+    VLOG(1) << __PRETTY_FUNCTION__ << ": delay for " << delay << "ms";
+
+    std::this_thread::sleep_for(std::chrono::milliseconds{delay});
+
+    return dummy::Provider::create_instance(config);
+}

=== added file 'src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.h'
--- src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.h	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/dummy/delayed_provider.h	2016-03-17 09:08:50 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Scott Sweeny <[e-mail]>
+ */
+
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_DUMMY_DELAYED_PROVIDER_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_DUMMY_DELAYED_PROVIDER_H_
+
+#include "provider.h"
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+namespace providers
+{
+namespace dummy
+{
+    struct DelayConfiguration
+    {
+        struct Keys
+        {
+            static constexpr const char* delay
+            {
+                "DelayInMs"
+            };
+        };
+    };
+
+class DelayedProvider : public Provider
+{
+    public:
+        // For integration with the Provider factory
+        static std::string class_name();
+        // Waits for "DelayInMs" from the provided property bundle then
+        // instantiates a new provider instance, populating the configuration object
+        // from the provided property bundle.
+        static DelayedProvider::Ptr create_instance(const ProviderFactory::Configuration&);
+        // Creates a new provider instance from the given configuration.
+        DelayedProvider(const Configuration config = Configuration{});
+};
+}
+}
+}
+}
+}
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_DUMMY_DELAYED_PROVIDER_H_

=== modified file 'src/location_service/com/ubuntu/location/providers/gps/CMakeLists.txt'
--- src/location_service/com/ubuntu/location/providers/gps/CMakeLists.txt	2014-07-28 19:14:58 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/CMakeLists.txt	2016-03-17 09:08:50 +0000
@@ -4,30 +4,34 @@
     ON
 )
 
-if (LOCATION_SERVICE_ENABLE_GPS_PROVIDER)
-  find_file(
-    UBUNTU_HARDWARE_GPS_H gps.h
-    NAMES ubuntu/hardware/gps.h
-  )
-
-  if (UBUNTU_HARDWARE_GPS_H)
+if ((LOCATION_SERVICE_ENABLE_GPS_PROVIDER) AND (UBUNTU_PLATFORM_HARDWARE_API_FOUND))
     message(STATUS "Enabling GPS location provider")
 
+    include_directories(${UBUNTU_PLATFORM_HARDWARE_API_INCLUDE_DIRS})
+
     add_library(
         gps
 
         gps.conf
 
+        hardware_abstraction_layer.cpp
+
         android_hardware_abstraction_layer.h
         android_hardware_abstraction_layer.cpp
 
+        sntp_reference_time_source.h
+        sntp_reference_time_source.cpp
+
+        sntp_client.h
+        sntp_client.cpp
+
         hardware_abstraction_layer.h
         # hardware_abstraction_layer.cpp
 
         provider.h
         provider.cpp)
 
-    target_link_libraries(gps ubuntu_platform_hardware_api.so)
+    target_link_libraries(gps ${UBUNTU_PLATFORM_HARDWARE_API_LDFLAGS})
   
     set(
       ENABLED_PROVIDER_TARGETS
@@ -41,5 +45,4 @@
     )
 
     install(FILES gps.conf DESTINATION /etc/)
-  endif (UBUNTU_HARDWARE_GPS_H)
-endif (LOCATION_SERVICE_ENABLE_GPS_PROVIDER)
+endif ()

=== modified file 'src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp'
--- src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp	2016-03-17 09:08:50 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.cpp	2016-03-17 09:08:50 +0000
@@ -17,6 +17,7 @@
  */
 
 #include "android_hardware_abstraction_layer.h"
+#include "sntp_reference_time_source.h"
 
 #if defined(COM_UBUNTU_LOCATION_SERVICE_HAVE_NET_CPP)
 #include "net_cpp_gps_xtra_downloader.h"
@@ -93,6 +94,44 @@
     return impl.server_ip;
 }
 
+void android::HardwareAbstractionLayer::SuplAssistant::set_set_id(SetIdType type, const std::string& id) const
+{
+    u_hardware_gps_agps_set_set_id(
+                impl.hal.impl.gps_handle,
+                static_cast<UHardwareGpsAgpsSetIdType>(type),
+                id.c_str());
+}
+
+
+void android::HardwareAbstractionLayer::SuplAssistant::inject_radio_cell_information(const location::connectivity::RadioCell& cell) const
+{
+    UHardwareGpsAGpsRefLocation ref_loc;
+    switch (cell.type())
+    {
+    case location::connectivity::RadioCell::Type::gsm:
+        ref_loc.type = U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_GSM_CELLID;
+        ref_loc.u.cellID.mcc = cell.gsm().mobile_country_code;
+        ref_loc.u.cellID.mnc = cell.gsm().mobile_network_code;
+        ref_loc.u.cellID.lac = cell.gsm().location_area_code;
+        ref_loc.u.cellID.cid = cell.gsm().id;
+        break;
+    case location::connectivity::RadioCell::Type::umts:
+        ref_loc.type = U_HARDWARE_GPS_AGPS_REF_LOCATION_TYPE_UMTS_CELLID;
+        ref_loc.u.cellID.mcc = cell.umts().mobile_country_code;
+        ref_loc.u.cellID.mnc = cell.umts().mobile_network_code;
+        ref_loc.u.cellID.lac = cell.umts().location_area_code;
+        ref_loc.u.cellID.cid = cell.umts().id;
+        break;
+    default:
+        return;
+    }
+
+    u_hardware_gps_agps_set_reference_location(
+                impl.hal.impl.gps_handle,
+                &ref_loc,
+                sizeof(ref_loc));
+}
+
 void android::HardwareAbstractionLayer::SuplAssistant::set_server(const std::string& host_name, std::uint16_t port)
 {
     // TODO(tvoss): Reenable this once the platform api HAL changes land.
@@ -169,16 +208,49 @@
 
 void android::HardwareAbstractionLayer::on_ril_request_set_id(uint32_t flags, void* context)
 {
-    VLOG(1) << __PRETTY_FUNCTION__ << ": "
-            << "flags=" << flags << " "
-            << "context=" << context;
+    VLOG(1) << __PRETTY_FUNCTION__ << ": " << "flags=" << flags << " " << "context=" << context;
+
+    if (auto thiz = static_cast<android::HardwareAbstractionLayer*>(context))
+    {
+        switch (flags)
+        {
+        case U_HARDWARE_GPS_AGPS_REQUEST_SETID_IMSI:
+            thiz->impl.connectivity_manager->enumerate_imsis([thiz](const std::string& imsi)
+            {
+               VLOG(1) << "IMSI received: " << imsi;
+               thiz->impl.supl_assistant.set_set_id(SuplAssistant::SetIdType::imsi, imsi);
+            });
+            break;
+        case U_HARDWARE_GPS_AGPS_REQUEST_SETID_MSISDN:
+            thiz->impl.connectivity_manager->enumerate_msisdns([thiz](const std::string& msisdn)
+            {
+                VLOG(1) << "MSISDN received: " << msisdn;
+               thiz->impl.supl_assistant.set_set_id(SuplAssistant::SetIdType::msisdn, msisdn);
+            });
+            break;
+        }
+    }
 }
 
 void android::HardwareAbstractionLayer::on_ril_request_reference_location(uint32_t flags, void* context)
 {
-    VLOG(1) << __PRETTY_FUNCTION__ << ": "
-            << "flags=" << flags << " "
-            << "context=" << context;
+    VLOG(1) << __PRETTY_FUNCTION__ << ": " << "flags=" << flags << " " << "context=" << context;
+
+    if (auto thiz = static_cast<android::HardwareAbstractionLayer*>(context))
+    {
+        switch (flags)
+        {
+        case U_HARDWARE_GPS_AGPS_REQUEST_REFLOC_CELLID:
+            thiz->impl.connectivity_manager->enumerate_connected_radio_cells([thiz](const connectivity::RadioCell::Ptr& cell)
+            {
+                thiz->impl.supl_assistant.inject_radio_cell_information(*cell);
+            });
+            break;
+        case U_HARDWARE_GPS_AGPS_REQUEST_REFLOC_MAC:
+        default:
+            break;
+        }
+    }
 }
 
 void android::HardwareAbstractionLayer::on_location_update(UHardwareGpsLocation* location, void* context)
@@ -323,23 +395,18 @@
 {
     VLOG(1) << __PRETTY_FUNCTION__;
 
-    auto thiz = static_cast<android::HardwareAbstractionLayer*>(context);
-
-    if (thiz->impl.utc_time_request_handler)
-    {
-        thiz->impl.utc_time_request_handler();
-    } else
-    {
-        auto now = location::Clock::now().time_since_epoch();
-        auto ms_since_epoch = std::chrono::duration_cast<std::chrono::milliseconds>(now);
-
-        static const int zero_uncertainty = 0;
-
-        u_hardware_gps_inject_time(
-                    thiz->impl.gps_handle,
-                    ms_since_epoch.count(),
-                    ms_since_epoch.count(),
-                    zero_uncertainty);
+    try
+    {
+        if (auto thiz = static_cast<android::HardwareAbstractionLayer*>(context))
+            thiz->inject_reference_time(thiz->impl.reference_time_source->sample());
+    }
+    catch (const std::runtime_error& e)
+    {
+        LOG(WARNING) << "Failed to inject reference time to chipset: " << e.what();
+    }
+    catch (...)
+    {
+        LOG(WARNING) << "Failed to inject reference time to chipset.";
     }
 }
 
@@ -534,19 +601,22 @@
     return true;
 }
 
-bool android::HardwareAbstractionLayer::inject_reference_time(
-        const std::chrono::microseconds& reference_time,
-        const std::chrono::microseconds& sample_time)
+bool android::HardwareAbstractionLayer::inject_reference_time(const ReferenceTimeSample& sample)
 {
     if (!is_capable_of(gps::Capability::on_demand_time_injection))
         return false;
 
     // TODO(tvoss): We should expose the int return type of the underyling
     //  Android HAL to capture errors here.
+    //
+    // Please see:
+    //   http://androidxref.com/5.1.1_r6/xref/frameworks/base/core/java/android/net/SntpClient.java#72
+    // for the bloody details of relating the system wall clock time to the elapsed realtime since boot
+    // including deep sleep.
     u_hardware_gps_inject_time(impl.gps_handle,
-                               reference_time.count(),
-                               sample_time.count(),
-                               10);
+                               sample.since_epoch.count(),
+                               sample.since_boot.count(),
+                               sample.uncertainty.count());
     return true;
 }
 
@@ -557,6 +627,8 @@
       assistance_mode(gps::AssistanceMode::mobile_station_based),
       position_mode(gps::PositionMode::periodic),
       supl_assistant(*parent),
+      connectivity_manager(configuration.connectivity_manager),
+      reference_time_source(configuration.reference_time_source),
       gps_xtra_configuration(configuration.gps_xtra.configuration),
       gps_xtra_downloader(configuration.gps_xtra.downloader)
 {
@@ -615,6 +687,22 @@
 
 namespace
 {
+gps::SntpReferenceTimeSource::Configuration sntp_reference_time_source_configuration(std::istream& in)
+{
+    gps::SntpReferenceTimeSource::Configuration config;
+
+    try
+    {
+        config = gps::SntpReferenceTimeSource::Configuration::from_gps_conf_ini_file(in);
+    }
+    catch (...)
+    {
+        // Consciously dropping all exceptions here.
+    }
+
+    return config;
+}
+
 android::GpsXtraDownloader::Configuration gps_xtra_downloader_configuration(std::istream& in)
 {
     android::GpsXtraDownloader::Configuration config;
@@ -641,6 +729,8 @@
 
     return config;
 }
+
+
 }
 
 std::shared_ptr<gps::HardwareAbstractionLayer> gps::HardwareAbstractionLayer::create_default_instance()
@@ -664,7 +754,9 @@
         {
             create_xtra_downloader(),
             gps_xtra_downloader_configuration((in_system_gps_conf ? in_system_gps_conf : in_gps_conf))
-        }
+        },
+        std::dynamic_pointer_cast<connectivity::ExtendedManager>(connectivity::platform_default_manager()),
+        std::make_shared<gps::SntpReferenceTimeSource>(sntp_reference_time_source_configuration((in_system_gps_conf ? in_system_gps_conf : in_gps_conf)))
     };
 
     static std::shared_ptr<gps::HardwareAbstractionLayer> instance

=== modified file 'src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h'
--- src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h	2016-03-17 09:08:50 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h	2016-03-17 09:08:50 +0000
@@ -19,6 +19,9 @@
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GPS_ANDROID_HARDWARE_ABSTRACTION_LAYER_H_
 
 #include <com/ubuntu/location/providers/gps/hardware_abstraction_layer.h>
+#include <com/ubuntu/location/providers/gps/sntp_client.h>
+
+#include <com/ubuntu/location/connectivity/manager.h>
 
 #include <ubuntu/hardware/gps.h>
 
@@ -66,7 +69,24 @@
 };
 
 struct HardwareAbstractionLayer : public gps::HardwareAbstractionLayer
-{
+{    
+    /** @brief A ReferenceTimeSource provides samples of an arbitrary reference time source. */
+    class ReferenceTimeSource
+    {
+    public:
+        /** @cond */
+        typedef std::shared_ptr<ReferenceTimeSource> Ptr;
+
+        virtual ~ReferenceTimeSource() = default;
+        /** @endcond */
+
+        /** @brief sample returns a sample of the current ReferenceTimeSource. */
+        virtual ReferenceTimeSample sample() = 0;
+
+    protected:
+        ReferenceTimeSource() = default;
+    };
+
     /** @brief Implements gps::HardwareAbstractionLayer::SuplAssistant interface for the android gps HAL. */
     struct SuplAssistant : public gps::HardwareAbstractionLayer::SuplAssistant
     {
@@ -74,6 +94,10 @@
         SuplAssistant(android::HardwareAbstractionLayer& hal);
         /** @brief Getable/observable access to the status of the assistant instance. */
         const core::Property<Status>& status() const override;
+        /** @brief Sets mobile subscriber identity. */
+        void set_set_id(SetIdType type, const std::string& id) const override;
+        /** @brief Injects reference location information. */
+        void inject_radio_cell_information(const connectivity::RadioCell& radio_cell) const override;
         /** @brief Getable/setable/observable access to the status of the assistant instance. */
         core::Property<Status>& status();
         /** @brief Getable/observable access to the ip the assistance instance uses. */
@@ -186,6 +210,9 @@
             std::shared_ptr<GpsXtraDownloader> downloader;
             GpsXtraDownloader::Configuration configuration;
         } gps_xtra;
+
+        std::shared_ptr<connectivity::ExtendedManager> connectivity_manager;
+        ReferenceTimeSource::Ptr reference_time_source;
     };
 
     HardwareAbstractionLayer(const Configuration& configuration);
@@ -227,8 +254,8 @@
     bool set_position_mode(gps::PositionMode mode) override;
 
     bool inject_reference_position(const location::Position& position) override;
-    bool inject_reference_time(const std::chrono::microseconds& reference_time,
-                               const std::chrono::microseconds& sample_time) override;
+    bool inject_reference_time(const ReferenceTimeSample& sample) override;
+
     struct Impl
     {
         // Bootstraps access to the GPS chipset, wiring up all callbacks.
@@ -252,8 +279,10 @@
         // An implementation of the gps::HardwareAbstractionLayer::SuplAssistant interface.
         SuplAssistant supl_assistant;
 
-        // Callback for handling utc time requests.
-        gps::HardwareAbstractionLayer::UtcTimeRequestHandler utc_time_request_handler;
+        // An implementation of connectivity::Manager.
+        std::shared_ptr<connectivity::ExtendedManager> connectivity_manager;
+        // An implementation of ReferenceTimeSource.
+        ReferenceTimeSource::Ptr reference_time_source;
 
         // Emitted whenever the set of visible space vehicles changes.
         core::Signal<std::set<location::SpaceVehicle>> space_vehicle_updates;

=== added file 'src/location_service/com/ubuntu/location/providers/gps/hardware_abstraction_layer.cpp'
--- src/location_service/com/ubuntu/location/providers/gps/hardware_abstraction_layer.cpp	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/hardware_abstraction_layer.cpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#include <com/ubuntu/location/providers/gps/hardware_abstraction_layer.h>
+
+#include <iostream>
+
+namespace gps = com::ubuntu::location::providers::gps;
+
+std::ostream& gps::operator<<(std::ostream& out, const gps::HardwareAbstractionLayer::ReferenceTimeSample& sample)
+{
+    return out << "[since epoch: "  << sample.since_epoch.count() << " [ms], since boot: "
+                                    << sample.since_boot.count() << " [ms], uncertainty: "
+                                    << sample.uncertainty.count() << " [ms]";
+}

=== modified file 'src/location_service/com/ubuntu/location/providers/gps/hardware_abstraction_layer.h'
--- src/location_service/com/ubuntu/location/providers/gps/hardware_abstraction_layer.h	2014-06-06 17:52:59 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/hardware_abstraction_layer.h	2016-03-17 09:08:50 +0000
@@ -18,11 +18,14 @@
 #ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GPS_HARDWARE_ABSTRACTION_LAYER_H_
 #define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GPS_HARDWARE_ABSTRACTION_LAYER_H_
 
+#include <com/ubuntu/location/clock.h>
 #include <com/ubuntu/location/heading.h>
 #include <com/ubuntu/location/position.h>
 #include <com/ubuntu/location/space_vehicle.h>
 #include <com/ubuntu/location/velocity.h>
 
+#include <com/ubuntu/location/connectivity/radio_cell.h>
+
 #include <core/property.h>
 
 #include <chrono>
@@ -104,6 +107,13 @@
 class HardwareAbstractionLayer
 {
 public:
+    /** @brief ReferenceTimeSample bundles together the local reference. */
+    struct ReferenceTimeSample
+    {
+        std::chrono::milliseconds since_epoch;  /**< Reference wall-clock time since the epoch (UTC). */
+        std::chrono::milliseconds since_boot;   /**< Reference time since boot. */
+        std::chrono::milliseconds uncertainty;  /**< Uncertainty estimate of the sample. */
+    };
 
     class SuplAssistant
     {
@@ -148,6 +158,16 @@
             data_connection_failed = 5
         };
 
+        /**
+         * @brief The SetIdType enum enumerates all valid types of SetIds.
+         */
+        enum class SetIdType
+        {
+            none,
+            imsi,
+            msisdn
+        };
+
         virtual ~SuplAssistant() = default;
         SuplAssistant(const SuplAssistant&) = delete;
 
@@ -165,6 +185,16 @@
         virtual const core::Property<IpV4Address>& server_ip() const = 0;
 
         /**
+         * @brief Sets mobile subscriber identity.
+         */
+        virtual void set_set_id(SetIdType type, const std::string& id) const = 0;
+
+        /**
+         * @brief Injects reference location information.
+         */
+        virtual void inject_radio_cell_information(const connectivity::RadioCell& radio_cell) const = 0;
+
+        /**
          * @brief set_server informs the assistant instance about the SUPL server it should talk to.
          * @param host_name The host name of the SUPL server.
          * @param port The port of the SUPL server.
@@ -304,16 +334,17 @@
 
     /**
      * @brief Injects a new reference time to the underlying gps driver/chipset.
-     * @param reference_time The new reference time.
-     * @param sample_time When the reference time was sampled.
+     * @param sample The reference time sample
      * @return true iff the injection was successful, false otherwise.
      */
-    virtual bool inject_reference_time(const std::chrono::microseconds& reference_time,
-                                       const std::chrono::microseconds& sample_time) = 0;
+    virtual bool inject_reference_time(const ReferenceTimeSample& sample) = 0;
 
 protected:
     HardwareAbstractionLayer() = default;
 };
+
+/** @brief operator<< inserts sample into out. */
+std::ostream& operator<<(std::ostream& out, const HardwareAbstractionLayer::ReferenceTimeSample& sample);
 }
 }
 }

=== added file 'src/location_service/com/ubuntu/location/providers/gps/sntp_client.cpp'
--- src/location_service/com/ubuntu/location/providers/gps/sntp_client.cpp	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/sntp_client.cpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,210 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#include <com/ubuntu/location/providers/gps/sntp_client.h>
+
+#include <com/ubuntu/location/time_since_boot.h>
+
+#include <boost/asio/ip/udp.hpp>
+#include <boost/endian/buffers.hpp>
+
+#include <bitset>
+#include <fstream>
+#include <future>
+#include <iostream>
+#include <thread>
+
+namespace location = com::ubuntu::location;
+namespace gps = location::providers::gps;
+namespace ip = boost::asio::ip;
+
+namespace
+{
+
+template<typename T>
+T sync_or_throw(std::future<T>& f)
+{
+    return f.get();
+}
+
+template<>
+void sync_or_throw<>(std::future<void>& f)
+{
+    f.get();
+}
+
+struct Now
+{
+    std::chrono::nanoseconds time = std::chrono::duration_cast<std::chrono::milliseconds>(
+                std::chrono::system_clock::now().time_since_epoch());
+    std::chrono::nanoseconds ticks = location::time_since_boot();
+};
+}
+
+const std::chrono::seconds& gps::sntp::offset_1900_to_1970()
+{
+    static const std::uint64_t secs = ((365ull * 70ull) + 17ull) * 24ull * 60ull * 60ull;
+    static const std::chrono::seconds seconds{secs};
+    return seconds;
+}
+
+gps::sntp::LeapIndicator gps::sntp::Packet::LeapIndicatorVersionMode::leap_indicator() const
+{
+    return static_cast<LeapIndicator>((livm.value() >> 6) & 0x3);
+}
+
+gps::sntp::Packet::LeapIndicatorVersionMode& gps::sntp::Packet::LeapIndicatorVersionMode::leap_indicator(LeapIndicator li)
+{
+    livm = livm.value() | (static_cast<uint8_t>(li) << 6);
+    return *this;
+}
+
+std::uint8_t gps::sntp::Packet::LeapIndicatorVersionMode::version() const
+{
+    return (livm.value() >> 3) & 0x7;
+}
+
+gps::sntp::Packet::LeapIndicatorVersionMode& gps::sntp::Packet::LeapIndicatorVersionMode::version(std::uint8_t version)
+{
+    livm = livm.value() | (version << 3);
+    return *this;
+}
+
+gps::sntp::Mode gps::sntp::Packet::LeapIndicatorVersionMode::mode() const
+{
+    return static_cast<Mode>(livm.value() & 0x7);
+}
+
+gps::sntp::Packet::LeapIndicatorVersionMode& gps::sntp::Packet::LeapIndicatorVersionMode::mode(Mode m)
+{
+    livm = static_cast<uint8_t>(m) | livm.value();
+    return *this;
+}
+
+gps::sntp::Client::Response gps::sntp::Client::request_time(const std::string& host, const std::chrono::milliseconds& timeout, boost::asio::io_service& ios)
+{
+    ip::udp::resolver resolver{ios};
+    ip::udp::socket socket{ios};
+    bool timed_out{false};
+
+    std::promise<ip::udp::resolver::iterator> promise_resolve;
+    auto future_resolve= promise_resolve.get_future();
+
+    boost::asio::deadline_timer timer{ios};
+    timer.expires_from_now(boost::posix_time::milliseconds{timeout.count()});
+    timer.async_wait([&timed_out, &resolver, &socket](const boost::system::error_code& ec)
+    {
+        if (ec)
+            return;
+
+        timed_out = true;
+
+        resolver.cancel();
+        socket.shutdown(ip::udp::socket::shutdown_both);
+        socket.close();
+    });
+
+    ip::udp::resolver::query query{ip::udp::v4(), host, "ntp"};
+
+    resolver.async_resolve(query, [&promise_resolve](const boost::system::error_code& ec, ip::udp::resolver::iterator it)
+    {
+        if (ec)
+            promise_resolve.set_exception(std::make_exception_ptr(boost::system::system_error(ec)));
+        else
+            promise_resolve.set_value(it);
+    });
+
+    auto it = sync_or_throw(future_resolve);
+
+    std::promise<void> promise_connect;
+    auto future_connect = promise_connect.get_future();
+
+    socket.async_connect(*it, [&promise_connect](const boost::system::error_code& ec)
+    {
+        if (ec)
+            promise_connect.set_exception(std::make_exception_ptr(boost::system::system_error(ec)));
+        else
+            promise_connect.set_value();
+    });
+
+    sync_or_throw(future_connect);
+
+    sntp::Packet packet;
+
+    Now before;
+    {        
+        packet = request(socket);
+        timer.cancel();
+
+        if (timed_out)
+            throw std::runtime_error("Operation timed out.");
+    }
+    Now after;
+
+    auto originate = packet.originate.to_milliseconds_since_epoch();
+    auto receive = packet.receive.to_milliseconds_since_epoch();
+    auto transmit = packet.transmit.to_milliseconds_since_epoch();
+
+    auto rtt = after.ticks - before.ticks - (transmit - receive);
+    auto offset = ((receive - originate) + (transmit - after.time))/2;
+
+    return
+    {
+        packet,
+        std::chrono::duration_cast<std::chrono::milliseconds>(after.time + offset),
+        std::chrono::duration_cast<std::chrono::milliseconds>(after.ticks),
+        std::chrono::duration_cast<std::chrono::milliseconds>(rtt)
+    };
+}
+
+gps::sntp::Packet gps::sntp::Client::request(boost::asio::ip::udp::socket& socket)
+{
+    sntp::Packet packet;
+    packet.transmit.from_milliseconds_since_epoch(
+                std::chrono::duration_cast<std::chrono::milliseconds>(
+                    std::chrono::system_clock::now().time_since_epoch()));
+    packet.livm.mode(sntp::Mode::client).version(sntp::version);
+
+    std::promise<std::size_t> promise_send;
+    auto future_send = promise_send.get_future();
+
+    socket.async_send(boost::asio::buffer(&packet, sizeof(packet)), [&promise_send](const boost::system::error_code& ec, std::size_t transferred)
+    {
+        if (ec)
+            promise_send.set_exception(std::make_exception_ptr(boost::system::system_error(ec)));
+        else
+            promise_send.set_value(transferred);
+    });
+
+    sync_or_throw(future_send);
+
+    std::promise<std::size_t> promise_receive;
+    auto future_receive = promise_receive.get_future();
+
+    socket.async_receive(boost::asio::buffer(&packet, sizeof(packet)), [&promise_receive](const boost::system::error_code& ec, std::size_t transferred)
+    {
+        if (ec)
+            promise_receive.set_exception(std::make_exception_ptr(boost::system::system_error(ec)));
+        else
+            promise_receive.set_value(transferred);
+    });
+
+    sync_or_throw(future_receive);
+
+    return packet;
+}

=== added file 'src/location_service/com/ubuntu/location/providers/gps/sntp_client.h'
--- src/location_service/com/ubuntu/location/providers/gps/sntp_client.h	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/sntp_client.h	2016-03-17 09:08:50 +0000
@@ -0,0 +1,210 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GPS_SNTP_CLIENT_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GPS_SNTP_CLIENT_H_
+
+#include <com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h>
+
+#include <boost/asio.hpp>
+#include <boost/endian/buffers.hpp>
+
+#include <chrono>
+#include <string>
+
+namespace com { namespace ubuntu { namespace location { namespace providers { namespace gps { namespace sntp {
+// Please see https://tools.ietf.org/html/rfc4330 for a discussion of sntp
+// and for a detailed explanation of the different types and algorithms.
+
+namespace detail
+{
+// enum_constant returns a compile-time constant assembled from 4 or at least
+// 3 individual characters.
+template<std::uint8_t a, std::uint8_t b, std::uint8_t c, std::uint8_t d = 0>
+constexpr uint32_t enum_constant()
+{
+    return (a << 24) | (b << 16) | (c << 8) | d;
+}
+}
+
+// offset_1900_to_1970 returns the number of seconds that elapsed between 1900 and 1970.
+const std::chrono::seconds& offset_1900_to_1970();
+
+// LeapIndicator enumerates warnings of an impending
+// leap second to be inserted/deleted in the last minute of the current
+// day.
+enum class LeapIndicator : std::uint8_t
+{
+    no_warning = 0,
+    last_minute_has_61_seconds = 1,
+    last_minute_has_59_seconds = 2,
+    alarm = 3
+};
+
+// Mode enumerates the different protocol modes.
+enum class Mode : std::uint8_t
+{
+    reserved = 0,
+    symmetric_active = 1,
+    symmetric_passive = 2,
+    client = 3,
+    server = 4,
+    broadcast = 5,
+    reserved_for_control = 6,
+    reserved_for_private_use = 7
+};
+
+// ReferenceIdentifier enumerates known references for NTP-servers
+// on stratum 0 or 1.
+enum class ReferenceIdentifier : std::uint32_t
+{
+    locl = detail::enum_constant<'L','O','C','L'>(),    // uncalibrated local clock
+    cesm = detail::enum_constant<'C','E','S','M'>(),    // calibrated Cesium clock
+    rbdm = detail::enum_constant<'R','B','D','M'>(),    // calibrated Rubidium clock
+    pps  = detail::enum_constant<'P','P','S'>(),        // calibrated quartz clock or other pulse-per-second source
+    irig = detail::enum_constant<'I','R','I','G'>(),    // Inter-Range Instrumentation Group
+    acts = detail::enum_constant<'A','C','T','S'>(),    // NIST telephone modem service
+    usno = detail::enum_constant<'U','S','N','O'>(),    // USNO telephone modem service
+    ptb  = detail::enum_constant<'P','T','B'>(),        // PTB (Germany) telephone modem service
+    tdf  = detail::enum_constant<'T','D','F'>(),        // Allouis (France) Radio 164 kHz
+    dcf  = detail::enum_constant<'D','C','F'>(),        // Mainflingen (Germany) Radio 77.5 kHz
+    msf  = detail::enum_constant<'M','S', 'F'>(),       // Rugby (UK) Radio 60 kHz
+    wwv  = detail::enum_constant<'W','W','V'>(),        // Ft. Collins (US) Radio 2.5, 5, 10, 15, 20 MHz
+    wwvb = detail::enum_constant<'W','W','V','B'>(),    // Boulder (US) Radio 60 kHz
+    wwvh = detail::enum_constant<'W','W','V','H'>(),    // Kauai Hawaii (US) Radio 2.5, 5, 10, 15 MHz
+    chu  = detail::enum_constant<'C','H','U'>(),        // Ottawa (Canada) Radio 3330, 7335, 14670 kHz
+    lorc = detail::enum_constant<'L','O','R','C'>(),    // LORAN-C radionavigation system
+    omeg = detail::enum_constant<'O','M','E','G'>(),    // OMEGA radionavigation system
+    gps  = detail::enum_constant<'G','P','S'>()         // Global Positioning Service
+};
+
+// Timestamp models a fixed-point NTP timestamp relative to 01.01.1900
+template<typename Seconds, typename FractionalSeconds = Seconds>
+struct Timestamp
+{
+    // To stay on the safe side, we only allow for the types specified below.
+    // With that, we make sure that we only ever use endian-save types.
+    static_assert(std::is_same<Seconds, boost::endian::big_int16_buf_t>::value ||
+                  std::is_same<Seconds, boost::endian::big_uint16_buf_t>::value ||
+                  std::is_same<Seconds, boost::endian::big_int32_buf_t>::value ||
+                  std::is_same<Seconds, boost::endian::big_uint32_buf_t>::value,
+                  "Timestamp<> only supports boost::endian::big_{{u}int{16,32}}_buf_t");
+
+    // from_milliseconds_since_epoch fills in seconds/fractional_seconds from
+    // ms, converting to NTP's reference time.
+    void from_milliseconds_since_epoch(const std::chrono::milliseconds& ts)
+    {
+        using s = std::chrono::seconds;
+        using ms = std::chrono::milliseconds;
+
+        auto secs = std::chrono::duration_cast<s>(ts);
+        auto msecs = std::chrono::duration_cast<ms>(ts - secs);
+
+        secs += offset_1900_to_1970();
+
+        seconds = secs.count();
+        fractional_seconds = msecs.count() * std::numeric_limits<typename FractionalSeconds::value_type>::max() + 1 / 1000;
+    }
+
+    // to_milliseconds_since_epoch returns a unix timestamp calculated from
+    // an NTP-timestamp.
+    std::chrono::milliseconds to_milliseconds_since_epoch() const
+    {
+        return std::chrono::seconds{seconds.value()} - offset_1900_to_1970() +
+               std::chrono::milliseconds{(fractional_seconds.value() * 1000) / std::numeric_limits<typename FractionalSeconds::value_type>::max()};
+    }
+
+    Seconds seconds;
+    FractionalSeconds fractional_seconds;
+};
+
+// Duration is just an alias to an sntp::Timestamp.
+template<typename T, typename U>
+using Duration = Timestamp<T, U>;
+
+// Packet models the SNTP wire format.
+struct Packet
+{
+    // LeapIndicatorVersionMode helps in handling the bitfield setup
+    // for the first byte of an sntp::Packet in a portable and endianess-safe way.
+    struct LeapIndicatorVersionMode
+    {
+        // leap_indicator extracts the LeapIndicator from the underlying data.
+        LeapIndicator leap_indicator() const;
+        // leap_indicator sets the value of the leap_indicatorin in the underyling
+        // data to li.
+        LeapIndicatorVersionMode& leap_indicator(LeapIndicator li);
+
+        // version extracts the version from the underlying data.
+        std::uint8_t version() const;
+        // version adjusts the version to version in the underlying data.
+        LeapIndicatorVersionMode& version(std::uint8_t version);
+
+        // mode extracts the mode from the underlying data.
+        Mode mode() const;
+        // mode adjusts the mode to m in the underlying data.
+        LeapIndicatorVersionMode& mode(Mode m);
+
+        boost::endian::big_uint8_buf_t livm;
+    };
+
+    LeapIndicatorVersionMode livm;
+    boost::endian::big_uint8_buf_t stratum;
+    boost::endian::big_uint8_buf_t poll_interval;
+    boost::endian::big_int8_buf_t precision;
+    Duration<boost::endian::big_int16_buf_t, boost::endian::big_uint16_buf_t> root_delay;
+    Duration<boost::endian::big_uint16_buf_t, boost::endian::big_uint16_buf_t> root_dispersion;
+    boost::endian::big_uint32_buf_t reference_identifier;
+    Timestamp<boost::endian::big_uint32_buf_t> reference;
+    Timestamp<boost::endian::big_uint32_buf_t> originate;
+    Timestamp<boost::endian::big_uint32_buf_t> receive;
+    Timestamp<boost::endian::big_uint32_buf_t> transmit;
+};
+// The SNTP version we are working with.
+static constexpr const std::uint8_t version = 3;
+
+// SntpClient provides access to querying time from an NTP server in
+// a unicast scenario.
+class Client
+{
+public:
+    // Response is returned in a request for time information.
+    struct Response
+    {
+        // The raw packet that was returned from the request.
+        sntp::Packet packet;
+        // Time computed from the NTP transaction.
+        std::chrono::milliseconds ntp_time;
+        // Reference clock value corresponding to the NTP time.
+        std::chrono::milliseconds ntp_time_reference;
+        // Round-trip time of the last NTP transaction.
+        std::chrono::milliseconds round_trip_time;
+    };
+
+    // request_time_with_timeout reaches out to the SNTP server known under host,
+    // and tries to determine the current UTC reference time. The operation aborts after
+    // timeout milliseconds.
+    //
+    // std::runtime_error is thrown in case of issues.
+    Response request_time(const std::string& host, const std::chrono::milliseconds& timeout, boost::asio::io_service& ios);
+    sntp::Packet request(boost::asio::ip::udp::socket& socket);
+};
+}
+}
+
+}}}}
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GPS_SNTP_CLIENT_H_

=== added file 'src/location_service/com/ubuntu/location/providers/gps/sntp_reference_time_source.cpp'
--- src/location_service/com/ubuntu/location/providers/gps/sntp_reference_time_source.cpp	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/sntp_reference_time_source.cpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright © 2012-2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#include <com/ubuntu/location/providers/gps/sntp_reference_time_source.h>
+
+#include <com/ubuntu/location/configuration.h>
+#include <com/ubuntu/location/service/runtime.h>
+
+#include <boost/property_tree/ini_parser.hpp>
+
+#include <future>
+
+namespace location = com::ubuntu::location;
+namespace gps = com::ubuntu::location::providers::gps;
+
+gps::SntpReferenceTimeSource::Configuration gps::SntpReferenceTimeSource::Configuration::from_gps_conf_ini_file(std::istream& in)
+{
+    gps::SntpReferenceTimeSource::Configuration result;
+
+    location::Configuration config;
+    boost::property_tree::read_ini(in, config);
+
+    if (config.count("NTP_SERVER") > 0)
+        result.host = config.get<std::string>("NTP_SERVER");
+
+    return result;
+}
+gps::SntpReferenceTimeSource::SntpReferenceTimeSource(const Configuration& config)
+    : config(config)
+{
+}
+
+gps::HardwareAbstractionLayer::ReferenceTimeSample gps::SntpReferenceTimeSource::sample()
+{
+    auto rt = location::service::Runtime::create();
+    rt->start();
+
+    location::providers::gps::sntp::Client sntp_client;
+    auto result = sntp_client.request_time(config.host, config.timeout, rt->service());
+
+    return {result.ntp_time, result.ntp_time_reference, result.round_trip_time};
+}

=== added file 'src/location_service/com/ubuntu/location/providers/gps/sntp_reference_time_source.h'
--- src/location_service/com/ubuntu/location/providers/gps/sntp_reference_time_source.h	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/providers/gps/sntp_reference_time_source.h	2016-03-17 09:08:50 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GPS_SNTP_REFERENCE_TIME_SOURCE_H_
+#define LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GPS_SNTP_REFERENCE_TIME_SOURCE_H_
+
+#include <com/ubuntu/location/providers/gps/android_hardware_abstraction_layer.h>
+
+#include <com/ubuntu/location/providers/gps/sntp_client.h>
+
+namespace com { namespace ubuntu { namespace location { namespace providers { namespace gps {
+
+class SntpReferenceTimeSource : public android::HardwareAbstractionLayer::ReferenceTimeSource
+{
+public:
+
+    /** @brief Configuration summarizes default parameter available to implementations. */
+    struct Configuration
+    {
+        /** @brief Reads a configuration from a gps.conf file in INI format. */
+        static Configuration from_gps_conf_ini_file(std::istream& in);
+
+        std::string host{"pool.ntp.org"}; /**< NTP host. */
+        std::chrono::milliseconds timeout{5000}; /**< Timeout when querying the NTP server. */
+    };
+
+    SntpReferenceTimeSource(const Configuration& configuration);
+
+    gps::HardwareAbstractionLayer::ReferenceTimeSample sample() override;
+
+private:
+    const Configuration config;
+};
+
+}}}}}
+
+#endif // LOCATION_SERVICE_COM_UBUNTU_LOCATION_PROVIDERS_GPS_SNTP_REFERENCE_TIME_SOURCE_H_

=== modified file 'src/location_service/com/ubuntu/location/providers/remote/provider.cpp'
--- src/location_service/com/ubuntu/location/providers/remote/provider.cpp	2015-04-14 18:54:00 +0000
+++ src/location_service/com/ubuntu/location/providers/remote/provider.cpp	2016-03-17 09:08:50 +0000
@@ -23,6 +23,7 @@
 #include <com/ubuntu/location/logging.h>
 
 #include <core/dbus/object.h>
+#include <core/dbus/service_watcher.h>
 #include <core/dbus/signal.h>
 #include <core/dbus/asio/executor.h>
 
@@ -191,6 +192,28 @@
     auto service = dbus::Service::use_service(bus, name);
     auto object = service->object_for_path(path);
 
+    // Check if the service has come up
+    if (!bus->has_owner_for_name(name)) {
+        // If it hasn't wait for it to come up
+        bool valid = false;
+        std::mutex guard;
+        std::condition_variable cv;
+        dbus::DBus daemon(bus);
+        dbus::ServiceWatcher::Ptr service_watcher(
+            daemon.make_service_watcher(name, dbus::DBus::WatchMode::registration));
+
+        service_watcher->service_registered().connect([&valid, &guard, &cv]()
+            {
+                std::unique_lock<std::mutex> ul(guard);
+                valid = true;
+                cv.notify_all();
+            });
+
+        std::unique_lock<std::mutex> ul(guard);
+        if (not cv.wait_for(ul, std::chrono::seconds{30}, [&valid]() { return valid; }))
+            throw std::runtime_error("Remote service failed to start");
+    }
+
     return create_instance_with_config(remote::stub::Configuration{object});
 }
 

=== modified file 'src/location_service/com/ubuntu/location/service/daemon.cpp'
--- src/location_service/com/ubuntu/location/service/daemon.cpp	2016-03-17 09:08:50 +0000
+++ src/location_service/com/ubuntu/location/service/daemon.cpp	2016-03-17 09:08:50 +0000
@@ -181,28 +181,27 @@
         trap->stop();
     });
 
-    auto runtime = location::service::Runtime::create();
-
-    const location::Configuration empty_provider_configuration;
-
-    std::set<location::Provider::Ptr> instantiated_providers;
-
+    auto runtime = location::service::Runtime::create(4);
+
+    location::service::DefaultConfiguration dc;
+    auto engine = dc.the_engine(std::set<location::Provider::Ptr>{}, dc.the_provider_selection_policy(), config.settings);
     for (const std::string& provider : config.providers)
     {
         std::cout << "Instantiating and configuring: " << provider << std::endl;
 
         try
         {
-            auto p = location::ProviderFactory::instance().create_provider_for_name_with_config(
-                        provider,
-                        config.provider_options.count(provider) > 0 ?
-                            config.provider_options.at(provider) : empty_provider_configuration);
-
-            if (p)
-                instantiated_providers.insert(p);
-            else
-                throw std::runtime_error("Problem instantiating provider");
-
+            auto result = std::async(std::launch::async, [provider, config, engine] {
+                return location::ProviderFactory::instance().create_provider_for_name_with_config(
+                    provider,
+                    config.provider_options.count(provider) > 0 ?
+                        config.provider_options.at(provider) : location::Configuration {},
+                    [engine](Provider::Ptr provider)
+                    {
+                        engine->add_provider(provider);
+                    }
+                );
+            });
         } catch(const std::runtime_error& e)
         {
             std::cerr << "Issue instantiating provider: " << e.what() << std::endl;
@@ -214,13 +213,11 @@
 
     runtime->start();
 
-    location::service::DefaultConfiguration dc;
-
     location::service::Implementation::Configuration configuration
     {
         config.incoming,
         config.outgoing,
-        dc.the_engine(instantiated_providers, dc.the_provider_selection_policy(), config.settings),
+        engine,
         dc.the_permission_manager(config.outgoing),
         location::service::Harvester::Configuration
         {

=== modified file 'src/location_service/com/ubuntu/location/service/implementation.cpp'
--- src/location_service/com/ubuntu/location/service/implementation.cpp	2016-03-17 09:08:50 +0000
+++ src/location_service/com/ubuntu/location/service/implementation.cpp	2016-03-17 09:08:50 +0000
@@ -156,10 +156,12 @@
     std::weak_ptr<session::Interface> session_weak{session_iface};
     session_iface->updates().position_status.changed().connect([this, session_weak](const session::Interface::Updates::Status& status)
     {
-        cul::Optional<cul::Update<cul::Position>> last_known_position =
-            configuration.engine->updates.last_known_location.get();
-        if (last_known_position &&
-            status == culs::session::Interface::Updates::Status::enabled)
+        cul::Optional<cul::Update<cul::Position>> last_known_position = configuration.engine->updates.last_known_location.get();
+        bool has_last_known_position = last_known_position ? true : false;
+        bool is_session_enabled = status == culs::session::Interface::Updates::Status::enabled;
+        bool is_session_on_or_active = configuration.engine->configuration.engine_state != Engine::Status::off;
+
+        if (has_last_known_position && is_session_enabled && is_session_on_or_active)
         {
             // Immediately send the last known position to the client
             if (auto session_iface = session_weak.lock())

=== modified file 'src/location_service/com/ubuntu/location/service/provider_daemon.cpp'
--- src/location_service/com/ubuntu/location/service/provider_daemon.cpp	2016-03-17 09:08:50 +0000
+++ src/location_service/com/ubuntu/location/service/provider_daemon.cpp	2016-03-17 09:08:50 +0000
@@ -112,7 +112,7 @@
 {
 std::shared_ptr<location::service::Runtime> runtime()
 {
-    static const auto inst = location::service::Runtime::create(1);
+    static const auto inst = location::service::Runtime::create(2);
     return inst;
 }
 }

=== modified file 'src/location_service/com/ubuntu/location/service/runtime.h'
--- src/location_service/com/ubuntu/location/service/runtime.h	2016-03-17 09:08:50 +0000
+++ src/location_service/com/ubuntu/location/service/runtime.h	2016-03-17 09:08:50 +0000
@@ -42,7 +42,7 @@
 {
 public:
     // Our default concurrency setup.
-    static constexpr const std::uint32_t worker_threads = 2;
+    static constexpr const std::uint32_t worker_threads = 4;
 
     // create returns a Runtime instance with pool_size worker threads
     // executing the underlying service.

=== modified file 'src/location_service/com/ubuntu/location/service/runtime_tests.cpp'
--- src/location_service/com/ubuntu/location/service/runtime_tests.cpp	2015-01-26 20:15:05 +0000
+++ src/location_service/com/ubuntu/location/service/runtime_tests.cpp	2016-03-17 09:08:50 +0000
@@ -16,9 +16,12 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
+#include <com/ubuntu/location/service/program_options.h>
+#include <com/ubuntu/location/service/runtime.h>
 #include <com/ubuntu/location/service/runtime_tests.h>
 
 #include <com/ubuntu/location/clock.h>
+#include <com/ubuntu/location/logging.h>
 #include <com/ubuntu/location/providers/gps/hardware_abstraction_layer.h>
 
 #include <boost/accumulators/accumulators.hpp>
@@ -30,6 +33,7 @@
 
 #include <chrono>
 #include <condition_variable>
+#include <fstream>
 #include <iostream>
 #include <mutex>
 #include <thread>
@@ -39,6 +43,39 @@
 
 namespace
 {
+namespace options
+{
+struct ResultFile
+{
+    static constexpr const char* name{"result-file"};
+
+    static void add_to_options(location::ProgramOptions& options)
+    {
+        options.add(name, "statistics are written to this file", std::string("runtime_test_result.txt"));
+    }
+
+    static std::string read_from_options(location::ProgramOptions& options)
+    {
+        return options.value_for_key<std::string>(name);
+    }
+};
+
+struct Trials
+{
+    static constexpr const char* name{"trials"};
+
+    static void add_to_options(location::ProgramOptions& options)
+    {
+        options.add(name, "total number of independent trials", std::uint32_t(3));
+    }
+
+    static std::uint32_t read_from_options(location::ProgramOptions& options)
+    {
+        return options.value_for_key<std::uint32_t>(name);
+    }
+};
+}
+
 template<bool expected, typename Exception>
 void expect(bool value, const std::string& what)
 {
@@ -49,6 +86,22 @@
 // running service instance and restarting it after the tests have been run.
 struct Fixture
 {
+    // ChipsetStartupMode enumerates all known startup modes.
+    enum class ChipsetStartupMode : std::uint32_t
+    {
+        cold, // Force a cold start, deleting all assistance data.
+        warm  // Warm start, rely on known assistance data.
+    };
+
+    // Configuration summarizes test case parameters.
+    struct Configuration
+    {
+        std::string name;                    // Name of the test case.
+        gps::AssistanceMode assistance_mode; // Requested assistance mode.
+        ChipsetStartupMode startup_mode;     // Requested startup mode.
+        std::size_t no_trials;               // Total number of independent trials.
+    };
+
     Fixture()
     {
         // We need to make sure that we are running as root. In addition, we will stop
@@ -70,8 +123,19 @@
     }
 };
 
+std::ostream& operator<<(std::ostream& out, Fixture::ChipsetStartupMode mode)
+{
+    switch (mode)
+    {
+    case Fixture::ChipsetStartupMode::cold: return out << "cold";
+    case Fixture::ChipsetStartupMode::warm: return out << "warm";
+    }
+
+    return out;
+}
+
 #if defined(COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_GPS)
-int snr_and_ttff()
+int snr_and_ttff(const Fixture::Configuration& config, std::ostream& out)
 {
     typedef boost::accumulators::accumulator_set<
         double,
@@ -84,8 +148,6 @@
     using boost::accumulators::mean;
     using boost::accumulators::variance;
 
-    static const unsigned int trials = 3;
-
     Statistics stats;
     auto hal = gps::HardwareAbstractionLayer::create_default_instance();
 
@@ -120,28 +182,37 @@
         bool fix_received;
     } state;
 
-    // We want to run in standalone mode
-    hal->set_assistance_mode(gps::AssistanceMode::standalone);
+    hal->set_assistance_mode(config.assistance_mode);
 
     // We wire up our state to position updates from the hal.
-    hal->position_updates().connect([&state](const location::Position& pos)
+    core::ScopedConnection scp = hal->position_updates().connect([&state](const location::Position& pos)
     {
         state.on_position_updated(pos);
     });
 
     // We report updates to the visible space vehicles here.
-    hal->space_vehicle_updates().connect([](const std::set<location::SpaceVehicle>& svs)
+    core::ScopedConnection svsc = hal->space_vehicle_updates().connect([](const std::set<location::SpaceVehicle>& svs)
     {
-        std::cout << std::scientific;
-        std::cout << "key snr has_almanac_data has_ephimeris_data used_in_fix azimuth elevation" << std::endl;
-        for (const auto& sv : svs)
-            std::cout << sv.key.id << " " << sv.snr << " " << sv.has_almanac_data << " " << sv.has_ephimeris_data << " " << sv.used_in_fix << " " << sv.azimuth.value() << " " << sv.elevation.value() << std::endl;
+        if (svs.size() > 0)
+        {
+            LOG(INFO) << "key snr has_almanac_data has_ephimeris_data used_in_fix azimuth elevation";
+            for (const auto& sv : svs)
+                LOG(INFO) << sv.key.id << " " << sv.snr << " " << sv.has_almanac_data << " " << sv.has_ephimeris_data << " " << sv.used_in_fix << " " << sv.azimuth.value() << " " << sv.elevation.value();
+        }
     });
 
-    for (unsigned int i = 0; i < trials; i++)
+    std::cout << "  " << config.name << " [" << config.no_trials << " trials]\t\t|" << std::flush;
+
+    for (unsigned int i = 0; i < config.no_trials; i++)
     {
-        // We want to force a cold start per trial.
-        hal->delete_all_aiding_data();
+        switch (config.startup_mode)
+        {
+        case Fixture::ChipsetStartupMode::cold:
+            hal->delete_all_aiding_data();
+            break;
+        default:
+            break;
+        }
 
         state.reset();
         auto start = std::chrono::duration_cast<std::chrono::microseconds>(location::Clock::now().time_since_epoch());
@@ -155,31 +226,56 @@
         }
         auto stop = std::chrono::duration_cast<std::chrono::microseconds>(location::Clock::now().time_since_epoch());
 
-        stats((stop - start).count());
+        stats((stop - start).count()); std::cout << "·" << std::flush;
     }
+    std::cout << "|" << std::endl;
 
-    std::cout << "Mean time to first fix in [ms]: "
-              << std::chrono::duration_cast<std::chrono::milliseconds>(
-                     std::chrono::microseconds(
-                         static_cast<std::uint64_t>(mean(stats)))).count()
-              << std::endl;
-    std::cout << "Variance in time to first fix in [ms]: "
-              << std::chrono::duration_cast<std::chrono::milliseconds>(
-                     std::chrono::microseconds(
-                         static_cast<std::uint64_t>(variance(stats)))).count()
-              << std::endl;
+    out << config.name << std::endl
+        << "  Mean time to first fix in [ms]: "
+        << std::chrono::duration_cast<std::chrono::milliseconds>(
+                std::chrono::microseconds(
+                    static_cast<std::uint64_t>(mean(stats)))).count()
+        << std::endl
+        << "  Std. dev in time to first fix in [ms]: "
+        << std::chrono::duration_cast<std::chrono::milliseconds>(
+                std::chrono::microseconds(
+                    static_cast<std::uint64_t>(::sqrt(variance(stats))))).count()
+        << std::endl;
 
     return 0;
 }
 #else
-int snr_and_ttff() { return 0; }
+int snr_and_ttff(const Fixture::Configuration&, std::ostream&) { return 0; }
 #endif // COM_UBUNTU_LOCATION_SERVICE_PROVIDERS_GPS
 }
 
+#define RUNTIME_TEST(name, assistance_mode, startup_mode, trials, result) \
+    {\
+        auto rc = snr_and_ttff(Fixture::Configuration{name, assistance_mode, startup_mode, trials}, result); \
+        if (rc != 0) return rc; \
+    }
+
 int location::service::execute_runtime_tests()
 {
     Fixture fixture; // This throws in case of issues.
-    auto rc = snr_and_ttff(); if (rc != 0) return rc;
-    // Other runtime tests go here;
-    return rc;
+
+    location::ProgramOptions po;
+    po.environment_prefix("UBUNTU_LOCATION_SERVICE_RUNTIME_TESTS_");
+
+    options::ResultFile::add_to_options(po);
+    options::Trials::add_to_options(po);
+
+    po.parse_from_environment();
+
+    auto trials = options::Trials::read_from_options(po);
+    std::ofstream out{options::ResultFile::read_from_options(po)}; // Actual result statistics are stored here.
+
+    std::cout << "Location service runtime tests:" << std::endl;
+
+    RUNTIME_TEST("ColdStartWithAssistance", gps::AssistanceMode::mobile_station_based, Fixture::ChipsetStartupMode::cold, trials, out);
+    RUNTIME_TEST("WarmStartWithoutAssistance", gps::AssistanceMode::standalone, Fixture::ChipsetStartupMode::warm, trials, out);
+    RUNTIME_TEST("WarmStartWithAssistance", gps::AssistanceMode::mobile_station_based, Fixture::ChipsetStartupMode::warm, trials, out);
+    RUNTIME_TEST("ColdStartWithoutAssistance",  gps::AssistanceMode::standalone, Fixture::ChipsetStartupMode::cold, trials, out);
+
+    return 0;
 }

=== modified file 'src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp'
--- src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp	2014-09-19 14:36:51 +0000
+++ src/location_service/com/ubuntu/location/service/trust_store_permission_manager.cpp	2016-03-17 09:08:50 +0000
@@ -146,7 +146,7 @@
         return service::PermissionManager::Result::rejected;
     }
 
-    std::string description = i18n::tr("%1% wants to access your current location.");
+    std::string description = i18n::tr("wants to access your current location.");
 
     core::trust::Agent::RequestParameters params
     {

=== added file 'src/location_service/com/ubuntu/location/time_since_boot.cpp'
--- src/location_service/com/ubuntu/location/time_since_boot.cpp	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/time_since_boot.cpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,140 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#include <com/ubuntu/location/time_since_boot.h>
+#include <com/ubuntu/location/logging.h>
+
+#if defined(COM_UBUNTU_LOCATION_SERVICE_HAVE_UBUNTU_PLATFORM_HARDWARE_API)
+#include <ubuntu/hardware/alarm.h>
+#endif // COM_UBUNTU_LOCATION_SERVICE_HAVE_UBUNTU_PLATFORM_HARDWARE_API
+
+#include <fstream>
+#include <sstream>
+#include <stdexcept>
+#include <system_error>
+
+namespace location = com::ubuntu::location;
+
+namespace
+{
+bool have_ubuntu_hardware_alarm()
+{
+#if defined(COM_UBUNTU_LOCATION_SERVICE_HAVE_UBUNTU_PLATFORM_HARDWARE_API)
+    return true;
+#else
+    return false;
+#endif // COM_UBUNTU_LOCATION_SERVICE_HAVE_UBUNTU_PLATFORM_HARDWARE_API
+}
+
+std::chrono::nanoseconds from_ubuntu_hardware_alarm()
+{
+#if defined(COM_UBUNTU_LOCATION_SERVICE_HAVE_UBUNTU_PLATFORM_HARDWARE_API)
+    struct Scope
+    {
+        Scope() : alarm{u_hardware_alarm_create()}
+        {
+        }
+
+        ~Scope()
+        {
+            u_hardware_alarm_unref(alarm);
+        }
+
+        UHardwareAlarm alarm{nullptr};
+    };
+
+    static Scope scope;
+
+    ::timespec ts;
+    if (not scope.alarm)
+        throw std::runtime_error{"Failed to access UHardwareAlarm subsystem."};
+
+    if (U_STATUS_SUCCESS != u_hardware_alarm_get_elapsed_real_time(scope.alarm, &ts))
+        throw std::runtime_error{"Failed to query time since boot from UHardwareAlarm."};
+
+    return std::chrono::seconds{ts.tv_sec} + std::chrono::nanoseconds{ts.tv_nsec};
+#else
+    throw std::logic_error{"not implemented"};
+#endif // COM_UBUNTU_LOCATION_SERVICE_HAVE_UBUNTU_PLATFORM_HARDWARE_API
+}
+
+
+std::chrono::nanoseconds from_clock_boottime()
+{
+    ::timespec ts;
+    if (-1 == clock_gettime(CLOCK_BOOTTIME, &ts))
+        throw std::system_error(errno, std::system_category());
+
+    return std::chrono::seconds{ts.tv_sec} + std::chrono::nanoseconds{ts.tv_nsec};
+}
+
+std::chrono::nanoseconds boot_time()
+{
+    std::ifstream in{"/proc/stat"};
+    std::string line;
+
+    while (std::getline(in, line))
+    {
+        if (line.empty())
+            continue;
+
+        std::stringstream ss{line};
+        std::string name; ss >> name;
+
+        if (name != "btime")
+            continue;
+
+        std::uint64_t ts; ss >> ts;
+        return std::chrono::nanoseconds{std::chrono::seconds{ts}};
+    }
+
+    throw std::runtime_error{"Failed to determine system boot time."};
+}
+
+std::chrono::nanoseconds from_proc_stat()
+{
+    static const std::chrono::nanoseconds bt{boot_time()};
+    return std::chrono::system_clock::now().time_since_epoch() - bt;
+}
+}
+
+std::chrono::nanoseconds location::time_since_boot()
+{
+    if (have_ubuntu_hardware_alarm())
+    {
+        try
+        {
+            return from_ubuntu_hardware_alarm();
+        }
+        catch (const std::exception& e)
+        {
+            VLOG(1) << e.what();
+        }
+    }
+
+    try
+    {
+        return from_clock_boottime();
+    }
+    catch (const std::exception& e)
+    {
+        VLOG(1) << e.what();
+    }
+
+    return from_proc_stat();
+}

=== added file 'src/location_service/com/ubuntu/location/time_since_boot.h'
--- src/location_service/com/ubuntu/location/time_since_boot.h	1970-01-01 00:00:00 +0000
+++ src/location_service/com/ubuntu/location/time_since_boot.h	2016-03-17 09:08:50 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef LOCATION_SERVICE_UBUNTU_LOCATION_SERVICE_TIME_SINCE_BOOT_H_
+#define LOCATION_SERVICE_UBUNTU_LOCATION_SERVICE_TIME_SINCE_BOOT_H_
+
+#include <chrono>
+
+namespace com
+{
+namespace ubuntu
+{
+namespace location
+{
+/** @brief time_since_boot returns the nanoseconds that elapsed since boot. */
+std::chrono::nanoseconds time_since_boot();
+}
+}
+}
+
+#endif // LOCATION_SERVICE_UBUNTU_LOCATION_SERVICE_TIME_SINCE_BOOT_H_

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-03-17 09:08:50 +0000
+++ tests/CMakeLists.txt	2016-03-17 09:08:50 +0000
@@ -98,6 +98,7 @@
 if (LOCATION_SERVICE_ENABLE_GPS_PROVIDER)
   include_directories(${CMAKE_SOURCE_DIR}/src/location_service)
   LOCATION_SERVICE_ADD_TEST(gps_provider_test gps_provider_test.cpp)
+  LOCATION_SERVICE_ADD_TEST(sntp_client_test sntp_client_test.cpp)
 endif(LOCATION_SERVICE_ENABLE_GPS_PROVIDER)
 
 if (LOCATION_SERVICE_ENABLE_GEOCLUE_PROVIDERS)
@@ -125,3 +126,4 @@
 
 LOCATION_SERVICE_ADD_TEST(remote_provider_test remote_provider_test.cpp)
 LOCATION_SERVICE_ADD_TEST(espoo_provider_test espoo_provider_test.cpp)
+LOCATION_SERVICE_ADD_TEST(delayed_service_test delayed_service_test.cpp)

=== added file 'tests/delayed_service_test.cpp'
--- tests/delayed_service_test.cpp	1970-01-01 00:00:00 +0000
+++ tests/delayed_service_test.cpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,193 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ *              Scott Sweeny <[e-mail]>
+ */
+
+#include <com/ubuntu/location/service/daemon.h>
+#include <com/ubuntu/location/service/provider_daemon.h>
+#include <com/ubuntu/location/providers/remote/provider.h>
+
+#include <com/ubuntu/location/service/stub.h>
+
+#include <com/ubuntu/location/position.h>
+#include <com/ubuntu/location/update.h>
+
+#include <core/dbus/fixture.h>
+
+#include <core/dbus/asio/executor.h>
+
+#include <core/posix/fork.h>
+#include <core/posix/signal.h>
+#include <core/posix/this_process.h>
+
+#include "did_finish_successfully.h"
+#include "mock_event_receiver.h"
+
+#include <gmock/gmock.h>
+
+namespace location = com::ubuntu::location;
+namespace remote = com::ubuntu::location::providers::remote;
+
+namespace
+{
+struct DelayedServiceTest : public core::dbus::testing::Fixture, public ::testing::WithParamInterface<int>
+{
+
+};
+}
+
+TEST_P(DelayedServiceTest, AClientReceivesUpdatesFromADelayedProvider)
+{
+    auto oopp = core::posix::fork([this]()
+    {
+        auto bus = session_bus();
+
+        // Pass the delay value to the provider
+        char delay[50];
+        sprintf(delay, "--dummy::DelayedProvider::DelayInMs=%d", GetParam());
+
+        const char* argv[] =
+        {
+            "--bus", "session",                                         // 2
+            "--service-name", "com.ubuntu.location.providers.Dummy",    // 4
+            "--service-path", "/com/ubuntu/location/providers/Dummy",   // 6
+            "--provider", "dummy::DelayedProvider",                     // 8
+            delay                                                       // 9
+        };
+
+        auto dbus_connection_factory = [bus](core::dbus::WellKnownBus)
+        {
+            return bus;
+        };
+
+        return static_cast<core::posix::exit::Status>(
+                    location::service::ProviderDaemon::main(
+                        location::service::ProviderDaemon::Configuration::from_command_line_args(
+                            9, argv, dbus_connection_factory)));
+    }, core::posix::StandardStream::empty);
+
+    std::this_thread::sleep_for(std::chrono::milliseconds{250});
+
+    auto service = core::posix::fork([this]()
+    {
+        core::posix::this_process::env::set_or_throw(
+                    "TRUST_STORE_PERMISSION_MANAGER_IS_RUNNING_UNDER_TESTING",
+                    "1");
+
+        const char* argv[] =
+        {
+            "--bus", "session",                                                 // 2
+            "--provider", "remote::Provider",                                   // 4
+            "--remote::Provider::bus=session_with_address_from_env",            // 5
+            "--remote::Provider::name=com.ubuntu.location.providers.Dummy",     // 6
+            "--remote::Provider::path=/com/ubuntu/location/providers/Dummy"     // 7
+        };
+
+        // The daemon instance requires two bus instances.
+        auto dbus_connection_factory = [this](core::dbus::WellKnownBus)
+        {
+            return session_bus();
+        };
+
+        return static_cast<core::posix::exit::Status>(
+                    location::service::Daemon::main(
+                        location::service::Daemon::Configuration::from_command_line_args(
+                            7, argv, dbus_connection_factory)));
+    }, core::posix::StandardStream::empty);
+
+    // Wait to setup the client until the service is up
+    std::this_thread::sleep_for(std::chrono::milliseconds{250 + GetParam()});
+
+    auto client = core::posix::fork([this]()
+    {
+        using namespace ::testing;
+
+        auto trap = core::posix::trap_signals_for_all_subsequent_threads(
+        {
+            core::posix::Signal::sig_term,
+            core::posix::Signal::sig_int
+        });
+
+        trap->signal_raised().connect([trap](const core::posix::Signal&)
+        {
+            trap->stop();
+        });
+
+        auto bus = session_bus();
+        bus->install_executor(core::dbus::asio::make_executor(bus));
+
+        std::thread worker
+        {
+            [bus]() { bus->run(); }
+        };
+
+        MockEventReceiver receiver;
+        EXPECT_CALL(receiver, position_update_received(_)).Times(AtLeast(1));
+        EXPECT_CALL(receiver, heading_update_received(_)).Times(AtLeast(1));
+        EXPECT_CALL(receiver, velocity_update_received(_)).Times(AtLeast(1));
+
+        com::ubuntu::location::service::Stub service{bus};
+
+        auto session = service.create_session_for_criteria(location::Criteria{});
+
+        session->updates().position.changed().connect([&receiver](location::Update<location::Position> pos)
+        {
+             receiver.position_update_received(pos);
+        });
+
+        session->updates().heading.changed().connect([&receiver](location::Update<location::Heading> heading)
+        {
+             receiver.heading_update_received(heading);
+        });
+
+        session->updates().velocity.changed().connect([&receiver](location::Update<location::Velocity> velocity)
+        {
+             receiver.velocity_update_received(velocity);
+        });
+
+        session->updates().position_status = location::service::session::Interface::Updates::Status::enabled;
+        session->updates().velocity_status = location::service::session::Interface::Updates::Status::enabled;
+        session->updates().heading_status = location::service::session::Interface::Updates::Status::enabled;
+
+        trap->run();
+
+        bus->stop();
+
+        if (worker.joinable())
+            worker.join();
+
+        return ::testing::Test::HasFailure() ? core::posix::exit::Status::failure :
+                                               core::posix::exit::Status::success;
+    }, core::posix::StandardStream::empty);
+
+    std::this_thread::sleep_for(std::chrono::milliseconds{4000});
+
+    std::cout << "Shutting down client" << std::endl;
+    client.send_signal_or_throw(core::posix::Signal::sig_term);
+    EXPECT_TRUE(did_finish_successfully(client.wait_for(core::posix::wait::Flags::untraced)));
+
+    std::cout << "Shutting down service" << std::endl;
+    service.send_signal_or_throw(core::posix::Signal::sig_term);
+    EXPECT_TRUE(did_finish_successfully(service.wait_for(core::posix::wait::Flags::untraced)));
+
+    std::cout << "Shutting down oopp" << std::endl;
+    oopp.send_signal_or_throw(core::posix::Signal::sig_term);
+    EXPECT_TRUE(did_finish_successfully(oopp.wait_for(core::posix::wait::Flags::untraced)));
+}
+
+INSTANTIATE_TEST_CASE_P(ServiceDelays, DelayedServiceTest,
+                        ::testing::Values(0, 250, 500, 1000, 2000, 5000, 10000));

=== modified file 'tests/gps_provider_test.cpp'
--- tests/gps_provider_test.cpp	2016-03-17 09:08:50 +0000
+++ tests/gps_provider_test.cpp	2016-03-17 09:08:50 +0000
@@ -81,6 +81,11 @@
     MOCK_METHOD1(on_space_vehicles_updated, void(const std::set<location::SpaceVehicle>&));
 };
 
+struct MockReferenceTimeSource : public gps::android::HardwareAbstractionLayer::ReferenceTimeSource
+{
+    MOCK_METHOD0(sample, gps::HardwareAbstractionLayer::ReferenceTimeSample());
+};
+
 struct MockSuplAssistant : public gps::HardwareAbstractionLayer::SuplAssistant
 {
     MockSuplAssistant()
@@ -93,6 +98,8 @@
 
     MOCK_CONST_METHOD0(status, const core::Property<Status>&());
     MOCK_CONST_METHOD0(server_ip, const core::Property<IpV4Address>&());
+    MOCK_CONST_METHOD2(set_set_id, void(SetIdType, const std::string&));
+    MOCK_CONST_METHOD1(inject_radio_cell_information, void(const location::connectivity::RadioCell& radio_cell));
     MOCK_METHOD2(set_server, void(const std::string&, std::uint16_t));
     MOCK_METHOD1(notify_data_connection_open_via_apn, void(const std::string&));
     MOCK_METHOD0(notify_data_connection_closed, void());
@@ -133,9 +140,7 @@
     MOCK_METHOD1(set_assistance_mode, bool(gps::AssistanceMode));
     MOCK_METHOD1(set_position_mode, bool(gps::PositionMode));
     MOCK_METHOD1(inject_reference_position, bool(const location::Position&));
-    MOCK_METHOD2(inject_reference_time,
-                 bool(const std::chrono::microseconds&,
-                      const std::chrono::microseconds&));
+    MOCK_METHOD1(inject_reference_time, bool(const location::providers::gps::HardwareAbstractionLayer::ReferenceTimeSample&));
 
     MockSuplAssistant supl_assistant_;
     core::Signal<location::Position> position_updates_;
@@ -322,24 +327,54 @@
     provider.on_reference_location_updated(pos);
 }
 
+TEST(GpsProvider, time_requests_query_reference_time_source)
+{
+    using namespace ::testing;
+
+    NiceMock<MockHardwareGps> hardwareGps;
+
+    auto mock_reference_time_source = std::make_shared<MockReferenceTimeSource>();
+    EXPECT_CALL(*mock_reference_time_source, sample())
+            .Times(1)
+            .WillRepeatedly(Return(gps::HardwareAbstractionLayer::ReferenceTimeSample{}));
+
+    gps::android::HardwareAbstractionLayer::Configuration configuration;
+    configuration.reference_time_source = mock_reference_time_source;
+    gps::android::HardwareAbstractionLayer hal(configuration);
+
+    gps::android::HardwareAbstractionLayer::on_request_utc_time(&hal);
+}
+
 TEST(GpsProvider, time_requests_inject_current_time_into_the_hal)
 {
     using namespace ::testing;
 
+    auto sample_reference_time = []()
+    {
+        auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(location::Clock::now().time_since_epoch());
+        std::cout << duration.count() << std::endl;
+        return gps::HardwareAbstractionLayer::ReferenceTimeSample{duration, duration, std::chrono::milliseconds{0}};
+    };
+
     NiceMock<MockHardwareGps> hardwareGps;
 
+    auto mock_reference_time_source = std::make_shared<MockReferenceTimeSource>();
+    EXPECT_CALL(*mock_reference_time_source, sample())
+            .Times(1)
+            .WillRepeatedly(Invoke(sample_reference_time));
+
     gps::android::HardwareAbstractionLayer::Configuration configuration;
+    configuration.reference_time_source = mock_reference_time_source;
     gps::android::HardwareAbstractionLayer hal(configuration);
-    std::shared_ptr<gps::HardwareAbstractionLayer> hal_ptr(&hal, [](gps::HardwareAbstractionLayer*){});
+    hal.capabilities() = U_HARDWARE_GPS_CAPABILITY_ON_DEMAND_TIME;
 
-    gps::Provider provider(hal_ptr);
     int64_t time = 0;
     EXPECT_CALL(hardwareGps, inject_time(_, _, 0)).Times(1).WillOnce(SaveArg<0>(&time));
 
     auto t0 = std::chrono::duration_cast<std::chrono::milliseconds>(location::Clock::now().time_since_epoch());
-
+    //std::this_thread::sleep_for(std::chrono::milliseconds{10});
     gps::android::HardwareAbstractionLayer::on_request_utc_time(&hal);
-
+    //std::this_thread::sleep_for(std::chrono::milliseconds{10});
     auto t1 = std::chrono::duration_cast<std::chrono::milliseconds>(location::Clock::now().time_since_epoch());
     EXPECT_THAT(time, AllOf(Ge(t0.count()), Le(t1.count())));
 }
@@ -929,4 +964,3 @@
                          static_cast<std::uint64_t>(variance(stats)))).count()
               << std::endl;
 }
-

=== added file 'tests/mock_event_receiver.h'
--- tests/mock_event_receiver.h	1970-01-01 00:00:00 +0000
+++ tests/mock_event_receiver.h	2016-03-17 09:08:50 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright © 2015 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ *              Scott Sweeny <[e-mail]>
+ */
+#ifndef MOCK_EVENT_RECEIVER_H_
+#define MOCK_EVENT_RECEIVER_H_
+
+#include <com/ubuntu/location/update.h>
+
+#include <gmock/gmock.h>
+
+namespace location = com::ubuntu::location;
+
+struct MockEventReceiver
+{
+    MOCK_METHOD1(position_update_received, void(const location::Update<location::Position>&));
+    MOCK_METHOD1(heading_update_received, void(const location::Update<location::Heading>&));
+    MOCK_METHOD1(velocity_update_received, void(const location::Update<location::Velocity>&));
+};
+
+#endif // MOCK_EVENT_RECEIVER_H_

=== modified file 'tests/remote_providerd_test.cpp'
--- tests/remote_providerd_test.cpp	2014-10-27 21:58:16 +0000
+++ tests/remote_providerd_test.cpp	2016-03-17 09:08:50 +0000
@@ -31,6 +31,7 @@
 #include <core/posix/fork.h>
 
 #include "did_finish_successfully.h"
+#include "mock_event_receiver.h"
 
 #include <gmock/gmock.h>
 
@@ -38,13 +39,6 @@
 
 namespace
 {
-struct MockEventReceiver
-{
-    MOCK_METHOD1(position_update_received, void(const location::Update<location::Position>&));
-    MOCK_METHOD1(heading_update_received, void(const location::Update<location::Heading>&));
-    MOCK_METHOD1(velocity_update_received, void(const location::Update<location::Velocity>&));
-};
-
 struct RemoteProviderdTest : public core::dbus::testing::Fixture
 {
 

=== added file 'tests/sntp_client_test.cpp'
--- tests/sntp_client_test.cpp	1970-01-01 00:00:00 +0000
+++ tests/sntp_client_test.cpp	2016-03-17 09:08:50 +0000
@@ -0,0 +1,104 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#include <com/ubuntu/location/providers/gps/sntp_client.h>
+#include <com/ubuntu/location/service/runtime.h>
+
+#include <future>
+
+#include <core/posix/this_process.h>
+
+#include <gtest/gtest.h>
+
+namespace env = core::posix::this_process::env;
+namespace location = com::ubuntu::location;
+namespace sntp = location::providers::gps::sntp;
+
+namespace
+{
+struct SntpClient : public ::testing::Test
+{
+    void SetUp()
+    {
+        rt->start();
+    }
+
+    void TearDown()
+    {
+        rt->stop();
+    }
+
+    std::shared_ptr<location::service::Runtime> rt = location::service::Runtime::create();
+    std::string host = env::get("UBUNTU_LOCATION_SERVICE_NTP_HOST_FOR_TESTING", "ntp.ubuntu.com");
+};
+}
+
+TEST_F(SntpClient, packet_has_correct_size)
+{
+    static_assert(sizeof(sntp::Packet) == 48, "");
+}
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmultichar"
+TEST(EnumConstant, yields_same_value_as_multibyte_constant)
+{
+    static_assert(sntp::detail::enum_constant<'L','O','C','L'>() == 'LOCL', "");
+}
+#pragma GCC diagnostic pop
+
+TEST_F(SntpClient, succeeds_in_querying_time_from_server)
+{
+    location::providers::gps::sntp::Client sntp_client;
+    try
+    {
+        sntp_client.request_time(host, std::chrono::milliseconds{5000}, rt->service());
+    }
+    catch(...)
+    {
+    }
+}
+
+TEST_F(SntpClient, throws_for_timed_out_operation)
+{
+    location::providers::gps::sntp::Client sntp_client;
+    EXPECT_ANY_THROW(sntp_client.request_time(host, std::chrono::milliseconds{1}, rt->service()));
+}
+
+TEST_F(SntpClient, returns_correct_data_in_packet)
+{
+    for (unsigned int i = 0; i < 10; i++)