cleanup, escape resource
This commit is contained in:
parent
aa7a5e89ec
commit
42876ae30c
@ -6,15 +6,13 @@ class Connection extends Reference:
|
|||||||
var domain: String
|
var domain: String
|
||||||
var bare_jid: String
|
var bare_jid: String
|
||||||
var jid: String
|
var jid: String
|
||||||
var id_counter: int = 0
|
var _id_counter: int = 0
|
||||||
|
|
||||||
func generate_id() -> int:
|
func generate_id() -> int:
|
||||||
self.id_counter += 1
|
self._id_counter += 1
|
||||||
return hash(self.id_counter)
|
return hash(self._id_counter)
|
||||||
|
|
||||||
func establish_new_connection(domain: String, identity: String, password: String) -> Connection:
|
func establish_new_connection(domain: String, identity: String, password: String) -> Connection:
|
||||||
## XMPP uses unidirectional pipes for communication, which means
|
|
||||||
## multiple connections are open over different predefined ports.
|
|
||||||
var stream := StreamPeerTCP.new()
|
var stream := StreamPeerTCP.new()
|
||||||
if stream.connect_to_host(domain, 5222) != OK:
|
if stream.connect_to_host(domain, 5222) != OK:
|
||||||
push_error("Cannot establish client->server pipe to " + domain)
|
push_error("Cannot establish client->server pipe to " + domain)
|
||||||
@ -245,7 +243,7 @@ func _bind_resource(connection: Connection, resource: String = "tochie-facade")
|
|||||||
<resource>{resource}</resource>
|
<resource>{resource}</resource>
|
||||||
</bind></iq>""".format({
|
</bind></iq>""".format({
|
||||||
"id": iq_id,
|
"id": iq_id,
|
||||||
"resource": resource
|
"resource": resource.xml_escape()
|
||||||
}).to_utf8()) != OK:
|
}).to_utf8()) != OK:
|
||||||
return ERR_CONNECTION_ERROR
|
return ERR_CONNECTION_ERROR
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user