Changeset 222

Timestamp:

03/04/10 16:17:14 (5 months ago)

Author:

dragorn

Message:

Add get channel to drv_mac80211
Fix major bug in drv_mac80211 which would crash if setmac used
Add get channel to ruby

Location:

trunk

Files:

• drv_mac80211.c (modified) (3 diffs)
• ruby-lorcon/Lorcon2.c (modified) (2 diffs)

trunk/drv_mac80211.c

@@ -77 +77 @@
         if ((parent = nl80211_find_parent(context->vapname)) == NULL) {
                 if (nl80211_createvap(context->ifname, context->vapname, context->errstr) < 0) {
+                        free(parent);
                         return -1;
                 }
-        } else {
-                free(parent);
-        }
+        } 
+
+        free(parent);
 
         if (ifconfig_delta_flags(context->vapname, context->errstr,
@@ -164 +165 @@
 
         return 0;
+}
+
+int mac80211_getchan_cb(lorcon_t *context) {
+        int ch;
+
+        if ((ch = iwconfig_get_channel(context->vapname, context->errstr)) < 0) {
+                // Fall back to parent if vap doesn't act right (mac80211 seems to do this)
+                if ((ch = iwconfig_get_channel(context->ifname, context->errstr)) < 0)
+                        return -1;
+        }
+
+        return ch;
 }
 
@@ -290 +303 @@
 
         context->setchan_cb = mac80211_setchan_cb;
+        context->getchan_cb = mac80211_getchan_cb;
 
         context->getmac_cb = mac80211_getmac_cb;
-        context->setmac_cb = mac80211_setchan_cb;
+        context->setmac_cb = mac80211_setmac_cb;
 
         context->auxptr = extras;

trunk/ruby-lorcon/Lorcon2.c

@@ -507 +507 @@
 }
 
+static VALUE Lorcon_get_channel(VALUE self) {
+        struct rldev *rld;
+        Data_Get_Struct(self, struct rldev, rld);
+        return INT2FIX(lorcon_get_channel(rld->context));
+}
 
 static void rblorcon_pcap_handler(rblorconjob_t *job, struct pcap_pkthdr *hdr, u_char *pkt){
@@ -632 +637 @@
         rb_define_method(cDevice, "filter=", Lorcon_set_filter, 1);
         rb_define_method(cDevice, "channel=", Lorcon_set_channel, 1);
+        rb_define_method(cDevice, "channel", Lorcon_get_channel, 0);
 
         rb_define_method(cDevice, "loop", Lorcon_capture_loop, -1);