brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Specify reason for blacklisting MACs

Browse Source
This commit is contained in:
Mygod
2020-06-04 21:49:02 -04:00
parent 6ab763013b
commit 0965581cc4
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/src/main/java/be/mygod/vpnhotspot/net/MacAddressCompat.kt
View File

@@ -21,6 +21,7 @@ inline class MacAddressCompat(val addr: Long) : Parcelable {
* @hide * @hide
*/ */
val ALL_ZEROS_ADDRESS = MacAddressCompat(0) val ALL_ZEROS_ADDRESS = MacAddressCompat(0)
val ANY_ADDRESS = MacAddressCompat(2L shl 40)
fun bytesToString(addr: ByteArray): String { fun bytesToString(addr: ByteArray): String {
require(addr.size == ETHER_ADDR_LEN) { addr.contentToString() + " was not a valid MAC address" } require(addr.size == ETHER_ADDR_LEN) { addr.contentToString() + " was not a valid MAC address" }

10
mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt
View File

@@ -4,6 +4,7 @@ import android.net.wifi.p2p.WifiP2pGroup
import android.os.Build import android.os.Build
import be.mygod.vpnhotspot.App.Companion.app import be.mygod.vpnhotspot.App.Companion.app
import be.mygod.vpnhotspot.RepeaterService import be.mygod.vpnhotspot.RepeaterService
import be.mygod.vpnhotspot.net.MacAddressCompat
import be.mygod.vpnhotspot.util.RootSession import be.mygod.vpnhotspot.util.RootSession
import com.google.firebase.crashlytics.FirebaseCrashlytics import com.google.firebase.crashlytics.FirebaseCrashlytics
import java.io.File import java.io.File
@@ -54,7 +55,14 @@ class P2pSupplicantConfiguration(private val group: WifiP2pGroup, ownerAddress:
try { try {
val bssids = listOfNotNull(group.owner.deviceAddress, ownerAddress, RepeaterService.lastMac) val bssids = listOfNotNull(group.owner.deviceAddress, ownerAddress, RepeaterService.lastMac)
.distinct() .distinct()
.filter { it != "00:00:00:00:00:00" && it != "02:00:00:00:00:00" } .filter {
try {
val mac = MacAddressCompat.fromString(it)
mac != MacAddressCompat.ALL_ZEROS_ADDRESS && mac != MacAddressCompat.ANY_ADDRESS
} catch (_: IllegalArgumentException) {
false
}
}
while (parser.next()) { while (parser.next()) {
if (parser.trimmed.startsWith("network={")) { if (parser.trimmed.startsWith("network={")) {
val block = NetworkBlock() val block = NetworkBlock()