diff options
| author | Martin Willi <martin@revosec.ch> | 2013-10-11 15:32:10 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2014-06-04 15:53:00 +0200 |
| commit | aa5b49c0377604472ed65122bbba9299d49665a9 (patch) | |
| tree | 8b31aa61337a13bfacb34ec9275eed469764f62d /src/libstrongswan/Makefile.am | |
| parent | 93f78d82256fd50623048dcb262b147cad85b902 (diff) | |
| download | strongswan-aa5b49c0377604472ed65122bbba9299d49665a9.tar.bz2 strongswan-aa5b49c0377604472ed65122bbba9299d49665a9.tar.xz | |
stream: Separate TCP/Unix stream helpers from stream/service implementations
This allows us to disable Unix sockets cleanly on Windows. Replaces some
read/write calls with recv/send counterparts, as Winsock does not like
read/writes.
Diffstat (limited to 'src/libstrongswan/Makefile.am')
| -rw-r--r-- | src/libstrongswan/Makefile.am | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 711676a26..df1f0260e 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -25,8 +25,9 @@ credentials/sets/callback_cred.c credentials/auth_cfg.c database/database.c \ database/database_factory.c fetcher/fetcher.c fetcher/fetcher_manager.c eap/eap.c \ ipsec/ipsec_types.c \ networking/host.c networking/host_resolver.c networking/packet.c \ -networking/tun_device.c networking/streams/stream.c \ -networking/streams/stream_service.c networking/streams/stream_manager.c \ +networking/tun_device.c networking/streams/stream_manager.c \ +networking/streams/stream.c networking/streams/stream_service.c \ +networking/streams/stream_tcp.c networking/streams/stream_service_tcp.c \ pen/pen.c plugins/plugin_loader.c plugins/plugin_feature.c processing/jobs/job.c \ processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \ processing/watcher.c resolver/resolver_manager.c resolver/rr_set.c \ @@ -38,6 +39,12 @@ utils/utils.c utils/chunk.c utils/debug.c utils/enum.c utils/identification.c \ utils/lexparser.c utils/optionsfrom.c utils/capabilities.c utils/backtrace.c \ utils/parser_helper.c utils/test.c utils/utils/strerror.c +if !USE_WINDOWS + libstrongswan_la_SOURCES += \ + networking/streams/stream_unix.c \ + networking/streams/stream_service_unix.c +endif + # private header files noinst_HEADERS = \ settings/settings_types.h @@ -74,6 +81,8 @@ database/database.h database/database_factory.h fetcher/fetcher.h \ fetcher/fetcher_manager.h eap/eap.h pen/pen.h ipsec/ipsec_types.h \ networking/host.h networking/host_resolver.h networking/packet.h \ networking/tun_device.h networking/streams/stream.h \ +networking/streams/stream_unix.h networking/streams/stream_service_unix.h \ +networking/streams/stream_tcp.h networking/streams/stream_service_tcp.h \ networking/streams/stream_service.h networking/streams/stream_manager.h \ resolver/resolver.h resolver/resolver_response.h resolver/rr_set.h \ resolver/rr.h resolver/resolver_manager.h \ |