Commit 3c7a798

committed

Fixed already kicked clients.

1 parent a0d1ec5 commit 3c7a798Copy full SHA for 3c7a798

File tree

1 file changed

+22

-12

lines changed

bin
- php-proxy-stratum-daemon.php

1 file changed

+22

-12

lines changed

`‎bin/php-proxy-stratum-daemon.php‎`

Lines changed: 22 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@ public function __construct() {`
`16`	`16`	`$this->s[] = $c;`
`17`	`17`	`$this->l('connected, total: '.($k+1).'.');`
`18`	`18`	`$c->on('close', function ($c) {`
`19`		`- $this->k(array_search($c, $this->s), 'gone');`
	`19`	`+ if (($k = array_search($c, $this->s))!==FALSE)`
	`20`	`+ $this->k($k, $c, 'gone');`
`20`	`21`	`});`
`21`	`22`	`$c->on('data', function ($d, $c) use ($l) {`
`22`	`23`	`$this->x($d, $c, $l);`
`@@ -40,9 +41,13 @@ public function __construct() {`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`private function x($_d, $_r, $l) {`
`43`		`- $k = array_search($_r, $this->s);`
	`44`	`+ if (($k = array_search($_r, $this->s))===FALSE) {`
	`45`	`+ $_r->close();`
	`46`	`+ $this->l('already kicked.');`
	`47`	`+ return;`
	`48`	`+ }`
`44`	`49`	`$_d = $this->o[$k]->d($_d);`
`45`		`- if ($_d === FALSE \|\| !($d = json_decode($_d, TRUE))) $this->k($k, 'lost');`
	`50`	`+ if ($_d === FALSE \|\| !($d = json_decode($_d, TRUE))) $this->k($k, $_r, 'lost');`
`46`	`51`	`else {`
`47`	`52`	`$this->l(((int)$k).' says: '.$_d);`
`48`	`53`	`if (isset($d['method'])) {`
`@@ -59,14 +64,14 @@ private function x($_d, $_r, $l) {`
`59`	`64`	`if (isset($d['params']) && isset($d['params'][0]) && $d['params'][0]) {`
`60`	`65`	`$this->o[$k]->u = $d['params'][0];`
`61`	`66`	`$this->c($l, $k);`
`62`		`- } else $this->k($k, 'unkown');`
	`67`	`+ } else $this->k($k, $_r, 'unkown');`
`63`	`68`	`} else if ($this->p[$k]) {`
`64`	`69`	`if(isset($d['method']) && $d['method']=='mining.submit' && isset($d['params']) && isset($d['params'][0]) and $d['params'][0]==$this->o[$k]->P['user'])`
`65`	`70`	`$this->o[$k]->t(-$d['id']);`
`66`	`71`	`$this->l('server '.$k.' gets '.$_d);`
`67`	`72`	`$this->p[$k]->write($_d);`
`68`		`- } else $this->k($k, 'lost server');`
`69`		`- } else $this->k($k, 'said garbage');`
	`73`	`+ } else $this->k($k, $_r, 'lost server');`
	`74`	`+ } else $this->k($k, $_r, 'said garbage');`
`70`	`75`	`}`
`71`	`76`	`}`
`72`	`77`
`@@ -86,13 +91,14 @@ private function c($l, $k, $o = 0) {`
`86`	`91`	`$this->o[$k]->I = array();`
`87`	`92`	`$this->l(((int)$k).' connected to '.$this->o[$k]->P['url'].':'.$this->o[$k]->P['port'].' as '.$this->o[$k]->P['user'].'.');`
`88`	`93`	`$s->on('close', function ($s) {`
`89`		`- $this->k(array_search($s, $this->p), 'server gone');`
	`94`	`+ if (($k = array_search($s, $this->p))!==FALSE)`
	`95`	`+ $this->k($k, $s, 'server gone');`
`90`	`96`	`});`
`91`	`97`	`$s->on('data', function ($__d, $s) {`
`92`	`98`	`$k = array_search($s, $this->p);`
`93`	`99`	`if (isset($this->s[$k])) {`
`94`	`100`	`foreach(array_filter(explode(PHP_EOL, $__d)) as $_d) {`
`95`		`- if ($_d === FALSE \|\| !($d = json_decode($_d, TRUE))) $this->k($k, 'server lost');`
	`101`	`+ if ($_d === FALSE \|\| !($d = json_decode($_d, TRUE))) $this->k($k, $s, 'server lost');`
`96`	`102`	`if (isset($d['id']) && $d['id'] && $d['id'] == $this->o[$k]->s[0]) {`
`97`	`103`	`if (isset($d['result']) && isset($d['result'][1]) && $d['result'][1]) {`
`98`	`104`	`$this->l(((int)$k).' gets extranonce ["'.$d['result'][1].'", '.$d['result'][2].'].');`
`@@ -107,16 +113,20 @@ private function c($l, $k, $o = 0) {`
`107`	`113`	`if (isset($d['result']) && $d['result']===TRUE && isset($d['id']) && $d['id'])`
`108`	`114`	`$this->o[$k]->t($d['id']);`
`109`	`115`	`}`
`110`		`- } else $this->k($k, 'lost before server');`
	`116`	`+ } else $this->k($k, $s, 'lost before server');`
`111`	`117`	`});`
`112`		`- } else $this->k($k, 'miss subscribe');`
	`118`	`+ } else $this->k($k, $s, 'miss subscribe');`
`113`	`119`	`}, function() use ($k, $n) {`
`114`	`120`	`if ($n) $this->c($l, $k, $n);`
`115`		`- else $this->k($k, 'lost pools');`
	`121`	`+ else $this->k($k, $this->s[$k], 'lost pools');`
`116`	`122`	`});`
`117`	`123`	`}`
`118`	`124`
`119`		`- private function k($k, $m) {`
	`125`	`+ private function k($k, $x, $m) {`
	`126`	`+ if ($k===FALSE \|\| !in_array($x, array($this->s[$k], $this->p[$k]), TRUE)) {`
	`127`	`+ $this->l(($k===FALSE?'?':(int)$k).' does not compute.');`
	`128`	`+ return;`
	`129`	`+ }`
`120`	`130`	`unset($this->s[$k], $this->p[$k], $this->o[$k]);`
`121`	`131`	`$this->s = array_values($this->s);`
`122`	`132`	`$this->p = array_values($this->p);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 3c7a798

File tree

1 file changed

1 file changed

`‎bin/php-proxy-stratum-daemon.php‎`

0 commit comments