fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-30 22:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

wifi: add some mesh bits to wifi utils

Browse source
This commit is contained in:
Dan Williams 2011-10-05 09:44:11 -05:00
parent a5c2c47b3e
commit fe4c8eb022
4 changed files with 100 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/wifi-utils-private.h
View file

@ -56,6 +56,14 @@ struct WifiData {
int (*get_qual) (WifiData *data);
void (*deinit) (WifiData *data);
/* OLPC Mesh-only functions */
/* channel == 0 means "auto channel" */
gboolean (*set_mesh_channel) (WifiData *data, guint32 channel);
/* ssid == NULL means "auto SSID" */
gboolean (*set_mesh_ssid) (WifiData *data, const GByteArray *ssid);
};
gpointer wifi_data_new (const char *iface, int ifindex, gsize len);

64
src/wifi-utils-wext.c
View file

@ -364,6 +364,68 @@ wifi_wext_get_qual (WifiData *data)
return wext_qual_to_percent (&stats.qual, &wext->max_qual);
}
/*********************/
/* OLPC Mesh-only functions */
static gboolean
wifi_wext_set_mesh_channel (WifiData *data, guint32 channel)
{
WifiDataWext *wext = (WifiDataWext *) data;
struct iwreq wrq;
memset (&wrq, 0, sizeof (struct iwreq));
strncpy (wrq.ifr_name, wext->parent.iface, IFNAMSIZ);
if (channel > 0) {
wrq.u.freq.flags = IW_FREQ_FIXED;
wrq.u.freq.e = 0;
wrq.u.freq.m = channel;
}
if (ioctl (wext->fd, SIOCSIWFREQ, &wrq) < 0) {
nm_log_err (LOGD_HW | LOGD_WIFI | LOGD_OLPC_MESH,
"(%s): error setting channel to %d: %s",
wext->parent.iface, channel, strerror (errno));
return FALSE;
}
return TRUE;
}
static gboolean
wifi_wext_set_mesh_ssid (WifiData *data, const GByteArray *ssid)
{
WifiDataWext *wext = (WifiDataWext *) data;
struct iwreq wrq;
guint32 len = 0;
char buf[IW_ESSID_MAX_SIZE + 1];
memset (buf, 0, sizeof (buf));
if (ssid) {
len = ssid->len;
memcpy (buf, ssid->data, MIN (sizeof (buf) - 1, len));
}
wrq.u.essid.pointer = (caddr_t) buf;
wrq.u.essid.length = len;
wrq.u.essid.flags = (len > 0) ? 1 : 0; /* 1=enable SSID, 0=disable/any */
strncpy (wrq.ifr_name, wext->parent.iface, IFNAMSIZ);
if (ioctl (wext->fd, SIOCSIWESSID, &wrq) == 0)
return TRUE;
if (errno != ENODEV) {
nm_log_err (LOGD_HW | LOGD_WIFI | LOGD_OLPC_MESH,
"(%s): error setting SSID to '%s': %s",
wext->parent.iface,
ssid ? nm_utils_escape_ssid (ssid->data, ssid->len) : "(null)",
strerror (errno));
}
return FALSE;
}
/*********************/
static gboolean
wext_can_scan (WifiDataWext *wext)
{
@ -487,6 +549,8 @@ wifi_wext_init (const char *iface, int ifindex)
wext->parent.get_rate = wifi_wext_get_rate;
wext->parent.get_qual = wifi_wext_get_qual;
wext->parent.deinit = wifi_wext_deinit;
wext->parent.set_mesh_channel = wifi_wext_set_mesh_channel;
wext->parent.set_mesh_ssid = wifi_wext_set_mesh_ssid;
wext->fd = socket (PF_INET, SOCK_DGRAM, 0);
if (wext->fd < 0)

25
src/wifi-utils.c
View file

@ -88,9 +88,7 @@ wifi_utils_set_mode (WifiData *data, const NM80211Mode mode)
g_return_val_if_fail ((mode == NM_802_11_MODE_INFRA) || (mode == NM_802_11_MODE_ADHOC), FALSE);
/* nl80211 probably doesn't need this */
if (data->set_mode)
return data->set_mode (data, mode);
return TRUE;
return data->set_mode ? data->set_mode (data, mode) : TRUE;
}
guint32
@ -158,3 +156,24 @@ wifi_utils_is_wifi (const char *iface)
return FALSE;
}
/* OLPC Mesh-only functions */
gboolean
wifi_utils_set_mesh_channel (WifiData *data, guint32 channel)
{
g_return_val_if_fail (data != NULL, FALSE);
g_return_val_if_fail (channel >= 0, FALSE);
g_return_val_if_fail (channel <= 13, FALSE);
g_return_val_if_fail (data->set_mesh_channel != NULL, FALSE);
return data->set_mesh_channel (data, channel);
}
gboolean
wifi_utils_set_mesh_ssid (WifiData *data, const GByteArray *ssid)
{
g_return_val_if_fail (data != NULL, FALSE);
g_return_val_if_fail (data->set_mesh_ssid != NULL, FALSE);
return data->set_mesh_ssid (data, ssid);
}

6
src/wifi-utils.h
View file

@ -61,4 +61,10 @@ guint32 wifi_utils_get_rate (WifiData *data);
/* Returns quality 0 - 100% on succes, or -1 on error */
int wifi_utils_get_qual (WifiData *data);
/* OLPC Mesh-only functions */
gboolean wifi_utils_set_mesh_channel (WifiData *data, guint32 channel);
gboolean wifi_utils_set_mesh_ssid (WifiData *data, const GByteArray *ssid);
#endif /* WIFI_UTILS_H */