Skip to content

Changed SSL socket handling #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Changed SSL socket handling #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions apns.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from datetime import datetime
from socket import socket, AF_INET, SOCK_STREAM, ssl
from socket import socket, AF_INET, SOCK_STREAM
from struct import pack, unpack
import ssl

import simplejson

Expand Down Expand Up @@ -106,21 +107,24 @@ def __init__(self, cert_file=None, key_file=None):
super(APNsConnection, self).__init__()
self.cert_file = cert_file
self.key_file = key_file
self._socket = None
self._ssl = None

def __del__(self):
self._disconnect();

def _connect(self):
# Establish an SSL connection
self._socket = socket(AF_INET, SOCK_STREAM)
self._socket.connect((self.server, self.port))
self._ssl = ssl(self._socket, self.key_file, self.cert_file)
# Establish an SSL connection
s = socket(AF_INET, SOCK_STREAM)
self._ssl = ssl.wrap_socket(
s,
keyfile=self.key_file,
certfile=self.cert_file,
)
self._ssl.connect((self.server, self.port))

def _disconnect(self):
if self._socket:
self._socket.close()
if self._ssl:
self._ssl.close()

def _connection(self):
if not self._ssl:
Expand Down