diogo
/
xmpphp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

we can receive messages of any length now, even > 4096 bytes

This commit is contained in:
Christian Weiske 2010-02-24 19:53:13 +01:00
parent 6744ba5541
commit b855049379
1 changed files with 63 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
XMPPHP/XMLStream.php
View File

@ -288,9 +288,12 @@ class XMPPHP_XMLStream {
/** /**
* Connect to XMPP Host * Connect to XMPP Host
* *
* @param integer $timeout * @param integer $timeout Timeout in seconds
* @param boolean $persistent * @param boolean $persistent
* @param boolean $sendinit * @param boolean $sendinit Send XMPP starting sequence after connect
* automatically
*
* @throws XMPPHP_Exception When the connection fails
*/ */
public function connect($timeout = 30, $persistent = false, $sendinit = true) { public function connect($timeout = 30, $persistent = false, $sendinit = true) {
$this->sent_disconnect = false; $this->sent_disconnect = false;
@ -330,6 +333,10 @@ class XMPPHP_XMLStream {
/** /**
* Reconnect XMPP Host * Reconnect XMPP Host
*
* @throws XMPPHP_Exception When the connection fails
* @uses $reconnectTimeout
* @see setReconnectTimeout()
*/ */
public function doReconnect() { public function doReconnect() {
if(!$this->is_server) { if(!$this->is_server) {
@ -368,6 +375,41 @@ class XMPPHP_XMLStream {
return $this->disconnected; return $this->disconnected;
} }
/**
* Checks if the given string is closed with the same tag as it is
* opened. We try to be as fast as possible here.
*
* @param string $buff Read buffer of __process()
*
* @return boolean true if the buffer seems to be complete
*/
protected function bufferComplete($buff)
{
if (substr($buff, -1) != '>') {
return false;
}
//we always have a space since the namespace needs to be
//declared. could be a tab, though
$start = substr($buff, 1, strpos($buff, ' ', 2) - 1);
$stop = substr($buff, -strlen($start) - 3);
if ($start == '?xml') {
//starting with an xml tag. this means a stream is being
// opened, which is not much of data, so no fear it's
// not complete
return true;
}
if (substr($stop, -2) == '/>') {
//one tag, i.e. <success />
return true;
}
if ('</' . $start . '>' == $stop) {
return true;
}
return false;
}
/** /**
* Core reading tool * Core reading tool
* *
@ -410,18 +452,22 @@ class XMPPHP_XMLStream {
return false; return false;
} }
} else if ($updated > 0) { } else if ($updated > 0) {
# XXX: Is this big enough? $buff = '';
$buff = @fread($this->socket, 4096); do {
if(!$buff) { $part = stream_socket_recvfrom($this->socket, 4096);
if($this->reconnect) { if (!$part) {
$this->doReconnect(); if($this->reconnect) {
} else { $this->doReconnect();
fclose($this->socket); } else {
$this->socket = NULL; fclose($this->socket);
return false; $this->socket = NULL;
return false;
}
} }
} $this->log->log("RECV: $part", XMPPHP_Log::LEVEL_VERBOSE);
$this->log->log("RECV: $buff", XMPPHP_Log::LEVEL_VERBOSE); $buff .= $part;
} while (!$this->bufferComplete($buff));
xml_parse($this->parser, $buff, false); xml_parse($this->parser, $buff, false);
if ($return_when_received) { if ($return_when_received) {
return true; return true;
@ -491,7 +537,10 @@ class XMPPHP_XMLStream {
$maximum = $timeout == -1 $maximum = $timeout == -1
? NULL ? NULL
: time() - $start; : time() - $start;
$this->__process($maximum, true); $ret = $this->__process($maximum, true);
if (!$ret) {
break;
}
} }
if (array_key_exists($event_key, $this->until_payload)) { if (array_key_exists($event_key, $this->until_payload)) {