fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-22 12:40:37 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

callouts: remove glib code from DHCP callout

Browse source 
The whole callout is pure dbus, not dbus-glib, so there's really no need
for glib code there.  Even so, DBUS_LIBS contains dbus-glib and gobject,
so we're still linking to glib/gobject.
This commit is contained in:
Dan Williams 2012-07-16 19:51:05 -05:00
parent 00297f49fb
commit 757a34fcdd
2 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
callouts/Makefile.am
View file

@ -24,14 +24,10 @@ nm_dhcp_client_action_SOURCES = \
nm_dhcp_client_action_CPPFLAGS = \
$(DBUS_CFLAGS) \
$(GLIB_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DLIBEXECDIR=\"$(libexecdir)\"
nm_dhcp_client_action_LDADD = \
$(DBUS_LIBS) \
$(GLIB_LIBS)
nm_dhcp_client_action_LDADD = $(DBUS_LIBS)
nm_avahi_autoipd_action_SOURCES = \

47
callouts/nm-dhcp-client-action.c
View file

@ -15,18 +15,18 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2007 - 2008 Red Hat, Inc.
* Copyright (C) 2007 - 2012 Red Hat, Inc.
*/
/* for environ */
#define _GNU_SOURCE
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus-glib.h>
#define NM_DHCP_CLIENT_DBUS_SERVICE "org.freedesktop.nm_dhcp_client"
#define NM_DHCP_CLIENT_DBUS_IFACE "org.freedesktop.nm_dhcp_client"
@ -178,9 +178,7 @@ static const char * ignore[] = {"PATH", "SHLVL", "_", "PWD", "dhc_dbus", NULL};
static dbus_bool_t
build_message (DBusMessage * message)
{
char ** env = NULL;
char ** item;
char ** p;
char **item;
dbus_bool_t success = FALSE;
DBusMessageIter iter, iter_dict;
@ -189,31 +187,37 @@ build_message (DBusMessage * message)
goto out;
/* List environment and format for dbus dict */
env = g_listenv ();
for (item = env; *item; item++) {
gboolean ignore_item = FALSE;
const char * val = g_getenv (*item);
for (item = environ; *item; item++) {
char *name, *val, **p;
/* Split on the = */
name = strdup (*item);
val = strchr (name, '=');
if (!val)
goto next;
*val++ = '\0';
if (!strlen (val))
val = NULL;
/* Ignore non-DCHP-related environment variables */
for (p = (char **) ignore; *p && !ignore_item; p++) {
if (strncmp (*item, *p, strlen (*p)) == 0)
ignore_item = TRUE;
for (p = (char **) ignore; *p; p++) {
if (strncmp (name, *p, strlen (*p)) == 0)
goto next;
}
if (ignore_item)
continue;
/* Value passed as a byte array rather than a string, because there are
* no character encoding guarantees with DHCP, and D-Bus requires
* strings to be UTF-8.
*/
if (!wpa_dbus_dict_append_byte_array (&iter_dict,
*item,
name,
val ? val : "\0",
val ? strlen (val) : 1)) {
fprintf (stderr, "Error: failed to add item '%s' to signal\n",
*item);
goto out;
fprintf (stderr, "Error: failed to add item '%s' to signal\n", name);
}
next:
free (name);
}
if (!wpa_dbus_dict_close_write (&iter, &iter_dict))
@ -222,7 +226,6 @@ build_message (DBusMessage * message)
success = TRUE;
out:
g_strfreev (env);
return success;
}
@ -284,8 +287,6 @@ main (int argc, char *argv[])
DBusMessage * message;
dbus_bool_t result;
g_type_init ();
/* Get a connection to the system bus */
connection = dbus_init ();
if (connection == NULL)