Skip to content

Commit

Permalink
Merge pull request #163 from tayler6000/bugfix/Issue-162
Browse files Browse the repository at this point in the history
  • Loading branch information
tayler6000 authored Dec 30, 2023
2 parents c3838da + 72cf17f commit 5e0c100
Show file tree
Hide file tree
Showing 16 changed files with 929 additions and 580 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
- name: Start Docker
run: |
docker build docker -t pyvoip/tests
docker run -d -p 5060:5060/udp -p 5061-5062:5061-5062/tcp pyvoip/tests
docker run --add-host host.docker.internal:host-gateway -d -p 5060:5060/udp -p 5061-5062:5061-5062/tcp pyvoip/tests
- name: pytest
# run: pytest --check-func
run: pytest
run: pytest --check-func
4 changes: 2 additions & 2 deletions docker/settings/pjsip.conf
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ aors=nopass

[nopass]
type=aor
max_contacts=1
max_contacts=999

[pass]
type=endpoint
Expand All @@ -48,4 +48,4 @@ password=Testing123!

[pass]
type=aor
max_contacts=1
max_contacts=999
4 changes: 0 additions & 4 deletions docker/start.bat

This file was deleted.

5 changes: 5 additions & 0 deletions docker/start.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
docker stop $(docker ps -a -q)
docker rm --force --volumes $(docker ps -a -q)
docker rmi pyvoip/tests
docker build . -t pyvoip/tests
docker run --add-host host.docker.internal:host-gateway -d -p 5060:5060/udp -p 5061-5062:5061-5062/tcp pyvoip/tests
22 changes: 10 additions & 12 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,24 @@

# -- Project information -----------------------------------------------------

project = 'pyVoIP'
copyright = '2023, Tayler Porter'
author = 'Tayler J Porter'
project = "pyVoIP"
copyright = "2023, Tayler Porter"
author = "Tayler J Porter"

# The full version, including alpha/beta/rc tags
release = '2.0.0'
release = "2.0.0"

master_doc = 'index'
master_doc = "index"

# -- General configuration ---------------------------------------------------

# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
extensions = [
"sphinx_rtd_theme"
]
extensions = ["sphinx_rtd_theme"]

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
templates_path = ["_templates"]

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand All @@ -51,11 +49,11 @@
# The theme to use for HTML and HTML Help pages. See the documentation for
# a list of builtin themes.
#
html_theme = 'sphinx_rtd_theme'
html_theme = "sphinx_rtd_theme"

#pygments_style = 'sphinx'
# pygments_style = 'sphinx'

# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
html_static_path = ['_static']
html_static_path = ["_static"]
8 changes: 6 additions & 2 deletions pyVoIP/RTP.py
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,12 @@ def start(self) -> None:

def stop(self) -> None:
self.NSD = False
self.sin.close()
self.sout.close()
if hasattr(self, "sin"):
if self.sin:
self.sin.close()
if hasattr(self, "sout"):
if self.sout:
self.sout.close()

def read(self, length: int = 160, blocking: bool = True) -> bytes:
if not blocking:
Expand Down
Loading

0 comments on commit 5e0c100

Please sign in to comment.