diff options
| author | Dan Williams <dcbw@redhat.com> | 2007-06-21 20:42:53 +0000 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2007-06-21 20:42:53 +0000 |
| commit | 9f0dbb0756dfdb0b62805a73c097a8fb60f94c56 (patch) | |
| tree | 1ea398ada84babead0d9e912aa43bb9408aa053a | |
| parent | 27a2db6b4dbe443809b323195f0a13af3f996f7f (diff) | |
| download | NetworkManager-9f0dbb0756dfdb0b62805a73c097a8fb60f94c56.tar.gz | |
2007-06-21 Dan Williams <dcbw@redhat.com>
* configure.in
callouts/Makefile.am
- Add avahi-autoipd callouts
* callouts/nm-avahi-autoipd.action
- Action script to be executed by avahi-autoipd to forward discovered
IP information back to NetworkManager
* callouts/nm-avahi-autoipd.conf
- D-Bus service config file for nm-avahi-autoipd.action
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/branches/nm-0-6-olpc@2608 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | callouts/Makefile.am | 9 | ||||
| -rw-r--r-- | callouts/nm-avahi-autoipd.action | 23 | ||||
| -rw-r--r-- | callouts/nm-avahi-autoipd.conf | 14 | ||||
| -rw-r--r-- | configure.in | 1 |
5 files changed, 60 insertions, 0 deletions
@@ -1,5 +1,18 @@ 2007-06-21 Dan Williams <dcbw@redhat.com> + * configure.in + callouts/Makefile.am + - Add avahi-autoipd callouts + + * callouts/nm-avahi-autoipd.action + - Action script to be executed by avahi-autoipd to forward discovered + IP information back to NetworkManager + + * callouts/nm-avahi-autoipd.conf + - D-Bus service config file for nm-avahi-autoipd.action + +2007-06-21 Dan Williams <dcbw@redhat.com> + * src/nm-device.c - (real_act_stage3_ip_config_start): sometimes the device gets downed during the wpa_supplicant association. Ensure the device is up diff --git a/callouts/Makefile.am b/callouts/Makefile.am new file mode 100644 index 0000000000..2d681bb1b9 --- /dev/null +++ b/callouts/Makefile.am @@ -0,0 +1,9 @@ +dbusservicedir = $(DBUS_SYS_DIR) +dbusservice_DATA = nm-avahi-autoipd.conf + +calloutdir = $(sysconfdir)/NetworkManager/callouts +callout_DATA = nm-avahi-autoipd.action + +EXTRA_DIST = \ + $(dbusservice_DATA) \ + $(callout_DATA) diff --git a/callouts/nm-avahi-autoipd.action b/callouts/nm-avahi-autoipd.action new file mode 100644 index 0000000000..1b2f709df8 --- /dev/null +++ b/callouts/nm-avahi-autoipd.action @@ -0,0 +1,23 @@ +#!/bin/sh + +set -e + +# Command line arguments: +# $1 event that happened: +# BIND: Successfully claimed address +# CONFLICT: An IP address conflict happened +# UNBIND: The IP address is no longer needed +# STOP: The daemon is terminating +# $2 interface name +# $3 IP adddress + +/bin/dbus-send \ + --system \ + --type=signal \ + / \ + org.freedesktop.NetworkManager.avahiautoipd.AutoIP4Event \ + 'string:'"$1" \ + 'string:'"$2" \ + 'string:'"$3"; + +exit 0 diff --git a/callouts/nm-avahi-autoipd.conf b/callouts/nm-avahi-autoipd.conf new file mode 100644 index 0000000000..780883b766 --- /dev/null +++ b/callouts/nm-avahi-autoipd.conf @@ -0,0 +1,14 @@ +<!DOCTYPE busconfig PUBLIC + "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" + "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> +<busconfig> + <policy user="root"> + <allow own="org.freedesktop.NetworkManager.avahiautoipd"/> + <allow send_interface="org.freedesktop.NetworkManager.avahiautoipd"/> + </policy> + <policy context="default"> + <deny own="org.freedesktop.NetworkManager.avahiautoipd"/> + <deny send_interface="org.freedesktop.NetworkManager.avahiautoipd"/> + </policy> +</busconfig> + diff --git a/configure.in b/configure.in index c196efb88c..d86b47180f 100644 --- a/configure.in +++ b/configure.in @@ -321,6 +321,7 @@ gnome/Makefile gnome/libnm_glib/libnm_glib.pc gnome/libnm_glib/Makefile gnome/vpn-properties/Makefile +callouts/Makefile test/Makefile test/test-common/Makefile test/libnm-util/Makefile |