diff --git a/.gitignore b/.gitignore index ba1463955..ef0055f25 100644 --- a/.gitignore +++ b/.gitignore @@ -49,11 +49,11 @@ test-*.trs /conftest.[ch] /conftest.o.* -/callouts/nm-avahi-autoipd.action -/callouts/nm-dispatcher -/callouts/nmdbus-dispatcher.* -/callouts/org.freedesktop.nm_dispatcher.service -/callouts/tests/test-dispatcher-envp +/dispatcher/nm-avahi-autoipd.action +/dispatcher/nm-dispatcher +/dispatcher/nmdbus-dispatcher.* +/dispatcher/org.freedesktop.nm_dispatcher.service +/dispatcher/tests/test-dispatcher-envp /clients/cli/nmcli /clients/cli/settings-docs.c @@ -276,6 +276,11 @@ test-*.trs # but they were on older versions. Thus keep ignoring them # otherwise when switching branches these untracked files show # up. +/callouts/nm-avahi-autoipd.action +/callouts/nm-dispatcher +/callouts/nmdbus-dispatcher.* +/callouts/org.freedesktop.nm_dispatcher.service +/callouts/tests/test-dispatcher-envp /include/ /initscript/Slackware/rc.networkmanager /initscript/*/[Nn]etwork[Mm]anager diff --git a/Makefile.am b/Makefile.am index dd818fa81..80eade945 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS = \ libnm-core \ libnm \ src \ - callouts \ + dispatcher \ clients \ tools \ policy \ diff --git a/configure.ac b/configure.ac index 717209310..a19fdf50e 100644 --- a/configure.ac +++ b/configure.ac @@ -1184,8 +1184,8 @@ libnm-glib/libnm-glib.pc libnm-glib/libnm-glib-vpn.pc libnm-glib/Makefile libnm-glib/tests/Makefile -callouts/Makefile -callouts/tests/Makefile +dispatcher/Makefile +dispatcher/tests/Makefile tools/Makefile clients/Makefile clients/cli/Makefile diff --git a/callouts/Makefile.am b/dispatcher/Makefile.am similarity index 100% rename from callouts/Makefile.am rename to dispatcher/Makefile.am diff --git a/callouts/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c similarity index 100% rename from callouts/nm-dispatcher-utils.c rename to dispatcher/nm-dispatcher-utils.c diff --git a/callouts/nm-dispatcher-utils.h b/dispatcher/nm-dispatcher-utils.h similarity index 100% rename from callouts/nm-dispatcher-utils.h rename to dispatcher/nm-dispatcher-utils.h diff --git a/callouts/nm-dispatcher.c b/dispatcher/nm-dispatcher.c similarity index 100% rename from callouts/nm-dispatcher.c rename to dispatcher/nm-dispatcher.c diff --git a/callouts/nm-dispatcher.conf b/dispatcher/nm-dispatcher.conf similarity index 100% rename from callouts/nm-dispatcher.conf rename to dispatcher/nm-dispatcher.conf diff --git a/callouts/nm-dispatcher.xml b/dispatcher/nm-dispatcher.xml similarity index 100% rename from callouts/nm-dispatcher.xml rename to dispatcher/nm-dispatcher.xml diff --git a/callouts/org.freedesktop.nm_dispatcher.service.in b/dispatcher/org.freedesktop.nm_dispatcher.service.in similarity index 100% rename from callouts/org.freedesktop.nm_dispatcher.service.in rename to dispatcher/org.freedesktop.nm_dispatcher.service.in diff --git a/callouts/tests/Makefile.am b/dispatcher/tests/Makefile.am similarity index 87% rename from callouts/tests/Makefile.am rename to dispatcher/tests/Makefile.am index e85d9f94f..e7e50adc0 100644 --- a/callouts/tests/Makefile.am +++ b/dispatcher/tests/Makefile.am @@ -5,8 +5,8 @@ AM_CPPFLAGS = \ -I$(top_builddir)/shared \ -I$(top_srcdir)/libnm-core \ -I$(top_builddir)/libnm-core \ - -I$(top_srcdir)/callouts \ - -I$(top_builddir)/callouts \ + -I$(top_srcdir)/dispatcher \ + -I$(top_builddir)/dispatcher \ -DNETWORKMANAGER_COMPILATION \ -DSRCDIR=\"$(abs_srcdir)\" \ $(GLIB_CFLAGS) @@ -21,7 +21,7 @@ test_dispatcher_envp_SOURCES = \ test_dispatcher_envp_LDADD = \ $(top_builddir)/libnm/libnm.la \ - $(top_builddir)/callouts/libnm-dispatcher-core.la \ + $(top_builddir)/dispatcher/libnm-dispatcher-core.la \ $(GLIB_LIBS) ############################################################################### diff --git a/callouts/tests/dispatcher-connectivity-full b/dispatcher/tests/dispatcher-connectivity-full similarity index 87% rename from callouts/tests/dispatcher-connectivity-full rename to dispatcher/tests/dispatcher-connectivity-full index c370bc355..0b2796d12 100644 --- a/callouts/tests/dispatcher-connectivity-full +++ b/dispatcher/tests/dispatcher-connectivity-full @@ -17,7 +17,7 @@ PATH= CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 CONNECTION_ID=Random Connection -CONNECTION_FILENAME=/callouts/tests/dispatcher-connectivity-full +CONNECTION_FILENAME=/dispatcher/tests/dispatcher-connectivity-full DEVICE_IFACE=wlan0 DEVICE_IP_IFACE=wlan0 CONNECTIVITY_STATE=FULL diff --git a/callouts/tests/dispatcher-connectivity-unknown b/dispatcher/tests/dispatcher-connectivity-unknown similarity index 86% rename from callouts/tests/dispatcher-connectivity-unknown rename to dispatcher/tests/dispatcher-connectivity-unknown index 9622d017d..4d797712a 100644 --- a/callouts/tests/dispatcher-connectivity-unknown +++ b/dispatcher/tests/dispatcher-connectivity-unknown @@ -17,6 +17,6 @@ PATH= CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 CONNECTION_ID=Random Connection -CONNECTION_FILENAME=/callouts/tests/dispatcher-connectivity-unknown +CONNECTION_FILENAME=/dispatcher/tests/dispatcher-connectivity-unknown DEVICE_IFACE=wlan0 DEVICE_IP_IFACE=wlan0 diff --git a/callouts/tests/dispatcher-down b/dispatcher/tests/dispatcher-down similarity index 88% rename from callouts/tests/dispatcher-down rename to dispatcher/tests/dispatcher-down index f766595c1..e0e44a723 100644 --- a/callouts/tests/dispatcher-down +++ b/dispatcher/tests/dispatcher-down @@ -16,7 +16,7 @@ PATH= CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 CONNECTION_ID=Random Connection -CONNECTION_FILENAME=/callouts/tests/dispatcher-down +CONNECTION_FILENAME=/dispatcher/tests/dispatcher-down DEVICE_IFACE=wlan0 DEVICE_IP_IFACE=wlan0 diff --git a/callouts/tests/dispatcher-external b/dispatcher/tests/dispatcher-external similarity index 93% rename from callouts/tests/dispatcher-external rename to dispatcher/tests/dispatcher-external index a8c129c9e..41f01d463 100644 --- a/callouts/tests/dispatcher-external +++ b/dispatcher/tests/dispatcher-external @@ -25,7 +25,7 @@ gateway=0.0.0.0 PATH= CONNECTION_UUID=92bbc2fb-7304-46be-8ebb-6093dbe19a6a CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 -CONNECTION_FILENAME=/callouts/tests/dispatcher-external +CONNECTION_FILENAME=/dispatcher/tests/dispatcher-external CONNECTION_ID=virbr0 CONNECTION_EXTERNAL=1 DEVICE_IFACE=virbr0 diff --git a/callouts/tests/dispatcher-up b/dispatcher/tests/dispatcher-up similarity index 97% rename from callouts/tests/dispatcher-up rename to dispatcher/tests/dispatcher-up index 44eb9f7c2..ad7e87d3b 100644 --- a/callouts/tests/dispatcher-up +++ b/dispatcher/tests/dispatcher-up @@ -39,7 +39,7 @@ PATH= CONNECTION_UUID=3fd2a33a-d81b-423f-ae99-e6baba742311 CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 CONNECTION_ID=Random Connection -CONNECTION_FILENAME=/callouts/tests/dispatcher-up +CONNECTION_FILENAME=/dispatcher/tests/dispatcher-up DEVICE_IFACE=wlan0 DEVICE_IP_IFACE=wlan0 PROXY_PAC_URL=http://networkmanager.com/proxy.pac diff --git a/callouts/tests/dispatcher-vpn-down b/dispatcher/tests/dispatcher-vpn-down similarity index 96% rename from callouts/tests/dispatcher-vpn-down rename to dispatcher/tests/dispatcher-vpn-down index 1de7e233a..c921f105d 100644 --- a/callouts/tests/dispatcher-vpn-down +++ b/dispatcher/tests/dispatcher-vpn-down @@ -39,7 +39,7 @@ PATH= CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 CONNECTION_ID=Random Connection -CONNECTION_FILENAME=/callouts/tests/dispatcher-vpn-down +CONNECTION_FILENAME=/dispatcher/tests/dispatcher-vpn-down DEVICE_IFACE=wlan0 DEVICE_IP_IFACE=tun0 PROXY_PAC_URL=http://networkmanager.com/proxy.pac diff --git a/callouts/tests/dispatcher-vpn-up b/dispatcher/tests/dispatcher-vpn-up similarity index 96% rename from callouts/tests/dispatcher-vpn-up rename to dispatcher/tests/dispatcher-vpn-up index d16e58234..cbafc0313 100644 --- a/callouts/tests/dispatcher-vpn-up +++ b/dispatcher/tests/dispatcher-vpn-up @@ -39,7 +39,7 @@ PATH= CONNECTION_UUID=355653c0-34d3-4777-ad25-f9a498b7ef8e CONNECTION_DBUS_PATH=/org/freedesktop/NetworkManager/Connections/5 CONNECTION_ID=Random Connection -CONNECTION_FILENAME=/callouts/tests/dispatcher-vpn-up +CONNECTION_FILENAME=/dispatcher/tests/dispatcher-vpn-up DEVICE_IFACE=wlan0 DEVICE_IP_IFACE=tun0 PROXY_PAC_URL=http://networkmanager.com/proxy.pac diff --git a/callouts/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c similarity index 99% rename from callouts/tests/test-dispatcher-envp.c rename to dispatcher/tests/test-dispatcher-envp.c index 383beaab7..6dd4db07b 100644 --- a/callouts/tests/test-dispatcher-envp.c +++ b/dispatcher/tests/test-dispatcher-envp.c @@ -87,7 +87,7 @@ parse_main (GKeyFile *kf, g_variant_new_object_path ("/org/freedesktop/NetworkManager/Connections/5")); /* Strip out the non-fixed portion of the filename */ - filename = strstr (filename, "/callouts"); + filename = strstr (filename, "/dispatcher"); g_variant_builder_add (&props, "{sv}", "filename", g_variant_new_string (filename));