Commit graph

1172 commits

Author SHA1 Message Date
Eric Frias
fa2b8fd4d2 Merge branch 'cryptonomex_master'
# Conflicts:
#	src/network/http/websocket.cpp
2016-02-26 11:16:10 -05:00
theoreticalbts
83b4de067a future.cpp: Fix use-after-free bug cryptonomex/graphene#597 2016-02-25 03:04:45 -05:00
theoreticalbts
232d59525a raw.hpp: Use fc::raw:: namespace explicitly everywhere, cleanup whitespace 2016-02-19 16:36:29 -05:00
Daniel Larimer
e5ca765f15 clean up logging 2016-02-15 11:59:28 -05:00
Daniel Larimer
a54d469f3c Merge branch 'master' of https://github.com/cryptonomex/fc 2016-02-11 17:16:43 -05:00
Daniel Larimer
bde8a7f424 fixes updates for deque to variant 2016-02-11 17:16:39 -05:00
Eric Frias
6ed7717826 Handle http requests to the websocket server async, in a similar manner to the way regular websocket messages were handled since 01445529f0. Fixes cryptonomex/graphene#251, and likely eliminates the need for the workaround used to fix cryptonomex/graphene#1 and cryptonomex/graphene#252 2016-02-10 15:25:54 -05:00
Daniel Larimer
7840ef16e9 adding rshift 2016-02-04 16:32:13 -05:00
Daniel Larimer
4438c8aa80 fix include dependency and redundancy of to_variant 2016-02-02 13:36:48 -05:00
Daniel Larimer
78552e83d6 Merge branch 'master' of https://github.com/cryptonomex/fc 2016-02-01 18:29:56 -05:00
Daniel Larimer
7278b56452 Merge commit '845f838' 2016-02-01 18:29:47 -05:00
Daniel Larimer
845f8388c4 add deque support to variant 2016-02-01 18:29:30 -05:00
theoreticalbts
46ed830373 variant.cpp: Tighten bool parsing in variant::as_bool() cryptonomex/graphene#525 2016-01-21 15:30:51 -05:00
theoreticalbts
9128edb0d6 websocketpp: Define BOOST_ASIO_HAS_STD_CHRONO to fix clang compile 2016-01-12 15:34:36 -05:00
theoreticalbts
8eec508b8c iostream.hpp: Add get(char&) override to allow unpack(fc::istream, unsigned_int) 2016-01-08 11:20:38 -05:00
theoreticalbts
7b6431f20e raw.hpp: Add pack() override for shared_ptr<T> 2016-01-08 11:20:32 -05:00
Michael Vandeberg
d74eee8110 Implements deserialize for extended_public_key and extended_private_key.
Implementation needed by cryptonomex/graphene#500
2016-01-07 17:14:16 -05:00
theoreticalbts
ad7ecbf061 Build with WEBSOCKETPP_STRICT_MASKING 2015-12-04 11:41:33 -05:00
Daniel Larimer
cb27b810e3 adding support for unpacking shared_ptr 2015-11-25 12:49:49 -05:00
theoreticalbts
1e10d3dc47 raw.hpp: Require high bits to be 0 when unpacking bool 2015-10-12 10:09:08 -04:00
Daniel Larimer
6495004302 move potential yields outside of catch 2015-10-09 17:08:03 -04:00
Eric Frias
f9e3f0c4e6 Merge branch 'github_master' 2015-10-06 17:02:25 -04:00
Eric Frias
2b2dfc62fc Win32 compile fixes (replace nonstandard runtime-sized auto arrays with alloca) 2015-10-05 12:09:35 -04:00
Daniel Larimer
dacdb997f8 Merge branch 'master' of https://github.com/cryptonomex/fc 2015-10-05 08:44:31 -04:00
Daniel Larimer
6872112ab0 adding extra checks for yielding while processing a catch 2015-10-05 08:44:24 -04:00
Daniel Larimer
7e32df4978 Merge pull request #46 from pmconrad/blinding
Blinding a la Oleg Andreev
2015-10-01 09:55:28 -04:00
Eric Frias
9933f57dda In asio worker threads, catch and ignore exceptions thrown by asio
handlers.  websocketspp code leaks boost exceptions from its handlers
which would otherwise terminate the program
2015-09-25 19:24:48 -04:00
Eric Frias
00c02b67df In asio worker threads, catch and ignore exceptions thrown by asio
handlers.  websocketspp code leaks boost exceptions from its handlers
which would otherwise terminate the program
2015-09-25 19:19:45 -04:00
Eric Frias
28475608cd Merge branch 'github_master' 2015-09-23 16:38:35 -04:00
Daniel Larimer
83a9e4d7c8 Update NTP performance requirments
NTP server must ACK within 300ms or time will not be set.
Removed extra printing
2015-09-23 16:22:11 -04:00
Eric Frias
008dafe7d0 Merge branch 'github_master'
Conflicts:
	src/asio.cpp
	src/network/http/websocket.cpp
2015-09-18 16:03:34 -04:00
Daniel Larimer
d19f67d94f prevent yielding from catch block 2015-09-14 11:14:52 -04:00
Daniel Larimer
483b348878 Merge branch 'master' of https://github.com/cryptonomex/fc 2015-09-11 08:55:02 -04:00
Daniel Larimer
99e1c1fd52 fix warnings 2015-09-11 08:54:51 -04:00
Daniel Larimer
19e42ac4c4 fix potential crash in websocket 2015-09-07 17:46:08 -04:00
Daniel Larimer
08944de151 updating logs to append 2015-09-07 11:15:48 -04:00
Vikram Rajkumar
c89a25a55c Merge pull request #49 from pmconrad/testing
More unit testing
2015-09-01 13:12:17 -04:00
Peter Conrad
a9364db96b Refactored + extended websocket test 2015-08-30 22:15:20 +02:00
theoreticalbts
80d967a70d variant_object: Implement operator() overload to copy a variant_object 2015-08-28 22:14:27 -04:00
SynaptiCAD User
b3f8031a83 Fix whitespace padding in recent logging changes 2015-08-28 14:05:58 -04:00
Eric Frias
9f2a1e8b0c When logging timestamps for log messages, log to millisecond precision 2015-08-25 17:30:21 -04:00
Eric Frias
71be796af5 Remove extraneous spaces in relative time printing 2015-08-24 09:34:18 -04:00
Peter Conrad
899a5c489b Added tests for UTF-8 2015-08-23 22:15:47 +02:00
Peter Conrad
cd7615475f Fixed some tests 2015-08-20 22:57:08 +02:00
Eric Frias
18ed468c6f Win32 compile fix (allocate buffer on heap instead of stack, probably a good
idea anyway given fc task stack sizes)
2015-08-17 12:38:54 -04:00
Eric Frias
f6a675681e Revert "Update secp submodule, it looks like the upstream rebased and our"
This reverts commit 5234ee532a.
2015-08-15 19:14:40 -04:00
Eric Frias
2decfbb4b4 Merge branch 'master' of git.syncad.com:/fc 2015-08-15 19:14:25 -04:00
Eric Frias
5bd281fcce Update secp submodule 2015-08-15 19:11:13 -04:00
Eric Frias
5234ee532a Update secp submodule, it looks like the upstream rebased and our
old commit hash doesn't exit any longer
2015-08-15 18:50:24 -04:00
Nathan Hourt
9c868b3927 Fix crash on exit 2015-08-14 14:31:09 -04:00