replace string with define

This commit is contained in:
PolynomialDivision 2017-10-26 17:53:28 +02:00
parent ad7c62f521
commit a5c69a2ef0
4 changed files with 17 additions and 16 deletions

View file

@ -12,7 +12,7 @@ int parse_rssi(char *iwinfo_string);
int get_rssi_from_iwinfo(__uint8_t *client_addr) {
char mac_buf[20];
sprintf(mac_buf, "%02X:%02X:%02X:%02X:%02X:%02X", MAC2STR(client_addr));
sprintf(mac_buf, MACSTR, MAC2STR(client_addr));
char mac_buf_conv[20];
convert_mac(mac_buf, mac_buf_conv);

View file

@ -119,8 +119,6 @@ static int subscribe_to_hostapd_interfaces(char *hostapd_dir);
static int ubus_get_clients();
/* hostapd function */
#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
static void
blobmsg_add_macaddr(struct blob_buf *buf, const char *name, const uint8_t *addr) {
@ -438,7 +436,7 @@ dump_client_table(struct blob_attr *head, int len, const char *bssid_addr, uint3
int tmp_int_mac[ETH_ALEN];
uint8_t tmp_mac[ETH_ALEN];
sscanf((char *) hdr->name, "%02X:%02X:%02X:%02X:%02X:%02X", STR2MAC(tmp_int_mac));
sscanf((char *) hdr->name, MACSTR, STR2MAC(tmp_int_mac));
for (int i = 0; i < ETH_ALEN; ++i)
tmp_mac[i] = (uint8_t) tmp_int_mac[i];
@ -535,12 +533,12 @@ void *kick_clients_thread(void *arg) {
/*
int tmp_int_mac[ETH_ALEN];
uint8_t tmp_mac[ETH_ALEN];
sscanf("a4:2b:b0:de:f1:fd", "%02X:%02X:%02X:%02X:%02X:%02X", STR2MAC(tmp_int_mac));
sscanf("a4:2b:b0:de:f1:fd", MACSTR, STR2MAC(tmp_int_mac));
for(int i = 0; i < ETH_ALEN; ++i )
tmp_mac[i] = (uint8_t) tmp_int_mac[i];
//kick_clients(tmp_mac);
sscanf("a4:2b:b0:de:f1:fe", "%02X:%02X:%02X:%02X:%02X:%02X", STR2MAC(tmp_int_mac));
sscanf("a4:2b:b0:de:f1:fe", MACSTR, STR2MAC(tmp_int_mac));
for(int i = 0; i < ETH_ALEN; ++i )
tmp_mac[i] = (uint8_t) tmp_int_mac[i];*/
//kick_clients(tmp_mac);