[Jive-Checkins] r3669 - in /7.4/trunk/squeezeplay/src/squeezeplay_squeezeos: share/jive/net/Wireless.lua src/wireless.c

[titmuss]

Author: titmuss
Date: Mon Jan  5 03:32:23 2009
New Revision: 3669

URL: http://svn.slimdevices.com?rev=3669&root=Jive&view=rev
Log:
Bug: N/A
Description:
Code clean up. Remove hardcoded eth0.


Modified:
    7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Wireless.lua
    7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/src/wireless.c

Modified: 
7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Wireless.lua
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Wireless.lua?rev=3669&root=Jive&r1=3668&r2=3669&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Wireless.lua 
(original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Wireless.lua 
Mon Jan  5 03:32:23 2009
@@ -574,7 +574,7 @@
        end
 
        local err
-       self.t_sock, err = wireless:open()
+       self.t_sock, err = wireless:open("eth0")
        if err then
                log:warn(err)
 

Modified: 7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/src/wireless.c
URL: 
http://svn.slimdevices.com/7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/src/wireless.c?rev=3669&root=Jive&r1=3668&r2=3669&view=diff
==============================================================================
--- 7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/src/wireless.c (original)
+++ 7.4/trunk/squeezeplay/src/squeezeplay_squeezeos/src/wireless.c Mon Jan  5 
03:32:23 2009
@@ -17,25 +17,26 @@
 
 
 struct wlan_data {
+       char *iface;
        struct wpa_ctrl *ctrl;
        int fd;
 };
 
 
 static int jive_net_wpa_ctrl_open(lua_State *L) {
-       const char *ctrl_path;
+       char ctrl_path[PATH_MAX];
        struct wlan_data *data;
        int err;
 
        /* stack is:
-        * 1: JiveWPA
-        * 2: ctrl_path
+        * 1: Wireless class
+        * 2: iface
         */
 
-       // FIXME allow variable control path
-       ctrl_path = "/var/run/wpa_supplicant/eth0";
-
        data = lua_newuserdata(L, sizeof(struct wlan_data));
+
+       data->iface = strdup(lua_tostring(L, 2));
+       sprintf(ctrl_path, "/var/run/wpa_supplicant/%s", data->iface);
 
        data->ctrl = wpa_ctrl_open(ctrl_path);
        if (data->ctrl == NULL) {
@@ -90,6 +91,11 @@
                data->fd = 0;
        }
 
+       if (data->iface) {
+               free(data->iface);
+               data->iface = 0;
+       }
+
        return 0;
 }
 
@@ -187,7 +193,7 @@
                return 2;
        }
 
-       strncpy(wrq.ifr_ifrn.ifrn_name, "eth0", IFNAMSIZ);
+       strncpy(wrq.ifr_ifrn.ifrn_name, data->iface, IFNAMSIZ);
        wrq.u.power.flags = 0;
 
        if (ioctl(data->fd, SIOCGIWPOWER, &wrq) < 0) {
@@ -219,7 +225,7 @@
                return 2;
        }
 
-       strncpy(wrq.ifr_ifrn.ifrn_name, "eth0", IFNAMSIZ);
+       strncpy(wrq.ifr_ifrn.ifrn_name, data->iface, IFNAMSIZ);
 
        if (lua_toboolean(L, 2)) {
                wrq.u.power.disabled = 0;

_______________________________________________
Jive-checkins mailing list
Jive-checkins@lists.slimdevices.com
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins