fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-05 12:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dispatcher: put WINS servers into dispatcher script environment (bgo #624238)

Browse source
This commit is contained in:
Dan Williams 2011-04-26 14:18:51 -05:00
parent db9b1df0e4
commit bb7e03f846
1 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
callouts/nm-dispatcher-action.c
View file

@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2008 Red Hat, Inc.
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
#include <syslog.h>
@ -247,7 +247,7 @@ construct_envp (const char *uuid,
guint32 envp_idx = 0;
GHashTable *options = NULL;
GSList *addresses, *routes, *iter;
GArray *nameservers;
GArray *nameservers, *wins;
GPtrArray *domains;
guint32 num, i;
GString *tmp;
@ -258,13 +258,14 @@ construct_envp (const char *uuid,
addresses = (GSList *) nm_ip4_config_get_addresses (ip4_config);
nameservers = (GArray *) nm_ip4_config_get_nameservers (ip4_config);
domains = (GPtrArray *) nm_ip4_config_get_domains (ip4_config);
wins = (GArray *) nm_ip4_config_get_wins_servers (ip4_config);
routes = (GSList *) nm_ip4_config_get_routes (ip4_config);
env_size = g_slist_length (addresses)
+ 1 /* addresses length */
+ 1 /* nameservers */
+ 1 /* domains */
+ 1 /* hostname */
+ 1 /* WINS servers */
+ g_slist_length (routes)
+ 1 /* routes length */
+ 1 /* connection UUID */
@ -339,6 +340,27 @@ construct_envp (const char *uuid,
g_string_free (tmp, FALSE);
}
if (wins && wins->len) {
gboolean first = TRUE;
tmp = g_string_new ("IP4_WINS_SERVERS=");
for (i = 0; i < wins->len; i++) {
struct in_addr addr;
char buf[INET_ADDRSTRLEN + 1];
addr.s_addr = g_array_index (wins, guint32, i);
memset (buf, 0, sizeof (buf));
if (inet_ntop (AF_INET, &addr, buf, sizeof (buf))) {
if (!first)
g_string_append_c (tmp, ' ');
g_string_append (tmp, buf);
first = FALSE;
}
}
envp[envp_idx++] = tmp->str;
g_string_free (tmp, FALSE);
}
for (iter = routes, num = 0; iter; iter = g_slist_next (iter)) {
NMIP4Route *route = (NMIP4Route *) iter->data;
char str_addr[INET_ADDRSTRLEN + 1];