diff options
| author | Martin Willi <martin@strongswan.org> | 2009-09-07 12:07:57 +0200 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2009-09-07 15:00:45 +0200 |
| commit | b7b56533862f8b4ae705e3adb31b7b9533a42947 (patch) | |
| tree | 63f32988d97e75dd7b34eae48097a60e529a7497 /src/charon/plugins/kernel_netlink | |
| parent | b803bc82f4517d864938ced136170c33d8655852 (diff) | |
| download | strongswan-b7b56533862f8b4ae705e3adb31b7b9533a42947.tar.bz2 strongswan-b7b56533862f8b4ae705e3adb31b7b9533a42947.tar.xz | |
Use macros to define --with options
Diffstat (limited to 'src/charon/plugins/kernel_netlink')
| -rw-r--r-- | src/charon/plugins/kernel_netlink/Makefile.am | 6 | ||||
| -rw-r--r-- | src/charon/plugins/kernel_netlink/kernel_netlink_net.c | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/src/charon/plugins/kernel_netlink/Makefile.am b/src/charon/plugins/kernel_netlink/Makefile.am index 6351280d6..31d9c6d5c 100644 --- a/src/charon/plugins/kernel_netlink/Makefile.am +++ b/src/charon/plugins/kernel_netlink/Makefile.am @@ -1,7 +1,9 @@ -INCLUDES = -I${linuxdir} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon +INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon -AM_CFLAGS = -rdynamic +AM_CFLAGS = -rdynamic \ +-DROUTING_TABLE=${routing_table} \ +-DROUTING_TABLE_PRIO=${routing_table_prio} plugin_LTLIBRARIES = libstrongswan-kernel-netlink.la diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c b/src/charon/plugins/kernel_netlink/kernel_netlink_net.c index 8fd25e96f..1037c8084 100644 --- a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c +++ b/src/charon/plugins/kernel_netlink/kernel_netlink_net.c @@ -34,14 +34,6 @@ /** delay before firing roam jobs (ms) */ #define ROAM_DELAY 100 -/** routing table for routes installed by us */ -#ifndef IPSEC_ROUTING_TABLE -#define IPSEC_ROUTING_TABLE 100 -#endif -#ifndef IPSEC_ROUTING_TABLE_PRIO -#define IPSEC_ROUTING_TABLE_PRIO 100 -#endif - typedef struct addr_entry_t addr_entry_t; /** @@ -1366,9 +1358,9 @@ kernel_netlink_net_t *kernel_netlink_net_create() this->condvar = condvar_create(CONDVAR_TYPE_DEFAULT); timerclear(&this->last_roam); this->routing_table = lib->settings->get_int(lib->settings, - "charon.routing_table", IPSEC_ROUTING_TABLE); + "charon.routing_table", ROUTING_TABLE); this->routing_table_prio = lib->settings->get_int(lib->settings, - "charon.routing_table_prio", IPSEC_ROUTING_TABLE_PRIO); + "charon.routing_table_prio", ROUTING_TABLE_PRIO); this->process_route = lib->settings->get_bool(lib->settings, "charon.process_route", TRUE); this->install_virtual_ip = lib->settings->get_bool(lib->settings, |