tobias/waybar
1
0
Fork 0
mirror of https://github.com/rad4day/Waybar.git synced 2023-12-21 10:22:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean (#31)

Browse Source
This commit is contained in:
Alex
2018-08-20 14:50:45 +02:00
committed by GitHub
parent b7e3d10fb7
commit 49232eed8d
30 changed files with 261 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/modules/network.cpp
View File

@ -1,7 +1,7 @@
#include "modules/network.hpp"
waybar::modules::Network::Network(Json::Value config)
: ALabel(std::move(config)), family_(AF_INET),
waybar::modules::Network::Network(const Json::Value& config)
: ALabel(config), family_(AF_INET),
signal_strength_dbm_(0), signal_strength_(0)
{
sock_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
@ -31,8 +31,7 @@ waybar::modules::Network::Network(Json::Value config)
label_.set_name("network");
// Trigger first values
getInfo();
update();
thread_.sig_update.connect(sigc::mem_fun(*this, &Network::update));
dp.emit();
thread_ = [this] {
char buf[4096];
uint64_t len = netlinkResponse(sock_fd_, buf, sizeof(buf),
@ -69,7 +68,7 @@ waybar::modules::Network::Network(Json::Value config)
}
if (need_update) {
getInfo();
thread_.emit();
dp.emit();
}
};
}
@ -116,20 +115,18 @@ void waybar::modules::Network::disconnected()
// Based on https://gist.github.com/Yawning/c70d804d4b8ae78cc698
int waybar::modules::Network::getExternalInterface()
{
static const uint32_t route_buffer_size = 8192;
struct nlmsghdr *hdr = nullptr;
struct rtmsg *rt = nullptr;
void *resp = nullptr;
char resp[route_buffer_size] = {0};
int ifidx = -1;
/* Allocate space for the request. */
/* Prepare request. */
uint32_t reqlen = NLMSG_SPACE(sizeof(*rt));
void *req = nullptr;
if ((req = calloc(1, reqlen)) == nullptr) {
goto out; /* ENOBUFS */
}
char req[reqlen] = {0};
/* Build the RTM_GETROUTE request. */
hdr = static_cast<struct nlmsghdr *>(req);
hdr = reinterpret_cast<struct nlmsghdr *>(req);
hdr->nlmsg_len = NLMSG_LENGTH(sizeof(*rt));
hdr->nlmsg_flags = NLM_F_REQUEST | NLM_F_DUMP;
hdr->nlmsg_type = RTM_GETROUTE;
@ -142,12 +139,6 @@ int waybar::modules::Network::getExternalInterface()
goto out;
}
/* Allocate space for the response. */
static const uint32_t route_buffer_size = 8192;
if ((resp = calloc(1, route_buffer_size)) == nullptr) {
goto out; /* ENOBUFS */
}
/* Read the response(s).
*
* WARNING: All the packets generated by the request must be consumed (as in,
@ -160,7 +151,7 @@ int waybar::modules::Network::getExternalInterface()
}
/* Parse the response payload into netlink messages. */
for (hdr = static_cast<struct nlmsghdr *>(resp); NLMSG_OK(hdr, len);
for (hdr = reinterpret_cast<struct nlmsghdr *>(resp); NLMSG_OK(hdr, len);
hdr = NLMSG_NEXT(hdr, len)) {
if (hdr->nlmsg_type == NLMSG_DONE) {
goto out;
@ -241,10 +232,6 @@ int waybar::modules::Network::getExternalInterface()
} while (true);
out:
if (req != nullptr)
free(req);
if (resp != nullptr)
free(resp);
return ifidx;
}
@ -269,8 +256,9 @@ uint64_t waybar::modules::Network::netlinkResponse(int fd, void *resp,
struct iovec iov = { resp, resplen };
struct msghdr msg = { &sa, sizeof(sa), &iov, 1, nullptr, 0, 0 };
ret = recvmsg(fd, &msg, 0);
if (msg.msg_flags & MSG_TRUNC)
if (msg.msg_flags & MSG_TRUNC) {
return -1;
}
return ret;
}