Commit graph

326 commits

Author SHA1 Message Date
Eric Frias
7dde0a705d Add 5 and 6 argument versions of json rpc call functions 2014-05-29 15:54:40 -04:00
Eric Frias
07f131336f Convert boost exceptions caught while parsing fc::time_point strings into fc::exception 2014-05-29 15:54:39 -04:00
dnotestein
54c66bbb86 Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
Conflicts:
	src/crypto/aes.cpp
2014-05-27 09:44:54 -04:00
dnotestein
d1c3637a9f Fix variable name (input parameter to function is length of cipher text, not decoded plain text) and function comments (looks like it was some copy/paste error). 2014-05-27 09:40:23 -04:00
Daniel Larimer
ac03a71f3d improve variant cast error reporting 2014-05-25 14:18:26 -04:00
Daniel Larimer
9f6b52eac2 fix build on OS X 2014-05-23 21:54:59 -04:00
Eric Frias
b9050b589d Merge branch 'phoenix' into tcp_rate_limiting 2014-05-23 18:04:05 -04:00
Vikram Rajkumar
375aa098eb Merge github.com:vikramrajkumar/fc into phoenix 2014-05-22 03:55:45 -04:00
Daniel Larimer
e6007b88cd Merge pull request #26 from HackFisher/patch-3
Fix issue #25
2014-05-21 09:53:45 -04:00
Vikram Rajkumar
379b0791e3 Merge github.com:vikramrajkumar/fc into phoenix 2014-05-20 19:03:01 -04:00
Eric Frias
5719d28a19 Move/rename git revision info compiled into FC to be more self-explanatory 2014-05-20 18:02:20 -04:00
Daniel Larimer
17aefe29de using explicit bool operator for optional 2014-05-20 11:25:31 -04:00
HackFisher
174096c3ab Fix issue #25
eofbit std exception is replaced by eof_exception, checked in peek(), so no need to throw std exception when encounter EOF.
2014-05-20 19:17:19 +08:00
Daniel Larimer
8a8ff28221 adding '/' to token chars to support paths 2014-05-19 16:59:01 -04:00
Eric Frias
c4770f0819 Restore correct parsing of json keywords (true/false/null) 2014-05-19 14:12:49 -04:00
Vikram Rajkumar
6b455ab850 Fix typos 2014-05-19 02:52:21 -04:00
Daniel Larimer
fd00bddcb4 update logging to create parent directory if it does not exist 2014-05-17 16:38:32 -04:00
Vikram Rajkumar
e8326ca66c Make objectFromStream always throw parse_error_exception when throwing 2014-05-17 03:30:49 -04:00
Daniel Larimer
8c370b06e6 update json error handling 2014-05-15 17:44:38 -04:00
Daniel Larimer
7078ebf382 expanding token chars 2014-05-15 14:07:19 -04:00
Daniel Larimer
c27ea9ba13 fix bugs parsing json tokens 2014-05-15 13:52:21 -04:00
Daniel Larimer
271fe8b909 found major bug in parsing, fixed it 2014-05-15 13:35:49 -04:00
Eric Frias
2837892ec0 Upgrade to new version of city_hash library. This version has performance improvements, plus implements a variant with 32-bit output which will quiet some compiler warnings on win32. 2014-05-14 17:11:36 -04:00
Eric Frias
873a0ea70d Merge branch 'phoenix' into tcp_rate_limiting 2014-05-14 16:26:34 -04:00
Eric Frias
50ac462471 Enable SO_REUSEPORT on Linux as well as OS X 2014-05-14 16:02:41 -04:00
Eric Frias
db7b1bdd69 Add an optional timeout parameter when waiting for a local process to exit 2014-05-14 08:51:30 -04:00
Eric Frias
eb501387e8 Set the SO_REUSEPORT flag on OS X whenever we set the SO_REUSEADDR 2014-05-13 21:14:40 -07:00
Daniel Larimer
8d4fccba5f update pretty print save to file 2014-05-11 20:33:08 -04:00
Eric Frias
37330ca005 change the naming of invalidOperation exception to the more fc-friendly
invalid_operation, and add an implementation so it can be used.
2014-05-09 11:50:32 -04:00
Eric Frias
62b479568e Get rate limiting mostly working 2014-05-08 15:13:49 -04:00
Eric Frias
bc4361bf64 Merge branch 'phoenix' into tcp_rate_limiting
Conflicts:
	include/fc/network/tcp_socket.hpp
	src/network/tcp_socket.cpp
2014-05-08 09:04:45 -04:00
valzav
102e0c4ab8 fixed a bug in configure_logging that made adding more than one logger impossible 2014-05-07 20:58:54 -07:00
valzav
687eaa98f2 Merge remote-tracking branch 'upstream/phoenix' into http-server-improvements 2014-05-07 20:48:23 -07:00
Daniel Larimer
9378f6c7aa Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-05-07 21:27:48 -04:00
Daniel Larimer
3a34299199 update json validation and varint hashing 2014-05-07 21:27:37 -04:00
Eric Frias
b8a7531eab Fix error message printed when unable to deserialize a json object, improve
logging of return values and add logging of exceptional returns from
json function calls.  Continue my endless quest to break the mac build.
2014-05-06 17:20:04 -04:00
valzav
e02a509b30 Merge remote-tracking branch 'upstream/phoenix' into http-server-improvements 2014-05-05 15:38:41 -07:00
Daniel Larimer
3ac07ddbf5 updates 2014-05-04 14:26:36 -04:00
valzav
de8ec4a1ae Merge remote-tracking branch 'upstream/phoenix' into http-server-improvements 2014-05-03 17:49:36 -07:00
valzav
bc1792dc98 commented out http header printed to stdout 2014-05-02 14:46:15 -07:00
Daniel Larimer
6532839938 fix apple build 2014-05-02 14:09:29 -04:00
Eric Frias
aa111510f3 Expose enough functions in tcp_socket and tcp_server to allow listening and originating connections on the same port. So far, this seems to work on win32, other platforms untested.
Add a local_endpoint() function so we can find out which local interface a socket is bound to
2014-05-01 14:02:49 -04:00
Eric Frias
00edd3958c Remove accidentally-committed garbage 2014-04-30 10:56:51 -04:00
Eric Frias
19f2869490 Disable keepalives on old clang compiler used for nightly
until we can upgrade it
2014-04-30 10:52:16 -04:00
dnotestein
7672754c51 add some minor comments 2014-04-26 18:02:31 -04:00
Daniel Larimer
07affde1f2 Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-04-25 15:17:10 -04:00
Daniel Larimer
9301771405 enhance error message in variant 2014-04-25 15:17:06 -04:00
Eric Frias
9731fac9f3 Fix error parsing a numeric constant at the end of file 2014-04-22 18:35:36 -04:00
Eric Frias
c3ea6cc62c Assert to warn when calling unimplemented functions 2014-04-22 18:35:36 -04:00
Eric Frias
cd34f696ce - Add four-argument version of json-rpc call function
- fix bug in json parser that prevented correct parsing of
  a true/false/null at the end of input
- prevent infinite recursion in a json helper function
2014-04-21 14:34:46 -04:00