From 5f93d55dabff9049b8598429e9d479a923b6364e Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Tue, 6 May 2014 23:54:03 -0400 Subject: [PATCH] Don't convert IP string back into an InetAddress just leave it an InetAddress --- .../limelight/nvstream/rtsp/RtspConnection.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/moonlight-common/src/com/limelight/nvstream/rtsp/RtspConnection.java b/moonlight-common/src/com/limelight/nvstream/rtsp/RtspConnection.java index fdca46db..f12803d4 100644 --- a/moonlight-common/src/com/limelight/nvstream/rtsp/RtspConnection.java +++ b/moonlight-common/src/com/limelight/nvstream/rtsp/RtspConnection.java @@ -23,15 +23,17 @@ public class RtspConnection { private int sequenceNumber = 1; private int sessionId = 0; - private String host; + private InetAddress host; + private String hostStr; public RtspConnection(InetAddress host) { + this.host = host; if (host instanceof Inet6Address) { // RFC2732-formatted IPv6 address for use in URL - this.host = "["+host.getHostAddress()+"]"; + this.hostStr = "["+host.getHostAddress()+"]"; } else { - this.host = host.getHostAddress(); + this.hostStr = host.getHostAddress(); } } @@ -61,12 +63,12 @@ public class RtspConnection { } private RtspResponse requestOptions() throws IOException { - RtspRequest m = createRtspRequest("OPTIONS", "rtsp://"+host); + RtspRequest m = createRtspRequest("OPTIONS", "rtsp://"+hostStr); return transactRtspMessage(m); } private RtspResponse requestDescribe() throws IOException { - RtspRequest m = createRtspRequest("DESCRIBE", "rtsp://"+host); + RtspRequest m = createRtspRequest("DESCRIBE", "rtsp://"+hostStr); m.setOption("Accept", "application/sdp"); m.setOption("If-Modified-Since", "Thu, 01 Jan 1970 00:00:00 GMT"); return transactRtspMessage(m); @@ -92,8 +94,7 @@ public class RtspConnection { RtspRequest m = createRtspRequest("ANNOUNCE", "streamid=video"); m.setOption("Session", ""+sessionId); m.setOption("Content-type", "application/sdp"); - // FIXME: IP jank - m.setPayload(SdpGenerator.generateSdpFromConfig(InetAddress.getByName(host), sc)); + m.setPayload(SdpGenerator.generateSdpFromConfig(host, sc)); m.setOption("Content-length", ""+m.getPayload().length()); return transactRtspMessage(m); }