summaryrefslogtreecommitdiffstats
path: root/src/iwapi.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/iwapi.c')
-rw-r--r--src/iwapi.c34
1 files changed, 20 insertions, 14 deletions
diff --git a/src/iwapi.c b/src/iwapi.c
index 5d8afe8..64eb8b2 100644
--- a/src/iwapi.c
+++ b/src/iwapi.c
@@ -236,14 +236,19 @@ int iw_scan_result(struct interface *i, int (*callback)(struct ap_info* ap)) {
}
int iw_tune(struct interface *i, struct ap_info *ap) {
+ char c[67];
assert(i && ap);
+ snprint_hw_addr(c, sizeof(c), &ap->ap);
+
/* We are not interested in the return values of these functions due to driver issues */
+ daemon_log(LOG_INFO, "Tuning %s ... %s", ap->essid, c);
iw_set_mode(i, IW_MODE_INFRA);
iw_set_essid(i, ap->essid);
//iw_set_freq(i, &ap->freq);
iw_set_ap(i, &ap->ap);
+
return 0;
}
@@ -302,21 +307,21 @@ int iw_get_mode(struct interface *i, int *m) {
return 0;
}
-int iw_get_freq(struct interface *i, struct iw_freq *f) {
- struct iwreq req;
- assert(i && f);
+/* int iw_get_freq(struct interface *i, struct iw_freq *f) { */
+/* struct iwreq req; */
+/* assert(i && f); */
- memset(&req, 0, sizeof(req));
- strncpy(req.ifr_ifrn.ifrn_name, i->name, IFNAMSIZ);
+/* memset(&req, 0, sizeof(req)); */
+/* strncpy(req.ifr_ifrn.ifrn_name, i->name, IFNAMSIZ); */
- if (ioctl(i->fd, SIOCGIWFREQ, &req) < 0) {
- memset(f, 0, sizeof(struct iw_freq)); /* hostap 0.1.2 fails to report the freq sometimes */
- return 0;
- }
+/* if (ioctl(i->fd, SIOCGIWFREQ, &req) < 0) { */
+/* memset(f, 0, sizeof(struct iw_freq)); /\* hostap 0.1.2 fails to report the freq sometimes *\/ */
+/* return 0; */
+/* } */
- *f = req.u.freq;
- return 0;
-}
+/* *f = req.u.freq; */
+/* return 0; */
+/* } */
int iw_assoc(struct interface *i, struct ap_info *ap) {
struct hw_addr hw;
@@ -369,6 +374,7 @@ int iw_assoc(struct interface *i, struct ap_info *ap) {
(q.qual.level > range.max_qual.level ? q.qual.level <= 156 : q.qual.level <= 0))
return 0;
+
if (ap) {
memset(ap, 0, sizeof(struct ap_info));
@@ -377,8 +383,8 @@ int iw_assoc(struct interface *i, struct ap_info *ap) {
if (iw_get_essid(i, ap->essid) < 0)
return -1;
- if (iw_get_freq(i, &ap->freq) < 0)
- return -1;
+ /* if (iw_get_freq(i, &ap->freq) < 0) */
+/* return -1; */
}
return 1;