修复swoole获取本机网卡ip的bug

qieangel2013 · Nov 3, 2016 · 6da6181 · 6da6181
1 parent f0521c9
commit 6da6181
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/application/library/distributed.php b/application/library/distributed.php
@@ -8,7 +8,7 @@ public function __construct() {
         $config_obj=Yaf_Registry::get("config");
         $distributed_config=$config_obj->distributed->toArray();
         $localinfo=swoole_get_local_ip();
-          if (!$this->client->connect($localinfo['eth0'],$distributed_config['port'], -1))
+          if (!$this->client->connect(current($localinfo),$distributed_config['port'], -1))
         {
             exit("connect failed. Error: {$client->errCode}\n");
         }

diff --git a/distributed/server/DistributedClient.php b/distributed/server/DistributedClient.php
@@ -64,7 +64,7 @@ public function onConnect($serv)
             'data' => array(
                 'code' => 10001,
                 'status' => 1,
-                'fd' => $localinfo['eth0']
+                'fd' => current($localinfo)
             )
         )));
     }

diff --git a/distributed/server/DistributedServer.php b/distributed/server/DistributedServer.php
@@ -97,12 +97,12 @@ public function __construct()
     public function onStart($serv)
     {
         $localinfo     = swoole_get_local_ip();
-        $this->localip = $localinfo['eth0'];
+        $this->localip = current($localinfo);
         $serverlist    = DistributedClient::getInstance()->getserlist();
         $result_fd     = json_decode($serverlist, true);
         if (!empty($result_fd)) {
             foreach ($result_fd as $id => $fd) {
-                if ($fd != $localinfo['eth0']) {
+                if ($fd != $this->localip) {
                     $client = DistributedClient::getInstance()->addServerClient($fd);
                     $this->table->set(ip2long($fd), array(
                         'serverfd' => ip2long($fd)
@@ -126,7 +126,7 @@ public function onConnect($serv, $fd)
     {
         $this->connectioninfo = $serv->connection_info($fd);
         $localinfo            = swoole_get_local_ip();
-        $this->localip        = $localinfo['eth0'];
+        $this->localip        = current($localinfo);
         if ($this->localip != $this->connectioninfo['remote_ip']) {
             $this->client_pool[ip2long($this->connectioninfo['remote_ip'])] = array(
                 'fd' => $fd,