Fixes #96

[FIX] Fixed NameErrors in multiple raises. [CHANGE] Changed pyVoIP to just ignore video until it is implemented.
tayler6000 · Jun 5, 2023 · 1f03437 · 1f03437
1 parent 3161551
commit 1f03437
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/pyVoIP/VoIP.py b/pyVoIP/VoIP.py
@@ -122,6 +122,8 @@ def __init__(
                 return
 
             for i in request.body["m"]:
+                if i["type"] == "video":  # Disable Video
+                    continue
                 assoc = {}
                 e = False
                 for x in i["methods"]:
@@ -159,8 +161,12 @@ def __init__(
                             assoc[int(x)] = p
 
                 if e:
+                    if pt:
+                        raise RTP.RTPParseError(
+                            f"RTP Payload type {pt} not found."
+                        )
                     raise RTP.RTPParseError(
-                        f"RTP Payload type {pt} not found."
+                        "RTP Payload type could not be derived from SDP."
                     )
 
                 # Make sure codecs are compatible.
@@ -290,6 +296,8 @@ def renegotiate(self, request: SIP.SIPMessage) -> None:
             message.encode("utf8"), (self.phone.server, self.phone.port)
         )
         for i in request.body["m"]:
+            if i["type"] == "video":  # Disable Video
+                continue
             for ii, client in zip(
                 range(len(request.body["c"])), self.RTPClients
             ):
@@ -313,8 +321,9 @@ def answered(self, request: SIP.SIPMessage) -> None:
             return
 
         for i in request.body["m"]:
+            if i["type"] == "video":  # Disable Video
+                continue
             assoc = {}
-            e = False
             for x in i["methods"]:
                 try:
                     p = RTP.PayloadType(int(x))
@@ -326,10 +335,13 @@ def answered(self, request: SIP.SIPMessage) -> None:
                         )
                         assoc[int(x)] = p
                     except ValueError:
-                        e = True
-
-            if e:
-                raise RTP.RTPParseError(f"RTP Payload type {p} not found.")
+                        if p:
+                            raise RTP.RTPParseError(
+                                f"RTP Payload type {p} not found."
+                            )
+                        raise RTP.RTPParseError(
+                            "RTP Payload type could not be derived from SDP."
+                        )
 
             self.createRTPClients(
                 assoc, self.myIP, self.port, request, i["port"]