colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bluetooth: NMDeviceBt and associated fixes

Browse Source
This commit is contained in:
Dan Williams
2009-05-14 11:01:56 -04:00
parent 4d58683276
commit 7d88a87214
11 changed files with 822 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
include/NetworkManager.h
View File

@@ -25,11 +25,11 @@
/* /*
* dbus services details * dbus services details
*/ */
#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager" #define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
#define NM_DBUS_PATH "/org/freedesktop/NetworkManager" #define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager" #define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
#define NM_DBUS_INTERFACE_DEVICE NM_DBUS_INTERFACE ".Device" #define NM_DBUS_INTERFACE_DEVICE NM_DBUS_INTERFACE ".Device"
#define NM_DBUS_INTERFACE_DEVICE_WIRED NM_DBUS_INTERFACE_DEVICE ".Wired" #define NM_DBUS_INTERFACE_DEVICE_WIRED NM_DBUS_INTERFACE_DEVICE ".Wired"
#define NM_DBUS_INTERFACE_DEVICE_WIRELESS NM_DBUS_INTERFACE_DEVICE ".Wireless" #define NM_DBUS_INTERFACE_DEVICE_WIRELESS NM_DBUS_INTERFACE_DEVICE ".Wireless"
#define NM_DBUS_PATH_ACCESS_POINT NM_DBUS_PATH "/AccessPoint" #define NM_DBUS_PATH_ACCESS_POINT NM_DBUS_PATH "/AccessPoint"
@@ -75,7 +75,8 @@ typedef enum NMDeviceType
NM_DEVICE_TYPE_ETHERNET, NM_DEVICE_TYPE_ETHERNET,
NM_DEVICE_TYPE_WIFI, NM_DEVICE_TYPE_WIFI,
NM_DEVICE_TYPE_GSM, NM_DEVICE_TYPE_GSM,
NM_DEVICE_TYPE_CDMA NM_DEVICE_TYPE_CDMA,
NM_DEVICE_TYPE_BT /* Bluetooth */
} NMDeviceType; } NMDeviceType;
/* DEPRECATED TYPE NAMES */ /* DEPRECATED TYPE NAMES */
@@ -90,27 +91,27 @@ typedef enum NMDeviceType
* General device capability bits * General device capability bits
* *
*/ */
#define NM_DEVICE_CAP_NONE 0x00000000 #define NM_DEVICE_CAP_NONE 0x00000000
#define NM_DEVICE_CAP_NM_SUPPORTED 0x00000001 #define NM_DEVICE_CAP_NM_SUPPORTED 0x00000001
#define NM_DEVICE_CAP_CARRIER_DETECT 0x00000002 #define NM_DEVICE_CAP_CARRIER_DETECT 0x00000002
/* 802.11 wireless device-specific capabilities */ /* 802.11 wireless device-specific capabilities */
#define NM_WIFI_DEVICE_CAP_NONE 0x00000000 #define NM_WIFI_DEVICE_CAP_NONE 0x00000000
#define NM_WIFI_DEVICE_CAP_CIPHER_WEP40 0x00000001 #define NM_WIFI_DEVICE_CAP_CIPHER_WEP40 0x00000001
#define NM_WIFI_DEVICE_CAP_CIPHER_WEP104 0x00000002 #define NM_WIFI_DEVICE_CAP_CIPHER_WEP104 0x00000002
#define NM_WIFI_DEVICE_CAP_CIPHER_TKIP 0x00000004 #define NM_WIFI_DEVICE_CAP_CIPHER_TKIP 0x00000004
#define NM_WIFI_DEVICE_CAP_CIPHER_CCMP 0x00000008 #define NM_WIFI_DEVICE_CAP_CIPHER_CCMP 0x00000008
#define NM_WIFI_DEVICE_CAP_WPA 0x00000010 #define NM_WIFI_DEVICE_CAP_WPA 0x00000010
#define NM_WIFI_DEVICE_CAP_RSN 0x00000020 #define NM_WIFI_DEVICE_CAP_RSN 0x00000020
/* /*
* 802.11 Access Point flags * 802.11 Access Point flags
* *
*/ */
#define NM_802_11_AP_FLAGS_NONE 0x00000000 #define NM_802_11_AP_FLAGS_NONE 0x00000000
#define NM_802_11_AP_FLAGS_PRIVACY 0x00000001 #define NM_802_11_AP_FLAGS_PRIVACY 0x00000001
/* /*
* 802.11 Access Point security flags * 802.11 Access Point security flags
@@ -119,17 +120,17 @@ typedef enum NMDeviceType
* from various pieces of beacon information, like beacon flags and various * from various pieces of beacon information, like beacon flags and various
* information elements. * information elements.
*/ */
#define NM_802_11_AP_SEC_NONE 0x00000000 #define NM_802_11_AP_SEC_NONE 0x00000000
#define NM_802_11_AP_SEC_PAIR_WEP40 0x00000001 #define NM_802_11_AP_SEC_PAIR_WEP40 0x00000001
#define NM_802_11_AP_SEC_PAIR_WEP104 0x00000002 #define NM_802_11_AP_SEC_PAIR_WEP104 0x00000002
#define NM_802_11_AP_SEC_PAIR_TKIP 0x00000004 #define NM_802_11_AP_SEC_PAIR_TKIP 0x00000004
#define NM_802_11_AP_SEC_PAIR_CCMP 0x00000008 #define NM_802_11_AP_SEC_PAIR_CCMP 0x00000008
#define NM_802_11_AP_SEC_GROUP_WEP40 0x00000010 #define NM_802_11_AP_SEC_GROUP_WEP40 0x00000010
#define NM_802_11_AP_SEC_GROUP_WEP104 0x00000020 #define NM_802_11_AP_SEC_GROUP_WEP104 0x00000020
#define NM_802_11_AP_SEC_GROUP_TKIP 0x00000040 #define NM_802_11_AP_SEC_GROUP_TKIP 0x00000040
#define NM_802_11_AP_SEC_GROUP_CCMP 0x00000080 #define NM_802_11_AP_SEC_GROUP_CCMP 0x00000080
#define NM_802_11_AP_SEC_KEY_MGMT_PSK 0x00000100 #define NM_802_11_AP_SEC_KEY_MGMT_PSK 0x00000100
#define NM_802_11_AP_SEC_KEY_MGMT_802_1X 0x00000200 #define NM_802_11_AP_SEC_KEY_MGMT_802_1X 0x00000200
/* /*
* 802.11 AP and Station modes * 802.11 AP and Station modes
@@ -141,6 +142,16 @@ typedef enum {
NM_802_11_MODE_INFRA NM_802_11_MODE_INFRA
} NM80211Mode; } NM80211Mode;
/*
* Bluetooth device capabilities
*
*/
enum {
NM_BT_CAPABILITY_NONE = 0x00000000,
NM_BT_CAPABILITY_DUN = 0x00000001,
NM_BT_CAPABILITY_NAP = 0x00000002,
};
/* /*
* Device states * Device states

1
introspection/all.xml
View File

@@ -33,6 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
<xi:include href="nm-device-cdma.xml"/> <xi:include href="nm-device-cdma.xml"/>
<xi:include href="nm-device-gsm.xml"/> <xi:include href="nm-device-gsm.xml"/>
<xi:include href="nm-device-serial.xml"/> <xi:include href="nm-device-serial.xml"/>
<xi:include href="nm-device-bt.xml"/>
<xi:include href="nm-ip4-config.xml"/> <xi:include href="nm-ip4-config.xml"/>
<xi:include href="nm-dhcp4-config.xml"/> <xi:include href="nm-dhcp4-config.xml"/>
<xi:include href="nm-settings.xml"/> <xi:include href="nm-settings.xml"/>

33
introspection/nm-device-bt.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8" ?>
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
<interface name="org.freedesktop.NetworkManager.Device.Bluetooth">
<property name="HwAddress" type="s" access="read">
<tp:docstring>
Bluetooth hardware address of the device.
</tp:docstring>
</property>
<property name="Name" type="s" access="read">
<tp:docstring>
Bluetooth name of the device.
</tp:docstring>
</property>
<property name="BtCapabilities" type="u" access="read">
<tp:docstring>
Bluetooth capabilities of the device (either DUN or NAP).
</tp:docstring>
</property>
<signal name="PropertiesChanged">
<arg name="properties" type="a{sv}" tp:type="String_Variant_Map">
<tp:docstring>
A dictionary mapping property names to variant boxed values
</tp:docstring>
</arg>
</signal>
</interface>
</node>

2
libnm-util/nm-setting-bluetooth.c
View File

@@ -141,7 +141,7 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
NM_SETTING_BLUETOOTH_TYPE); NM_SETTING_BLUETOOTH_TYPE);
return FALSE; return FALSE;
} else if (!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_DUN) && } else if (!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_DUN) &&
!g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_PANU)) { !g_str_equal (priv->type, NM_SETTING_BLUETOOTH_TYPE_NAP)) {
g_set_error (error, g_set_error (error,
NM_SETTING_BLUETOOTH_ERROR, NM_SETTING_BLUETOOTH_ERROR,
NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY, NM_SETTING_BLUETOOTH_ERROR_INVALID_PROPERTY,

8
libnm-util/nm-setting-bluetooth.h
View File

@@ -54,11 +54,11 @@ GType nm_setting_bluetooth_error_get_type (void);
#define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark () #define NM_SETTING_BLUETOOTH_ERROR nm_setting_bluetooth_error_quark ()
GQuark nm_setting_bluetooth_error_quark (void); GQuark nm_setting_bluetooth_error_quark (void);
#define NM_SETTING_BLUETOOTH_BDADDR "bdaddr" #define NM_SETTING_BLUETOOTH_BDADDR "bdaddr"
#define NM_SETTING_BLUETOOTH_TYPE "type" #define NM_SETTING_BLUETOOTH_TYPE "type"
#define NM_SETTING_BLUETOOTH_TYPE_DUN "dun" #define NM_SETTING_BLUETOOTH_TYPE_DUN "dun"
#define NM_SETTING_BLUETOOTH_TYPE_PANU "panu" #define NM_SETTING_BLUETOOTH_TYPE_NAP "nap"
typedef struct { typedef struct {
NMSetting parent; NMSetting parent;

90
src/Makefile.am
View File

@@ -53,50 +53,52 @@ libtest_dhcp_la_LIBADD = \
sbin_PROGRAMS = NetworkManager sbin_PROGRAMS = NetworkManager
NetworkManager_SOURCES = \ NetworkManager_SOURCES = \
nm-call-store.c \ nm-call-store.c \
nm-call-store.h \ nm-call-store.h \
nm-device.c \ nm-device.c \
nm-device.h \ nm-device.h \
nm-device-interface.c \ nm-device-interface.c \
nm-device-interface.h \ nm-device-interface.h \
nm-device-private.h \ nm-device-private.h \
nm-device-ethernet.c \ nm-device-ethernet.c \
nm-device-ethernet.h \ nm-device-ethernet.h \
nm-device-wifi.c \ nm-device-wifi.c \
nm-device-wifi.h \ nm-device-wifi.h \
NetworkManagerAP.c \ nm-device-bt.c \
NetworkManagerAP.h \ nm-device-bt.h \
nm-dbus-manager.h \ NetworkManagerAP.c \
nm-dbus-manager.c \ NetworkManagerAP.h \
nm-hal-manager.c \ nm-dbus-manager.h \
nm-hal-manager.h \ nm-dbus-manager.c \
nm-hostname-provider.c \ nm-hal-manager.c \
nm-hostname-provider.h \ nm-hal-manager.h \
nm-ip4-config.c \ nm-hostname-provider.c \
nm-ip4-config.h \ nm-hostname-provider.h \
nm-ip4-config.c \
nm-ip4-config.h \
nm-active-connection.h \ nm-active-connection.h \
nm-active-connection.c \ nm-active-connection.c \
NetworkManager.c \ NetworkManager.c \
NetworkManagerPolicy.c \ NetworkManagerPolicy.c \
NetworkManagerPolicy.h \ NetworkManagerPolicy.h \
NetworkManagerUtils.c \ NetworkManagerUtils.c \
NetworkManagerUtils.h \ NetworkManagerUtils.h \
NetworkManagerSystem.c \ NetworkManagerSystem.c \
NetworkManagerSystem.h \ NetworkManagerSystem.h \
nm-logging.c \ nm-logging.c \
nm-logging.h \ nm-logging.h \
nm-manager.c \ nm-manager.c \
nm-manager.h \ nm-manager.h \
nm-netlink-monitor.c \ nm-netlink-monitor.c \
nm-netlink-monitor.h \ nm-netlink-monitor.h \
nm-activation-request.c \ nm-activation-request.c \
nm-activation-request.h \ nm-activation-request.h \
nm-properties-changed-signal.c \ nm-properties-changed-signal.c \
nm-properties-changed-signal.h \ nm-properties-changed-signal.h \
wpa.c \ wpa.c \
wpa.h \ wpa.h \
nm-netlink.c \ nm-netlink.c \
nm-netlink.h \ nm-netlink.h \
nm-dhcp4-config.c \ nm-dhcp4-config.c \
nm-dhcp4-config.h nm-dhcp4-config.h
@@ -116,6 +118,9 @@ nm-device-ethernet-glue.h: $(top_srcdir)/introspection/nm-device-ethernet.xml
nm-device-wifi-glue.h: $(top_srcdir)/introspection/nm-device-wifi.xml nm-device-wifi-glue.h: $(top_srcdir)/introspection/nm-device-wifi.xml
dbus-binding-tool --prefix=nm_device_wifi --mode=glib-server --output=$@ $< dbus-binding-tool --prefix=nm_device_wifi --mode=glib-server --output=$@ $<
nm-device-bt-glue.h: $(top_srcdir)/introspection/nm-device-bt.xml
dbus-binding-tool --prefix=nm_device_bt --mode=glib-server --output=$@ $<
nm-ip4-config-glue.h: $(top_srcdir)/introspection/nm-ip4-config.xml nm-ip4-config-glue.h: $(top_srcdir)/introspection/nm-ip4-config.xml
dbus-binding-tool --prefix=nm_ip4_config --mode=glib-server --output=$@ $< dbus-binding-tool --prefix=nm_ip4_config --mode=glib-server --output=$@ $<
@@ -131,6 +136,7 @@ BUILT_SOURCES = \
nm-device-interface-glue.h \ nm-device-interface-glue.h \
nm-device-ethernet-glue.h \ nm-device-ethernet-glue.h \
nm-device-wifi-glue.h \ nm-device-wifi-glue.h \
nm-device-bt-glue.h \
nm-ip4-config-glue.h \ nm-ip4-config-glue.h \
nm-active-connection-glue.h \ nm-active-connection-glue.h \
nm-dhcp4-config-glue.h nm-dhcp4-config-glue.h

5
src/bluez-manager/nm-bluez-common.h
View File

@@ -21,11 +21,6 @@
#ifndef NM_BLUEZ_COMMON_H #ifndef NM_BLUEZ_COMMON_H
#define NM_BLUEZ_COMMON_H #define NM_BLUEZ_COMMON_H
enum {
NM_BLUEZ_TYPE_DUN = 1 << 1,
NM_BLUEZ_TYPE_NAP = 1 << 2,
};
#define BLUEZ_SERVICE "org.bluez" #define BLUEZ_SERVICE "org.bluez"
#define BLUEZ_MANAGER_PATH "/" #define BLUEZ_MANAGER_PATH "/"

4
src/bluez-manager/nm-bluez-device.c
View File

@@ -164,10 +164,10 @@ convert_uuids (const char **strings)
switch (uuid16) { switch (uuid16) {
case 0x1103: case 0x1103:
uuids |= NM_BLUEZ_TYPE_DUN; uuids |= NM_BT_CAPABILITY_DUN;
break; break;
case 0x1116: case 0x1116:
uuids |= NM_BLUEZ_TYPE_NAP; uuids |= NM_BT_CAPABILITY_NAP;
break; break;
default: default:
break; break;

631
src/nm-device-bt.c Normal file
View File

@@ -0,0 +1,631 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* NetworkManager -- Network link manager
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2009 Red Hat, Inc.
*/
#include <stdio.h>
#include <string.h>
#include "nm-glib-compat.h"
#include "nm-device-bt.h"
#include "nm-device-interface.h"
#include "nm-device-private.h"
#include "nm-utils.h"
#include "nm-marshal.h"
#include "ppp-manager/nm-ppp-manager.h"
#include "nm-properties-changed-signal.h"
#include "nm-setting-connection.h"
#include "nm-setting-bluetooth.h"
#include "nm-setting-cdma.h"
#include "nm-setting-gsm.h"
#include "nm-device-bt-glue.h"
G_DEFINE_TYPE (NMDeviceBt, nm_device_bt, NM_TYPE_DEVICE)
#define NM_DEVICE_BT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DEVICE_BT, NMDeviceBtPrivate))
typedef struct {
char *bdaddr;
char *name;
guint32 capabilities;
guint pending_id;
guint state_to_disconnected_id;
NMPPPManager *ppp_manager;
char *rfcomm_iface;
guint32 in_bytes;
guint32 out_bytes;
NMIP4Config *pending_ip4_config;
guint32 bt_type; /* BT type of the current connection */
} NMDeviceBtPrivate;
enum {
PROP_0,
PROP_HW_ADDRESS,
PROP_BT_NAME,
PROP_BT_CAPABILITIES,
LAST_PROP
};
enum {
PPP_STATS,
PROPERTIES_CHANGED,
LAST_SIGNAL
};
static guint signals[LAST_SIGNAL] = { 0 };
NMDeviceBt *
nm_device_bt_new (const char *udi,
const char *bdaddr,
const char *name,
guint32 capabilities,
gboolean managed)
{
g_return_val_if_fail (udi != NULL, NULL);
g_return_val_if_fail (bdaddr != NULL, NULL);
g_return_val_if_fail (name != NULL, NULL);
g_return_val_if_fail (capabilities != 0, NULL);
return (NMDeviceBt *) g_object_new (NM_TYPE_DEVICE_BT,
NM_DEVICE_INTERFACE_UDI, udi,
NM_DEVICE_INTERFACE_IFACE, bdaddr,
NM_DEVICE_INTERFACE_DRIVER, "bluez",
NM_DEVICE_BT_HW_ADDRESS, bdaddr,
NM_DEVICE_BT_NAME, name,
NM_DEVICE_BT_CAPABILITIES, capabilities,
NM_DEVICE_INTERFACE_MANAGED, managed,
NULL);
}
static guint32
get_connection_bt_type (NMConnection *connection)
{
NMSettingBluetooth *s_bt;
const char *bt_type;
s_bt = (NMSettingBluetooth *) nm_connection_get_setting (connection, NM_TYPE_SETTING_BLUETOOTH);
if (!s_bt)
return NM_BT_CAPABILITY_NONE;
bt_type = nm_setting_bluetooth_get_connection_type (s_bt);
g_assert (bt_type);
if (!strcmp (bt_type, NM_SETTING_BLUETOOTH_TYPE_DUN))
return NM_BT_CAPABILITY_DUN;
else if (!strcmp (bt_type, NM_SETTING_BLUETOOTH_TYPE_NAP))
return NM_BT_CAPABILITY_NAP;
return NM_BT_CAPABILITY_NONE;
}
static NMConnection *
real_get_best_auto_connection (NMDevice *device,
GSList *connections,
char **specific_object)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
GSList *iter;
for (iter = connections; iter; iter = g_slist_next (iter)) {
NMConnection *connection = NM_CONNECTION (iter->data);
NMSettingConnection *s_con;
guint32 bt_type;
s_con = (NMSettingConnection *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
g_assert (s_con);
if (!nm_setting_connection_get_autoconnect (s_con))
continue;
if (strcmp (nm_setting_connection_get_connection_type (s_con), NM_SETTING_BLUETOOTH_SETTING_NAME))
continue;
bt_type = get_connection_bt_type (connection);
if (!(bt_type & priv->capabilities))
continue;
return connection;
}
return NULL;
}
static guint32
real_get_generic_capabilities (NMDevice *dev)
{
return NM_DEVICE_CAP_NM_SUPPORTED;
}
/*****************************************************************************/
/* IP method PPP */
static void
ppp_state_changed (NMPPPManager *ppp_manager, NMPPPStatus status, gpointer user_data)
{
NMDevice *device = NM_DEVICE (user_data);
switch (status) {
case NM_PPP_STATUS_NETWORK:
nm_device_state_changed (device, NM_DEVICE_STATE_IP_CONFIG, NM_DEVICE_STATE_REASON_NONE);
break;
case NM_PPP_STATUS_DISCONNECT:
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_PPP_DISCONNECT);
break;
case NM_PPP_STATUS_DEAD:
nm_device_state_changed (device, NM_DEVICE_STATE_FAILED, NM_DEVICE_STATE_REASON_PPP_FAILED);
break;
case NM_PPP_STATUS_AUTHENTICATE:
nm_device_state_changed (device, NM_DEVICE_STATE_NEED_AUTH, NM_DEVICE_STATE_REASON_NONE);
break;
default:
break;
}
}
static void
ppp_ip4_config (NMPPPManager *ppp_manager,
const char *iface,
NMIP4Config *config,
gpointer user_data)
{
NMDevice *device = NM_DEVICE (user_data);
nm_device_set_ip_iface (device, iface);
NM_DEVICE_BT_GET_PRIVATE (device)->pending_ip4_config = g_object_ref (config);
nm_device_activate_schedule_stage4_ip_config_get (device);
}
static void
ppp_stats (NMPPPManager *ppp_manager,
guint32 in_bytes,
guint32 out_bytes,
gpointer user_data)
{
NMDeviceBt *self = NM_DEVICE_BT (user_data);
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
if (priv->in_bytes != in_bytes || priv->out_bytes != out_bytes) {
priv->in_bytes = in_bytes;
priv->out_bytes = out_bytes;
g_signal_emit (self, signals[PPP_STATS], 0, in_bytes, out_bytes);
}
}
static gboolean
get_ppp_credentials (NMConnection *connection,
const char **username,
const char **password)
{
NMSettingGsm *s_gsm;
NMSettingCdma *s_cdma = NULL;
s_gsm = (NMSettingGsm *) nm_connection_get_setting (connection, NM_TYPE_SETTING_GSM);
if (s_gsm) {
if (username)
*username = nm_setting_gsm_get_username (s_gsm);
if (password)
*password = nm_setting_gsm_get_password (s_gsm);
} else {
/* Try CDMA then */
s_cdma = (NMSettingCdma *) nm_connection_get_setting (connection, NM_TYPE_SETTING_CDMA);
if (s_cdma) {
if (username)
*username = nm_setting_cdma_get_username (s_cdma);
if (password)
*password = nm_setting_cdma_get_password (s_cdma);
}
}
return (s_cdma || s_gsm) ? TRUE : FALSE;
}
static void
real_connection_secrets_updated (NMDevice *device,
NMConnection *connection,
GSList *updated_settings,
RequestSecretsCaller caller)
{
NMDeviceBt *self = NM_DEVICE_BT (device);
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
NMActRequest *req;
const char *username = NULL, *password = NULL;
gboolean success = FALSE;
if (caller != SECRETS_CALLER_PPP)
return;
g_return_if_fail (priv->ppp_manager);
req = nm_device_get_act_request (device);
g_assert (req);
success = get_ppp_credentials (nm_act_request_get_connection (req),
&username,
&password);
if (success) {
nm_ppp_manager_update_secrets (priv->ppp_manager,
nm_device_get_ip_iface (device),
username ? username : "",
password ? password : "",
NULL);
return;
}
/* Shouldn't ever happen */
nm_ppp_manager_update_secrets (priv->ppp_manager,
nm_device_get_ip_iface (device),
NULL,
NULL,
"missing GSM/CDMA setting; no secrets could be found.");
}
static NMActStageReturn
ppp_stage3_start (NMDevice *device, NMDeviceStateReason *reason)
{
NMDeviceBt *self = NM_DEVICE_BT (device);
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
NMActRequest *req;
const char *ppp_name = NULL;
GError *err = NULL;
NMActStageReturn ret;
gboolean success;
req = nm_device_get_act_request (device);
g_assert (req);
success = get_ppp_credentials (nm_act_request_get_connection (req),
&ppp_name,
NULL);
if (!success) {
// FIXME: set reason to something plausible
return NM_ACT_STAGE_RETURN_FAILURE;
}
priv->ppp_manager = nm_ppp_manager_new (priv->rfcomm_iface);
if (nm_ppp_manager_start (priv->ppp_manager, req, ppp_name, &err)) {
g_signal_connect (priv->ppp_manager, "state-changed",
G_CALLBACK (ppp_state_changed),
device);
g_signal_connect (priv->ppp_manager, "ip4-config",
G_CALLBACK (ppp_ip4_config),
device);
g_signal_connect (priv->ppp_manager, "stats",
G_CALLBACK (ppp_stats),
device);
ret = NM_ACT_STAGE_RETURN_POSTPONE;
} else {
nm_warning ("%s", err->message);
g_error_free (err);
g_object_unref (priv->ppp_manager);
priv->ppp_manager = NULL;
*reason = NM_DEVICE_STATE_REASON_PPP_START_FAILED;
ret = NM_ACT_STAGE_RETURN_FAILURE;
}
return ret;
}
static NMActStageReturn
ppp_stage4 (NMDevice *device, NMIP4Config **config, NMDeviceStateReason *reason)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
*config = priv->pending_ip4_config;
priv->pending_ip4_config = NULL;
return NM_ACT_STAGE_RETURN_SUCCESS;
}
/*****************************************************************************/
static gboolean
bluez_set_shit_up (gpointer user_data)
{
NMDeviceBt *self = NM_DEVICE_BT (user_data);
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
// FIXME: use the network interface we got from bluez
if (priv->bt_type == NM_BT_CAPABILITY_DUN) {
g_free (priv->rfcomm_iface);
priv->rfcomm_iface = g_strdup ("rfcomm0");
} else if (priv->bt_type == NM_BT_CAPABILITY_NAP)
nm_device_set_ip_iface (NM_DEVICE (self), "pan0");
nm_device_activate_schedule_stage3_ip_config_start (NM_DEVICE (self));
return FALSE;
}
static NMActStageReturn
real_act_stage2_config (NMDevice *device, NMDeviceStateReason *reason)
{
NMDeviceBt *self = NM_DEVICE_BT (device);
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
NMActRequest *req;
req = nm_device_get_act_request (device);
g_assert (req);
priv->bt_type = get_connection_bt_type (nm_act_request_get_connection (req));
if (!priv->bt_type) {
// FIXME: set a reason code
return NM_ACT_STAGE_RETURN_FAILURE;
}
if (priv->bt_type == NM_BT_CAPABILITY_DUN) {
// FIXME: tell bluez to set up the rfcomm port
priv->pending_id = g_idle_add (bluez_set_shit_up, self);
} else if (priv->bt_type == NM_BT_CAPABILITY_NAP) {
// FIXME: tell bluez to set up the PAN connection to the phone
priv->pending_id = g_idle_add (bluez_set_shit_up, self);
}
return NM_ACT_STAGE_RETURN_POSTPONE;
}
static NMActStageReturn
real_act_stage3_ip_config_start (NMDevice *device, NMDeviceStateReason *reason)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
NMActStageReturn ret;
if (priv->bt_type == NM_BT_CAPABILITY_DUN)
ret = ppp_stage3_start (device, reason);
else
ret = NM_DEVICE_CLASS (nm_device_bt_parent_class)->act_stage3_ip_config_start (device, reason);
return ret;
}
static NMActStageReturn
real_act_stage4_get_ip4_config (NMDevice *device,
NMIP4Config **config,
NMDeviceStateReason *reason)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
NMActStageReturn ret;
if (priv->bt_type == NM_BT_CAPABILITY_DUN)
ret = ppp_stage4 (device, config, reason);
else
ret = NM_DEVICE_CLASS (nm_device_bt_parent_class)->act_stage4_get_ip4_config (device, config, reason);
return ret;
}
static void
real_deactivate_quickly (NMDevice *device)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (device);
if (priv->pending_ip4_config) {
g_object_unref (priv->pending_ip4_config);
priv->pending_ip4_config = NULL;
}
priv->in_bytes = priv->out_bytes = 0;
g_free (priv->rfcomm_iface);
priv->rfcomm_iface = NULL;
if (priv->bt_type == NM_BT_CAPABILITY_DUN) {
if (priv->ppp_manager) {
g_object_unref (priv->ppp_manager);
priv->ppp_manager = NULL;
}
}
priv->bt_type = NM_BT_CAPABILITY_NONE;
if (priv->pending_id) {
g_source_remove (priv->pending_id);
priv->pending_id = 0;
}
// FIXME: tell bluez to shut the connection down
if (NM_DEVICE_CLASS (nm_device_bt_parent_class)->deactivate_quickly)
NM_DEVICE_CLASS (nm_device_bt_parent_class)->deactivate_quickly (device);
}
static void
nm_device_bt_init (NMDeviceBt *self)
{
nm_device_set_device_type (NM_DEVICE (self), NM_DEVICE_TYPE_BT);
}
static gboolean
unavailable_to_disconnected (gpointer user_data)
{
nm_device_state_changed (NM_DEVICE (user_data),
NM_DEVICE_STATE_DISCONNECTED,
NM_DEVICE_STATE_REASON_NONE);
return FALSE;
}
static void
device_state_changed (NMDeviceInterface *device,
NMDeviceState new_state,
NMDeviceState old_state,
NMDeviceStateReason reason,
gpointer user_data)
{
NMDeviceBt *self = NM_DEVICE_BT (user_data);
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (self);
/* Remove any previous delayed transition to disconnected */
if (priv->state_to_disconnected_id) {
g_source_remove (priv->state_to_disconnected_id);
priv->state_to_disconnected_id = 0;
}
/* Transition to DISCONNECTED from an idle handler */
if (new_state == NM_DEVICE_STATE_UNAVAILABLE)
priv->state_to_disconnected_id = g_idle_add (unavailable_to_disconnected, self);
}
static GObject*
constructor (GType type,
guint n_construct_params,
GObjectConstructParam *construct_params)
{
GObject *object;
object = G_OBJECT_CLASS (nm_device_bt_parent_class)->constructor (type,
n_construct_params,
construct_params);
if (!object)
return NULL;
g_signal_connect (NM_DEVICE (object), "state-changed",
G_CALLBACK (device_state_changed), NM_DEVICE_BT (object));
return object;
}
static void
set_property (GObject *object, guint prop_id,
const GValue *value, GParamSpec *pspec)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (object);
switch (prop_id) {
case PROP_HW_ADDRESS:
/* Construct only */
priv->bdaddr = g_value_dup_string (value);
break;
case PROP_BT_NAME:
/* Construct only */
priv->name = g_value_dup_string (value);
break;
case PROP_BT_CAPABILITIES:
/* Construct only */
priv->capabilities = g_value_get_uint (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (object);
switch (prop_id) {
case PROP_HW_ADDRESS:
g_value_set_string (value, priv->bdaddr);
break;
case PROP_BT_NAME:
g_value_set_string (value, priv->bdaddr);
break;
case PROP_BT_CAPABILITIES:
g_value_set_uint (value, priv->capabilities);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
finalize (GObject *object)
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (object);
g_free (priv->bdaddr);
g_free (priv->name);
if (priv->state_to_disconnected_id) {
g_source_remove (priv->state_to_disconnected_id);
priv->state_to_disconnected_id = 0;
}
G_OBJECT_CLASS (nm_device_bt_parent_class)->finalize (object);
}
static void
nm_device_bt_class_init (NMDeviceBtClass *klass)
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
NMDeviceClass *device_class = NM_DEVICE_CLASS (klass);
g_type_class_add_private (object_class, sizeof (NMDeviceBtPrivate));
object_class->constructor = constructor;
object_class->get_property = get_property;
object_class->set_property = set_property;
object_class->finalize = finalize;
device_class->get_best_auto_connection = real_get_best_auto_connection;
device_class->get_generic_capabilities = real_get_generic_capabilities;
device_class->connection_secrets_updated = real_connection_secrets_updated;
device_class->deactivate_quickly = real_deactivate_quickly;
device_class->act_stage2_config = real_act_stage2_config;
device_class->act_stage3_ip_config_start = real_act_stage3_ip_config_start;
device_class->act_stage4_get_ip4_config = real_act_stage4_get_ip4_config;
/* Properties */
g_object_class_install_property
(object_class, PROP_HW_ADDRESS,
g_param_spec_string (NM_DEVICE_BT_HW_ADDRESS,
"Bluetooth address",
"Bluetooth address",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
(object_class, PROP_BT_NAME,
g_param_spec_string (NM_DEVICE_BT_NAME,
"Bluetooth device name",
"Bluetooth device name",
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property
(object_class, PROP_BT_NAME,
g_param_spec_uint (NM_DEVICE_BT_CAPABILITIES,
"Bluetooth device capabilities",
"Bluetooth device capabilities",
NM_BT_CAPABILITY_NONE, G_MAXUINT, NM_BT_CAPABILITY_NONE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
/* Signals */
signals[PPP_STATS] =
g_signal_new ("ppp-stats",
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (NMDeviceBtClass, ppp_stats),
NULL, NULL,
_nm_marshal_VOID__UINT_UINT,
G_TYPE_NONE, 2,
G_TYPE_UINT, G_TYPE_UINT);
signals[PROPERTIES_CHANGED] =
nm_properties_changed_signal_new (object_class,
G_STRUCT_OFFSET (NMDeviceBtClass, properties_changed));
dbus_g_object_type_install_info (G_TYPE_FROM_CLASS (klass),
&dbus_glib_nm_device_bt_object_info);
}

61
src/nm-device-bt.h Normal file
View File

@@ -0,0 +1,61 @@
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
/* NetworkManager -- Network link manager
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2009 Red Hat, Inc.
*/
#ifndef NM_DEVICE_BT_H
#define NM_DEVICE_BT_H
#include <nm-device.h>
G_BEGIN_DECLS
#define NM_TYPE_DEVICE_BT (nm_device_bt_get_type ())
#define NM_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BT, NMDeviceBt))
#define NM_DEVICE_BT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE_BT, NMDeviceBtClass))
#define NM_IS_DEVICE_BT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE_BT))
#define NM_IS_DEVICE_BT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE_BT))
#define NM_DEVICE_BT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE_BT, NMDeviceBtClass))
#define NM_DEVICE_BT_HW_ADDRESS "hw-address"
#define NM_DEVICE_BT_NAME "name"
#define NM_DEVICE_BT_CAPABILITIES "capabilities"
typedef struct {
NMDevice parent;
} NMDeviceBt;
typedef struct {
NMDeviceClass parent;
/* Signals */
void (*ppp_stats) (NMDeviceBt *device, guint32 in_bytes, guint32 out_bytes);
void (*properties_changed) (NMDeviceBt *device, GHashTable *properties);
} NMDeviceBtClass;
GType nm_device_bt_get_type (void);
NMDeviceBt *nm_device_bt_new (const char *udi,
const char *bdaddr,
const char *name,
guint32 capabilities,
gboolean managed);
G_END_DECLS
#endif /* NM_GSM_DEVICE_H */

4
src/nm-manager.c
View File

@@ -1802,8 +1802,8 @@ bluez_manager_bdaddr_added_cb (NMBluezManager *bluez_mgr,
guint32 uuids, guint32 uuids,
gpointer user_data) gpointer user_data)
{ {
gboolean has_dun = (uuids & NM_BLUEZ_TYPE_DUN); gboolean has_dun = (uuids & NM_BT_CAPABILITY_DUN);
gboolean has_nap = (uuids & NM_BLUEZ_TYPE_NAP); gboolean has_nap = (uuids & NM_BT_CAPABILITY_NAP);
g_message ("%s: BT device %s added (%s%s%s)", g_message ("%s: BT device %s added (%s%s%s)",
__func__, __func__,