Merge branch 'DevDebug' into noWaterMark
This commit is contained in:
commit
5bf163f40c
2 files changed
+2
No files matched your search
@@ -71,6 +71,7 @@
|
|||||||
parentHost.ipv6Address = self.ipv6Address;
|
parentHost.ipv6Address = self.ipv6Address;
|
||||||
}
|
}
|
||||||
// try to fix invalid mac happens in some cases
|
// try to fix invalid mac happens in some cases
|
||||||
|
// 添加主机crash问题重点关注
|
||||||
if (!(self.mac == nil || [self.mac isEqualToString:@"00:00:00:00:00:00"])) parentHost.mac = self.mac;
|
if (!(self.mac == nil || [self.mac isEqualToString:@"00:00:00:00:00:00"])) parentHost.mac = self.mac;
|
||||||
if (self.serverCert != nil) {
|
if (self.serverCert != nil) {
|
||||||
parentHost.serverCert = self.serverCert;
|
parentHost.serverCert = self.serverCert;
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
|
|
||||||
|
|
||||||
// try to fix invalid mac happens in some cases
|
// try to fix invalid mac happens in some cases
|
||||||
|
// 添加主机crash问题重点关注
|
||||||
NSString* tmpMac = [[self getStringTag:TAG_MAC_ADDRESS] trim];
|
NSString* tmpMac = [[self getStringTag:TAG_MAC_ADDRESS] trim];
|
||||||
if (!(tmpMac == nil || [tmpMac isEqualToString:@"00:00:00:00:00:00"])) host.mac = tmpMac;
|
if (!(tmpMac == nil || [tmpMac isEqualToString:@"00:00:00:00:00:00"])) host.mac = tmpMac;
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user