mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-10 10:30:19 +01:00
adsl: fix detection of br2684 ("nas") interface (bgo #759001)
At some point the platform changed to no longer ask the kernel for interfaces when one wasn't in its cache, but to wait for netlink events to be notified of the new interface. That broke some assumptions that the ADSL code was making, causing a crash. Rework the ADSL br2684 interface to clean up a couple of things (get rid of 'disposed', consolidate dispose/deactivate cleanup) and watch for the br2684 interface to show up with a periodic timeout.
This commit is contained in:
Dan Williams
parent
d0d96c1a13
commit
29f4de09a5
1 changed files with 161 additions and 126 deletions
|
|
@ -55,7 +55,6 @@ G_DEFINE_TYPE (NMDeviceAdsl, nm_device_adsl, NM_TYPE_DEVICE)
|
|||
/**********************************************/
|
||||
|
||||
typedef struct {
|
||||
gboolean disposed;
|
||||
guint carrier_poll_id;
|
||||
int atm_index;
|
||||
|
||||
|
|
@ -66,6 +65,8 @@ typedef struct {
|
|||
int brfd;
|
||||
int nas_ifindex;
|
||||
char * nas_ifname;
|
||||
guint nas_update_id;
|
||||
guint nas_update_count;
|
||||
} NMDeviceAdslPrivate;
|
||||
|
||||
/**************************************************************/
|
||||
|
|
@ -133,76 +134,6 @@ complete_connection (NMDevice *device,
|
|||
|
||||
/**************************************************************/
|
||||
|
||||
static void
|
||||
set_nas_iface (NMDeviceAdsl *self, int idx, const char *name)
|
||||
{
|
||||
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
|
||||
|
||||
g_return_if_fail (name != NULL);
|
||||
|
||||
g_warn_if_fail (priv->nas_ifindex <= 0);
|
||||
priv->nas_ifindex = idx > 0 ? idx : nm_platform_link_get_ifindex (NM_PLATFORM_GET, name);
|
||||
g_warn_if_fail (priv->nas_ifindex > 0);
|
||||
|
||||
g_warn_if_fail (priv->nas_ifname == NULL);
|
||||
priv->nas_ifname = g_strdup (name);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
br2684_create_iface (NMDeviceAdsl *self, NMSettingAdsl *s_adsl)
|
||||
{
|
||||
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
|
||||
struct atm_newif_br2684 ni;
|
||||
int err, fd, errsv;
|
||||
gboolean success = FALSE;
|
||||
guint num = 0;
|
||||
|
||||
g_return_val_if_fail (s_adsl != NULL, FALSE);
|
||||
|
||||
fd = socket (PF_ATMPVC, SOCK_DGRAM, ATM_AAL5);
|
||||
if (fd < 0) {
|
||||
errsv = errno;
|
||||
_LOGE (LOGD_ADSL, "failed to open ATM control socket (%d)", errsv);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
memset (&ni, 0, sizeof (ni));
|
||||
ni.backend_num = ATM_BACKEND_BR2684;
|
||||
ni.media = BR2684_MEDIA_ETHERNET;
|
||||
ni.mtu = 1500;
|
||||
|
||||
/* Loop attempting to create an interface that doesn't exist yet. The
|
||||
* kernel can create one for us automatically, but due to API issues it
|
||||
* cannot return that name to us. Since we want to know the name right
|
||||
* away, just brute-force it.
|
||||
*/
|
||||
while (num < 10000) {
|
||||
memset (&ni.ifname, 0, sizeof (ni.ifname));
|
||||
g_snprintf (ni.ifname, sizeof (ni.ifname), "nas%d", num);
|
||||
|
||||
err = ioctl (fd, ATM_NEWBACKENDIF, &ni);
|
||||
if (err == 0) {
|
||||
set_nas_iface (self, -1, ni.ifname);
|
||||
_LOGI (LOGD_ADSL, "using NAS interface %s (%d)",
|
||||
priv->nas_ifname, priv->nas_ifindex);
|
||||
success = TRUE;
|
||||
break;
|
||||
} else {
|
||||
errsv = errno;
|
||||
if (errsv == -EEXIST) {
|
||||
/* Try again */
|
||||
num++;
|
||||
} else {
|
||||
_LOGW (LOGD_ADSL, "failed to create br2684 interface (%d)", errsv);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
close (fd);
|
||||
return success;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
br2684_assign_vcc (NMDeviceAdsl *self, NMSettingAdsl *s_adsl)
|
||||
{
|
||||
|
|
@ -292,7 +223,12 @@ error:
|
|||
}
|
||||
|
||||
static void
|
||||
link_changed_cb (NMPlatform *platform, NMPObjectType obj_type, int ifindex, NMPlatformLink *info, NMPlatformSignalChangeType change_type, NMDeviceAdsl *self)
|
||||
link_changed_cb (NMPlatform *platform,
|
||||
NMPObjectType obj_type,
|
||||
int ifindex,
|
||||
NMPlatformLink *info,
|
||||
NMPlatformSignalChangeType change_type,
|
||||
NMDeviceAdsl *self)
|
||||
{
|
||||
if (change_type == NM_PLATFORM_SIGNAL_REMOVED) {
|
||||
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
|
||||
|
|
@ -300,9 +236,9 @@ link_changed_cb (NMPlatform *platform, NMPObjectType obj_type, int ifindex, NMPl
|
|||
|
||||
/* This only gets called for PPPoE connections and "nas" interfaces */
|
||||
|
||||
if (priv->nas_ifindex >= 0 && ifindex == priv->nas_ifindex) {
|
||||
if (priv->nas_ifindex > 0 && ifindex == priv->nas_ifindex) {
|
||||
/* NAS device went away for some reason; kill the connection */
|
||||
_LOGD (LOGD_ADSL, "NAS interface disappeared");
|
||||
_LOGD (LOGD_ADSL, "br2684 interface disappeared");
|
||||
nm_device_state_changed (device,
|
||||
NM_DEVICE_STATE_FAILED,
|
||||
NM_DEVICE_STATE_REASON_BR2684_FAILED);
|
||||
|
|
@ -310,11 +246,140 @@ link_changed_cb (NMPlatform *platform, NMPObjectType obj_type, int ifindex, NMPl
|
|||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
pppoe_vcc_config (NMDeviceAdsl *self)
|
||||
{
|
||||
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
|
||||
NMDevice *device = NM_DEVICE (self);
|
||||
NMSettingAdsl *s_adsl;
|
||||
|
||||
s_adsl = nm_connection_get_setting_adsl (nm_device_get_applied_connection (device));
|
||||
g_assert (s_adsl);
|
||||
|
||||
/* Set up the VCC */
|
||||
if (!br2684_assign_vcc (self, s_adsl))
|
||||
return FALSE;
|
||||
|
||||
/* Watch for the 'nas' interface going away */
|
||||
g_signal_connect (nm_platform_get (), NM_PLATFORM_SIGNAL_LINK_CHANGED,
|
||||
G_CALLBACK (link_changed_cb),
|
||||
self);
|
||||
|
||||
_LOGD (LOGD_ADSL, "ATM setup successful");
|
||||
|
||||
/* otherwise we're good for stage3 */
|
||||
nm_platform_link_set_up (NM_PLATFORM_GET, priv->nas_ifindex, NULL);
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
nas_update_cb (gpointer user_data)
|
||||
{
|
||||
NMDeviceAdsl *self = NM_DEVICE_ADSL (user_data);
|
||||
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
|
||||
NMDevice *device = NM_DEVICE (self);
|
||||
|
||||
g_assert (priv->nas_ifname);
|
||||
|
||||
priv->nas_update_count++;
|
||||
|
||||
if (priv->nas_update_count > 10) {
|
||||
priv->nas_update_id = 0;
|
||||
_LOGW (LOGD_ADSL, "failed to find br2684 interface %s ifindex after timeout", priv->nas_ifname);
|
||||
nm_device_state_changed (device,
|
||||
NM_DEVICE_STATE_FAILED,
|
||||
NM_DEVICE_STATE_REASON_BR2684_FAILED);
|
||||
return G_SOURCE_REMOVE;
|
||||
}
|
||||
|
||||
g_warn_if_fail (priv->nas_ifindex < 0);
|
||||
priv->nas_ifindex = nm_platform_link_get_ifindex (NM_PLATFORM_GET, priv->nas_ifname);
|
||||
if (priv->nas_ifindex < 0) {
|
||||
/* Keep waiting for it to appear */
|
||||
return G_SOURCE_CONTINUE;
|
||||
}
|
||||
|
||||
priv->nas_update_id = 0;
|
||||
_LOGD (LOGD_ADSL, "using br2684 iface '%s' index %d", priv->nas_ifname, priv->nas_ifindex);
|
||||
|
||||
if (pppoe_vcc_config (self)) {
|
||||
nm_device_activate_schedule_stage3_ip_config_start (device);
|
||||
} else {
|
||||
nm_device_state_changed (device,
|
||||
NM_DEVICE_STATE_FAILED,
|
||||
NM_DEVICE_STATE_REASON_BR2684_FAILED);
|
||||
}
|
||||
|
||||
return G_SOURCE_REMOVE;
|
||||
}
|
||||
|
||||
static NMActStageReturn
|
||||
br2684_create_iface (NMDeviceAdsl *self,
|
||||
NMSettingAdsl *s_adsl,
|
||||
NMDeviceStateReason *out_reason)
|
||||
{
|
||||
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
|
||||
struct atm_newif_br2684 ni;
|
||||
int err, fd, errsv;
|
||||
NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
|
||||
guint num = 0;
|
||||
|
||||
g_return_val_if_fail (s_adsl != NULL, FALSE);
|
||||
|
||||
if (priv->nas_update_id) {
|
||||
g_warn_if_fail (priv->nas_update_id == 0);
|
||||
nm_clear_g_source (&priv->nas_update_id);
|
||||
}
|
||||
|
||||
fd = socket (PF_ATMPVC, SOCK_DGRAM, ATM_AAL5);
|
||||
if (fd < 0) {
|
||||
errsv = errno;
|
||||
_LOGE (LOGD_ADSL, "failed to open ATM control socket (%d)", errsv);
|
||||
*out_reason = NM_DEVICE_STATE_REASON_BR2684_FAILED;
|
||||
return NM_ACT_STAGE_RETURN_FAILURE;
|
||||
}
|
||||
|
||||
memset (&ni, 0, sizeof (ni));
|
||||
ni.backend_num = ATM_BACKEND_BR2684;
|
||||
ni.media = BR2684_MEDIA_ETHERNET;
|
||||
ni.mtu = 1500;
|
||||
|
||||
/* Loop attempting to create an interface that doesn't exist yet. The
|
||||
* kernel can create one for us automatically, but due to API issues it
|
||||
* cannot return that name to us. Since we want to know the name right
|
||||
* away, just brute-force it.
|
||||
*/
|
||||
while (num < 10000) {
|
||||
memset (&ni.ifname, 0, sizeof (ni.ifname));
|
||||
g_snprintf (ni.ifname, sizeof (ni.ifname), "nas%d", num++);
|
||||
|
||||
err = ioctl (fd, ATM_NEWBACKENDIF, &ni);
|
||||
if (err == 0) {
|
||||
g_free (priv->nas_ifname);
|
||||
priv->nas_ifname = g_strdup (ni.ifname);
|
||||
_LOGD (LOGD_ADSL, "waiting for br2684 iface '%s' to appear", priv->nas_ifname);
|
||||
|
||||
priv->nas_update_count = 0;
|
||||
priv->nas_update_id = g_timeout_add (100, nas_update_cb, self);
|
||||
ret = NM_ACT_STAGE_RETURN_POSTPONE;
|
||||
break;
|
||||
} else if (errno != EEXIST) {
|
||||
errsv = errno;
|
||||
_LOGW (LOGD_ADSL, "failed to create br2684 interface (%d)", errsv);
|
||||
*out_reason = NM_DEVICE_STATE_REASON_BR2684_FAILED;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
close (fd);
|
||||
return ret;
|
||||
}
|
||||
|
||||
static NMActStageReturn
|
||||
act_stage2_config (NMDevice *device, NMDeviceStateReason *out_reason)
|
||||
{
|
||||
NMDeviceAdsl *self = NM_DEVICE_ADSL (device);
|
||||
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
|
||||
NMActStageReturn ret = NM_ACT_STAGE_RETURN_FAILURE;
|
||||
NMSettingAdsl *s_adsl;
|
||||
const char *protocol;
|
||||
|
|
@ -328,37 +393,14 @@ act_stage2_config (NMDevice *device, NMDeviceStateReason *out_reason)
|
|||
_LOGD (LOGD_ADSL, "using ADSL protocol '%s'", protocol);
|
||||
|
||||
if (g_strcmp0 (protocol, NM_SETTING_ADSL_PROTOCOL_PPPOE) == 0) {
|
||||
|
||||
/* PPPoE needs RFC2684 bridging before we can do PPP over it */
|
||||
if (!br2684_create_iface (self, s_adsl)) {
|
||||
*out_reason = NM_DEVICE_STATE_REASON_BR2684_FAILED;
|
||||
goto done;
|
||||
}
|
||||
|
||||
/* Set up the VCC */
|
||||
if (!br2684_assign_vcc (self, s_adsl)) {
|
||||
*out_reason = NM_DEVICE_STATE_REASON_BR2684_FAILED;
|
||||
goto done;
|
||||
}
|
||||
|
||||
/* Watch for the 'nas' interface going away */
|
||||
g_signal_connect (nm_platform_get (), NM_PLATFORM_SIGNAL_LINK_CHANGED,
|
||||
G_CALLBACK (link_changed_cb),
|
||||
self);
|
||||
|
||||
_LOGD (LOGD_ADSL, "ATM setup successful");
|
||||
|
||||
/* otherwise we're good for stage3 */
|
||||
nm_platform_link_set_up (NM_PLATFORM_GET, priv->nas_ifindex, NULL);
|
||||
ret = NM_ACT_STAGE_RETURN_SUCCESS;
|
||||
|
||||
ret = br2684_create_iface (self, s_adsl, out_reason);
|
||||
} else if (g_strcmp0 (protocol, NM_SETTING_ADSL_PROTOCOL_PPPOA) == 0) {
|
||||
/* PPPoA doesn't need anything special */
|
||||
ret = NM_ACT_STAGE_RETURN_SUCCESS;
|
||||
} else
|
||||
_LOGW (LOGD_ADSL, "unhandled ADSL protocol '%s'", protocol);
|
||||
|
||||
done:
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
@ -422,7 +464,7 @@ act_stage3_ip4_config_start (NMDevice *device,
|
|||
g_assert (priv->nas_ifname);
|
||||
ppp_iface = priv->nas_ifname;
|
||||
|
||||
_LOGD (LOGD_ADSL, "starting PPPoE on NAS interface %s", priv->nas_ifname);
|
||||
_LOGD (LOGD_ADSL, "starting PPPoE on br2684 interface %s", priv->nas_ifname);
|
||||
} else {
|
||||
ppp_iface = nm_device_get_iface (device);
|
||||
_LOGD (LOGD_ADSL, "starting PPPoA");
|
||||
|
|
@ -450,28 +492,37 @@ act_stage3_ip4_config_start (NMDevice *device,
|
|||
}
|
||||
|
||||
static void
|
||||
deactivate (NMDevice *device)
|
||||
adsl_cleanup (NMDeviceAdsl *self)
|
||||
{
|
||||
NMDeviceAdsl *self = NM_DEVICE_ADSL (device);
|
||||
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
|
||||
|
||||
nm_exported_object_clear_and_unexport (&priv->ppp_manager);
|
||||
if (priv->ppp_manager) {
|
||||
g_signal_handlers_disconnect_by_func (priv->ppp_manager, G_CALLBACK (ppp_state_changed), self);
|
||||
g_signal_handlers_disconnect_by_func (priv->ppp_manager, G_CALLBACK (ppp_ip4_config), self);
|
||||
nm_exported_object_clear_and_unexport (&priv->ppp_manager);
|
||||
}
|
||||
|
||||
g_signal_handlers_disconnect_by_func (nm_platform_get (), G_CALLBACK (link_changed_cb), device);
|
||||
g_signal_handlers_disconnect_by_func (nm_platform_get (), G_CALLBACK (link_changed_cb), self);
|
||||
|
||||
if (priv->brfd >= 0) {
|
||||
close (priv->brfd);
|
||||
priv->brfd = -1;
|
||||
}
|
||||
|
||||
nm_clear_g_source (&priv->nas_update_id);
|
||||
|
||||
/* FIXME: kernel has no way of explicitly deleting the 'nasX' interface yet,
|
||||
* so it gets leaked. It does get destroyed when it's no longer in use,
|
||||
* but we have no control over that.
|
||||
*/
|
||||
if (priv->nas_ifindex >= 0)
|
||||
priv->nas_ifindex = -1;
|
||||
g_free (priv->nas_ifname);
|
||||
priv->nas_ifname = NULL;
|
||||
priv->nas_ifindex = -1;
|
||||
g_clear_pointer (&priv->nas_ifname, g_free);
|
||||
}
|
||||
|
||||
static void
|
||||
deactivate (NMDevice *device)
|
||||
{
|
||||
adsl_cleanup (NM_DEVICE_ADSL (device));
|
||||
}
|
||||
|
||||
/**************************************************************/
|
||||
|
|
@ -560,25 +611,9 @@ constructor (GType type,
|
|||
static void
|
||||
dispose (GObject *object)
|
||||
{
|
||||
NMDeviceAdsl *self = NM_DEVICE_ADSL (object);
|
||||
NMDeviceAdslPrivate *priv = NM_DEVICE_ADSL_GET_PRIVATE (self);
|
||||
adsl_cleanup (NM_DEVICE_ADSL (object));
|
||||
|
||||
if (priv->disposed) {
|
||||
G_OBJECT_CLASS (nm_device_adsl_parent_class)->dispose (object);
|
||||
return;
|
||||
}
|
||||
|
||||
priv->disposed = TRUE;
|
||||
|
||||
if (priv->carrier_poll_id) {
|
||||
g_source_remove (priv->carrier_poll_id);
|
||||
priv->carrier_poll_id = 0;
|
||||
}
|
||||
|
||||
g_signal_handlers_disconnect_by_func (nm_platform_get (), G_CALLBACK (link_changed_cb), self);
|
||||
|
||||
g_free (priv->nas_ifname);
|
||||
priv->nas_ifname = NULL;
|
||||
nm_clear_g_source (&NM_DEVICE_ADSL_GET_PRIVATE (object)->carrier_poll_id);
|
||||
|
||||
G_OBJECT_CLASS (nm_device_adsl_parent_class)->dispose (object);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue