mirrors
/
madwifi
mirror of https://github.com/proski/madwifi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix sparse warnings 

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4094 0192ed92-7a03-0410-a25b-9323aeb14dbd
This commit is contained in:
proski 2009-09-02 20:01:52 +00:00
parent bc1810756f
commit 0c1df90920
3 changed files with 40 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/athchans.c
View File

@ -63,7 +63,7 @@ static int s = -1;
static const char *progname; static const char *progname;
static void static void
checksocket() checksocket(void)
{ {
if (s < 0 ? (s = socket(AF_INET, SOCK_DGRAM, 0)) == -1 : 0) if (s < 0 ? (s = socket(AF_INET, SOCK_DGRAM, 0)) == -1 : 0)
perror("socket(SOCK_DGRAM)"); perror("socket(SOCK_DGRAM)");

2
tools/athkey.c
View File

@ -63,7 +63,7 @@ static int s = -1;
static const char *progname; static const char *progname;
static void static void
checksocket() checksocket(void)
{ {
if (s < 0 ? (s = socket(AF_INET, SOCK_DGRAM, 0)) == -1 : 0) if (s < 0 ? (s = socket(AF_INET, SOCK_DGRAM, 0)) == -1 : 0)
perror("socket(SOCK_DGRAM)"); perror("socket(SOCK_DGRAM)");

58
tools/wpakey.c
View File

@ -29,11 +29,11 @@
#define MACS "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx" #define MACS "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx"
#define MACP(mac) (mac)[0], (mac)[1], (mac)[2], (mac)[3], (mac)[4], (mac)[5] #define MACP(mac) (mac)[0], (mac)[1], (mac)[2], (mac)[3], (mac)[4], (mac)[5]
char *dev = "ath0"; static char *dev = "ath0";
int sock; static int sock;
int warn_wpa = 1; static int warn_wpa = 1;
int parse_mac(uint8_t *mac, const char *str) static int parse_mac(uint8_t *mac, const char *str)
{ {
if (sscanf(str, MACS, if (sscanf(str, MACS,
&mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5] &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]
@ -44,14 +44,17 @@ int parse_mac(uint8_t *mac, const char *str)
return 1; return 1;
} }
} }
void hexdump(unsigned char *data, ssize_t dlen) {
static void hexdump(unsigned char *data, ssize_t dlen)
{
//printf("%s: (%i) ", prefix, dlen); //printf("%s: (%i) ", prefix, dlen);
while (dlen-- > 0) { while (dlen-- > 0) {
printf("%02hhx", *data++); printf("%02hhx", *data++);
} }
} }
int set80211param(int op, int arg) { static int set80211param(int op, int arg)
{
struct iwreq iwr; struct iwreq iwr;
memset(&iwr, 0, sizeof(iwr)); memset(&iwr, 0, sizeof(iwr));
@ -67,7 +70,8 @@ int set80211param(int op, int arg) {
return 0; return 0;
} }
int get80211param(int op) { static int get80211param(int op)
{
struct iwreq iwr; struct iwreq iwr;
memset(&iwr, 0, sizeof(iwr)); memset(&iwr, 0, sizeof(iwr));
@ -83,7 +87,8 @@ int get80211param(int op) {
} }
int set80211priv(int op, void *data, int len) { static int set80211priv(int op, void *data, int len)
{
struct iwreq iwr; struct iwreq iwr;
memset(&iwr, 0, sizeof(iwr)); memset(&iwr, 0, sizeof(iwr));
@ -99,7 +104,8 @@ int set80211priv(int op, void *data, int len) {
return iwr.u.data.length; return iwr.u.data.length;
} }
void prep_key(struct ieee80211req_key *wk, int keyidx, uint8_t *mac) { static void prep_key(struct ieee80211req_key *wk, int keyidx, uint8_t *mac)
{
memset(wk, 0, sizeof(struct ieee80211req_key)); memset(wk, 0, sizeof(struct ieee80211req_key));
wk->ik_keyix = keyidx; wk->ik_keyix = keyidx;
@ -108,15 +114,18 @@ void prep_key(struct ieee80211req_key *wk, int keyidx, uint8_t *mac) {
} }
} }
char *cipherstrs[] = { "WEP", "TKIP", "OCB", "CCMP", "invalid", "CKIP", "none" }; static char *cipherstrs[] = { "WEP", "TKIP", "OCB", "CCMP", "invalid",
"CKIP", "none" };
char *strcipher(int c) { static char *strcipher(int c)
{
if (c > IEEE80211_CIPHER_NONE) return "invalid"; if (c > IEEE80211_CIPHER_NONE) return "invalid";
return cipherstrs[c]; return cipherstrs[c];
} }
char *strflags(int f) { static char *strflags(int f)
{
static char buf[5]; static char buf[5];
char *ff = buf; char *ff = buf;
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
@ -129,7 +138,8 @@ char *strflags(int f) {
return buf; return buf;
} }
int getkey(int keyidx, uint8_t *mac, int verbose) { static int getkey(int keyidx, uint8_t *mac, int verbose)
{
struct ieee80211req_key wk; struct ieee80211req_key wk;
if (warn_wpa && get80211param(IEEE80211_PARAM_WPA) == 0) { if (warn_wpa && get80211param(IEEE80211_PARAM_WPA) == 0) {
@ -155,14 +165,17 @@ int getkey(int keyidx, uint8_t *mac, int verbose) {
return -1; return -1;
} }
int delkey(int keyidx, uint8_t *mac) { static int delkey(int keyidx, uint8_t *mac)
{
struct ieee80211req_key wk; struct ieee80211req_key wk;
prep_key(&wk, keyidx, mac); prep_key(&wk, keyidx, mac);
return set80211priv(IEEE80211_IOCTL_DELKEY, &wk, sizeof(wk)); return set80211priv(IEEE80211_IOCTL_DELKEY, &wk, sizeof(wk));
} }
int setkey(int keyidx, uint8_t *mac, int type, int flags, int keylen, char *key) { static int setkey(int keyidx, uint8_t *mac, int type, int flags, int keylen,
char *key)
{
struct ieee80211req_key wk; struct ieee80211req_key wk;
prep_key(&wk, keyidx, mac); prep_key(&wk, keyidx, mac);
@ -175,7 +188,8 @@ int setkey(int keyidx, uint8_t *mac, int type, int flags, int keylen, char *key)
} }
void iter_sta() { static void iter_sta(void)
{
uint8_t buf[24*1024]; uint8_t buf[24*1024];
uint8_t *bufpos; uint8_t *bufpos;
ssize_t len; ssize_t len;
@ -195,7 +209,8 @@ void iter_sta() {
} }
} }
void set_wpa(int cipher, int wpa, int key) { static void set_wpa(int cipher, int wpa, int key)
{
printf("Setting WPA: cipher=%s wpa=%i mgmt=%i\n", printf("Setting WPA: cipher=%s wpa=%i mgmt=%i\n",
strcipher(cipher), wpa, key); strcipher(cipher), wpa, key);
set80211param(IEEE80211_PARAM_MCASTCIPHER, cipher); set80211param(IEEE80211_PARAM_MCASTCIPHER, cipher);
@ -207,7 +222,8 @@ void set_wpa(int cipher, int wpa, int key) {
} }
void init() { static void init(void)
{
sock = socket(PF_INET, SOCK_DGRAM, 0); sock = socket(PF_INET, SOCK_DGRAM, 0);
if (sock < 0) { if (sock < 0) {
perror("socket()"); perror("socket()");
@ -216,7 +232,8 @@ void init() {
} }
void help() { static void help(void)
{
fprintf(stderr, "Possible options are:\n" fprintf(stderr, "Possible options are:\n"
" -a print all group keys\n" " -a print all group keys\n"
" -A print all keys (default option)\n" " -A print all keys (default option)\n"
@ -234,7 +251,8 @@ void help() {
"", dev); "", dev);
} }
int main(int argc, char** argv) { int main(int argc, char** argv)
{
int keyidx = 0; int keyidx = 0;
uint8_t mac[6]; uint8_t mac[6];
int cipher = IEEE80211_CIPHER_AES_CCM; int cipher = IEEE80211_CIPHER_AES_CCM;