mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-28 02:50:10 +01:00
db5a10dc4d
Merge the beginnings of the new GSM card support.
* src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_stop): Remove
* the
ppp watch source before killing pppd - If this happens from
g_object_unref()
then the ppp manager is already destroyed by the time the watch
callback runs.
* src/nm-hal-manager.c: Add a device_type_name string to the
* device
creators, so that we can print a nice human readable string when
a
device is added.
* src/nm-umts-device.c (automatic_registration_get_network):
* Query
for the activated network, not much is done with the result
thought.
* src/nm-serial-device.c (nm_serial_device_get_reply):
* Implement.
(ppp_ip4_config): Change the device state to activated here for
now.
(real_check_connection): Make sure the connection includes ppp
setting.
* libnm-glib/nm-client.c (get_device): Handle umts devices.
* libnm-glib/Makefile.am: Add the new files to build.
* libnm-glib/nm-umts-device.c:
* libnm-glib/nm-umts-device.h: Implement.
2007-11-26 Tambet Ingo <tambet@gmail.com>
* src/nm-umts-device.c (automatic_registration_get_network): For
* now, dial
immediately, nm_serial_device_get_reply() isn't implemented
correctly yet.
* src/nm-serial-device.c (wait_for_reply_info_destroy): Don't
* try to remove
the timeout source - this function is only called when the
timeout source has
been removed.
(nm_serial_device_wait_for_reply): Allocate the duplicate
responses array
to be big enough to contain the terminating zero element as
well.
The timeout argument is meant to be in seconds now.
(real_deactivate_quickly): Implement.
* src/NetworkManager.conf: Allow root to own
"org.freedesktop.NetworkManager.PPP", deny it for everybody
else.
* libnm-util/nm-setting-umts.c: Network type and band properties
* are ints,
(not unsigned ints).
* libnm-util/nm-setting-serial.c (nm_setting_serial_class_init):
* Fix a
small issue with parity bounds - capital letters have lower
ascii codes
than lower case letters.
* libnm-util/nm-connection.c (register_default_settings):
* Register serial
and umts settings.
2007-11-22 Tambet Ingo <tambet@gmail.com>
Remove the "index" property from devices as not all device types
have this.
* include/NetworkManager.h (NM_DBUS_PATH_DEVICE): Remove.
* src/nm-hal-manager.c (nm_get_device_index_from_hal): Remove.
(wired_device_creator): Get the device interface from hal to
create the device.
(wireless_device_creator): Ditto.
* src/nm-device.c (nm_device_init): Remove the index member.
(constructor): Remove the checks for index property, make
interface property
a require constructor property.
Use the HAL udi for DBus path for devices.
(nm_device_get_index): Remove.
(set_property): Remove index handling.
(get_property): Ditto.
(nm_device_get_dbus_path): Remove.
* src/nm-device-interface.c (nm_device_interface_init): Remove
* the index
property.
* src/nm-device-802-3-ethernet.c
* (nm_device_802_3_ethernet_link_activated):
Access the device index through it's interface.
(nm_device_802_3_ethernet_link_deactivated): Ditto.
(nm_device_802_3_ethernet_new): Remove the useless argument
test_dev. Remove
index argument. Add interface argument.
* src/nm-device-802-11-wireless.c
* (nm_device_802_11_wireless_new): Remove
the useless test_dev argument. Remove index argument. Add
interface arugment.
* src/NetworkManagerSystem.c
* (nm_system_device_set_from_ip4_config): Get the
device index through interface.
(nm_system_set_mtu): Ditto.
* introspection/nm-device.xml: Remove the "Index" property.
2007-11-21 Tambet Ingo <tambet@gmail.com>
* src/nm-serial-device.c:
* src/nm-serial-device.c:
* src/nm-umts-device.c:
* src/nm-umts-device.h: Implement.
* src/nm-hal-manager.c (nm_get_device_driver_name):
* libhal_free_string the string
allocated by libhal.
(modem_device_creator): Implement.
(register_built_in_creators): Register the modem creator.
* src/nm-device-802-11-wireless.c
* (nm_device_802_11_wireless_new):
Remove the unused test_dev argument.
* src/nm-device-802-3-ethernet.c (nm_device_802_3_ethernet_new):
* Ditto.
* src/Makefile.am: Add new files to build.
Link in ppp-manager.
* libnm-util/nm-setting-umts.c:
* libnm-util/nm-setting-umts.h:
* libnm-util/nm-setting-serial.c:
* libnm-util/nm-setting-serial.h: Implement.
* libnm-util/Makefile.am: Add new files to build.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3116 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
169 lines
5.4 KiB
C
169 lines
5.4 KiB
C
/* NetworkManager -- Network link manager
|
|
*
|
|
* Dan Williams <dcbw@redhat.com>
|
|
*
|
|
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* (C) Copyright 2005 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef NM_DEVICE_H
|
|
#define NM_DEVICE_H
|
|
|
|
#include <glib-object.h>
|
|
#include <dbus/dbus.h>
|
|
#include <netinet/in.h>
|
|
|
|
#include "NetworkManager.h"
|
|
#include "nm-activation-request.h"
|
|
#include "nm-ip4-config.h"
|
|
#include "nm-connection.h"
|
|
|
|
#if 0
|
|
# define IOCTL_DEBUG 1
|
|
#endif
|
|
|
|
#ifdef IOCTL_DEBUG
|
|
# define nm_ioctl_info(fmt, args...) \
|
|
G_STMT_START { \
|
|
g_message ("<information>\t" fmt "\n", ##args); \
|
|
} G_STMT_END
|
|
#else
|
|
# define nm_ioctl_info(fmt, args...) do { } while(0)
|
|
#endif
|
|
|
|
typedef enum NMActStageReturn
|
|
{
|
|
NM_ACT_STAGE_RETURN_FAILURE = 0,
|
|
NM_ACT_STAGE_RETURN_SUCCESS,
|
|
NM_ACT_STAGE_RETURN_POSTPONE
|
|
} NMActStageReturn;
|
|
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define NM_TYPE_DEVICE (nm_device_get_type ())
|
|
#define NM_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE, NMDevice))
|
|
#define NM_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_DEVICE, NMDeviceClass))
|
|
#define NM_IS_DEVICE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_DEVICE))
|
|
#define NM_IS_DEVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_DEVICE))
|
|
#define NM_DEVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_DEVICE, NMDeviceClass))
|
|
|
|
typedef struct _NMDevice NMDevice;
|
|
typedef struct _NMDeviceClass NMDeviceClass;
|
|
typedef struct _NMDevicePrivate NMDevicePrivate;
|
|
|
|
struct _NMDevice
|
|
{
|
|
GObject parent;
|
|
|
|
/*< private >*/
|
|
NMDevicePrivate *priv;
|
|
};
|
|
|
|
struct NMData;
|
|
|
|
struct _NMDeviceClass
|
|
{
|
|
GObjectClass parent;
|
|
|
|
void (* update_link) (NMDevice *self);
|
|
|
|
gboolean (* is_up) (NMDevice *self);
|
|
gboolean (* bring_up) (NMDevice *self);
|
|
void (* bring_down) (NMDevice *self);
|
|
|
|
void (* set_hw_address) (NMDevice *self);
|
|
|
|
guint32 (* get_type_capabilities) (NMDevice *self);
|
|
guint32 (* get_generic_capabilities) (NMDevice *self);
|
|
|
|
NMConnection * (* get_best_connection) (NMDevice *self,
|
|
GSList *connections,
|
|
char **specific_object);
|
|
|
|
void (* connection_secrets_updated) (NMDevice *self,
|
|
NMConnection *connection,
|
|
const char *setting_name);
|
|
|
|
gboolean (* check_connection) (NMDevice *self, NMConnection *connection);
|
|
|
|
NMActStageReturn (* act_stage1_prepare) (NMDevice *self);
|
|
NMActStageReturn (* act_stage2_config) (NMDevice *self);
|
|
NMActStageReturn (* act_stage3_ip_config_start) (NMDevice *self);
|
|
NMActStageReturn (* act_stage4_get_ip4_config) (NMDevice *self,
|
|
NMIP4Config **config);
|
|
NMActStageReturn (* act_stage4_ip_config_timeout) (NMDevice *self,
|
|
NMIP4Config **config);
|
|
void (* deactivate) (NMDevice *self);
|
|
void (* deactivate_quickly) (NMDevice *self);
|
|
|
|
void (* activation_cancel_handler) (NMDevice *self);
|
|
|
|
gboolean (* can_interrupt_activation) (NMDevice *self);
|
|
};
|
|
|
|
|
|
GType nm_device_get_type (void);
|
|
|
|
const char * nm_device_get_udi (NMDevice *dev);
|
|
const char * nm_device_get_iface (NMDevice *dev);
|
|
const char * nm_device_get_driver (NMDevice *dev);
|
|
|
|
NMDeviceType nm_device_get_device_type (NMDevice *dev);
|
|
guint32 nm_device_get_capabilities (NMDevice *dev);
|
|
guint32 nm_device_get_type_capabilities (NMDevice *dev);
|
|
|
|
gboolean nm_device_has_active_link (NMDevice *dev);
|
|
guint32 nm_device_get_ip4_address (NMDevice *dev);
|
|
void nm_device_update_ip4_address (NMDevice *dev);
|
|
struct in6_addr * nm_device_get_ip6_address (NMDevice *dev);
|
|
|
|
gboolean nm_device_get_use_dhcp (NMDevice *dev);
|
|
void nm_device_set_use_dhcp (NMDevice *dev,
|
|
gboolean use_dhcp);
|
|
|
|
NMIP4Config * nm_device_get_ip4_config (NMDevice *dev);
|
|
void nm_device_set_ip4_config (NMDevice *dev,
|
|
NMIP4Config *config);
|
|
|
|
gboolean nm_device_is_up (NMDevice *dev);
|
|
gboolean nm_device_bring_up (NMDevice *dev, gboolean wait);
|
|
void nm_device_bring_down (NMDevice *dev, gboolean wait);
|
|
|
|
|
|
void * nm_device_get_system_config_data (NMDevice *dev);
|
|
|
|
NMActRequest * nm_device_get_act_request (NMDevice *dev);
|
|
|
|
NMConnection * nm_device_get_best_connection (NMDevice *dev,
|
|
GSList *connections,
|
|
char **specific_object);
|
|
|
|
void nm_device_activate_schedule_stage1_device_prepare (NMDevice *device);
|
|
void nm_device_activate_schedule_stage2_device_config (NMDevice *device);
|
|
void nm_device_activate_schedule_stage4_ip_config_get (NMDevice *device);
|
|
void nm_device_activate_schedule_stage4_ip_config_timeout (NMDevice *device);
|
|
gboolean nm_device_deactivate_quickly (NMDevice *dev);
|
|
gboolean nm_device_is_activating (NMDevice *dev);
|
|
void nm_device_activation_cancel (NMDevice *dev);
|
|
|
|
gboolean nm_device_can_interrupt_activation (NMDevice *self);
|
|
|
|
NMDeviceState nm_device_get_state (NMDevice *device);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* NM_DEVICE_H */
|