Browse Source

Merge branch 'rpc_version_miner' into bfgminer

Conflicts:
	README.RPC
Luke Dashjr 11 years ago
parent
commit
356c24c565
2 changed files with 4 additions and 1 deletions
  1. 3 1
      README.RPC
  2. 1 0
      api.c

+ 3 - 1
README.RPC

@@ -146,7 +146,8 @@ The list of requests - a (*) means it requires privileged access - and replies:
 
  Request       Reply Section  Details
  -------       -------------  -------
- version       VERSION        CGMiner=BFGMiner version
+ version       VERSION        Miner="BFGMiner " BFGMiner version
+                              CGMiner=BFGMiner version
                               API=API version
 
  config        CONFIG         Some miner configuration information:
@@ -455,6 +456,7 @@ Added API commands:
 Modified API commands:
  'devs' - remove 'GPU Count' and 'CPU Count'
  'summary' - add 'MHS rolling'
+ 'version' - add 'Miner'
 
 Deprecated API commands:
  'cpu'

+ 1 - 0
api.c

@@ -1256,6 +1256,7 @@ static void apiversion(struct io_data *io_data, __maybe_unused SOCKETTYPE c, __m
 	message(io_data, MSG_VERSION, 0, NULL, isjson);
 	io_open = io_add(io_data, isjson ? COMSTR JSON_VERSION : _VERSION COMSTR);
 
+	root = api_add_string(root, "Miner", PACKAGE " " VERSION, false);
 	root = api_add_string(root, "CGMiner", VERSION, false);
 	root = api_add_const(root, "API", APIVERSION, false);