From 1125a0be8189876d0b60fab256cc0111cc3e51f2 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Sun, 20 Dec 2009 14:57:38 +0100 Subject: [PATCH] moved traffic_selectors from charon to libstrongswan --- src/charon/Makefile.am | 1 - src/charon/config/child_cfg.h | 2 +- src/charon/config/peer_cfg.h | 2 +- src/charon/config/proposal.h | 2 +- src/charon/daemon.c | 2 +- src/charon/encoding/payloads/traffic_selector_substructure.h | 4 ++-- src/charon/encoding/payloads/ts_payload.h | 2 +- src/charon/processing/jobs/acquire_job.h | 2 +- src/charon/processing/jobs/migrate_job.h | 2 +- src/libstrongswan/Makefile.am | 1 + .../config => libstrongswan/selectors}/traffic_selector.c | 1 - .../config => libstrongswan/selectors}/traffic_selector.h | 0 12 files changed, 10 insertions(+), 11 deletions(-) rename src/{charon/config => libstrongswan/selectors}/traffic_selector.c (99%) rename src/{charon/config => libstrongswan/selectors}/traffic_selector.h (100%) diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am index 9302b63c3..1d6fa6dbe 100644 --- a/src/charon/Makefile.am +++ b/src/charon/Makefile.am @@ -11,7 +11,6 @@ config/ike_cfg.c config/ike_cfg.h \ config/peer_cfg.c config/peer_cfg.h \ config/proposal.c config/proposal.h \ config/auth_cfg.c config/auth_cfg.h \ -config/traffic_selector.c config/traffic_selector.h \ control/controller.c control/controller.h \ daemon.c daemon.h \ encoding/generator.c encoding/generator.h \ diff --git a/src/charon/config/child_cfg.h b/src/charon/config/child_cfg.h index becee8107..b189ab4fe 100644 --- a/src/charon/config/child_cfg.h +++ b/src/charon/config/child_cfg.h @@ -29,8 +29,8 @@ typedef struct lifetime_cfg_t lifetime_cfg_t; typedef struct child_cfg_t child_cfg_t; #include +#include #include -#include #include /** diff --git a/src/charon/config/peer_cfg.h b/src/charon/config/peer_cfg.h index 94a04bd36..6855276f8 100644 --- a/src/charon/config/peer_cfg.h +++ b/src/charon/config/peer_cfg.h @@ -30,7 +30,7 @@ typedef struct peer_cfg_t peer_cfg_t; #include #include #include -#include +#include #include #include #include diff --git a/src/charon/config/proposal.h b/src/charon/config/proposal.h index c342fb959..d3973fb78 100644 --- a/src/charon/config/proposal.h +++ b/src/charon/config/proposal.h @@ -33,7 +33,7 @@ typedef struct proposal_t proposal_t; #include #include #include -#include +#include /** * Protocol ID of a proposal. diff --git a/src/charon/daemon.c b/src/charon/daemon.c index 06495df77..d895cf499 100644 --- a/src/charon/daemon.c +++ b/src/charon/daemon.c @@ -41,7 +41,7 @@ #include #include -#include +#include #include #ifndef LOG_AUTHPRIV /* not defined on OpenSolaris */ diff --git a/src/charon/encoding/payloads/traffic_selector_substructure.h b/src/charon/encoding/payloads/traffic_selector_substructure.h index da4c9a4b2..0109fd7f5 100644 --- a/src/charon/encoding/payloads/traffic_selector_substructure.h +++ b/src/charon/encoding/payloads/traffic_selector_substructure.h @@ -25,9 +25,9 @@ typedef struct traffic_selector_substructure_t traffic_selector_substructure_t; #include -#include #include -#include +#include +#include /** * Length of a TRAFFIC SELECTOR SUBSTRUCTURE without start and end address. diff --git a/src/charon/encoding/payloads/ts_payload.h b/src/charon/encoding/payloads/ts_payload.h index 1d198a6fa..d322ff1a8 100644 --- a/src/charon/encoding/payloads/ts_payload.h +++ b/src/charon/encoding/payloads/ts_payload.h @@ -27,7 +27,7 @@ typedef struct ts_payload_t ts_payload_t; #include #include -#include +#include #include #include diff --git a/src/charon/processing/jobs/acquire_job.h b/src/charon/processing/jobs/acquire_job.h index 766e4db90..eff79a9b0 100644 --- a/src/charon/processing/jobs/acquire_job.h +++ b/src/charon/processing/jobs/acquire_job.h @@ -24,7 +24,7 @@ typedef struct acquire_job_t acquire_job_t; #include -#include +#include #include /** diff --git a/src/charon/processing/jobs/migrate_job.h b/src/charon/processing/jobs/migrate_job.h index 927668f04..de313d517 100644 --- a/src/charon/processing/jobs/migrate_job.h +++ b/src/charon/processing/jobs/migrate_job.h @@ -25,7 +25,7 @@ typedef struct migrate_job_t migrate_job_t; #include #include -#include +#include #include #include diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index d8d027e8e..b81146862 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -42,6 +42,7 @@ credentials/certificates/pgp_certificate.h \ credentials/ietf_attributes/ietf_attributes.c credentials/ietf_attributes/ietf_attributes.h \ database/database.h database/database_factory.h database/database_factory.c \ fetcher/fetcher.h fetcher/fetcher_manager.h fetcher/fetcher_manager.c \ +selectors/traffic_selector.c selectors/traffic_selectors.h \ utils.h utils.c \ utils/host.c utils/host.h \ utils/identification.c utils/identification.h \ diff --git a/src/charon/config/traffic_selector.c b/src/libstrongswan/selectors/traffic_selector.c similarity index 99% rename from src/charon/config/traffic_selector.c rename to src/libstrongswan/selectors/traffic_selector.c index 40977db60..08bf98795 100644 --- a/src/charon/config/traffic_selector.c +++ b/src/libstrongswan/selectors/traffic_selector.c @@ -22,7 +22,6 @@ #include "traffic_selector.h" -#include #include #include diff --git a/src/charon/config/traffic_selector.h b/src/libstrongswan/selectors/traffic_selector.h similarity index 100% rename from src/charon/config/traffic_selector.h rename to src/libstrongswan/selectors/traffic_selector.h