mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Don't use ConnectivityManager checkRouteToHost for IPv6 

T-Mobile LTE now uses IPv6 addresses for their MMSC, which are
incompatible with ConnectivityManager's checkRouteToHost.
fork-5.53.8
Moxie Marlinspike 2013-07-12 15:25:34 -07:00
rodzic bccf4895f6
commit dfa710a6fc
1 zmienionych plików z 9 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
src/org/thoughtcrime/securesms/mms/MmsCommunication.java
Wyświetl plik

@ -148,15 +148,17 @@ public class MmsCommunication {
return; return;
} }
byte[] ipAddressBytes = inetAddress.getAddress(); Log.w("MmsCommunication", "Checking route to address: " + host + " , " + inetAddress.getHostAddress());
int ipAddress = Conversions.byteArrayToIntLittleEndian(ipAddressBytes, 0);
ConnectivityManager manager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
if (!manager.requestRouteToHost(MmsDownloader.TYPE_MOBILE_MMS, ipAddress)) byte[] ipAddressBytes = inetAddress.getAddress();
throw new IOException("Connection manager could not obtain route to host.");
// if (!manager.requestRouteToHost(ConnectivityManager.TYPE_MOBILE, ipAddress))
// throw new IOException("Connection manager could not obtain route to host.");
if (ipAddressBytes != null && ipAddressBytes.length == 4) {
int ipAddress = Conversions.byteArrayToIntLittleEndian(ipAddressBytes, 0);
ConnectivityManager manager = (ConnectivityManager)context.getSystemService(Context.CONNECTIVITY_SERVICE);
if (!manager.requestRouteToHost(MmsDownloader.TYPE_MOBILE_MMS, ipAddress))
throw new IOException("Connection manager could not obtain route to host.");
}
} }
protected static AndroidHttpClient constructHttpClient(Context context, MmsConnectionParameters mmsConfig) { protected static AndroidHttpClient constructHttpClient(Context context, MmsConnectionParameters mmsConfig) {