Lots of updates to webserver.
Make ssl keys consistent (and write to the correct location)
Make sessions keyed by connection id
Clean up logging frameworks
Add new static files, and make firmware update work
Make sensors work again
Add better json handling
Change-Id: I531a0fd7d583e049949cf27aa71544808fd7642d
diff --git a/boost-dbus/include/dbus/detail/queue.hpp b/boost-dbus/include/dbus/detail/queue.hpp
index c435af3..a1ca563 100644
--- a/boost-dbus/include/dbus/detail/queue.hpp
+++ b/boost-dbus/include/dbus/detail/queue.hpp
@@ -30,6 +30,11 @@
public:
queue(boost::asio::io_service& io_service) : io(io_service) {}
+ queue(const queue<Message>& m)
+ : io(m.io), messages(m.messages), handlers(m.handlers) {
+ //TODO(ed) acquire the lock before copying messages and handlers
+ }
+
private:
class closure {
handler_type handler_;
@@ -38,7 +43,7 @@
public:
void operator()() { handler_(error_, message_); }
- closure(BOOST_ASIO_MOVE_ARG(handler_type) h, Message m,
+ closure(handler_type h, Message m,
boost::system::error_code e = boost::system::error_code())
: handler_(h), message_(m), error_(e) {}
};
@@ -54,7 +59,7 @@
lock.unlock();
- io.post(closure(BOOST_ASIO_MOVE_CAST(handler_type)(h), m));
+ io.post(closure(h, m));
}
}
@@ -85,7 +90,7 @@
init_type init(BOOST_ASIO_MOVE_CAST(MessageHandler)(h));
- io.post(closure(BOOST_ASIO_MOVE_CAST(handler_type)(init.handler), m));
+ io.post(closure(init.handler, m));
return init.result.get();
}