diff options
| author | Michael Biebl <biebl@debian.org> | 2018-09-23 10:10:27 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-09-23 10:10:27 +0200 |
| commit | e126f3e804c35480c4f075777430419d6ece23da (patch) | |
| tree | 5d5821ebcda8cd6ac34d2483bb3354910e508930 /src/ppp | |
| parent | c240974325c552cad177c457d6ff04e381fd77a3 (diff) | |
New upstream version 1.12.4 upstream/1.12.4
Diffstat (limited to 'src/ppp')
| -rw-r--r-- | src/ppp/meson.build | 1 | ||||
| -rw-r--r-- | src/ppp/nm-ppp-manager.c | 20 | ||||
| -rw-r--r-- | src/ppp/nm-pppd-plugin.c | 2 |
3 files changed, 11 insertions, 12 deletions
diff --git a/src/ppp/meson.build b/src/ppp/meson.build index 20ed64ed..38f9a0f1 100644 --- a/src/ppp/meson.build +++ b/src/ppp/meson.build @@ -31,6 +31,7 @@ core_plugins += shared_module( name, sources: 'nm-ppp-manager.c', dependencies: deps, + c_args: '-DPPPD_PLUGIN_DIR="@0@"'.format(pppd_plugin_dir), link_args: [ '-Wl,--version-script,@0@'.format(linker_script), ], diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c index b231ff20..40bdea64 100644 --- a/src/ppp/nm-ppp-manager.c +++ b/src/ppp/nm-ppp-manager.c @@ -438,11 +438,10 @@ impl_ppp_manager_set_ifindex (NMDBusObject *obj, g_variant_get (parameters, "(i)", &ifindex); + _LOGD ("set-ifindex %d", (int) ifindex); + if (priv->ifindex >= 0) { - if (priv->ifindex == ifindex) - _LOGD ("set-ifindex: ignore repeated calls setting ifindex to %d", (int) ifindex); - else - _LOGW ("set-ifindex: can't change the ifindex from %d to %d", priv->ifindex, (int) ifindex); + _LOGW ("can't change the ifindex from %d to %d", priv->ifindex, (int) ifindex); goto out; } @@ -455,15 +454,14 @@ impl_ppp_manager_set_ifindex (NMDBusObject *obj, } if (!plink) { - _LOGW ("set-ifindex: unknown interface with ifindex %d", ifindex); + _LOGW ("unknown interface with ifindex %d", ifindex); ifindex = 0; - } else { - obj_keep_alive = nmp_object_ref (NMP_OBJECT_UP_CAST (plink)); - _LOGD ("set-ifindex: %d, name \"%s\"", (int) ifindex, plink->name); } priv->ifindex = ifindex; + obj_keep_alive = nmp_object_ref (NMP_OBJECT_UP_CAST (plink)); + g_signal_emit (self, signals[IFINDEX_SET], 0, @@ -703,7 +701,7 @@ nm_cmd_line_to_str (NMCmdLine *cmd) char *str; g_ptr_array_add (cmd->array, NULL); - str = g_strjoinv (" ", (char **) cmd->array->pdata); + str = g_strjoinv (" ", (gchar **) cmd->array->pdata); g_ptr_array_remove_index (cmd->array, cmd->array->len - 1); return str; @@ -882,13 +880,13 @@ create_pppd_cmd_line (NMPPPManager *self, nm_cmd_line_add_string (cmd, pppoe_service); } } else if (adsl) { - const char *protocol = nm_setting_adsl_get_protocol (adsl); + const gchar *protocol = nm_setting_adsl_get_protocol (adsl); if (!strcmp (protocol, NM_SETTING_ADSL_PROTOCOL_PPPOA)) { guint32 vpi = nm_setting_adsl_get_vpi (adsl); guint32 vci = nm_setting_adsl_get_vci (adsl); const char *encaps = nm_setting_adsl_get_encapsulation (adsl); - char *vpivci; + gchar *vpivci; nm_cmd_line_add_string (cmd, "plugin"); nm_cmd_line_add_string (cmd, "pppoatm.so"); diff --git a/src/ppp/nm-pppd-plugin.c b/src/ppp/nm-pppd-plugin.c index 09196340..989f7433 100644 --- a/src/ppp/nm-pppd-plugin.c +++ b/src/ppp/nm-pppd-plugin.c @@ -147,7 +147,7 @@ nm_phasechange (void *data, int arg) if ( if_indextoname (index, new_name) && !nm_streq0 (ifname, new_name)) { g_message ("nm-ppp-plugin: interface name changed from '%s' to '%s'", ifname, new_name); - g_strlcpy (ifname, new_name, IF_NAMESIZE); + strncpy (ifname, new_name, IF_NAMESIZE); } } } |