azlux/pymumble
1
0
Fork 0
mirror of https://github.com/azlux/pymumble synced 2024-11-23 22:06:10 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: azlux:ac3b6dee0c35841b6513bce740c2fe47d70673c4
Branches Tags
azlux:pymumble_py3
azlux:master
azlux:test_udp
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:1a455454e8edfaddca1ae0a4d51036b4066c95c8
Branches Tags
azlux:pymumble_py3
azlux:master
azlux:test_udp
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

No commits in common. "ac3b6dee0c35841b6513bce740c2fe47d70673c4" and "1a455454e8edfaddca1ae0a4d51036b4066c95c8" have entirely different histories.
ac3b6dee0c ... 1a455454e8

2 changed files with 7 additions and 11 deletions
Show Stats Expand all files Collapse all files

2
pymumble_py3/constants.py
View File

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

4
pymumble_py3/mumble.py
View File

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