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

net: initialize some structs with {}

Browse Source
This commit is contained in:
Robert Swiecki 2023-10-22 23:19:37 +02:00
parent 61250ea20b
commit 78110d184e
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
net.cc
View File

@ -198,7 +198,7 @@ bool limitConns(nsjconf_t* nsjconf, int connsock) {
return true; return true;
} }
struct sockaddr_in6 addr; struct sockaddr_in6 addr = {};
auto connstr = connToText(connsock, true /* remote */, &addr); auto connstr = connToText(connsock, true /* remote */, &addr);
unsigned cnt = 0; unsigned cnt = 0;
@ -278,7 +278,7 @@ int getRecvSocket(const char* bindhost, int port) {
} }
int acceptConn(int listenfd) { int acceptConn(int listenfd) {
struct sockaddr_in6 cli_addr; struct sockaddr_in6 cli_addr = {};
socklen_t socklen = sizeof(cli_addr); socklen_t socklen = sizeof(cli_addr);
int connfd = accept4(listenfd, (struct sockaddr*)&cli_addr, &socklen, SOCK_NONBLOCK); int connfd = accept4(listenfd, (struct sockaddr*)&cli_addr, &socklen, SOCK_NONBLOCK);
if (connfd == -1) { if (connfd == -1) {
@ -340,8 +340,7 @@ static bool ifaceUp(const char* ifacename) {
return false; return false;
} }
struct ifreq ifr; struct ifreq ifr = {};
memset(&ifr, '\0', sizeof(ifr));
snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", ifacename); snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", ifacename);
if (ioctl(sock, SIOCGIFFLAGS, &ifr) == -1) { if (ioctl(sock, SIOCGIFFLAGS, &ifr) == -1) {
@ -382,8 +381,7 @@ static bool ifaceConfig(const std::string& iface, const std::string& ip, const s
return true; return true;
} }
struct ifreq ifr; struct ifreq ifr = {};
memset(&ifr, '\0', sizeof(ifr));
snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", iface.c_str()); snprintf(ifr.ifr_name, IF_NAMESIZE, "%s", iface.c_str());
struct sockaddr_in* sa = (struct sockaddr_in*)(&ifr.ifr_addr); struct sockaddr_in* sa = (struct sockaddr_in*)(&ifr.ifr_addr);
sa->sin_family = AF_INET; sa->sin_family = AF_INET;
@ -423,8 +421,7 @@ static bool ifaceConfig(const std::string& iface, const std::string& ip, const s
return true; return true;
} }
struct rtentry rt; struct rtentry rt = {};
memset(&rt, '\0', sizeof(rt));
struct sockaddr_in* sdest = (struct sockaddr_in*)(&rt.rt_dst); struct sockaddr_in* sdest = (struct sockaddr_in*)(&rt.rt_dst);
struct sockaddr_in* smask = (struct sockaddr_in*)(&rt.rt_genmask); struct sockaddr_in* smask = (struct sockaddr_in*)(&rt.rt_genmask);
struct sockaddr_in* sgate = (struct sockaddr_in*)(&rt.rt_gateway); struct sockaddr_in* sgate = (struct sockaddr_in*)(&rt.rt_gateway);