~ubuntu-branches/ubuntu/precise/network-manager/precise

« back to all changes in this revision

Viewing changes to .pc/git_glib_enum_dbus_nicks_54ef8f3.patch/libnm-util/nm-setting-ppp.h

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-03-14 15:03:16 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120314150316-y8gehl25m86qda1q
Tags: 0.9.3.995+git201203081848.bba834f-0ubuntu1
* upstream snapshot 2012-03-08 18:48:46 (GMT) (LP: #950313)
  + bba834f8428934608b58eb96aa2b81e413430346
  - Added VLAN support.
  - Added bonding support.
  - Added Firewalld support.
  - Added support for IP connectivity checking.
  - Updated translations for Ukrainian, Slovenian, Hungarian, Malayalam,
    Polish and Brazilian Portugese.
  - Miscellaneous bugfixes.
* debian/patches/nm-change-dnsmasq-parameters.diff: refreshed, dropped the
  disabling of --strict-order, since that change made it upstream.
* debian/patches/avoid-periodic-disk-wakeups.patch: dropped, this was fixed
  slightly differently upstream, keeping periodic updates of the timestamps
  in memory but avoiding to flush the changes to disk, see commit 0be930c.
* debian/patches/manage-privacy-extensions.patch: dropped, applied upstream;
  the only part that wasn't applied is to default to privacy extensions being
  enabled...
* debian/patches/enable-ipv6-privacy.patch: since we dropped the previous
  patch, update the defaults for PROP_IP6_PRIVACY to make sure IPv6 privacy
  extensions are enabled by default, to retain the same behavior we already
  had.
* debian/patches/git_libnm-glib_ensure_device_state_aef4340.patch: dropped,
  applied upstream.
* debian/patches/dnsmasq-dont-read-hosts.patch: dropped, applied upstream.
* debian/patches/dnsmasq-dnssec-passthrough.patch: refreshed. 
* debian/patches/git_nm_device_set_device_type_private.patch: make sure
  nm_device_set_device_type() stays private.
* debian/libnm-glib4.symbols: add new symbols:
  + nm_device_bond_get_carrier@Base
  + nm_device_bond_get_hw_address@Base
  + nm_device_bond_get_type@Base
  + nm_device_bond_new@Base
  + nm_device_olpc_mesh_get_active_channel@Base
  + nm_device_olpc_mesh_get_companion@Base
  + nm_device_olpc_mesh_get_hw_address@Base
  + nm_device_olpc_mesh_get_type@Base
  + nm_device_olpc_mesh_new@Base
  + nm_device_vlan_get_carrier@Base
  + nm_device_vlan_get_hw_address@Base
  + nm_device_vlan_get_type@Base
  + nm_device_vlan_get_vlan_id@Base
  + nm_device_vlan_new@Base
* debian/libnm-util2.symbols: add new symbols:
  + nm_connection_get_setting_vlan@Base
  + nm_setting_bond_get_option_default@Base
  + nm_setting_bond_get_valid_options@Base
  + nm_setting_ip6_config_get_ip6_privacy@Base (renamed from
    nm_setting_ip6_config_get_enable_ip6_privacy@Base)
  + nm_setting_ip6_config_privacy_get_type@Base
  + nm_setting_vlan_*
  + nm_vlan_flags_get_type@Base
  + nm_vlan_priority_map_get_type@Base
* debian/network-manager.install: install the debug-helper.py script as a way
  for our users to change wpasupplicant, NetworkManager and ModemManager log
  levels easily; as /usr/lib/NetworkManager/debug-helper.py.
* debian/control: add python to Suggests because the debug-helper.py script
  does require it, but leave it as just a Suggests because the script is
  simply there to make people's life easier when reporting bugs.
* debian/patches/git_glib_enum_dbus_nicks_54ef8f3.patch: make sure the nicks
  for NM enums are properly set rather than defaulting to the automatic
  values from glib-mkenums; this should fix the nm-connection-editor bug
  with editing various types of connections. (LP: #951464, #953522) 
* debian/patches/git_libnm-util_wep_caps_assert_bb6da99.patch: fix asserts
  in nm_util_security_valid() when devices (like those which use ipw2200)
  report no WEP capabilities. (LP: #908380)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
 
2
 
 
3
/*
 
4
 * Dan Williams <dcbw@redhat.com>
 
5
 * Tambet Ingo <tambet@gmail.com>
 
6
 *
 
7
 * This library is free software; you can redistribute it and/or
 
8
 * modify it under the terms of the GNU Lesser General Public
 
9
 * License as published by the Free Software Foundation; either
 
10
 * version 2 of the License, or (at your option) any later version.
 
11
 *
 
12
 * This library is distributed in the hope that it will be useful,
 
13
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 
14
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 
15
 * Lesser General Public License for more details.
 
16
 *
 
17
 * You should have received a copy of the GNU Lesser General Public
 
18
 * License along with this library; if not, write to the
 
19
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 
20
 * Boston, MA 02110-1301 USA.
 
21
 *
 
22
 * (C) Copyright 2007 - 2008 Red Hat, Inc.
 
23
 * (C) Copyright 2007 - 2008 Novell, Inc.
 
24
 */
 
25
 
 
26
#ifndef NM_SETTING_PPP_H
 
27
#define NM_SETTING_PPP_H
 
28
 
 
29
#include <nm-setting.h>
 
30
 
 
31
G_BEGIN_DECLS
 
32
 
 
33
#define NM_TYPE_SETTING_PPP            (nm_setting_ppp_get_type ())
 
34
#define NM_SETTING_PPP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTING_PPP, NMSettingPPP))
 
35
#define NM_SETTING_PPP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SETTING_PPP, NMSettingPPPClass))
 
36
#define NM_IS_SETTING_PPP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SETTING_PPP))
 
37
#define NM_IS_SETTING_PPP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), NM_TYPE_SETTING_PPP))
 
38
#define NM_SETTING_PPP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SETTING_PPP, NMSettingPPPClass))
 
39
 
 
40
#define NM_SETTING_PPP_SETTING_NAME "ppp"
 
41
 
 
42
/**
 
43
 * NMSettingPPPError:
 
44
 * @NM_SETTING_PPP_ERROR_UNKNOWN: unknown or unclassified error
 
45
 * @NM_SETTING_PPP_ERROR_INVALID_PROPERTY: the property was invalid
 
46
 * @NM_SETTING_PPP_ERROR_MISSING_PROPERTY: the property was missing and is
 
47
 * required
 
48
 * @NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED: requiring MPPE is not compatible
 
49
 * with other setting configuration parameters
 
50
 */
 
51
typedef enum {
 
52
        NM_SETTING_PPP_ERROR_UNKNOWN = 0,
 
53
        NM_SETTING_PPP_ERROR_INVALID_PROPERTY,
 
54
        NM_SETTING_PPP_ERROR_MISSING_PROPERTY,
 
55
        NM_SETTING_PPP_ERROR_REQUIRE_MPPE_NOT_ALLOWED
 
56
} NMSettingPPPError;
 
57
 
 
58
#define NM_SETTING_PPP_ERROR nm_setting_ppp_error_quark ()
 
59
GQuark nm_setting_ppp_error_quark (void);
 
60
 
 
61
#define NM_SETTING_PPP_NOAUTH            "noauth"
 
62
#define NM_SETTING_PPP_REFUSE_EAP        "refuse-eap"
 
63
#define NM_SETTING_PPP_REFUSE_PAP        "refuse-pap"
 
64
#define NM_SETTING_PPP_REFUSE_CHAP       "refuse-chap"
 
65
#define NM_SETTING_PPP_REFUSE_MSCHAP     "refuse-mschap"
 
66
#define NM_SETTING_PPP_REFUSE_MSCHAPV2   "refuse-mschapv2"
 
67
#define NM_SETTING_PPP_NOBSDCOMP         "nobsdcomp"
 
68
#define NM_SETTING_PPP_NODEFLATE         "nodeflate"
 
69
#define NM_SETTING_PPP_NO_VJ_COMP        "no-vj-comp"
 
70
#define NM_SETTING_PPP_REQUIRE_MPPE      "require-mppe"
 
71
#define NM_SETTING_PPP_REQUIRE_MPPE_128  "require-mppe-128"
 
72
#define NM_SETTING_PPP_MPPE_STATEFUL     "mppe-stateful"
 
73
#define NM_SETTING_PPP_CRTSCTS           "crtscts"
 
74
#define NM_SETTING_PPP_BAUD              "baud"
 
75
#define NM_SETTING_PPP_MRU               "mru"
 
76
#define NM_SETTING_PPP_MTU               "mtu"
 
77
#define NM_SETTING_PPP_LCP_ECHO_FAILURE  "lcp-echo-failure"
 
78
#define NM_SETTING_PPP_LCP_ECHO_INTERVAL "lcp-echo-interval"
 
79
 
 
80
typedef struct {
 
81
        NMSetting parent;
 
82
} NMSettingPPP;
 
83
 
 
84
typedef struct {
 
85
        NMSettingClass parent;
 
86
 
 
87
        /* Padding for future expansion */
 
88
        void (*_reserved1) (void);
 
89
        void (*_reserved2) (void);
 
90
        void (*_reserved3) (void);
 
91
        void (*_reserved4) (void);
 
92
} NMSettingPPPClass;
 
93
 
 
94
GType nm_setting_ppp_get_type (void);
 
95
 
 
96
NMSetting *nm_setting_ppp_new                   (void);
 
97
gboolean   nm_setting_ppp_get_noauth            (NMSettingPPP *setting);
 
98
gboolean   nm_setting_ppp_get_refuse_eap        (NMSettingPPP *setting);
 
99
gboolean   nm_setting_ppp_get_refuse_pap        (NMSettingPPP *setting);
 
100
gboolean   nm_setting_ppp_get_refuse_chap       (NMSettingPPP *setting);
 
101
gboolean   nm_setting_ppp_get_refuse_mschap     (NMSettingPPP *setting);
 
102
gboolean   nm_setting_ppp_get_refuse_mschapv2   (NMSettingPPP *setting);
 
103
gboolean   nm_setting_ppp_get_nobsdcomp         (NMSettingPPP *setting);
 
104
gboolean   nm_setting_ppp_get_nodeflate         (NMSettingPPP *setting);
 
105
gboolean   nm_setting_ppp_get_no_vj_comp        (NMSettingPPP *setting);
 
106
gboolean   nm_setting_ppp_get_require_mppe      (NMSettingPPP *setting);
 
107
gboolean   nm_setting_ppp_get_require_mppe_128  (NMSettingPPP *setting);
 
108
gboolean   nm_setting_ppp_get_mppe_stateful     (NMSettingPPP *setting);
 
109
gboolean   nm_setting_ppp_get_crtscts           (NMSettingPPP *setting);
 
110
guint32    nm_setting_ppp_get_baud              (NMSettingPPP *setting);
 
111
guint32    nm_setting_ppp_get_mru               (NMSettingPPP *setting);
 
112
guint32    nm_setting_ppp_get_mtu               (NMSettingPPP *setting);
 
113
guint32    nm_setting_ppp_get_lcp_echo_failure  (NMSettingPPP *setting);
 
114
guint32    nm_setting_ppp_get_lcp_echo_interval (NMSettingPPP *setting);
 
115
 
 
116
G_END_DECLS
 
117
 
 
118
#endif /* NM_SETTING_PPP_H */