permissionlesstech/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-25 22:25:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
callebtc
2025-10-22 13:05:32 +02:00
parent fcbecd4ef6
commit ddff565bdd
1 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareMeshServiceLatest.kt
+6 -16
View File
@@ -173,15 +173,9 @@ class WifiAwareMeshService(private val context: Context) {
*/ */
private fun broadcastPacket(routed: RoutedPacket) { private fun broadcastPacket(routed: RoutedPacket) {
Log.d(TAG, "TX: packet type=${routed.packet.type} broadcast (ttl=${routed.packet.ttl})") Log.d(TAG, "TX: packet type=${routed.packet.type} broadcast (ttl=${routed.packet.ttl})")
// Generalized fragmentation support (parity with BLE) // Wi‑Fi Aware uses full packets; no fragmentation
val frags = try { fragmentManager.createFragments(routed.packet) } catch (_: Exception) { listOf(routed.packet) } val data = routed.packet.toBinaryData() ?: return
serviceScope.launch { serviceScope.launch { broadcastRaw(data) }
if (frags.size > 1) Log.d(TAG, "TX: fragmenting into ${frags.size} parts for broadcast")
for ((idx, frag) in frags.withIndex()) {
frag.toBinaryData()?.let { broadcastRaw(it) }
if (frags.size > 1) delay(20)
}
}
} }
// Expose a public method so BLE can forward relays to Wi‑Fi Aware // Expose a public method so BLE can forward relays to Wi‑Fi Aware
@@ -193,23 +187,19 @@ class WifiAwareMeshService(private val context: Context) {
* Send packet to connected peer. * Send packet to connected peer.
*/ */
private fun sendPacketToPeer(peerID: String, packet: BitchatPacket) { private fun sendPacketToPeer(peerID: String, packet: BitchatPacket) {
val frags = try { fragmentManager.createFragments(packet) } catch (_: Exception) { listOf(packet) } // Wi‑Fi Aware uses full packets; no fragmentation
val data = packet.toBinaryData() ?: return
serviceScope.launch { serviceScope.launch {
val sock = peerSockets[peerID] val sock = peerSockets[peerID]
if (sock == null) { if (sock == null) {
Log.w(TAG, "TX: no socket for ${peerID.take(8)}…") Log.w(TAG, "TX: no socket for ${peerID.take(8)}…")
return@launch return@launch
} }
if (frags.size > 1) Log.d(TAG, "TX: fragmenting into ${frags.size} parts → ${peerID.take(8)}…")
for (frag in frags) {
val data = frag.toBinaryData() ?: continue
try { try {
sock.getOutputStream().write(data) sock.getOutputStream().write(data)
Log.d(TAG, "TX: packet type=${packet.type} → ${peerID.take(8)}… (bytes=${data.size})")
} catch (e: IOException) { } catch (e: IOException) {
Log.e(TAG, "TX: write to ${peerID.take(8)}… failed: ${e.message}") Log.e(TAG, "TX: write to ${peerID.take(8)}… failed: ${e.message}")
break
}
if (frags.size > 1) delay(20)
} }
} }
} }