Commit graph

501 commits

Author SHA1 Message Date
Daniel Larimer
615f2463fb Merge pull request #22 from valzav/http-server-improvements
fixed a minor bug in configure_logging and commented out one fc::cerr debug output
2014-05-08 10:50:46 -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
9d3bddf09a constification 2014-05-01 14:04:44 -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
Daniel Larimer
1d8f80c8f7 Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-04-27 21:20:54 -04:00
Daniel Larimer
6f466979cc adding helper methods 2014-04-27 21:20:40 -04:00
dnotestein
7672754c51 add some minor comments 2014-04-26 18:02:31 -04:00
Nikolai Mushegian
6b84b990b3 Merge pull request #21 from vikramrajkumar/phoenix
Make fc::reflector<ENUM>::to_string work with C++11 strongly typed enumerations
2014-04-25 16:19:39 -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
Daniel Larimer
61f2ac4679 adding HTTP response code 2014-04-22 17:25:07 -04:00
Vikram Rajkumar
1bdc40368f Make fc::reflector<ENUM>::to_string work with C++11 strongly typed enumerations 2014-04-22 15:57:11 -04:00
Daniel Larimer
e36ccb3cfd adding NotAuthorized HTTP response code 2014-04-22 10:22:17 -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
Eric Frias
7849cc7ada Get keepalive code building on os x 2014-04-15 13:40:19 -04:00
Eric Frias
1b16e15585 Quiet compiler warning signed vs unsigned 2014-04-14 17:10:29 -04:00
Eric Frias
c63e598497 Fix a race that occurred when notifying a thread that was blocked on a
promise to wake up, but that thread simultaneously awoke for another
reason (probably a timeout)
2014-04-14 16:27:08 -04:00
Daniel Larimer
ac0f01843f fix build on osx by disabling some keepalive params 2014-04-11 17:06:57 -04:00
vogel76
468d6da711 [BW]: [Ign] Changes needed to support statically built OpenSSL on windows. 2014-04-11 13:32:58 +02:00
vogel76
6c9f758e9c [BW]: [Ign] Changes to support VS 2013 and boost 1.55 2014-04-10 13:23:34 +02:00
Eric Frias
85a9da6f27 Add to tcp_socket to enable TCP keepalives 2014-04-09 18:38:52 -04:00
vogel76
23cd85ef87 Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix 2014-04-09 12:42:04 +02:00
vogel76
1628ce39ae [BW]: [Ign] Prerequisites for using boost 1.55 and VS 2013. 2014-04-09 12:41:52 +02:00
Eric Frias
07c861cca9 Add missing includes for VC12 2014-04-07 16:46:27 -04:00
Eric Frias
88f6ca16e9 Add missing file to build 2014-04-06 19:16:14 -04:00
Eric Frias
8bdc6fd219 Colorize fc log messages on win32 2014-04-06 18:06:43 -04:00
Eric Frias
3d02e3bc00 Wrap OpenSSL's random number generator in fc clothing 2014-04-02 08:54:13 -04:00
Eric Frias
2e5fdf952c Add a new version of tcp_socket::connect_to() that allows you to set the source port
(working, but not yet useful because we'll need to set SO_REUSEADDR)
2014-04-02 08:54:13 -04:00
Eric Frias
d27be6851b Fix serializing enums 2014-04-02 08:54:12 -04:00
Eric Frias
061007ee29 In debug builds, set the thread name in the debugger to match the name given to fc::thread ctor 2014-04-01 16:56:11 -04:00
Eric Frias
f791cba36b Fix Keyhotee hang when setting system clock back bug 2014-04-01 15:22:53 -04:00
vogel76
99fb836492 [BW]: [Ign] Removed unneeded linker settings polluting Keyhotee project linker settings (generally related to PDB specification). 2014-04-01 21:04:59 +02:00
vogel76
d1ffcebfd7 [BW]: [NIP] Prerequisites for collecting full .pdb list for packaging. 2014-04-01 13:54:57 +02:00
Eric Frias
5543044bd3 Collect time of git commit for display in Keyhotee, add function for pretty-printing times 2014-03-31 16:10:52 -04:00
dnotestein
6c989e7b7a added minutes, hours, and days time functions 2014-03-31 11:01:28 -04:00
dnotestein
10127a854c Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
Conflicts:
	src/crypto/elliptic.cpp
2014-03-30 18:32:20 -04:00
dnotestein
f09c91f878 added hash64 function that uses sha256 to replace city_hash in blockchain and message protocol-related hashing 2014-03-30 14:16:33 -04:00