Implement displaying the wireless connection speed (Thanks Felicitus)
Based on a patch by Felicitus.
This commit is contained in:
parent
fac05bf4e8
commit
af5fd7b77e
|
@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
|
|||
};
|
||||
|
||||
cfg_opt_t wireless_opts[] = {
|
||||
CFG_STR("format_up", "W: (%quality at %essid) %ip", CFGF_NONE),
|
||||
CFG_STR("format_up", "W: (%quality at %essid, %bitrate) %ip", CFGF_NONE),
|
||||
CFG_STR("format_down", "W: down", CFGF_NONE),
|
||||
CFG_END()
|
||||
};
|
||||
|
|
|
@ -57,7 +57,7 @@ order += "load"
|
|||
order += "time"
|
||||
|
||||
wireless wlan0 {
|
||||
format_up = "W: (%quality at %essid) %ip"
|
||||
format_up = "W: (%quality at %essid, %bitrate) %ip"
|
||||
format_down = "W: down"
|
||||
}
|
||||
|
||||
|
@ -160,7 +160,7 @@ connected.
|
|||
|
||||
*Example order*: +wireless wlan0+
|
||||
|
||||
*Example format*: +W: (%quality at %essid) %ip+
|
||||
*Example format*: +W: (%quality at %essid, %bitrate) %ip+
|
||||
|
||||
=== Ethernet
|
||||
|
||||
|
|
|
@ -25,6 +25,7 @@ typedef struct {
|
|||
int signal_level_max;
|
||||
int noise_level;
|
||||
int noise_level_max;
|
||||
int bitrate;
|
||||
} wireless_info_t;
|
||||
|
||||
static int get_wireless_info(const char *interface, wireless_info_t *info) {
|
||||
|
@ -132,6 +133,10 @@ static int get_wireless_info(const char *interface, wireless_info_t *info) {
|
|||
}
|
||||
}
|
||||
|
||||
struct iwreq wrq;
|
||||
if (iw_get_ext(skfd, interface, SIOCGIWRATE, &wrq) >= 0)
|
||||
info->bitrate = wrq.u.bitrate.value;
|
||||
|
||||
close(skfd);
|
||||
return 1;
|
||||
#endif
|
||||
|
@ -210,6 +215,15 @@ void print_wireless_info(const char *interface, const char *format_up, const cha
|
|||
else (void)printf("no IP");
|
||||
walk += strlen("ip");
|
||||
}
|
||||
|
||||
if (BEGINS_WITH(walk+1, "bitrate")) {
|
||||
char buffer[128];
|
||||
|
||||
iw_print_bitrate(buffer, sizeof(buffer), info.bitrate);
|
||||
|
||||
printf("%s", buffer);
|
||||
walk += strlen("bitrate");
|
||||
}
|
||||
}
|
||||
|
||||
(void)printf("%s", endcolor());
|
||||
|
|
Loading…
Reference in New Issue