marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Beautify the code for getting ip address/ethernet speed, only use one static socket

Browse Source
This commit is contained in:
Michael Stapelberg 2009-01-25 19:11:53 +01:00
parent 618990292c
commit 5aa7639297
1 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
wmiistatus.c
View File

@ -59,6 +59,9 @@
#undef _IS_WMIISTATUS_C #undef _IS_WMIISTATUS_C
#include "config.h" #include "config.h"
/* socket file descriptor for general purposes */
static int general_socket;
/* /*
* This function just concats two strings in place, it should only be used * This function just concats two strings in place, it should only be used
* for concatting order to the name of a file or concatting color codes. * for concatting order to the name of a file or concatting color codes.
@ -336,33 +339,20 @@ static char *get_wireless_info() {
static const char *get_ip_address(const char *interface) { static const char *get_ip_address(const char *interface) {
static char part[512]; static char part[512];
struct ifreq ifr; struct ifreq ifr;
int fd; struct sockaddr_in addr;
socklen_t len = sizeof(struct sockaddr_in);
memset(part, 0, sizeof(part)); memset(part, 0, sizeof(part));
if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
die("Could not create socket");
strcpy(ifr.ifr_name, interface);
if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0)
die("Could not get interface flags (SIOCGIFFLAGS)");
if (!(ifr.ifr_flags & IFF_UP) ||
!(ifr.ifr_flags & IFF_RUNNING)) {
close(fd);
return NULL;
}
(void)strcpy(ifr.ifr_name, interface); (void)strcpy(ifr.ifr_name, interface);
ifr.ifr_addr.sa_family = AF_INET; ifr.ifr_addr.sa_family = AF_INET;
if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) { if (ioctl(general_socket, SIOCGIFADDR, &ifr) < 0)
struct sockaddr_in addr; return NULL;
memcpy(&addr, &ifr.ifr_addr, sizeof(struct sockaddr_in));
(void)inet_ntop(AF_INET, &addr.sin_addr.s_addr, part, (socklen_t)sizeof(struct sockaddr_in)); memcpy(&addr, &ifr.ifr_addr, len);
if (strlen(part) == 0) (void)inet_ntop(AF_INET, &addr.sin_addr.s_addr, part, len);
snprintf(part, sizeof(part), "no IP"); if (strlen(part) == 0)
} (void)snprintf(part, sizeof(part), "no IP");
(void)close(fd);
return part; return part;
} }
@ -379,20 +369,15 @@ static char *get_eth_info() {
/* This code path requires root privileges */ /* This code path requires root privileges */
struct ifreq ifr; struct ifreq ifr;
struct ethtool_cmd ecmd; struct ethtool_cmd ecmd;
int fd, err; int err;
if ((fd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
write_error_to_statusbar("Could not open socket");
ecmd.cmd = ETHTOOL_GSET; ecmd.cmd = ETHTOOL_GSET;
(void)memset(&ifr, 0, sizeof(ifr)); (void)memset(&ifr, 0, sizeof(ifr));
ifr.ifr_data = (caddr_t)&ecmd; ifr.ifr_data = (caddr_t)&ecmd;
(void)strcpy(ifr.ifr_name, eth_interface); (void)strcpy(ifr.ifr_name, eth_interface);
if ((err = ioctl(fd, SIOCETHTOOL, &ifr)) == 0) if ((err = ioctl(general_socket, SIOCETHTOOL, &ifr)) == 0)
ethspeed = (ecmd.speed == 65535 ? 0 : ecmd.speed); ethspeed = (ecmd.speed == 65535 ? 0 : ecmd.speed);
else get_ethspeed = false; else get_ethspeed = false;
(void)close(fd);
} }
if (ip_address == NULL) if (ip_address == NULL)
@ -462,6 +447,9 @@ int main(int argc, char *argv[]) {
setup(); setup();
if ((general_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
die("Could not create socket");
while (1) { while (1) {
for (i = 0; i < num_run_watches; i += 2) { for (i = 0; i < num_run_watches; i += 2) {
bool running = process_runs(run_watches[i+1]); bool running = process_runs(run_watches[i+1]);