azlux
/
pymumble
mirror of https://github.com/azlux/pymumble
1
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: azlux:1a455454e8edfaddca1ae0a4d51036b4066c95c8
Branches Tags
azlux:pymumble_py3
azlux:test_udp
azlux:master
azlux:1.7
azlux:1.6.1
azlux:1.6
azlux:1.5
azlux:1.4
azlux:1.3.1
azlux:1.3
azlux:1.2
azlux:1.1
azlux:1.0
azlux:v1.2
azlux:v1.1
azlux:v0.0.1
azlux:v0.2.0
...
compare: azlux:ac3b6dee0c35841b6513bce740c2fe47d70673c4
Branches Tags
azlux:pymumble_py3
azlux:test_udp
azlux:master
azlux:1.7
azlux:1.6.1
azlux:1.6
azlux:1.5
azlux:1.4
azlux:1.3.1
azlux:1.3
azlux:1.2
azlux:1.1
azlux:1.0
azlux:v1.2
azlux:v1.1
azlux:v0.0.1
azlux:v0.2.0

3 Commits
1a455454e8 ... ac3b6dee0c

Author SHA1 Message Date
Azlux ac3b6dee0c
minor version 2021-05-07 23:51:08 +02:00
Azlux 4047e4ade5
Connection error when IP lookup fail 
Merge pull request #105 from raek/pymumble_py3
 2021-05-07 23:49:43 +02:00
Rasmus Bondesson 738b479bc0 Retry IP lookup errors the same way as connection errors 
After this change, the retry loop no longer stops working if the IP
address could not be looked up. The same retry logic used for
connection failures is used.

IP address lookup failures can happen when the internet connection is
down. This change makes the pymumble client survive such outages.
 2021-05-07 20:14:08 +02:00
2 changed files with 11 additions and 7 deletions
Show Stats Expand all files Collapse all files

2
pymumble_py3/constants.py
View File

@ -3,7 +3,7 @@
import platform
import sys
PYMUMBLE_VERSION = "1.6"
PYMUMBLE_VERSION = "1.6.1"
# ============================================================================
# Tunable parameters

16
pymumble_py3/mumble.py
View File

@ -144,13 +144,17 @@ class Mumble(threading.Thread):
def connect(self):
"""Connect to the server"""
# Get IPv4/IPv6 server address
server_info = socket.getaddrinfo(self.host, self.port, type=socket.SOCK_STREAM)
try:
# Get IPv4/IPv6 server address
server_info = socket.getaddrinfo(self.host, self.port, type=socket.SOCK_STREAM)
# Connect the SSL tunnel
self.Log.debug("connecting to %s (%s) on port %i.", self.host, server_info[0][1], self.port)
std_sock = socket.socket(server_info[0][0], socket.SOCK_STREAM)
std_sock.settimeout(10)
# Connect the SSL tunnel
self.Log.debug("connecting to %s (%s) on port %i.", self.host, server_info[0][1], self.port)
std_sock = socket.socket(server_info[0][0], socket.SOCK_STREAM)
std_sock.settimeout(10)
except socket.error:
self.connected = PYMUMBLE_CONN_STATE_FAILED
return self.connected
try:
self.control_socket = ssl.wrap_socket(std_sock, certfile=self.certfile, keyfile=self.keyfile, ssl_version=ssl.PROTOCOL_TLS)