Merge pull request #276 from KentVu/pr_prepare

FIX an issue about the 'client_port' parameter in RtspServer
fyhertz · Feb 8, 2019 · 3a78d22 · 3a78d22
2 parents e71b49c + 0c2078d
commit 3a78d22
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java b/src/net/majorkernelpanic/streaming/rtsp/RtspServer.java
@@ -505,7 +505,7 @@ else if (request.method.equalsIgnoreCase("SETUP")) {
                         return response;
                     }
 
-                    p = Pattern.compile("client_port=(\\d+)-(\\d+)", Pattern.CASE_INSENSITIVE);
+                    p = Pattern.compile("client_port=(\\d+)(?:-(\\d+))?", Pattern.CASE_INSENSITIVE);
                     m = p.matcher(request.headers.get("transport"));
 
                     if (!m.find()) {
@@ -514,7 +514,11 @@ else if (request.method.equalsIgnoreCase("SETUP")) {
                         p2 = ports[1];
                     } else {
                         p1 = Integer.parseInt(m.group(1));
-                        p2 = Integer.parseInt(m.group(2));
+                        if (m.group(2) == null) {
+                            p2 = p1+1;
+                        } else {
+                            p2 = Integer.parseInt(m.group(2));
+                        }
                     }
 
                     ssrc = mSession.getTrack(trackId).getSSRC();