woj/nsjail
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: faster struct cleaning

Browse Source
This commit is contained in:
Robert Swiecki 2018-02-09 19:12:48 +01:00
parent c23e90bc5a
commit b84b349580
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
log.h
View File

@ -28,7 +28,8 @@
#include "nsjail.h"
#define LOG_HELP(...) log::logMsg(HELP, __PRETTY_FUNCTION__, __LINE__, false, __VA_ARGS__);
#define LOG_HELP_BOLD(...) log::logMsg(HELP_BOLD, __PRETTY_FUNCTION__, __LINE__, false, __VA_ARGS__);
#define LOG_HELP_BOLD(...) \
log::logMsg(HELP_BOLD, __PRETTY_FUNCTION__, __LINE__, false, __VA_ARGS__);
#define LOG_D(...) log::logMsg(DEBUG, __PRETTY_FUNCTION__, __LINE__, false, __VA_ARGS__);
#define LOG_I(...) log::logMsg(INFO, __PRETTY_FUNCTION__, __LINE__, false, __VA_ARGS__);

9
net.cc
View File

@ -302,8 +302,7 @@ static bool ifaceUp(const char* ifacename) {
return false;
}
struct ifreq ifr;
memset(&ifr, '\0', sizeof(ifr));
struct ifreq ifr = {};
snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", ifacename);
if (ioctl(sock, SIOCGIFFLAGS, &ifr) == -1) {
@ -325,8 +324,7 @@ static bool ifaceUp(const char* ifacename) {
}
static bool netConfigureVs(struct nsjconf_t* nsjconf) {
struct ifreq ifr;
memset(&ifr, '\0', sizeof(ifr));
struct ifreq ifr = {};
snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", IFACE_NAME);
struct in_addr addr;
@ -385,8 +383,7 @@ static bool netConfigureVs(struct nsjconf_t* nsjconf) {
return true;
}
struct rtentry rt;
memset(&rt, '\0', sizeof(rt));
struct rtentry rt = {};
struct sockaddr_in* sdest = (struct sockaddr_in*)(&rt.rt_dst);
struct sockaddr_in* smask = (struct sockaddr_in*)(&rt.rt_genmask);