Skip to content
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.

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

Add options #75

Merged
merged 2 commits into from
Oct 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions pyVoIP/SIP.py
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,12 @@ def parse_message(self, message: SIPMessage) -> None:
self.call_callback(message) # type: ignore
response = self.gen_ok(message)
self.out.sendto(response.encode("utf8"), (self.server, self.port))
elif message.method == "OPTIONS":
if self.call_callback:
response = self.call_callback(message)
else:
response = self._gen_options_response(message)
self.out.sendto(response.encode("utf8"), (self.server, self.port))
else:
debug("TODO: Add 400 Error on non processable request")

Expand Down Expand Up @@ -1393,6 +1399,9 @@ def gen_ack(self, request: SIPMessage) -> str:

return ackMessage

def _gen_options_response(self, request: SIPMessage) -> str:
return self.gen_busy(request)

def _gen_response_via_header(self, request: SIPMessage) -> str:
via = ""
for h_via in request.headers["Via"]:
Expand Down
12 changes: 11 additions & 1 deletion pyVoIP/VoIP.py
Original file line number Diff line number Diff line change
Expand Up @@ -449,14 +449,16 @@ def __init__(
transport_mode=self.transport_mode,
)

def callback(self, request: SIP.SIPMessage) -> None:
def callback(self, request: SIP.SIPMessage) -> Optional[str]:
# debug("Callback: "+request.summary())
if request.type == pyVoIP.SIP.SIPMessageType.MESSAGE:
# debug("This is a message")
if request.method == "INVITE":
self._callback_MSG_Invite(request)
elif request.method == "BYE":
self._callback_MSG_Bye(request)
elif request.method == "OPTIONS":
return self._callback_MSG_Options(request)
else:
if request.status == SIP.SIPStatus.OK:
self._callback_RESP_OK(request)
Expand Down Expand Up @@ -520,6 +522,14 @@ def _callback_MSG_Bye(self, request: SIP.SIPMessage) -> None:
return
self.calls[call_id].bye()

def _callback_MSG_Options(self, request: SIP.SIPMessage) -> str:
debug("Options recieved")
response = self.sip.gen_busy(request)
if self.call_callback:
response = response.replace("486 Busy Here", "200 OK")
# TODO: Remove warning, implement RFC 3264
return response

def _callback_RESP_OK(self, request: SIP.SIPMessage) -> None:
debug("OK recieved")
call_id = request.headers["Call-ID"]
Expand Down
2 changes: 1 addition & 1 deletion pyVoIP/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def debug(s, e=None):
# noqa because import will fail if debug is not defined
from pyVoIP.RTP import PayloadType # noqa: E402

SIPCompatibleMethods = ["INVITE", "ACK", "BYE", "CANCEL"]
SIPCompatibleMethods = ["INVITE", "ACK", "BYE", "CANCEL", "OPTIONS"]
SIPCompatibleVersions = ["SIP/2.0"]

RTPCompatibleVersions = [2]
Expand Down