Merge pull request #13 from ycgambo/dev

trace port for Guarder
ycgambo · May 1, 2018 · 4820a82 · 4820a82
2 parents e65a9a8 + caf056d
commit 4820a82
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/shadowrocket/Module/Base/GuarderInterface.php b/src/shadowrocket/Module/Base/GuarderInterface.php
@@ -34,7 +34,8 @@ public function block($request, $port);
     /**
      * If false returned, connection between client and remote will be closed.
      * @param $data string  the data come in and go out this server
+     * @param $port
      * @return mixed
      */
-    public function inspectFailed($data);
+    public function inspectFailed($data, $port);
 }
diff --git a/src/shadowrocket/Module/Guarder.php b/src/shadowrocket/Module/Guarder.php
@@ -44,22 +44,22 @@ public function _block($request, $port)
         return $this->getConfig('instance')->block($request, $port);
     }
 
-    public function _inspectFailed($data)
+    public function _inspectFailed($data, $port)
     {
-        return $this->getConfig('instance')->inspectFailed($data);
+        return $this->getConfig('instance')->inspectFailed($data, $port);
     }
 
     public function deny($request, $port)
     {
         return false;
     }
 
-    public function block($request, $prot)
+    public function block($request, $port)
     {
         return false;
     }
 
-    public function inspectFailed($data)
+    public function inspectFailed($data, $port)
     {
         return false;
     }

diff --git a/src/shadowrocket/Module/Server.php b/src/shadowrocket/Module/Server.php
@@ -115,21 +115,21 @@ protected function createWorker($protocol, $superadd = false)
                         Connection::bind($client, $remote);
 
                         // 远程连接发来消息时，进行加密，转发给shadowsocks客户端，shadowsocks客户端会解密转发给浏览器
-                        $remote->onMessage = function ($remote, $buffer) {
+                        $remote->onMessage = function ($remote, $buffer) use ($config) {
                             $data = $remote->opposite->cipher->encrypt($buffer);
                             if ($guarder = Launcher::getModuleIfReady('guarder')) {
-                                if ($guarder->_inspectFailed($data)) {
+                                if ($guarder->_inspectFailed($data, $config['port'])) {
                                     $remote->close();
                                     return;
                                 }
                             }
                             $remote->opposite->send($data);
                         };
                         // 当shadowsocks客户端发来数据时，解密数据，并发给远程服务端
-                        $client->onMessage = function ($client, $data) {
+                        $client->onMessage = function ($client, $data) use ($config) {
                             $data = $client->cipher->decrypt($data);
                             if ($guarder = Launcher::getModuleIfReady('guarder')) {
-                                if ($guarder->_inspectFailed($data)) {
+                                if ($guarder->_inspectFailed($data, $config['port'])) {
                                     $client->close();
                                     return;
                                 }