dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge dev

Browse source
This commit is contained in:
Adam Ierymenko 2019-09-04 14:38:35 -07:00
commit 7566d4fbab
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
6 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
service/OneService.cpp
View file

@ -1165,8 +1165,8 @@ public:
json &allowDefault = j["allowDefault"];
if (allowDefault.is_boolean()) localSettings.allowDefault = (bool)allowDefault;
}
} catch (std::exception &exc) {
} catch ( ... ) {
// discard invalid JSON
}
setNetworkSettings(nws->networks[i].nwid,localSettings);
@ -1632,6 +1632,8 @@ public:
return;
}
} catch (std::exception &exc) {
_phy.close(sock);
} catch ( ... ) {
_phy.close(sock);
}
@ -1740,6 +1742,8 @@ public:
#endif
_nets.erase(nwid);
return -999;
} catch (int exc) {
return -999;
} catch ( ... ) {
return -999; // tap init failed
}