Skip to content
Browse files

Update LICENSE to note more freely-available protocol headers.

And some protocol.h comment touch-ups.
  • Loading branch information...
1 parent d032f41 commit 0c80805e2ce07ac1f15d11190e84a95c297edb69 Jeff Garzik committed with Jeff Garzik Feb 13, 2011
Showing with 36 additions and 4 deletions.
  1. +4 −2 LICENSE
  2. +32 −2 protocol.h
View
6 LICENSE
@@ -1,3 +1,5 @@
-pushpool is available under the terms of the GNU Public License version 2.
+pushpool is available under the terms of the GNU Public License version 2,
+except for ubbp.h and protocol.h, which is available under the MIT/X11
+license.
-See COPYING for details.
+See source file headers and/or COPYING for details.
View
34 protocol.h
@@ -1,6 +1,35 @@
#ifndef __PROTOCOL_H__
#define __PROTOCOL_H__
+/*
+
+ bitcoin binary protocol
+
+ Copyright 2011 Jeff Garzik
+
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without restriction,
+ including without limitation the rights to use, copy, modify, merge,
+ publish, distribute, sublicense, and/or sell copies of the Software,
+ and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+*/
+
+
#define PUSHPOOL_UBBP_MAGIC "PMIN"
struct bc_work {
@@ -18,7 +47,8 @@ struct bc_work {
* BIN: Payload is binary message data
* JSON: Payload is zlib-compressed JSON message
*
- * If JSON response includes 'error' in object, that indicates failure.
+ * If JSON response includes 'error' in object, that indicates failure,
+ * similar to JSON-RPC 1.1.
*/
enum {
/* client or server originated; and receive NOP as response */
@@ -45,7 +75,7 @@ enum {
BC_OP_WORK = 104, /* BIN; work unit */
};
-/* error codes returned in response messages */
+/* error codes returned in JSON response messages */
enum {
BC_ERR_NONE = 0, /* no error (success) */
BC_ERR_INVALID = 1, /* invalid parameter */

0 comments on commit 0c80805

Please sign in to comment.
Something went wrong with that request. Please try again.