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

Merge pull request #408 from TimonAlex/freebsd-wifi-bitrate

Browse Source 
Fix rendering wireless bitrate and support bitrate on FreeBSD
This commit is contained in:
Michael Stapelberg 2020-04-21 09:52:13 +02:00 committed by GitHub
commit 57218e98de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/print_wireless_info.c
View File

@ -97,7 +97,7 @@ typedef struct {
double frequency; double frequency;
} wireless_info_t; } wireless_info_t;
#ifdef __linux__ #if defined(__linux__) || defined(__FreeBSD__)
// Like iw_print_bitrate, but without the dependency on libiw. // Like iw_print_bitrate, but without the dependency on libiw.
static void print_bitrate(char *buffer, int buflen, int bitrate, const char *format_bitrate) { static void print_bitrate(char *buffer, int buflen, int bitrate, const char *format_bitrate) {
const int kilo = 1e3; const int kilo = 1e3;
@ -120,7 +120,9 @@ static void print_bitrate(char *buffer, int buflen, int bitrate, const char *for
} }
snprintf(buffer, buflen, format_bitrate, rate / divisor, scale); snprintf(buffer, buflen, format_bitrate, rate / divisor, scale);
} }
#endif
#ifdef __linux__
// Based on NetworkManager/src/platform/wifi/wifi-utils-nl80211.c // Based on NetworkManager/src/platform/wifi/wifi-utils-nl80211.c
static uint32_t nl80211_xbm_to_percent(int32_t xbm, int32_t divisor) { static uint32_t nl80211_xbm_to_percent(int32_t xbm, int32_t divisor) {
#define NOISE_FLOOR_DBM -90 #define NOISE_FLOOR_DBM -90
@ -408,6 +410,9 @@ error1:
info->flags |= WIRELESS_INFO_FLAG_HAS_SIGNAL; info->flags |= WIRELESS_INFO_FLAG_HAS_SIGNAL;
info->noise_level = u.req.info[0].isi_noise; info->noise_level = u.req.info[0].isi_noise;
info->flags |= WIRELESS_INFO_FLAG_HAS_NOISE; info->flags |= WIRELESS_INFO_FLAG_HAS_NOISE;
// isi_txmbps is specified in units of 500 Kbit/s
// Convert them to bit/s
info->bitrate = u.req.info[0].isi_txmbps * 500 * 1000;
} }
return 1; return 1;
@ -599,9 +604,8 @@ void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface,
snprintf(string_ip, STRING_SIZE, "%s", ip_address); snprintf(string_ip, STRING_SIZE, "%s", ip_address);
#ifdef __linux__ #if defined(__linux__) || defined(__FreeBSD__)
char br_buffer[128]; print_bitrate(string_bitrate, sizeof(string_bitrate), info.bitrate, format_bitrate);
print_bitrate(br_buffer, sizeof(br_buffer), info.bitrate, format_bitrate);
#endif #endif
placeholder_t placeholders[] = { placeholder_t placeholders[] = {