fix Windows Direct service reachability
This commit is contained in:
@@ -12,8 +12,8 @@ android {
|
||||
applicationId = "com.qft.optical"
|
||||
minSdk = 24
|
||||
targetSdk = 35
|
||||
versionCode = 20
|
||||
versionName = "0.4.8"
|
||||
versionCode = 21
|
||||
versionName = "0.4.9"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
|
||||
@@ -195,7 +195,7 @@ class MainActivity : ComponentActivity() {
|
||||
) { showReceivedFiles() })
|
||||
root.addView(space(22))
|
||||
root.addView(text("本机设备:$receiverDeviceLabel", 13f, MUTED))
|
||||
root.addView(text("QFT v${BuildConfig.VERSION_NAME} · Android 7+ 到最新", 12f, MUTED))
|
||||
root.addView(text("QFT v0.4.9 · Android 7+ 到最新", 12f, MUTED))
|
||||
setContentView(ScrollView(this).apply { setBackgroundColor(BG); addView(root) })
|
||||
}
|
||||
|
||||
@@ -675,6 +675,7 @@ class MainActivity : ComponentActivity() {
|
||||
network = network,
|
||||
pairing = pair,
|
||||
hosts = wifiConnector.discoveryHosts(network),
|
||||
deviceName = receiverDeviceLabel,
|
||||
)
|
||||
subnet = wifiConnector.subnetEndpoints(network, pair.port)
|
||||
runOnUiThread {
|
||||
|
||||
@@ -57,6 +57,10 @@ internal fun <T> awaitFirstNonNull(
|
||||
return null
|
||||
}
|
||||
|
||||
internal fun directDiscoveryRequest(session: String, deviceName: String): ByteArray =
|
||||
"QFTDISC2:$session:${Base64Url.encode(deviceName.toByteArray(Charsets.UTF_8))}"
|
||||
.toByteArray(Charsets.US_ASCII)
|
||||
|
||||
object UploadClient {
|
||||
private const val TAG = "QftUpload"
|
||||
private const val DISCOVERY_PORT = 39392
|
||||
@@ -96,6 +100,7 @@ object UploadClient {
|
||||
network: Network?,
|
||||
pairing: PairingPayload,
|
||||
hosts: List<InetAddress>,
|
||||
deviceName: String,
|
||||
): String? {
|
||||
if (hosts.isEmpty()) return null
|
||||
val socket = DatagramSocket()
|
||||
@@ -103,7 +108,7 @@ object UploadClient {
|
||||
network?.bindSocket(socket)
|
||||
socket.broadcast = true
|
||||
socket.soTimeout = 160
|
||||
val request = "QFTDISC2:${pairing.session}".toByteArray(Charsets.US_ASCII)
|
||||
val request = directDiscoveryRequest(pairing.session, deviceName)
|
||||
// Two directed/broadcast bursts fit within the initial routing
|
||||
// window while keeping service discovery below 600 ms.
|
||||
repeat(2) {
|
||||
|
||||
@@ -10,6 +10,18 @@ import java.util.concurrent.Executors
|
||||
import java.util.zip.CRC32
|
||||
|
||||
class ProtocolTest {
|
||||
@Test
|
||||
fun directDiscoveryCarriesTheAndroidDeviceName() {
|
||||
val request = directDiscoveryRequest(
|
||||
session = "abcdefghijklmnopqrstuvwxyz012345",
|
||||
deviceName = "HUAWEI CDY-AN90",
|
||||
).toString(Charsets.US_ASCII)
|
||||
val encoded = request.substringAfterLast(':')
|
||||
|
||||
assertTrue(request.startsWith("QFTDISC2:abcdefghijklmnopqrstuvwxyz012345:"))
|
||||
assertEquals("HUAWEI CDY-AN90", Base64Url.decode(encoded)?.toString(Charsets.UTF_8))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun dedicatedWifiNeverProbesQrOrComputerLanAddresses() {
|
||||
assertEquals(
|
||||
|
||||
Reference in New Issue
Block a user