Skip to content

Fix EventList events handling #27

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −1
Open

Fix EventList events handling #27

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
23 changes: 22 additions & 1 deletion asterisk/ami/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,16 @@ class AMIClient(object):
asterisk_start_regex = re.compile('^Asterisk *Call *Manager/(?P<version>([0-9]+\.)*[0-9]+)', re.IGNORECASE)
asterisk_line_regex = re.compile(b'\r\n', re.IGNORECASE | re.MULTILINE)
asterisk_pack_regex = re.compile(b'\r\n\r\n', re.IGNORECASE | re.MULTILINE)
# EventList start pattern
asterisk_start_list_regex = re.compile(
b'^Response: Success\r\nActionID: \d+\r\nEventList: start',
re.IGNORECASE | re.MULTILINE
)
# EventList end pattern
asterisk_end_list_regex = re.compile(
b'EventList: Complete\r\n.+\r\n.+\r\n\r\n',
re.IGNORECASE | re.MULTILINE
)

def __init__(self, address='127.0.0.1', port=5038,
encoding='utf-8', encoding_errors='replace',
Expand Down Expand Up @@ -160,9 +170,20 @@ def _next_pack(self):
yield self._decode_pack(pack)
break
while not self.finished.is_set():
while self.asterisk_pack_regex.search(data):
is_list = self.asterisk_start_list_regex.match(data)
list_ends = self.asterisk_end_list_regex.search(data)
# If data has complete EventList even, get and yield it
if is_list and list_ends:
ending = list_ends.group()
(pack, data) = self.asterisk_end_list_regex.split(data, 1)
yield self._decode_pack(pack + ending)
# If data has Event divider CLRFCLRF and it is not EventList
# (has to starts with EventList start pattern
# get anf yield it
elif not is_list and self.asterisk_pack_regex.search(data):
(pack, data) = self.asterisk_pack_regex.split(data, 1)
yield self._decode_pack(pack)
# Read the data
recv = self._socket.recv(self._buffer_size)
if recv == b'':
self.finished.set()
Expand Down