moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-20 11:33:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't convert IP string back into an InetAddress just leave it an InetAddress

Browse Source
This commit is contained in:
Cameron Gutman 2014-05-06 23:54:03 -04:00
parent dfc0d518f8
commit 5f93d55dab
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
moonlight-common/src/com/limelight/nvstream/rtsp/RtspConnection.java
View File

@ -23,15 +23,17 @@ public class RtspConnection {
private int sequenceNumber = 1; private int sequenceNumber = 1;
private int sessionId = 0; private int sessionId = 0;
private String host; private InetAddress host;
private String hostStr;
public RtspConnection(InetAddress host) { public RtspConnection(InetAddress host) {
this.host = host;
if (host instanceof Inet6Address) { if (host instanceof Inet6Address) {
// RFC2732-formatted IPv6 address for use in URL // RFC2732-formatted IPv6 address for use in URL
this.host = "["+host.getHostAddress()+"]"; this.hostStr = "["+host.getHostAddress()+"]";
} }
else { else {
this.host = host.getHostAddress(); this.hostStr = host.getHostAddress();
} }
} }
@ -61,12 +63,12 @@ public class RtspConnection {
} }
private RtspResponse requestOptions() throws IOException { private RtspResponse requestOptions() throws IOException {
RtspRequest m = createRtspRequest("OPTIONS", "rtsp://"+host); RtspRequest m = createRtspRequest("OPTIONS", "rtsp://"+hostStr);
return transactRtspMessage(m); return transactRtspMessage(m);
} }
private RtspResponse requestDescribe() throws IOException { private RtspResponse requestDescribe() throws IOException {
RtspRequest m = createRtspRequest("DESCRIBE", "rtsp://"+host); RtspRequest m = createRtspRequest("DESCRIBE", "rtsp://"+hostStr);
m.setOption("Accept", "application/sdp"); m.setOption("Accept", "application/sdp");
m.setOption("If-Modified-Since", "Thu, 01 Jan 1970 00:00:00 GMT"); m.setOption("If-Modified-Since", "Thu, 01 Jan 1970 00:00:00 GMT");
return transactRtspMessage(m); return transactRtspMessage(m);
@ -92,8 +94,7 @@ public class RtspConnection {
RtspRequest m = createRtspRequest("ANNOUNCE", "streamid=video"); RtspRequest m = createRtspRequest("ANNOUNCE", "streamid=video");
m.setOption("Session", ""+sessionId); m.setOption("Session", ""+sessionId);
m.setOption("Content-type", "application/sdp"); m.setOption("Content-type", "application/sdp");
// FIXME: IP jank m.setPayload(SdpGenerator.generateSdpFromConfig(host, sc));
m.setPayload(SdpGenerator.generateSdpFromConfig(InetAddress.getByName(host), sc));
m.setOption("Content-length", ""+m.getPayload().length()); m.setOption("Content-length", ""+m.getPayload().length());
return transactRtspMessage(m); return transactRtspMessage(m);
} }