matrix/weechat-matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support weechat proxies.

Browse source
This commit is contained in:
Denis Kasak 2018-03-03 23:47:44 +01:00 • committed by poljar
parent 4a7b200ba4
commit 7434285ffb
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
matrix/server.py
View file

@ -63,6 +63,7 @@ class MatrixServer:
self.autoconnect = False # type: bool self.autoconnect = False # type: bool
self.connected = False # type: bool self.connected = False # type: bool
self.connecting = False # type: bool self.connecting = False # type: bool
self.proxy = None # type: str
self.reconnect_delay = 0 # type: int self.reconnect_delay = 0 # type: int
self.reconnect_time = None # type: float self.reconnect_time = None # type: float
self.socket = None # type: ssl.SSLSocket self.socket = None # type: ssl.SSLSocket
@ -134,6 +135,8 @@ class MatrixServer:
"Hostname or IP address for the server"), "Hostname or IP address for the server"),
Option('port', 'integer', '', 0, 65535, '8448', Option('port', 'integer', '', 0, 65535, '8448',
"Port for the server"), "Port for the server"),
Option('proxy', 'string', '', 0, 0, '',
("Name of weechat proxy to use (see /help proxy)")),
Option('ssl_verify', 'boolean', '', 0, 0, 'on', Option('ssl_verify', 'boolean', '', 0, 0, 'on',
("Check that the SSL connection is fully trusted")), ("Check that the SSL connection is fully trusted")),
Option('username', 'string', '', 0, 0, '', Option('username', 'string', '', 0, 0, '',
@ -179,6 +182,9 @@ class MatrixServer:
value = W.config_integer(option) value = W.config_integer(option)
self.port = value self.port = value
self._change_client() self._change_client()
elif option_name == "proxy":
value = W.config_string(option)
self.proxy = value
elif option_name == "ssl_verify": elif option_name == "ssl_verify":
value = W.config_boolean(option) value = W.config_boolean(option)
if value: if value:
@ -395,7 +401,9 @@ class MatrixServer:
W.prnt(self.server_buffer, message) W.prnt(self.server_buffer, message)
W.hook_connect("", self.address, self.port, 1, 0, "", "connect_cb", W.hook_connect(self.proxy if self.proxy else "",
self.address, self.port,
1, 0, "", "connect_cb",
self.name) self.name)
return True return True