projects / platform / upstream / connman.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
iptables: Free table pointer
[platform/upstream/connman.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index b22213e..cd69b56 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,8 @@ include_HEADERS = include/types.h include/log.h include/plugin.h \
                        include/resolver.h include/ipconfig.h \
                        include/device.h include/network.h include/inet.h \
                        include/storage.h include/provision.h \
-                       include/session.h include/ipaddress.h include/agent.h
+                       include/session.h include/ipaddress.h include/agent.h \
+                       include/inotify.h
 
 nodist_include_HEADERS = include/version.h
 
@@ -23,7 +24,7 @@ local_headers = $(foreach file,$(include_HEADERS) $(nodist_include_HEADERS) \
 
 
 gdbus_sources = gdbus/gdbus.h gdbus/mainloop.c gdbus/watch.c \
-                                       gdbus/object.c gdbus/polkit.c
+                               gdbus/object.c gdbus/client.c gdbus/polkit.c
 
 gdhcp_sources = gdhcp/gdhcp.h gdhcp/common.h gdhcp/common.c gdhcp/client.c \
                gdhcp/server.c gdhcp/ipv4ll.h gdhcp/ipv4ll.c gdhcp/unaligned.h
@@ -95,7 +96,8 @@ src_connmand_SOURCES = $(gdbus_sources) $(gdhcp_sources) $(gweb_sources) \
                        src/technology.c src/counter.c src/ntp.c \
                        src/session.c src/tethering.c src/wpad.c src/wispr.c \
                        src/stats.c src/iptables.c src/dnsproxy.c src/6to4.c \
-                       src/ippool.c src/bridge.c src/nat.c src/ipaddress.c
+                       src/ippool.c src/bridge.c src/nat.c src/ipaddress.c \
+                       src/inotify.c
 
 src_connmand_LDADD = $(builtin_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \
                                @XTABLES_LIBS@ @GNUTLS_LIBS@ -lresolv -ldl -lrt
@@ -121,7 +123,9 @@ vpn_connman_vpnd_SOURCES = $(gdbus_sources) $(builtin_vpn_sources) \
                        vpn/vpn-manager.c vpn/vpn-provider.c \
                        vpn/vpn-provider.h vpn/vpn-rtnl.h \
                        vpn/vpn-ipconfig.c src/inet.c vpn/vpn-rtnl.c \
-                       src/dbus.c src/storage.c src/ipaddress.c src/agent.c
+                       src/dbus.c src/storage.c src/ipaddress.c src/agent.c \
+                       vpn/vpn-agent.c vpn/vpn-agent.h src/inotify.c \
+                       vpn/vpn-config.c
 
 vpn_connman_vpnd_LDADD = $(builtin_vpn_libadd) @GLIB_LIBS@ @DBUS_LIBS@ \
                                @GNUTLS_LIBS@ -lresolv -ldl
@@ -149,6 +153,7 @@ plugindir = $(libdir)/connman/plugins
 scriptdir = $(libdir)/connman/scripts
 
 storagedir = $(localstatedir)/lib/connman
+vpn_storagedir = $(localstatedir)/lib/connman-vpn
 
 configdir = ${sysconfdir}/connman
 
@@ -173,6 +178,7 @@ AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \
                                -DPLUGINDIR=\""$(build_plugindir)"\" \
                                -DSCRIPTDIR=\""$(build_scriptdir)"\" \
                                -DSTORAGEDIR=\""$(storagedir)\"" \
+                               -DVPN_STORAGEDIR=\""$(vpn_storagedir)\"" \
                                -DCONFIGDIR=\""$(configdir)\""
 
 if VPN
@@ -188,6 +194,7 @@ src_connmand_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ @XTABLES_CFLAGS@ \
                                -DPLUGINDIR=\""$(build_plugindir)"\" \
                                -DSCRIPTDIR=\""$(build_scriptdir)"\" \
                                -DSTORAGEDIR=\""$(storagedir)\"" \
+                               -DVPN_STORAGEDIR=\""$(vpn_storagedir)\"" \
                                -DCONFIGDIR=\""$(configdir)\"" \
                                -I$(builddir)/src
 
@@ -202,12 +209,14 @@ vpn_connman_vpnd_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@ \
                                -DPLUGINDIR=\""$(build_vpn_plugindir)"\" \
                                -DSCRIPTDIR=\""$(build_scriptdir)"\" \
                                -DSTORAGEDIR=\""$(storagedir)\"" \
+                               -DVPN_STORAGEDIR=\""$(vpn_storagedir)\"" \
                                -DCONFIGDIR=\""$(configdir)\"" \
                                -I$(builddir)/vpn
 
-EXTRA_DIST += vpn/vpn-dbus.conf vpn/vpn-polkit.conf vpn/net.connman.vpn.service
 endif
 
+EXTRA_DIST += vpn/vpn-dbus.conf vpn/vpn-polkit.conf
+
 script_DATA =
 script_PROGRAMS =
 script_LTLIBRARIES =
@@ -220,8 +229,7 @@ noinst_PROGRAMS += client/connmanctl
 MANUAL_PAGES += doc/connmanctl.1
 
 client_connmanctl_SOURCES =  $(gdbus_sources) src/connman.h \
-                       include/log.h src/log.c \
-                       include/dbus.h src/dbus.c \
+                       client/dbus.h client/dbus.c \
                        client/data_manager.h client/data_manager.c \
                        client/services.h client/services.c \
                        client/technology.h client/technology.c \
@@ -232,6 +240,18 @@ client_connmanctl_SOURCES =  $(gdbus_sources) src/connman.h \
 client_connmanctl_LDADD = @DBUS_LIBS@ @GLIB_LIBS@ -lreadline -ldl
 endif
 
+noinst_PROGRAMS += unit/test-pbkdf2-sha1 unit/test-prf-sha1
+
+unit_test_pbkdf2_sha1_SOURCES = unit/test-pbkdf2-sha1.c \
+                               src/shared/sha1.h src/shared/sha1.c
+unit_test_pbkdf2_sha1_LDADD = @GLIB_LIBS@
+
+unit_test_prf_sha1_SOURCES = unit/test-prf-sha1.c \
+                               src/shared/sha1.h src/shared/sha1.c
+unit_test_prf_sha1_LDADD = @GLIB_LIBS@
+
+TESTS = unit/test-pbkdf2-sha1 unit/test-prf-sha1
+
 if WISPR
 noinst_PROGRAMS += tools/wispr
 
@@ -246,7 +266,8 @@ noinst_PROGRAMS += tools/supplicant-test \
                        tools/dbus-test tools/polkit-test \
                        tools/iptables-test tools/tap-test tools/wpad-test \
                        tools/stats-tool tools/private-network-test \
-                       unit/test-session unit/test-ippool unit/test-nat
+                       unit/test-session unit/test-ippool \
+                       unit/test-iptables
 
 tools_supplicant_test_SOURCES = $(gdbus_sources) tools/supplicant-test.c \
                        tools/supplicant-dbus.h tools/supplicant-dbus.c \
@@ -290,10 +311,10 @@ unit_test_ippool_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
 unit_test_ippool_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ -ldl
 unit_objects += $(unit_test_ippool_OBJECTS)
 
-unit_test_nat_SOURCES = $(gdbus_sources) src/log.c src/dbus.c \
-               src/iptables.c  src/nat.c unit/test-nat.c
-unit_test_nat_LDADD = @GLIB_LIBS@ @DBUS_LIBS@  @XTABLES_LIBS@ -ldl
-unit_objects += $(unit_nat_ippool_OBJECTS)
+unit_test_iptables_SOURCES = $(gdbus_sources) src/log.c \
+                src/iptables.c src/nat.c unit/test-iptables.c
+unit_test_iptables_LDADD = @GLIB_LIBS@ @DBUS_LIBS@ @XTABLES_LIBS@ -ldl
+unit_objects += $(unit_test_iptables_OBJECTS)
 endif
 
 test_scripts = test/get-state test/list-services \
@@ -309,10 +330,8 @@ test_scripts = test/get-state test/list-services \
                test/set-global-timeservers test/get-global-timeservers \
                test/set-nameservers test/set-domains test/set-timeservers
 
-if VPN
 test_scripts += test/vpn-connect test/vpn-disconnect test/vpn-get \
                test/monitor-vpn
-endif
 
 if TEST
 testdir = $(pkglibdir)/test
@@ -328,7 +347,9 @@ EXTRA_DIST += doc/overview-api.txt doc/behavior-api.txt \
                                doc/counter-api.txt doc/config-format.txt \
                                doc/clock-api.txt doc/session-api.txt \
                                doc/session-overview.txt doc/backtrace.txt \
-                               doc/advanced-configuration.txt
+                               doc/advanced-configuration.txt \
+                               doc/vpn-connection-api.txt \
+                               doc/vpn-manager-api.txt doc/vpn-overview.txt
 
 MANUAL_PAGES += doc/connman.8 doc/connman.conf.5
 
@@ -344,7 +365,7 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-gtk-doc \
                                --enable-openconnect \
                                --enable-openvpn \
                                --enable-vpnc \
-                               --enable-session-policy \
+                               --enable-session-policy-local \
                                --enable-nmcompat \
                                --enable-polkit
 
@@ -377,6 +398,18 @@ else
 endif
 endif
 
+if SELINUX
+if VPN
+EXTRA_DIST += connman-task.pp
+CLEANFILES += connman-task.pp
+endif
+
+connman-task.pp: vpn/connman-task.te
+       make -f /usr/share/selinux/devel/Makefile
+endif
+
+EXTRA_DIST += vpn/connman-task.te
+
 include/connman/version.h: include/version.h
        $(AM_V_at)$(MKDIR_P) include/connman
        $(AM_V_GEN)$(LN_S) $(abs_top_builddir)/$< $@
Domain: Network & Connectivity / Data Network;