]> git.ipfire.org Git - thirdparty/strongswan.git/commitdiff
Moved data structures to new collections subfolder
authorTobias Brunner <tobias@strongswan.org>
Tue, 16 Oct 2012 12:54:16 +0000 (14:54 +0200)
committerTobias Brunner <tobias@strongswan.org>
Wed, 24 Oct 2012 14:00:49 +0000 (16:00 +0200)
229 files changed:
src/checksum/checksum_builder.c
src/dumm/bridge.c
src/dumm/bridge.h
src/dumm/cowfs.c
src/dumm/dumm.c
src/dumm/dumm.h
src/dumm/ext/dumm.c
src/dumm/guest.c
src/dumm/guest.h
src/dumm/iface.c
src/dumm/iface.h
src/dumm/main.c
src/frontends/android/jni/libandroidbridge/charonservice.h
src/libcharon/config/backend.h
src/libcharon/config/backend_manager.c
src/libcharon/config/ike_cfg.h
src/libcharon/config/peer_cfg.c
src/libcharon/config/peer_cfg.h
src/libcharon/config/proposal.c
src/libcharon/config/proposal.h
src/libcharon/encoding/generator.c
src/libcharon/encoding/message.h
src/libcharon/encoding/parser.c
src/libcharon/encoding/payloads/cp_payload.c
src/libcharon/encoding/payloads/cp_payload.h
src/libcharon/encoding/payloads/encryption_payload.c
src/libcharon/encoding/payloads/ke_payload.h
src/libcharon/encoding/payloads/notify_payload.h
src/libcharon/encoding/payloads/proposal_substructure.c
src/libcharon/encoding/payloads/proposal_substructure.h
src/libcharon/encoding/payloads/sa_payload.c
src/libcharon/encoding/payloads/sa_payload.h
src/libcharon/encoding/payloads/traffic_selector_substructure.c
src/libcharon/encoding/payloads/transform_substructure.c
src/libcharon/encoding/payloads/transform_substructure.h
src/libcharon/encoding/payloads/ts_payload.c
src/libcharon/encoding/payloads/ts_payload.h
src/libcharon/network/socket.h
src/libcharon/network/socket_manager.c
src/libcharon/plugins/android/android_handler.c
src/libcharon/plugins/certexpire/certexpire_export.c
src/libcharon/plugins/certexpire/certexpire_export.h
src/libcharon/plugins/dhcp/dhcp_provider.c
src/libcharon/plugins/dhcp/dhcp_socket.c
src/libcharon/plugins/dhcp/dhcp_transaction.c
src/libcharon/plugins/duplicheck/duplicheck_listener.c
src/libcharon/plugins/duplicheck/duplicheck_notify.c
src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c
src/libcharon/plugins/eap_radius/eap_radius_accounting.c
src/libcharon/plugins/eap_radius/eap_radius_forward.c
src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.c
src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.h
src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.c
src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c
src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.c
src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c
src/libcharon/plugins/farp/farp_listener.c
src/libcharon/plugins/ha/ha_attribute.c
src/libcharon/plugins/ha/ha_cache.c
src/libcharon/plugins/ha/ha_cache.h
src/libcharon/plugins/ha/ha_segments.c
src/libcharon/plugins/lookip/lookip_listener.c
src/libcharon/plugins/lookip/lookip_socket.c
src/libcharon/plugins/medcli/medcli_creds.c
src/libcharon/plugins/medsrv/medsrv_creds.c
src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
src/libcharon/plugins/stroke/stroke_attribute.c
src/libcharon/plugins/stroke/stroke_ca.c
src/libcharon/plugins/stroke/stroke_cred.c
src/libcharon/plugins/stroke/stroke_cred.h
src/libcharon/plugins/stroke/stroke_handler.c
src/libcharon/plugins/stroke/stroke_list.c
src/libcharon/plugins/stroke/stroke_socket.c
src/libcharon/plugins/tnc_imc/tnc_imc.c
src/libcharon/plugins/tnc_imc/tnc_imc_manager.c
src/libcharon/plugins/tnc_imv/tnc_imv.c
src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c
src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.h
src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c
src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c
src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c
src/libcharon/plugins/tnccs_11/messages/tnccs_msg.h
src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c
src/libcharon/plugins/tnccs_20/tnccs_20.c
src/libcharon/plugins/uci/uci_parser.h
src/libcharon/plugins/unit_tester/tests/test_enumerator.c
src/libcharon/plugins/unit_tester/tests/test_hashtable.c
src/libcharon/plugins/unit_tester/tests/test_med_db.c
src/libcharon/plugins/unit_tester/tests/test_mysql.c
src/libcharon/plugins/unit_tester/tests/test_sqlite.c
src/libcharon/plugins/unity/unity_handler.c
src/libcharon/plugins/updown/updown_handler.c
src/libcharon/plugins/whitelist/whitelist_listener.c
src/libcharon/processing/jobs/mediation_job.h
src/libcharon/sa/eap/eap_manager.c
src/libcharon/sa/ike_sa.c
src/libcharon/sa/ike_sa_manager.c
src/libcharon/sa/ikev1/keymat_v1.c
src/libcharon/sa/ikev1/phase1.c
src/libcharon/sa/ikev2/connect_manager.c
src/libcharon/sa/ikev2/mediation_manager.c
src/libcharon/sa/shunt_manager.c
src/libcharon/sa/shunt_manager.h
src/libcharon/sa/trap_manager.c
src/libcharon/sa/trap_manager.h
src/libcharon/sa/xauth/xauth_manager.c
src/libfast/dispatcher.c
src/libfast/session.c
src/libhydra/attributes/attribute_handler.h
src/libhydra/attributes/attribute_manager.c
src/libhydra/attributes/attribute_provider.h
src/libhydra/attributes/mem_pool.c
src/libhydra/kernel/kernel_interface.c
src/libhydra/kernel/kernel_net.h
src/libhydra/plugins/attr/attr_provider.c
src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c
src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c
src/libimcv/ietf/ietf_attr_attr_request.c
src/libimcv/ietf/ietf_attr_installed_packages.c
src/libimcv/ietf/ietf_attr_port_filter.c
src/libimcv/imc/imc_agent.h
src/libimcv/imc/imc_msg.c
src/libimcv/imv/imv_agent.h
src/libimcv/imv/imv_msg.c
src/libimcv/os_info/os_info.c
src/libimcv/pa_tnc/pa_tnc_attr_manager.c
src/libimcv/pa_tnc/pa_tnc_msg.c
src/libimcv/plugins/imc_test/imc_test_state.c
src/libimcv/plugins/imv_os/imv_os.c
src/libimcv/plugins/imv_scanner/imv_scanner.c
src/libimcv/plugins/imv_test/imv_test_state.c
src/libipsec/ipsec_event_relay.c
src/libipsec/ipsec_policy_mgr.c
src/libipsec/ipsec_policy_mgr.h
src/libipsec/ipsec_processor.c
src/libipsec/ipsec_sa_mgr.c
src/libpts/plugins/imc_attestation/imc_attestation.c
src/libpts/plugins/imc_attestation/imc_attestation_state.c
src/libpts/plugins/imv_attestation/imv_attestation.c
src/libpts/plugins/imv_attestation/imv_attestation_process.h
src/libpts/plugins/imv_attestation/imv_attestation_state.c
src/libpts/pts/components/pts_component_manager.c
src/libpts/pts/pts.h
src/libpts/pts/pts_file_meas.c
src/libpts/pts/pts_file_meta.c
src/libpts/tcg/tcg_pts_attr_file_meas.c
src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c
src/libpts/tcg/tcg_pts_attr_unix_file_meta.c
src/libradius/radius_client.c
src/libradius/radius_config.c
src/libsimaka/simaka_manager.c
src/libsimaka/simaka_manager.h
src/libsimaka/simaka_message.c
src/libstrongswan/Android.mk
src/libstrongswan/Makefile.am
src/libstrongswan/collections/blocking_queue.c [moved from src/libstrongswan/utils/blocking_queue.c with 98% similarity]
src/libstrongswan/collections/blocking_queue.h [moved from src/libstrongswan/utils/blocking_queue.h with 99% similarity]
src/libstrongswan/collections/enumerator.c [moved from src/libstrongswan/utils/enumerator.c with 100% similarity]
src/libstrongswan/collections/enumerator.h [moved from src/libstrongswan/utils/enumerator.h with 99% similarity]
src/libstrongswan/collections/hashtable.c [moved from src/libstrongswan/utils/hashtable.c with 100% similarity]
src/libstrongswan/collections/hashtable.h [moved from src/libstrongswan/utils/hashtable.h with 98% similarity]
src/libstrongswan/collections/linked_list.c [moved from src/libstrongswan/utils/linked_list.c with 100% similarity]
src/libstrongswan/collections/linked_list.h [moved from src/libstrongswan/utils/linked_list.h with 99% similarity]
src/libstrongswan/credentials/auth_cfg.c
src/libstrongswan/credentials/auth_cfg.h
src/libstrongswan/credentials/certificates/pkcs10.h
src/libstrongswan/credentials/certificates/x509.h
src/libstrongswan/credentials/cred_encoding.c
src/libstrongswan/credentials/credential_factory.c
src/libstrongswan/credentials/credential_manager.c
src/libstrongswan/credentials/credential_manager.h
src/libstrongswan/credentials/ietf_attributes/ietf_attributes.c
src/libstrongswan/credentials/keys/shared_key.h
src/libstrongswan/credentials/sets/cert_cache.c
src/libstrongswan/credentials/sets/mem_cred.c
src/libstrongswan/credentials/sets/mem_cred.h
src/libstrongswan/crypto/crypto_factory.c
src/libstrongswan/crypto/crypto_tester.c
src/libstrongswan/crypto/pkcs7.c
src/libstrongswan/crypto/pkcs7.h
src/libstrongswan/crypto/pkcs9.c
src/libstrongswan/crypto/proposal/proposal_keywords.c
src/libstrongswan/database/database.h
src/libstrongswan/database/database_factory.c
src/libstrongswan/fetcher/fetcher_manager.c
src/libstrongswan/library.c
src/libstrongswan/library.h
src/libstrongswan/networking/host_resolver.c
src/libstrongswan/plugins/constraints/constraints_validator.c
src/libstrongswan/plugins/mysql/mysql_database.c
src/libstrongswan/plugins/openssl/openssl_crl.c
src/libstrongswan/plugins/openssl/openssl_x509.c
src/libstrongswan/plugins/pkcs11/pkcs11_creds.c
src/libstrongswan/plugins/pkcs11/pkcs11_library.c
src/libstrongswan/plugins/pkcs11/pkcs11_library.h
src/libstrongswan/plugins/pkcs11/pkcs11_manager.c
src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c
src/libstrongswan/plugins/plugin_loader.c
src/libstrongswan/plugins/plugin_loader.h
src/libstrongswan/plugins/x509/x509_ac.c
src/libstrongswan/plugins/x509/x509_cert.c
src/libstrongswan/plugins/x509/x509_crl.c
src/libstrongswan/plugins/x509/x509_ocsp_request.c
src/libstrongswan/plugins/x509/x509_ocsp_response.c
src/libstrongswan/plugins/x509/x509_pkcs10.c
src/libstrongswan/processing/jobs/callback_job.c
src/libstrongswan/processing/processor.c
src/libstrongswan/selectors/traffic_selector.c
src/libstrongswan/settings.c
src/libstrongswan/settings.h
src/libstrongswan/threading/thread.c
src/libstrongswan/utils.c
src/libstrongswan/utils/backtrace.c
src/libstrongswan/utils/identification.h
src/libstrongswan/utils/leak_detective.c
src/libtls/tls_alert.c
src/libtls/tls_cache.c
src/manager/gateway.h
src/manager/manager.c
src/manager/storage.h
src/manager/xml.h
src/pki/commands/issue.c
src/pki/commands/req.c
src/pki/commands/self.c
src/pki/commands/signcrl.c
src/scepclient/scepclient.c

index b083d54db97da3369b7e5d216f0ccdcced09c219..0d9e8fd85c5ef7c0bfa50e5ac1fe0ef4d581d42b 100644 (file)
@@ -21,7 +21,7 @@
 #include <library.h>
 #include <hydra.h>
 #include <daemon.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 /* we need to fake the pluto symbol to dlopen() the xauth plugin */
 void *pluto;
index 85b6471b6209c77d7fba780f2224fba4bae06b9d..3f4fdce9fc5d22306eac9779a6286becc9ec1382 100644 (file)
@@ -17,7 +17,7 @@
 #include <libbridge.h>
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include "bridge.h"
 
index c557de994bbdd264d839b2d9bb9bf18d3ab0e9f1..9d48092df0fcb951878b700033c8a146a4cabb51 100644 (file)
@@ -17,7 +17,7 @@
 #define BRIDGE_H
 
 #include <library.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 typedef struct bridge_t bridge_t;
 
index f708a293bcae880811a067217c49e6fb51152170..a6152bf25601c1aea62c8dfe5808df000c4744c5 100644 (file)
@@ -37,7 +37,7 @@
 #include <debug.h>
 #include <threading/thread.h>
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /** define _XOPEN_SOURCE 500 fails when using libstrongswan, define popen */
 extern ssize_t pread(int fd, void *buf, size_t count, off_t offset);
index 59751fa0916238ed349c59da6714889a0ea7b563..4d0ca9bc211d2b0dab1eebbff171238c82d9c0c4 100644 (file)
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include "dumm.h"
 
index 4bd20808c8ff5e7fd5ca43fe4f67e0be6e6f223d..7c7923c4600d119999e3d6ec363b1ff0c44879db 100644 (file)
@@ -20,7 +20,7 @@
 #include <signal.h>
 
 #include <library.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 #include "guest.h"
 #include "bridge.h"
index ca9b29388fb0fea87ad3609e9102d0894fbd733e..4c6a1484d220f99eeb67df6b9dd707ce57cfd026 100644 (file)
@@ -22,7 +22,7 @@
 #include <library.h>
 #include <dumm.h>
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #undef PACKAGE_NAME
 #undef PACKAGE_TARNAME
index 336f6effab5ec2bd4627bc33de0dffd94167a835..752d3075fa280c138d2ef144268ad71525e360e2 100644 (file)
@@ -29,7 +29,7 @@
 #include <stdarg.h>
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include "dumm.h"
 #include "guest.h"
index 789f2310ea383f8f5da1506906db80838f87f230..0da05d88c8ff043da49e1e9c61ccb98a1e9d9d33 100644 (file)
@@ -18,7 +18,7 @@
 #define GUEST_H
 
 #include <library.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 typedef enum guest_state_t guest_state_t;
 typedef struct guest_t guest_t;
index 214387e88f26a956550d875288996aed930c2e37..7ac3b71601542759313a8c5273107154b792ff2d 100644 (file)
@@ -26,7 +26,7 @@
 #include <linux/if_tun.h>
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include "iface.h"
 
index c43113abdeddb12985458f1cd91e297bcf0b06fd..ae886acc321e146b1bab4dfd386d3da967495803 100644 (file)
@@ -17,7 +17,7 @@
 #define IFACE_H
 
 #include <library.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <networking/host.h>
 
 #define TAP_DEVICE "/dev/net/tun"
index 37e7ba8f714bf6b8c20dfd4d3ad176a20b8b383d..4cdf4682ffcb1e673f4b0e942d81cbec0fce801c 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "dumm.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include <sys/types.h>
 #include <unistd.h>
index 4b5839f5e791eb893702ca5837c6420d4775414f..7391ea61d04339afb3f70570f6b797b801cc1afc 100644 (file)
@@ -35,7 +35,7 @@
 #include "kernel/network_manager.h"
 
 #include <library.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef enum android_vpn_state_t android_vpn_state_t;
 typedef struct charonservice_t charonservice_t;
index 458abc37f0917c759aa6cd212fa0f157cf90574e..aca3352ba7599b0b64d611496fda7f19d1bd0e5c 100644 (file)
@@ -26,7 +26,7 @@ typedef struct backend_t backend_t;
 #include <library.h>
 #include <config/ike_cfg.h>
 #include <config/peer_cfg.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /**
  * The interface for a configuration backend.
index f82b511b3df98769a7114d3d8402ad122c82b10e..f47d5715a7d5661d21fc71a60fb22daccefb0fb5 100644 (file)
@@ -18,7 +18,7 @@
 #include <sys/types.h>
 
 #include <daemon.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 
index dc58329278422b299c60a70b9745f9cc17880d6f..fa2aaa3259196316a29836a5054f96710f7d48e4 100644 (file)
@@ -27,7 +27,7 @@ typedef struct ike_cfg_t ike_cfg_t;
 
 #include <library.h>
 #include <networking/host.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/identification.h>
 #include <config/proposal.h>
 #include <crypto/diffie_hellman.h>
index 5b3d869de2ac26cef1ef5ab99e47e5af24fb8c91..3d4ff20b86f560e271a9822bb77a5a9136b6ed96 100644 (file)
@@ -22,7 +22,7 @@
 #include <daemon.h>
 
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/identification.h>
 
 ENUM(cert_policy_names, CERT_ALWAYS_SEND, CERT_NEVER_SEND,
index 121f7589ef45bbbe66b409ec83f483a6289bb166..80913beba19325151f236a9f0f2fb76fdec904b7 100644 (file)
@@ -29,7 +29,7 @@ typedef struct peer_cfg_t peer_cfg_t;
 
 #include <library.h>
 #include <utils/identification.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <selectors/traffic_selector.h>
 #include <config/proposal.h>
 #include <config/ike_cfg.h>
index 4738d0563f25187f3bea8d505617c43289cbfa88..e12fed7baa913d39f7f84e34bf6b431598ed9a8a 100644 (file)
@@ -19,7 +19,7 @@
 #include "proposal.h"
 
 #include <daemon.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/identification.h>
 
 #include <crypto/transform.h>
index ff6267dae17d0fbe71b84ee58badea4eba0f2a20..77e200acc93ccddac1cf963e1b617c840e629a86 100644 (file)
@@ -27,7 +27,7 @@ typedef struct proposal_t proposal_t;
 
 #include <library.h>
 #include <utils/identification.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <networking/host.h>
 #include <crypto/transform.h>
 #include <crypto/crypters/crypter.h>
index 2dfaf43df36102e8ec9d081c509b5fd288430bfa..2b6825c71200930f5479403ac77c4e76143a262a 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <library.h>
 #include <daemon.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/proposal_substructure.h>
 #include <encoding/payloads/transform_substructure.h>
index 53298387ef810c9e555f12464b64a59470a99a9b..2c11e4581bc4e72ef5f20cf950b39b248cc51414 100644 (file)
@@ -32,7 +32,7 @@ typedef struct message_t message_t;
 #include <sa/keymat.h>
 #include <sa/ike_sa_id.h>
 #include <networking/packet.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /**
  * This class is used to represent an IKE-Message.
index e4b140c3ecd16ca2a00405321f44a782bbeb2de5..9e7f8311b4060a903abc8e736f49d8fbe75f65b8 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <library.h>
 #include <daemon.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <encoding/payloads/encodings.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/sa_payload.h>
index 40f6ae48f1534dcdd4cc031fd112dc9ba5fec491..f6f373f99f71f566ebc73bdea5be61d18d4d2e81 100644 (file)
@@ -20,7 +20,7 @@
 #include "cp_payload.h"
 
 #include <encoding/payloads/encodings.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 ENUM(config_type_names, CFG_REQUEST, CFG_ACK,
        "CFG_REQUEST",
index 5eb1e06a7b0e1e2c70379166bd9f19528161191e..c23bc0bb4b028799512f4df1020138b257035609 100644 (file)
@@ -28,7 +28,7 @@ typedef struct cp_payload_t cp_payload_t;
 #include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/configuration_attribute.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 /**
  * Config Type of an Configuration Payload.
index 02e7b8bf37d57207a4f5f2ff2d03f0a39a15c410..6ba1b23a078c020fcb4ae1285840c8ad08120244 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <daemon.h>
 #include <encoding/payloads/encodings.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <encoding/generator.h>
 #include <encoding/parser.h>
 
index 5942954d9973d26568a13f75eb13b0a3de2b69d9..d3aa184840ba50db3c2bf17f97e60d0c7beeb3cd 100644 (file)
@@ -27,7 +27,7 @@ typedef struct ke_payload_t ke_payload_t;
 #include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/transform_substructure.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <crypto/diffie_hellman.h>
 
 /**
index beec1e2332b21f8b7f8224a2c973e91566f90e6a..498c659b1f5193f3ebe920feb141d17fc407726e 100644 (file)
@@ -30,7 +30,7 @@ typedef struct notify_payload_t notify_payload_t;
 #include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/proposal_substructure.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /**
  * Notify message types for IKEv2, and a subset for IKEv1.
index 653f51a46090f5a37b07115bd95a7cda3f8faad6..1616e828314b953d94d05a9be1a60396b1acda7b 100644 (file)
@@ -22,7 +22,7 @@
 #include <encoding/payloads/encodings.h>
 #include <encoding/payloads/transform_substructure.h>
 #include <library.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <daemon.h>
 
 /**
index 5d42a6116018d47c8264feb7efdcd8ee9b7af587..bfa8b9daa42c39e7919bd539254eb192911eb4dd 100644 (file)
@@ -29,7 +29,7 @@ typedef struct proposal_substructure_t proposal_substructure_t;
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/transform_substructure.h>
 #include <config/proposal.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <kernel/kernel_ipsec.h>
 #include <sa/authenticator.h>
 
index adf19aa6709f56c345e97a1ef179fa0a36e36c19..3a8d3a7608585496b7b656f99139ecc4b32fe819 100644 (file)
@@ -20,7 +20,7 @@
 #include "sa_payload.h"
 
 #include <encoding/payloads/encodings.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <daemon.h>
 
 /* IKEv1 situation */
index 9a88cccd519f47ec6deed1c89c03d3f40d3ec4bb..dac3043bf52edcd486fd3410a7e646c46a8b48fb 100644 (file)
@@ -27,7 +27,7 @@ typedef struct sa_payload_t sa_payload_t;
 #include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/proposal_substructure.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <kernel/kernel_ipsec.h>
 #include <sa/authenticator.h>
 
index 378f5bbc305598682e765ca699a33942f8083a6f..15f791b95328a0c3eb52af95693c254f10c1c859 100644 (file)
@@ -18,7 +18,7 @@
 #include "traffic_selector_substructure.h"
 
 #include <encoding/payloads/encodings.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_traffic_selector_substructure_t private_traffic_selector_substructure_t;
 
index a4a920b60afc379369612cf92ffeb7de9834b295..a8502756175e799211e2c259cb7d796a84a05371 100644 (file)
@@ -22,7 +22,7 @@
 #include <encoding/payloads/transform_attribute.h>
 #include <encoding/payloads/encodings.h>
 #include <library.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <daemon.h>
 
 typedef struct private_transform_substructure_t private_transform_substructure_t;
index 947df24f9b93f6e14660de1eee0ee3f7fab5f6eb..97717e65b9f668f62b8260169e9c6063b06f7438 100644 (file)
@@ -27,7 +27,7 @@ typedef struct transform_substructure_t transform_substructure_t;
 #include <library.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/transform_attribute.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <crypto/diffie_hellman.h>
 #include <crypto/signers/signer.h>
 #include <crypto/prfs/prf.h>
index a7678da7378636fec46c82507f689a57f66d11de..8dfa47bc2a437316100b5600d358e520721932c3 100644 (file)
@@ -20,7 +20,7 @@
 #include "ts_payload.h"
 
 #include <encoding/payloads/encodings.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_ts_payload_t private_ts_payload_t;
 
index 5a92655dcee1b895002aba82e3d0707beb262088..933245c62f9eb4849be19a0e59df92a3a1baa1c9 100644 (file)
@@ -25,7 +25,7 @@
 typedef struct ts_payload_t ts_payload_t;
 
 #include <library.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <selectors/traffic_selector.h>
 #include <encoding/payloads/payload.h>
 #include <encoding/payloads/traffic_selector_substructure.h>
index 2eccc4d3f9e40ec05fbecf9d0d181002447ecb8a..f6c8a86601dee660eb58b640fc3c84a068d68333 100644 (file)
@@ -28,7 +28,7 @@ typedef struct socket_t socket_t;
 
 #include <library.h>
 #include <networking/packet.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <plugins/plugin.h>
 
 /**
index d2736de8ecb5764c50299dd7a64c19740fa0c6e1..bf1fe5ba2540369a7f77177aa239d69c68fa5df0 100644 (file)
@@ -20,7 +20,7 @@
 #include <daemon.h>
 #include <threading/thread.h>
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_socket_manager_t private_socket_manager_t;
 
index c5e98d315d7f2d65f2713eb371028b210b8cb217..29dbbbfd05e9565785b73592469bb0e49d8fc9f3 100644 (file)
@@ -17,7 +17,7 @@
 #include "android_handler.h"
 
 #include <networking/host.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include <cutils/properties.h>
 
index 8e046d0fee88f2c8b0e44d3510bc0c4da1e8c786..1b912171a94374f4d24a809b85584a00311a786e 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <debug.h>
 #include <daemon.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 #include <threading/mutex.h>
 #include <credentials/certificates/x509.h>
 
index 64281d0bd5e68ada5ae24e7c191d818b04dc589f..7b75f2c92df96c36d2f662db3cd504bd071b3acd 100644 (file)
@@ -23,7 +23,7 @@
 
 typedef struct certexpire_export_t certexpire_export_t;
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /**
  * Caches and exports trustchain information to CSV files.
index 8bc547462719a1a40579cf6a9776333622befa8e..f83efda5d4659da1e5313881d1ed2a531aa4566a 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "dhcp_provider.h"
 
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 #include <threading/mutex.h>
 
 typedef struct private_dhcp_provider_t private_dhcp_provider_t;
index f469c5a35f94f395cfffeac19394995aac2e4661..46d4c64ef7b4ebd386e638144cbbeb80dc4433ec 100644 (file)
@@ -25,7 +25,7 @@
 #include <linux/if_ether.h>
 #include <linux/filter.h>
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/identification.h>
 #include <threading/mutex.h>
 #include <threading/condvar.h>
index 83f822dd8fa4e67480a281bd8c1efe5fc0ac58b0..22d3f3fdf66f91228a17597fcdef75604d7d3962 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "dhcp_transaction.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_dhcp_transaction_t private_dhcp_transaction_t;
 
index 4f59e034f4eb9e914e5028322d3c39c4c72fc3ff..7c6c13786c6d1e05c44e6ceb64ebfa1a15e122a5 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <daemon.h>
 #include <threading/mutex.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 #include <encoding/payloads/delete_payload.h>
 #include <processing/jobs/delete_ike_sa_job.h>
 
index 06a88ed7d37b5ccc2bb8677719452c10c61824d5..cd5d4970b827d0f5967dcb0e7e32e66bd5d936db 100644 (file)
@@ -25,7 +25,7 @@
 #include <daemon.h>
 #include <threading/mutex.h>
 #include <threading/thread.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <processing/jobs/callback_job.h>
 
 #define DUPLICHECK_SOCKET IPSEC_PIDDIR "/charon.dck"
index 0d71c3d976bf2b209d5c88f76690f7e925f7f002..96f4375835a6577af78634b4728c585a80ac2c5f 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <daemon.h>
 #include <library.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <crypto/crypters/crypter.h>
 #include <crypto/hashers/hasher.h>
 
index f164f67ed4c20e9e27e8af58495a05c381f7c447..7bff989fc6d70bf322964d30c3c3ee13f35dd230 100644 (file)
@@ -21,7 +21,7 @@
 #include <radius_message.h>
 #include <radius_client.h>
 #include <daemon.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 #include <threading/mutex.h>
 
 typedef struct private_eap_radius_accounting_t private_eap_radius_accounting_t;
index 2dd38ea2f5bf5e0fc319c21141c3d1824754edfe..e9124877c8d9df923d213419126e69b0f0e25ab5 100644 (file)
@@ -16,8 +16,8 @@
 #include "eap_radius_forward.h"
 
 #include <daemon.h>
-#include <utils/linked_list.h>
-#include <utils/hashtable.h>
+#include <collections/linked_list.h>
+#include <collections/hashtable.h>
 #include <threading/mutex.h>
 
 typedef struct private_eap_radius_forward_t private_eap_radius_forward_t;
index de3b69382622f42f2850aebc14fcc932c41d32e2..ec1686910ea32ad2606fc3bd26baeb74d30ccfbf 100644 (file)
@@ -19,7 +19,7 @@
 #include <errno.h>
 
 #include <daemon.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/mutex.h>
 #include <simaka_manager.h>
 
index c8e9e0359a52a0d39e60d69d997417c8346db100..3fa0ea38144fc114aa04b8617243270c3e665089 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef EAP_SIM_FILE_TRIPLETS_H_
 #define EAP_SIM_FILE_TRIPLETS_H_
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 typedef struct eap_sim_file_triplets_t eap_sim_file_triplets_t;
 
index 5f78c967a732e5710215fa4b468116fdcc1950a1..b5bbdd60fe6c1ab0ee481d002a8b125977e28923 100644 (file)
@@ -16,7 +16,7 @@
 #include "eap_simaka_pseudonym_card.h"
 
 #include <daemon.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 
 typedef struct private_eap_simaka_pseudonym_card_t private_eap_simaka_pseudonym_card_t;
 
index 3070b808a51d1670793eae3bc27f9122df8e46c7..32225d2e0a194900ddb3ba99b87cc3cd9efcf439 100644 (file)
@@ -16,7 +16,7 @@
 #include "eap_simaka_pseudonym_provider.h"
 
 #include <debug.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 
 typedef struct private_eap_simaka_pseudonym_provider_t private_eap_simaka_pseudonym_provider_t;
 
index 870d72781707cd089570fba48441ee4d4aedf6f6..5bc5fd38292a204d52e25e78b1a0f8b5fb85bad0 100644 (file)
@@ -16,7 +16,7 @@
 #include "eap_simaka_reauth_card.h"
 
 #include <daemon.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 
 typedef struct private_eap_simaka_reauth_card_t private_eap_simaka_reauth_card_t;
 
index b1a9a7f7c9bee20d1a3277f1b250cc080ce01926..937095ec1fe0036e13daf53b64d8bca8084f39d5 100644 (file)
@@ -16,7 +16,7 @@
 #include "eap_simaka_reauth_provider.h"
 
 #include <daemon.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 
 typedef struct private_eap_simaka_reauth_provider_t private_eap_simaka_reauth_provider_t;
 
index d1df4cc278a8ea8a17b089eda1dd6a434ecd91cf..81d5d2405dc758e268e8a58d56dc716816f388c6 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "farp_listener.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 typedef struct private_farp_listener_t private_farp_listener_t;
index ae62964623f3e660395dab3925203f9eb5b593b7..981def6a3be68f7ae68b6d3a0d4bf686adb0959c 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "ha_attribute.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/mutex.h>
 
 typedef struct private_ha_attribute_t private_ha_attribute_t;
index e21b461a74b98753aead53c9c604d77aad014e51..ce1afe6f9147c16da88efa05c5951e7b5bb047e2 100644 (file)
@@ -15,8 +15,8 @@
 
 #include "ha_cache.h"
 
-#include <utils/hashtable.h>
-#include <utils/linked_list.h>
+#include <collections/hashtable.h>
+#include <collections/linked_list.h>
 #include <threading/mutex.h>
 #include <processing/jobs/callback_job.h>
 
index 39f1947a85b556b1a21f7ecb0e2089758b9e6cb2..5e3936a20b04b92fdfb9b284b688eb82f483a7e7 100644 (file)
@@ -27,7 +27,7 @@ typedef struct ha_cache_t ha_cache_t;
 #include "ha_kernel.h"
 #include "ha_socket.h"
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 #include <sa/ike_sa.h>
 
index fb07809ef21f1c832e73371ded74e18ae710fe80..688e09bdcc8402acd256d1c00e8ac52da2a663a2 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <threading/mutex.h>
 #include <threading/condvar.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/thread.h>
 #include <processing/jobs/callback_job.h>
 
index 91d1235ecebd4c48e796b0fd8398e19aa10667cf..d2388f6b58fcfa3d8711b7b0d69dcb3135df1281 100644 (file)
@@ -16,8 +16,8 @@
 #include "lookip_listener.h"
 
 #include <daemon.h>
-#include <utils/hashtable.h>
-#include <utils/linked_list.h>
+#include <collections/hashtable.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 typedef struct private_lookip_listener_t private_lookip_listener_t;
index 5c6e0e3c9a2c4f18b8a8c41233cf2468f5c822b3..dc1a80b83656327d2126ba57f6dbda7a8debb918 100644 (file)
@@ -25,7 +25,7 @@
 #include <daemon.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <processing/jobs/callback_job.h>
 
 #include "lookip_msg.h"
index 9c4a0b7569af0de09f66038da06be35c0fc21f73..677229b9fef2111de810d56e9b42e56e3ec535aa 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <daemon.h>
 #include <library.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 typedef struct private_medcli_creds_t private_medcli_creds_t;
 
index 3ae80f64c7610642bc93d8cb0f53928040d2f52f..0d99c4f7780ad4da7aab7bd792662b0d1c413796 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <daemon.h>
 #include <library.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 typedef struct private_medsrv_creds_t private_medsrv_creds_t;
 
index 33f16cc45f6dc00733ea93352de9701c207cfe5f..a5e9193485032beaf294acaa4d52fa6d5d23d7d6 100644 (file)
@@ -40,7 +40,7 @@
 #include <daemon.h>
 #include <threading/thread.h>
 #include <threading/rwlock.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 
 /* Maximum size of a packet */
 #define MAX_PACKET 10000
index 85fb94e9e26498a31d782566d502be43d2d6581a..0f3c38986fc456bd2e092378a7ef727d1cfaf225 100644 (file)
@@ -17,7 +17,7 @@
 #include "stroke_attribute.h"
 
 #include <daemon.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 typedef struct private_stroke_attribute_t private_stroke_attribute_t;
index 763b4cc0f3cdeaa625d189fe4664deac6457a818..f8026875f17b16f6ae3e353cfa1a049696585849 100644 (file)
@@ -18,7 +18,7 @@
 #include "stroke_cred.h"
 
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <crypto/hashers/hasher.h>
 
 #include <daemon.h>
index de80327e46df00bf6da18eb3aa3ee172f4cb12f0..4ecb63d19cebe73e5f9c1d03412ce5bdf1914983 100644 (file)
@@ -34,7 +34,7 @@
 #include <credentials/certificates/ac.h>
 #include <credentials/sets/mem_cred.h>
 #include <credentials/sets/callback_cred.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/lexparser.h>
 #include <threading/rwlock.h>
 #include <daemon.h>
index 83e648819278b0d727bd057af03da4d6708e792c..c37d0580806065cae0698dbaaf0fc77400fe31da 100644 (file)
@@ -27,7 +27,7 @@
 #include <stroke_msg.h>
 #include <credentials/credential_set.h>
 #include <credentials/certificates/certificate.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct stroke_cred_t stroke_cred_t;
 
index 523151efb4b0c13aa4046d555d9800f9e23cec7d..fef8cab677600f691d14a7d597d479102cfca369 100644 (file)
@@ -16,7 +16,7 @@
 #include "stroke_handler.h"
 
 #include <daemon.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 typedef struct private_stroke_handler_t private_stroke_handler_t;
index c012ff25d2fb58ac40313c20cf12968d58f590f9..b3a20a6c7d2359a86e011ee83a5208a5a70ec4e1 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <hydra.h>
 #include <daemon.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <plugins/plugin.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/certificates/ac.h>
index 14f36cde55d3e11eb8f1ee4784212738312cee12..2771f0146b7abacd62e9c2d3437d0fd6346043f3 100644 (file)
@@ -29,7 +29,7 @@
 #include <threading/mutex.h>
 #include <threading/thread.h>
 #include <threading/condvar.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <processing/jobs/callback_job.h>
 
 #include "stroke_config.h"
index a1f2d770f9390c0b9426c8b532ccc041379ddd40..d8e9d0995da1c234e951af0b9b0beede36d7c3ec 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <debug.h>
 #include <library.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/mutex.h>
 
 typedef struct private_tnc_imc_t private_tnc_imc_t;
index 65ec81dae4941a02da81eb39215605a4ebb16ea2..20ad208b77878e6a41611e2ff7c157608f2eda93 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <tncifimc.h>
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 #include <daemon.h>
 
index f0b1507434d7e35da5741dfc78d724eb502212cd..e82cfc92d4770847623508deece67b9df713f666 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <debug.h>
 #include <library.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/mutex.h>
 
 typedef struct private_tnc_imv_t private_tnc_imv_t;
index 396d5d8543396d3a77cb2dccff62d25892679d70..11b98d8ca903e580da00ef394f96274882e3875c 100644 (file)
@@ -22,7 +22,7 @@
 #include <tnc/imv/imv_recommendations.h>
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_tnc_imv_recommendations_t private_tnc_imv_recommendations_t;
 typedef struct recommendation_entry_t recommendation_entry_t;
index 6d65a25216c87a2f5e4791323cb56871b7e41a65..66d03b2f88fdcabffea8236f8cbd3baf780f0e20 100644 (file)
@@ -23,7 +23,7 @@
 #define TNC_IMV_RECOMMENDATIONS_H_
 
 #include <tnc/imv/imv_recommendations.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /**
  * Create an IMV empty recommendations instance
index bca43985f6fc2a761ed6a3b858ae91dd81fb3e89..79aac45ed0b21d38a841d4f2a3b3f7c7adfebef6 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "tnc_pdp_connections.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_tnc_pdp_connections_t private_tnc_pdp_connections_t;
index 515e8580449b11c628b1acb4825a4353f42df7fc..2094ec5e850ec81019d661d2141a138ba65e5dd5 100644 (file)
@@ -21,7 +21,7 @@
 #include <tnc/imv/imv_manager.h>
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 typedef struct private_tnc_tnccs_manager_t private_tnc_tnccs_manager_t;
@@ -454,7 +454,7 @@ METHOD(tnccs_manager_t, get_attribute, TNC_Result,
        enumerator_t *enumerator;
        tnccs_connection_entry_t *entry;
        bool attribute_match = FALSE, entry_found = FALSE;
-       
+
        if (is_imc)
        {
                switch (attribute_id)
@@ -520,7 +520,7 @@ METHOD(tnccs_manager_t, get_attribute, TNC_Result,
                                return TNC_RESULT_INVALID_PARAMETER;
                }
        }
-       
+
        /* attributes specific to the TNCC or TNCS are unsupported */
        if (id == TNC_CONNECTIONID_ANY)
        {
@@ -577,10 +577,10 @@ METHOD(tnccs_manager_t, get_attribute, TNC_Result,
                                                                  entry->max_msg_len);
                case TNC_ATTRIBUTEID_HAS_LONG_TYPES:
                case TNC_ATTRIBUTEID_HAS_EXCLUSIVE:
-                       return bool_attribute(buffer_len, buffer, value_len, 
+                       return bool_attribute(buffer_len, buffer, value_len,
                                                                  entry->type == TNCCS_2_0);
                case TNC_ATTRIBUTEID_HAS_SOH:
-                       return bool_attribute(buffer_len, buffer, value_len, 
+                       return bool_attribute(buffer_len, buffer, value_len,
                                                                  entry->type == TNCCS_SOH);
                case TNC_ATTRIBUTEID_IFTNCCS_PROTOCOL:
                {
index c9397722b77425b64b41d7a8026e285cddf7ea6a..1f63de32366d336ac99e2e8b18edaee694ec9ee2 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <tnc/tnccs/tnccs.h>
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 #include <libxml/parser.h>
index e0b54449a4c7c683bb77d6924f902058bbeaefcc..88d6f07aada6032ddfd3fa7d34da4617864bf0da 100644 (file)
@@ -25,7 +25,7 @@ typedef enum tnccs_msg_type_t tnccs_msg_type_t;
 typedef struct tnccs_msg_t tnccs_msg_t;
 
 #include <library.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <libxml/parser.h>
 
 /**
index 2f932637afb95aa8282729cdc9120c95fbd38124..3bf048a414ce7060bfdd898065531373891b6de5 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <tnc/tnccs/tnccs.h>
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
 #include <pen/pen.h>
@@ -172,12 +172,12 @@ METHOD(pb_tnc_batch_t, build, void,
        bio_writer_t *writer;
 
        /* build PB-TNC batch header */
-       writer = bio_writer_create(this->batch_len);    
+       writer = bio_writer_create(this->batch_len);
        writer->write_uint8 (writer, PB_TNC_VERSION);
        writer->write_uint8 (writer, this->is_server ?
                                                                 PB_TNC_BATCH_FLAG_D : PB_TNC_BATCH_FLAG_NONE);
        writer->write_uint16(writer, this->type);
-       writer->write_uint32(writer, this->batch_len); 
+       writer->write_uint32(writer, this->batch_len);
 
        /* build PB-TNC messages */
        enumerator = this->messages->create_enumerator(this->messages);
@@ -297,7 +297,7 @@ static status_t process_batch_header(private_pb_tnc_batch_t *this,
 
 fatal:
        this->errors->insert_last(this->errors, msg);
-       return FAILED;  
+       return FAILED;
 }
 
 static status_t process_tnc_msg(private_pb_tnc_batch_t *this)
@@ -329,7 +329,7 @@ static status_t process_tnc_msg(private_pb_tnc_batch_t *this)
        reader->destroy(reader);
 
        noskip_flag = (flags & PB_TNC_FLAG_NOSKIP) != PB_TNC_FLAG_NONE;
-       
+
        if (msg_len > data.len)
        {
                DBG1(DBG_TNC, "%u bytes insufficient to parse PB-TNC message", data.len);
@@ -455,7 +455,7 @@ static status_t process_tnc_msg(private_pb_tnc_batch_t *this)
 
 fatal:
        this->errors->insert_last(this->errors, msg);
-       return FAILED;  
+       return FAILED;
 }
 
 METHOD(pb_tnc_batch_t, process, status_t,
index 44e1d278fe8a9471232c9d492a05cb7373ddd954..4d917ed3924c8d4f1a13a811c31ed6c19569e4c0 100644 (file)
@@ -37,7 +37,7 @@
 #include <debug.h>
 #include <daemon.h>
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <pen/pen.h>
 
 typedef struct private_tnccs_20_t private_tnccs_20_t;
index 7217e507a6df453d55d0e76433ebde45749bd933..230c35e86076d35f196f6843858702d51cf483cc 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef UCI_PARSER_H_
 #define UCI_PARSER_H_
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 typedef struct uci_parser_t uci_parser_t;
 
index edbf0f5bb269ddd93b6e51dbba6e5138a3b3a893..83b78c0926406d3e569f199d9f5c26a721adea56 100644 (file)
@@ -13,7 +13,7 @@
  * for more details.
  */
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 
 /*******************************************************************************
index bd79e12f75f7f97e7c859012272c91d8265951b6..5513f670722b9e9a7f8f9edbe9fb2f32eb5fc8c5 100644 (file)
@@ -14,7 +14,7 @@
  */
 
 #include <library.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 
 static u_int hash(char *key)
 {
index ae1d08e155f37a3694b5858cfacd00b3b74c0793..75244ab8f37c7cbb42630fd6d26ceb158d331d2c 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <library.h>
 #include <daemon.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 #include <unistd.h>
 
index 252441ef80d2104c0d6b3c9a211491062fc7de12..eda2386237913ad1fd61fda1700efc932d61632f 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <library.h>
 #include <daemon.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 /*******************************************************************************
  * mysql simple test
index dd8d1955e749cb50f0dd2f1d629ee1ab6f77a28e..99490b56643b6135fd14c5dc3a41690deb64e512 100644 (file)
@@ -15,7 +15,7 @@
 
 #include <library.h>
 #include <daemon.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 #include <unistd.h>
 
index b2aeba60513a7b155c9046b08860445571958657..446f51293409e7702e9d6882743d748dc5d31263 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <daemon.h>
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <processing/jobs/callback_job.h>
 
 typedef struct private_unity_handler_t private_unity_handler_t;
index b2ac02e85fdceb6cf49cfc5f5f1114cdc2e91ed0..3a644380a271c3c306cc13f3f8da278192b157a5 100644 (file)
@@ -16,7 +16,7 @@
 #include "updown_handler.h"
 
 #include <daemon.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 typedef struct private_updown_handler_t private_updown_handler_t;
index 64ef0480083ecef9af0938eade372c74f71c2060..382ee3b8b2a4e4b65cdae054084bfa32f36bf169 100644 (file)
@@ -16,7 +16,7 @@
 #include "whitelist_listener.h"
 
 #include <daemon.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 #include <threading/rwlock.h>
 
 typedef struct private_whitelist_listener_t private_whitelist_listener_t;
index 41485cbc63e4320c5a98a49891980e5661fcac52..6a14751023e5e2cec8cbcb84093506c64e2a554c 100644 (file)
@@ -26,7 +26,7 @@ typedef struct mediation_job_t mediation_job_t;
 #include <library.h>
 #include <processing/jobs/job.h>
 #include <utils/identification.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /**
  * Class representing a MEDIATION Job.
index 520c0ce56db814539b32b05078afe57c16d63b71..1886307e9e99918681bf6a2299da597c290dc5ed 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "eap_manager.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 typedef struct private_eap_manager_t private_eap_manager_t;
index d9118fc490aa282e9a8d67f7094841c8d3c5893b..0005188ad5dd4e970e43368919c51e71674365f0 100644 (file)
@@ -26,7 +26,7 @@
 #include <library.h>
 #include <hydra.h>
 #include <daemon.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/lexparser.h>
 #include <processing/jobs/retransmit_job.h>
 #include <processing/jobs/delete_ike_sa_job.h>
index cccf5d0d1f38485318c2cf6aa7650c30010f0310..38c5b4ac5a506e91899473ab2f8517b2bbca8d2b 100644 (file)
@@ -26,7 +26,7 @@
 #include <threading/condvar.h>
 #include <threading/mutex.h>
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <crypto/hashers/hasher.h>
 
 /* the default size of the hash table (MUST be a power of 2) */
index cff344a34a3c49439f244d3ac21cf0fefb0fc63c..eb642109bb7ebd3c48fb3946c5d6660c786b716e 100644 (file)
@@ -18,7 +18,7 @@
 #include <daemon.h>
 #include <encoding/generator.h>
 #include <encoding/payloads/nonce_payload.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_keymat_v1_t private_keymat_v1_t;
 
index 4096141ec467ae1a4eb1c0d1d89494f04cbe5669..636e06af6857bea4158ddbc37515655fa9e18e74 100644 (file)
@@ -22,7 +22,7 @@
 #include <sa/ikev1/keymat_v1.h>
 #include <encoding/payloads/ke_payload.h>
 #include <encoding/payloads/nonce_payload.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_phase1_t private_phase1_t;
 
index 5fdcea1ab9a1541904a814a435171846967c289e..c4e5ea7a0c9a219471cad9dae66a7077107202de 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <daemon.h>
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <crypto/hashers/hasher.h>
 
 #include <processing/jobs/callback_job.h>
index 60eeb5d4b62ccd242de9a64f0c760c5d245e194e..bf5b2f4b3a4c42feebe374f9d0067d151014e63f 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <daemon.h>
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <processing/jobs/mediation_job.h>
 
 typedef struct peer_t peer_t;
index 5af43fb912a9aac67e8a0292d8eab8515e1380be..94be7d433e730ba18a4596a9e8e0e4c303130596 100644 (file)
@@ -18,7 +18,7 @@
 #include <hydra.h>
 #include <daemon.h>
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 
 typedef struct private_shunt_manager_t private_shunt_manager_t;
index 12ff08558b427b18550b293f4fca59f18c96e9ae..28a795dc9d4357017427a81c4301cb0a13eae62b 100644 (file)
@@ -22,7 +22,7 @@
 #define SHUNT_MANAGER_H_
 
 #include <library.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <config/child_cfg.h>
 
 typedef struct shunt_manager_t shunt_manager_t;
index d068ce484634a1236f6c902e5be893d2518acedb..69b23e1dfa5a3a514afdee19fc7aabdeeb5a5c4b 100644 (file)
@@ -19,7 +19,7 @@
 #include <hydra.h>
 #include <daemon.h>
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 
 typedef struct private_trap_manager_t private_trap_manager_t;
index 928b2a49feebabbdf9980e81da43b2526953153d..e3d355662e40356a2ad17948f1495db019443431 100644 (file)
@@ -22,7 +22,7 @@
 #define TRAP_MANAGER_H_
 
 #include <library.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <config/peer_cfg.h>
 
 typedef struct trap_manager_t trap_manager_t;
index 432c9c0ab908da5556d74a42357bacc819fab3f8..f0602a67342aac94894f1e0c68d4cdc5115fb7a4 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "xauth_manager.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 typedef struct private_xauth_manager_t private_xauth_manager_t;
index 63c872e35c32983bcf3551083936bf5d1f7fec11..6b89635ae97326a0de4ca4081a08c9e5fc431fed 100644 (file)
@@ -26,8 +26,8 @@
 #include <threading/thread.h>
 #include <threading/condvar.h>
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
-#include <utils/hashtable.h>
+#include <collections/linked_list.h>
+#include <collections/hashtable.h>
 
 /** Intervall to check for expired sessions, in seconds */
 #define CLEANUP_INTERVAL 30
index cf14dbeb6f56dc90f317c910b9ee574c18613c84..87a157b619e70bda23cfde52bbf98fbb2e34752b 100644 (file)
@@ -21,7 +21,7 @@
 #include <fcgiapp.h>
 #include <stdio.h>
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #define COOKIE_LEN 16
 
index 6014ef0fad4d682fd9a48b9827a4a6c9ed493838..91fa4e5b014744669de0715d158707632106e101 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <chunk.h>
 #include <utils/identification.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include "attributes.h"
 
index 000d2e0827e8cbd0ba9d5a87a296aca4fe70f93e..dd3963b7fb2d8c922f2e58d32a8944c358fba4a7 100644 (file)
@@ -16,7 +16,7 @@
 #include "attribute_manager.h"
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 typedef struct private_attribute_manager_t private_attribute_manager_t;
index 82d0ee3c2095923999199fcfe060db2dbcc993f3..adfd4a516f6ae51264cacd3115adc0887b6c630a 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <networking/host.h>
 #include <utils/identification.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct attribute_provider_t attribute_provider_t;
 
index 1e150c794f2efb536ca4ac16c06ab52de18e40e2..1c5ea53deb5c83e40c0a324b6ea10e4946c06552 100644 (file)
@@ -17,8 +17,8 @@
 #include "mem_pool.h"
 
 #include <debug.h>
-#include <utils/hashtable.h>
-#include <utils/linked_list.h>
+#include <collections/hashtable.h>
+#include <collections/linked_list.h>
 #include <threading/mutex.h>
 
 #define POOL_LIMIT (sizeof(uintptr_t)*8)
index 5320ee2e9b388ce4b800c18f6b17a809051128a1..79a2ab93880fcbcd8a49090422e54d352d469425 100644 (file)
@@ -42,7 +42,7 @@
 #include <hydra.h>
 #include <debug.h>
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_kernel_interface_t private_kernel_interface_t;
 
index 0de93eaeedc5bd5bc0be825302023dc9b5fb15b6..0f2e31cc9b97f9c1474c6dc55e71116b48be3d01 100644 (file)
@@ -25,7 +25,7 @@
 typedef struct kernel_net_t kernel_net_t;
 typedef enum kernel_address_type_t kernel_address_type_t;
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <networking/host.h>
 #include <plugins/plugin.h>
 
index c1c3cd8953c6b5736495d815b104c3223d0ab2c7..ca3221979845cf62af215af652b290ae315a94cd 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <hydra.h>
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 #define SERVER_MAX             2
index d875dab040fd66fae44819c031addf4d3eaa7d02..2c1d7e9b36243344acf8537983861799e94eb7c8 100644 (file)
@@ -30,7 +30,7 @@
 
 #include <hydra.h>
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
 #include <processing/jobs/callback_job.h>
index a6aa34b89271cb6fd1ed770514ff537f4fa37c44..8cd19a245d219935726ed6b31897d877a51d2979 100644 (file)
@@ -39,8 +39,8 @@
 #include <debug.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
-#include <utils/hashtable.h>
-#include <utils/linked_list.h>
+#include <collections/hashtable.h>
+#include <collections/linked_list.h>
 #include <processing/jobs/callback_job.h>
 
 /** Required for Linux 2.6.26 kernel and later */
index e5f070e131734a5005e7b1c485b13c036b44c613..b39ffa3ac810fe5338bfc542295eaa6511c0732e 100644 (file)
@@ -55,8 +55,8 @@
 #include <threading/rwlock.h>
 #include <threading/rwlock_condvar.h>
 #include <threading/spinlock.h>
-#include <utils/hashtable.h>
-#include <utils/linked_list.h>
+#include <collections/hashtable.h>
+#include <collections/linked_list.h>
 #include <processing/jobs/callback_job.h>
 
 /** delay before firing roam events (ms) */
index ed541ad67ca08a374aa1a865701c71cebf2ffd59..e1a838419139bee4bf72f31d7942b90ccdce02e0 100644 (file)
@@ -60,8 +60,8 @@
 #include <hydra.h>
 #include <debug.h>
 #include <networking/host.h>
-#include <utils/linked_list.h>
-#include <utils/hashtable.h>
+#include <collections/linked_list.h>
+#include <collections/hashtable.h>
 #include <threading/thread.h>
 #include <threading/mutex.h>
 #include <processing/jobs/callback_job.h>
index 0ead657858f93d9df88a9bcbe6fdcd6dd6dd836d..6d5245636341839cafe6f2db58f542c847821ad6 100644 (file)
@@ -29,8 +29,8 @@
 #include <threading/thread.h>
 #include <threading/mutex.h>
 #include <threading/rwlock.h>
-#include <utils/hashtable.h>
-#include <utils/linked_list.h>
+#include <collections/hashtable.h>
+#include <collections/linked_list.h>
 #include <processing/jobs/callback_job.h>
 
 #ifndef HAVE_STRUCT_SOCKADDR_SA_LEN
index 44ad70a0f01998f0ee65a44e4c3f645af55ea266..1b0931950bd93da814960bfb9db9c93035750d29 100644 (file)
@@ -19,7 +19,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include <debug.h>
 
@@ -114,12 +114,12 @@ METHOD(pa_tnc_attr_t, build, void,
        {
                return;
        }
-       writer = bio_writer_create(ATTR_REQUEST_ENTRY_SIZE * 
+       writer = bio_writer_create(ATTR_REQUEST_ENTRY_SIZE *
                                                           this->list->get_count(this->list));
 
        enumerator = this->list->create_enumerator(this->list);
        while (enumerator->enumerate(enumerator, &entry))
-       {       
+       {
                writer->write_uint32(writer, entry->vendor_id);
                writer->write_uint32(writer, entry->type);
        }
@@ -161,7 +161,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        reader = bio_reader_create(this->value);
        while (count--)
        {
-               reader->read_uint8 (reader, &reserved); 
+               reader->read_uint8 (reader, &reserved);
                reader->read_uint24(reader, &vendor_id);
                reader->read_uint32(reader, &type);
 
index 786051da1cf0a6687641a1abfa5b8099f2e7528f..e0ff748f92ce777d78f214e4092f7dc5345ff9f2 100644 (file)
@@ -20,7 +20,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 
@@ -87,7 +87,7 @@ struct package_entry_t {
        chunk_t version;
 };
 
-/** 
+/**
  * Free a package entry
  */
 static void free_package_entry(package_entry_t *entry)
@@ -169,7 +169,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        reader->read_uint16(reader, &reserved);
        reader->read_uint16(reader, &count);
        *offset = INSTALLED_PACKAGES_MIN_SIZE;
-               
+
        while (reader->remaining(reader))
        {
                if (!reader->read_data8(reader, &name))
@@ -190,7 +190,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
                {
                        DBG1(DBG_TNC, "insufficient data for IETF installed package version");
                        goto end;
-               }       
+               }
                pos = memchr(version.ptr, '\0', version.len);
                if (pos)
                {
@@ -199,8 +199,8 @@ METHOD(pa_tnc_attr_t, process, status_t,
                        goto end;
                }
                *offset += 1 + version.len;
-       
-               entry = malloc_thing(package_entry_t);  
+
+               entry = malloc_thing(package_entry_t);
                entry->name = chunk_clone(name);
                entry->version = chunk_clone(version);
                this->packages->insert_last(this->packages, entry);
@@ -216,7 +216,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
 
 end:
        reader->destroy(reader);
-       return status;  
+       return status;
 }
 
 METHOD(pa_tnc_attr_t, get_ref, pa_tnc_attr_t*,
@@ -249,7 +249,7 @@ METHOD(ietf_attr_installed_packages_t, add, void,
        entry = malloc_thing(package_entry_t);
        entry->name = chunk_clone(name);
        entry->version = chunk_clone(version);
-       this->packages->insert_last(this->packages, entry);     
+       this->packages->insert_last(this->packages, entry);
 }
 
 /**
index 811ccbcf91a8dd92895578ca9b8ad948ff3eb4d5..34bcf895ccb10410414748416eed56bb9fd866f8 100644 (file)
@@ -17,7 +17,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 
@@ -152,7 +152,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
 
        while (reader->remaining(reader))
        {
-               entry = malloc_thing(port_entry_t);     
+               entry = malloc_thing(port_entry_t);
                reader->read_uint8 (reader, &blocked);
                entry->blocked = blocked & 0x01;
                reader->read_uint8 (reader, &entry->protocol);
@@ -161,7 +161,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        }
        reader->destroy(reader);
 
-       return SUCCESS; 
+       return SUCCESS;
 }
 
 METHOD(pa_tnc_attr_t, get_ref, pa_tnc_attr_t*,
@@ -192,7 +192,7 @@ METHOD(ietf_attr_port_filter_t, add_port, void,
        entry->blocked = blocked;
        entry->protocol = protocol;
        entry->port = port;
-       this->ports->insert_last(this->ports, entry);   
+       this->ports->insert_last(this->ports, entry);
 }
 
 /**
index 7c361361f8f935be4b19ce06f1dc023411a411ab..aef10c0d7ad29d26d05ee5926d7f5046dfcaffab 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <tncifimc.h>
 #include <pen/pen.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include <library.h>
 
index 80fc5205ecc55dba8b816d0e98af7bedd8ee39a1..48a2955750d2f35c4f5ffab43bffb3a44d3aff5b 100644 (file)
@@ -21,7 +21,7 @@
 #include <tncif_names.h>
 
 #include <pen/pen.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_imc_msg_t private_imc_msg_t;
index 4a4e71858af1d818df2ae896c25e604c27b037c2..0ef78409486bd4d2a62b37fc71b2bcda3abbeb86 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <tncifimv.h>
 #include <pen/pen.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include <library.h>
 
index 9781c28bf319768ff25aa49f09585386b15b70b1..e69121a4b5b93aeab2d071767653a20e05b49488 100644 (file)
@@ -21,7 +21,7 @@
 #include <tncif_names.h>
 
 #include <pen/pen.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_imv_msg_t private_imv_msg_t;
index 576d27c687492cf6248459d403572d915202dd55..8846c84cd253cf14ec46ae0d099c760c5735b98a 100644 (file)
@@ -18,7 +18,7 @@
 #include <sys/utsname.h>
 #include <stdio.h>
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_os_info_t private_os_info_t;
@@ -132,13 +132,13 @@ METHOD(os_info_t, get_uptime, time_t,
        if (!file)
        {
                DBG1(DBG_IMC, "failed to open \"%s\"", proc_uptime);
-               return 0;       
+               return 0;
        }
        if (fscanf(file, "%u", &uptime) != 1)
        {
                DBG1(DBG_IMC, "failed to read file \"%s\"", proc_uptime);
                uptime = 0;
-       }               
+       }
        fclose(file);
 
        return uptime;
@@ -229,7 +229,7 @@ static bool extract_platform_info(chunk_t *name, chunk_t *version)
                {
                        case RELEASE_LSB:
                        {
-                               /* Determine Distribution ID */                         
+                               /* Determine Distribution ID */
                                pos = strstr(buf, lsb_distrib_id);
                                if (!pos)
                                {
@@ -249,7 +249,7 @@ static bool extract_platform_info(chunk_t *name, chunk_t *version)
 
                                os_name.len = pos - os_name.ptr;
 
-                               /* Determine Distribution Release */                            
+                               /* Determine Distribution Release */
                                pos = strstr(buf, lsb_distrib_release);
                                if (!pos)
                                {
@@ -270,7 +270,7 @@ static bool extract_platform_info(chunk_t *name, chunk_t *version)
                                os_version.len = pos - os_version.ptr;
 
                                break;
-                       }                        
+                       }
                        case RELEASE_DEBIAN:
                        {
                                char str_debian[] = "Debian";
@@ -344,7 +344,7 @@ static bool extract_platform_info(chunk_t *name, chunk_t *version)
        *pos++ = ' ';
        memcpy(pos, uninfo.machine, strlen(uninfo.machine));
 
-       return TRUE;    
+       return TRUE;
 }
 
 /**
@@ -356,9 +356,9 @@ os_info_t *os_info_create(void)
        chunk_t name, version;
 
        /* As an opton OS name and OS version can be configured manually */
-       name.ptr = lib->settings->get_str(lib->settings, 
+       name.ptr = lib->settings->get_str(lib->settings,
                                                                          "libimcv.os_info.name", NULL);
-       version.ptr = lib->settings->get_str(lib->settings, 
+       version.ptr = lib->settings->get_str(lib->settings,
                                                                          "libimcv.os_info.version", NULL);
        if (name.ptr && version.ptr)
        {
@@ -366,7 +366,7 @@ os_info_t *os_info_create(void)
                name = chunk_clone(name);
 
                version.len = strlen(version.ptr);
-               version = chunk_clone(version); 
+               version = chunk_clone(version);
        }
        else
        {
index 1de89d87d93e4907c14c666fbdab0ef80261e30c..3df660e01bff1cdb9d7d7ed88e99e65cb74446ae 100644 (file)
@@ -16,7 +16,7 @@
 
 #include "pa_tnc_attr_manager.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_pa_tnc_attr_manager_t private_pa_tnc_attr_manager_t;
@@ -46,7 +46,7 @@ struct private_pa_tnc_attr_manager_t {
 };
 
 METHOD(pa_tnc_attr_manager_t, add_vendor, void,
-       private_pa_tnc_attr_manager_t *this, pen_t vendor_id, 
+       private_pa_tnc_attr_manager_t *this, pen_t vendor_id,
        pa_tnc_attr_create_t attr_create, enum_name_t *attr_names)
 {
        entry_t *entry;
@@ -128,7 +128,7 @@ METHOD(pa_tnc_attr_manager_t, create, pa_tnc_attr_t*,
 METHOD(pa_tnc_attr_manager_t, destroy, void,
        private_pa_tnc_attr_manager_t *this)
 {
-       this->list->destroy_function(this->list, free); 
+       this->list->destroy_function(this->list, free);
        free(this);
 }
 
index b324a69100c7e75fd2b6b2ed4ec85b1d0871c142..b7cdd37c28267bea6e1ef0505c7b68d049ea09f3 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <pen/pen.h>
 #include <debug.h>
 
@@ -42,7 +42,7 @@ typedef struct private_pa_tnc_msg_t private_pa_tnc_msg_t;
 #define PA_TNC_RESERVED                0x000000
 
 /**
- *  PA-TNC attribute 
+ *  PA-TNC attribute
  *
  *                       1                   2                   3
  *  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@@ -229,7 +229,7 @@ METHOD(pa_tnc_msg_t, process, status_t,
                error = ietf_attr_pa_tnc_error_create(error_code, this->encoding);
                goto err;
        }
-       
+
        /* offset of the first PA-TNC attribute in the PA-TNC message */
        offset = PA_TNC_HEADER_SIZE;
 
@@ -280,8 +280,8 @@ METHOD(pa_tnc_msg_t, process, status_t,
                        DBG1(DBG_TNC, "insufficient bytes for PA-TNC attribute value");
                        error = ietf_attr_pa_tnc_error_create_with_offset(error_code,
                                                this->encoding, offset + PA_TNC_ATTR_INFO_SIZE);
-                       goto err; 
-               } 
+                       goto err;
+               }
                DBG3(DBG_TNC, "%B", &value);
 
                attr = imcv_pa_tnc_attributes->create(imcv_pa_tnc_attributes,
@@ -416,7 +416,7 @@ METHOD(pa_tnc_msg_t, destroy, void,
        private_pa_tnc_msg_t *this)
 {
        this->attributes->destroy_offset(this->attributes,
-                                                                        offsetof(pa_tnc_attr_t, destroy)); 
+                                                                        offsetof(pa_tnc_attr_t, destroy));
        this->errors->destroy_offset(this->errors,
                                                                         offsetof(pa_tnc_attr_t, destroy));
        free(this->encoding.ptr);
index 7d2db7c3429737f0526f7ad032b9f814b0636a01..fba018d1a496b1e178042f51159fa1cdbb92378b 100644 (file)
@@ -18,7 +18,7 @@
 #include <tncif_names.h>
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_imc_test_state_t private_imc_test_state_t;
 typedef struct entry_t entry_t;
@@ -82,7 +82,7 @@ struct private_imc_test_state_t {
         * Do a handshake retry
         */
        bool handshake_retry;
-       
+
 };
 
 /**
@@ -280,7 +280,7 @@ imc_state_t *imc_test_state_create(TNC_ConnectionID connection_id,
                .first_handshake = TRUE,
                .handshake_retry = retry,
        );
-       
+
        return &this->public.interface;
 }
 
index c56c7358ec5a2c5aa0080460e8ca3186173d763b..3bfe89d2e9fdc672335dbd1da25982f2fad95a71 100644 (file)
@@ -34,7 +34,7 @@
 #include <tncif_pa_subtypes.h>
 
 #include <pen/pen.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 /* IMV definitions */
@@ -208,7 +208,7 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
                                break;
                        }
                        case IETF_ATTR_INSTALLED_PACKAGES:
-                       { 
+                       {
                                ietf_attr_installed_packages_t *attr_cast;
                                enumerator_t *e;
                                chunk_t name, version;
@@ -224,13 +224,13 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
 
                                state->set_recommendation(state,
                                                                          TNC_IMV_ACTION_RECOMMENDATION_ALLOW,
-                                                                         TNC_IMV_EVALUATION_RESULT_COMPLIANT); 
+                                                                         TNC_IMV_EVALUATION_RESULT_COMPLIANT);
                                assessment = TRUE;
                                break;
                        }
                        default:
                                break;
-               }               
+               }
        }
        enumerator->destroy(enumerator);
 
@@ -263,7 +263,7 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
                        assessment = TRUE;
                }
                else
-               {       
+               {
                        DBG1(DBG_IMV, "requesting installed packages for '%s'",
                                                   product_info);
                        attr = ietf_attr_attr_request_create(PEN_IETF,
index ad7591b39c772d3e2c3a1f9946645833f067452c..4d9762cb608b62eac50da3be967853e44d6caf0b 100644 (file)
@@ -25,7 +25,7 @@
 #include <tncif_pa_subtypes.h>
 
 #include <pen/pen.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/lexparser.h>
 #include <debug.h>
 
@@ -47,7 +47,7 @@ struct port_range_t {
 
 
 /**
- * Default port policy 
+ * Default port policy
  *
  * TRUE:  all server ports on the TNC client must be closed
  * FALSE: any server port on the TNC client is allowed to be open
@@ -207,7 +207,7 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
                        char buf[BUF_LEN], *pos = buf;
                        size_t len = BUF_LEN;
                        bool blocked, compliant = TRUE;
-       
+
                        attr_port_filter = (ietf_attr_port_filter_t*)attr;
                        enumerator = attr_port_filter->create_port_enumerator(attr_port_filter);
                        while (enumerator->enumerate(enumerator, &blocked, &protocol, &port))
@@ -237,7 +237,7 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
                                e->destroy(e);
 
                                passed = (closed_port_policy == found);
-                               DBG2(DBG_IMV, "%s port %5u %s: %s", 
+                               DBG2(DBG_IMV, "%s port %5u %s: %s",
                                        (protocol == IPPROTO_TCP) ? "tcp" : "udp", port,
                                         blocked ? "closed" : "open", passed ? "ok" : "fatal");
                                if (!passed)
@@ -253,14 +253,14 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
                                        pos += written;
                                        len -= written;
                                }
-                       } 
+                       }
                        enumerator->destroy(enumerator);
 
                        if (compliant)
                        {
                                state->set_recommendation(state,
                                                                TNC_IMV_ACTION_RECOMMENDATION_ALLOW,
-                                                               TNC_IMV_EVALUATION_RESULT_COMPLIANT);   
+                                                               TNC_IMV_EVALUATION_RESULT_COMPLIANT);
                        }
                        else
                        {
@@ -270,9 +270,9 @@ static TNC_Result receive_message(imv_state_t *state, imv_msg_t *in_msg)
                                imv_scanner_state->set_violating_ports(imv_scanner_state, buf);
                                state->set_recommendation(state,
                                                                TNC_IMV_ACTION_RECOMMENDATION_NO_ACCESS,
-                                                               TNC_IMV_EVALUATION_RESULT_NONCOMPLIANT_MAJOR);  
-                       }                 
-               }               
+                                                               TNC_IMV_EVALUATION_RESULT_NONCOMPLIANT_MAJOR);
+                       }
+               }
        }
        enumerator->destroy(enumerator);
 
index 67f22c0628c58df72f406bb46d8fd6e1213a3331..53d4c07b3e4d0741960cfaaf9b9e8e5a5cf7245c 100644 (file)
@@ -16,7 +16,7 @@
 #include "imv_test_state.h"
 
 #include <utils/lexparser.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_imv_test_state_t private_imv_test_state_t;
@@ -94,7 +94,7 @@ struct entry_t {
 };
 
 /**
- * Table of multi-lingual reason string entries 
+ * Table of multi-lingual reason string entries
  */
 static entry_t reasons[] = {
        { "en", "IMC Test was not configured with \"command = allow\"" },
@@ -191,7 +191,7 @@ METHOD(imv_state_t, get_reason_string, bool,
                        if (chunk_equals(lang, pref_lang))
                        {
                                *reason_language = lang;
-                               *reason_string = chunk_create(reasons[i].string, 
+                               *reason_string = chunk_create(reasons[i].string,
                                                                                strlen(reasons[i].string));
                                return TRUE;
                        }
@@ -201,7 +201,7 @@ METHOD(imv_state_t, get_reason_string, bool,
        /* no preferred language match found - use the default language */
        *reason_string =   chunk_create(reasons[0].string,
                                                                        strlen(reasons[0].string));
-       *reason_language = chunk_create(reasons[0].lang, 
+       *reason_language = chunk_create(reasons[0].lang,
                                                                        strlen(reasons[0].lang));
        return TRUE;
 }
@@ -274,8 +274,8 @@ METHOD(imv_test_state_t, another_round, bool,
                }
        }
        enumerator->destroy(enumerator);
-       
-       return not_finished;    
+
+       return not_finished;
 }
 
 /**
@@ -310,7 +310,7 @@ imv_state_t *imv_test_state_create(TNC_ConnectionID connection_id)
                .connection_id = connection_id,
                .imcs = linked_list_create(),
        );
-       
+
        return &this->public.interface;
 }
 
index 34222258cece4382461f5ec025158764e5a48bb6..19643d5dd29b529cb0cb70ac6a0b9eff745e4df9 100644 (file)
@@ -20,8 +20,8 @@
 #include <library.h>
 #include <debug.h>
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
-#include <utils/blocking_queue.h>
+#include <collections/linked_list.h>
+#include <collections/blocking_queue.h>
 #include <processing/jobs/callback_job.h>
 
 typedef struct private_ipsec_event_relay_t private_ipsec_event_relay_t;
index 41ba792c3037842f641af0b0c429585b41c0df09..dd904ba39ad8460cb1a46bf013832d510c428028 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <debug.h>
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /** Base priority for installed policies */
 #define PRIO_BASE 512
index ae0a29868f9c6f5428a62eed1b84b74c374155de..dfa4b12c32cae80cf14f894b4cc153e627fc52a7 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <library.h>
 #include <networking/host.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <ipsec/ipsec_types.h>
 #include <selectors/traffic_selector.h>
 
index 353f0e7e0a5ca286285547526ffd3bc5a91c8580..4d3649d4c851b3e0a30d0c45bfb80a60c1e76734 100644 (file)
@@ -19,7 +19,7 @@
 #include <debug.h>
 #include <library.h>
 #include <threading/rwlock.h>
-#include <utils/blocking_queue.h>
+#include <collections/blocking_queue.h>
 #include <processing/jobs/callback_job.h>
 
 typedef struct private_ipsec_processor_t private_ipsec_processor_t;
index 35ad6c171d363750d2e89ba1bc9c845009eb9c87..32f2cdb7369277d824a234aa1b8164b93dd8e978 100644 (file)
@@ -23,8 +23,8 @@
 #include <processing/jobs/callback_job.h>
 #include <threading/condvar.h>
 #include <threading/mutex.h>
-#include <utils/hashtable.h>
-#include <utils/linked_list.h>
+#include <collections/hashtable.h>
+#include <collections/linked_list.h>
 
 typedef struct private_ipsec_sa_mgr_t private_ipsec_sa_mgr_t;
 
index ee3d5c82e67136b087195efd38f938ae1937713b..9086f72634a4949bb7d7431735f90a516468d4f6 100644 (file)
@@ -37,7 +37,7 @@
 
 #include <pen/pen.h>
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /* IMC definitions */
 
@@ -85,7 +85,7 @@ TNC_Result TNC_IMC_Initialize(TNC_IMCID imc_id,
        }
 
        libpts_init();
-       
+
        if (min_version > TNC_IFIMC_VERSION_1 || max_version < TNC_IFIMC_VERSION_1)
        {
                DBG1(DBG_IMC, "no common IF-IMC version");
index b3d35102baef11bf3870fcc962b9c953e92b2242..5ff50c0bcd0b535c483a4d94d1b94ce04c25d3c4 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <tncif_names.h>
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_imc_attestation_state_t private_imc_attestation_state_t;
@@ -237,7 +237,7 @@ imc_state_t *imc_attestation_state_create(TNC_ConnectionID connection_id)
                .components = linked_list_create(),
                .list = linked_list_create(),
        );
-       
+
        return &this->public.interface;
 }
 
index a5175d96e5888045d7c56c1b1776f2512d9c4823..e3536d1641baa719cc4941934db62a7fd433ea3a 100644 (file)
@@ -38,7 +38,7 @@
 #include <pen/pen.h>
 #include <debug.h>
 #include <credentials/credential_manager.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /* IMV definitions */
 
@@ -104,7 +104,7 @@ TNC_Result TNC_IMV_Initialize(TNC_IMVID imv_id,
        }
 
        libpts_init();
-       
+
        if (min_version > TNC_IFIMV_VERSION_1 || max_version < TNC_IFIMV_VERSION_1)
        {
                DBG1(DBG_IMV, "no common IF-IMV version");
index b809ccfab77bb3a0774791679e74316e3b05b036..73b4251e0c86b9ffc74bf365557f425b0280d5a8 100644 (file)
@@ -25,7 +25,7 @@
 #include "imv_attestation_state.h"
 
 #include <library.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <credentials/credential_manager.h>
 #include <crypto/hashers/hasher.h>
 
index aa91bf2156977b4c5e32c533779681f2a61ef467..d5724f6ba2204141f4caacf38d72bb1163130547 100644 (file)
@@ -18,7 +18,7 @@
 #include <libpts.h>
 
 #include <utils/lexparser.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_imv_attestation_state_t private_imv_attestation_state_t;
@@ -44,7 +44,7 @@ struct private_imv_attestation_state_t {
         * TNCCS connection state
         */
        TNC_ConnectionState state;
-       
+
        /**
         * Does the TNCCS connection support long message types?
         */
@@ -139,7 +139,7 @@ struct entry_t {
 };
 
 /**
- * Table of multi-lingual reason string entries 
+ * Table of multi-lingual reason string entries
  */
 static entry_t reasons[] = {
        { "en", "IMV Attestation: Incorrect/pending file measurement/component"
@@ -302,7 +302,7 @@ METHOD(imv_attestation_state_t, check_off_file_meas_request, bool,
        enumerator_t *enumerator;
        file_meas_request_t *request;
        bool found = FALSE;
-       
+
        enumerator = this->file_meas_requests->create_enumerator(this->file_meas_requests);
        while (enumerator->enumerate(enumerator, &request))
        {
index e330aeebf9a99ab268f601bac2f95ef132f22e3c..40fea1cec6372d0334b5580b8e19753329856631 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pts/components/pts_component_manager.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_pts_component_manager_t private_pts_component_manager_t;
@@ -56,7 +56,7 @@ struct vendor_entry_t {
 
        /**
         * List of vendor-specific registered Functional Components
-        */     
+        */
        linked_list_t *components;
 };
 
@@ -103,7 +103,7 @@ struct private_pts_component_manager_t {
 };
 
 METHOD(pts_component_manager_t, add_vendor, void,
-       private_pts_component_manager_t *this, pen_t vendor_id, 
+       private_pts_component_manager_t *this, pen_t vendor_id,
        enum_name_t *comp_func_names, int qualifier_type_size,
        char *qualifier_flag_names, enum_name_t *qualifier_type_names)
 {
@@ -285,7 +285,7 @@ METHOD(pts_component_manager_t, create, pts_component_t*,
 METHOD(pts_component_manager_t, destroy, void,
        private_pts_component_manager_t *this)
 {
-       this->list->destroy_function(this->list, (void *)vendor_entry_destroy); 
+       this->list->destroy_function(this->list, (void *)vendor_entry_destroy);
        free(this);
 }
 
index aad73c4b6f860cdd03794a6ba5ef7ea244b988ea..423a4c802198a1c5291d48c7752a1ee4a3c9c74b 100644 (file)
@@ -35,7 +35,7 @@ typedef struct pts_t pts_t;
 #include "components/pts_comp_func_name.h"
 
 #include <library.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /**
  * UTF-8 encoding of the character used to delimiter the filename
index 4fece6b3c009608e9555a82d95534c7d6ccfc7c0..344914fc637226754ab1fe2b7e4c86bff971eaac 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pts_file_meas.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 #include <sys/stat.h>
@@ -179,7 +179,7 @@ METHOD(pts_file_meas_t, verify, bool,
                        }
                }
                enumerator->destroy(enumerator);
-               
+
                if (!found)
                {
                        DBG1(DBG_PTS, "  no measurement found for '%s'", filename);
@@ -200,7 +200,7 @@ METHOD(pts_file_meas_t, verify, bool,
                        break;
                }
        }
-       return success; 
+       return success;
 }
 
 METHOD(pts_file_meas_t, destroy, void,
index 6ed1c01b4f4da0c733239f3f2e1af5c94fce0777..c97c2d77001fa99e8cdbde82f57b0dd0655d9613 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "pts_file_meta.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_pts_file_meta_t private_pts_file_meta_t;
index 01c4361e1dcfbc8188423a360da94e39e271927a..8138a5f2e58e4ba47b2a01ff54ad224497646961 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_tcg_pts_attr_file_meas_t private_tcg_pts_attr_file_meas_t;
@@ -26,7 +26,7 @@ typedef struct private_tcg_pts_attr_file_meas_t private_tcg_pts_attr_file_meas_t
 /**
  * File Measurement
  * see section 3.19.2 of PTS Protocol: Binding to TNC IF-M Specification
- * 
+ *
  *                                        1                               2                               3
  *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -72,12 +72,12 @@ struct private_tcg_pts_attr_file_meas_t {
         * Attribute value
         */
        chunk_t value;
-       
+
        /**
         * Noskip flag
         */
        bool noskip_flag;
-       
+
        /**
         * PTS File Measurements
         */
@@ -123,7 +123,7 @@ METHOD(pa_tnc_attr_t, build, void,
        char *filename;
        chunk_t measurement;
        bool first = TRUE;
-       
+
        if (this->value.ptr)
        {
                return;
@@ -169,7 +169,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        chunk_t measurement, filename;
        char buf[BUF_LEN];
        status_t status = FAILED;
-       
+
        if (this->value.len < PTS_FILE_MEAS_SIZE)
        {
                DBG1(DBG_TNC, "insufficient data for PTS file measurement header");
@@ -181,9 +181,9 @@ METHOD(pa_tnc_attr_t, process, status_t,
        reader->read_uint64(reader, &number_of_files);
        reader->read_uint16(reader, &request_id);
        reader->read_uint16(reader, &meas_len);
-       
+
        this->measurements = pts_file_meas_create(request_id);
-       
+
        while (number_of_files--)
        {
                if (!reader->read_data(reader, meas_len, &measurement))
index a631e9891c667a7f40f8186b75e5ad1534869d1b..378168375927cb3a2d41e53e601bb390be8f3fc2 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_tcg_pts_attr_req_func_comp_evid_t private_tcg_pts_attr_req_func_comp_evid_t;
@@ -47,7 +47,7 @@ typedef struct private_tcg_pts_attr_req_func_comp_evid_t private_tcg_pts_attr_re
  */
 
 /**
- * Component Functional Name Structure 
+ * Component Functional Name Structure
  * (see section 5.1 of PTS Protocol: Binding to TNC IF-M Specification)
  *
  *                                        1                               2                               3
@@ -58,7 +58,7 @@ typedef struct private_tcg_pts_attr_req_func_comp_evid_t private_tcg_pts_attr_re
  *  |                   Component Functional Name                   |
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  */
+
 #define PTS_REQ_FUNC_COMP_EVID_SIZE            12
 #define PTS_REQ_FUNC_COMP_FAMILY_MASK  0xC0
 
@@ -81,7 +81,7 @@ struct private_tcg_pts_attr_req_func_comp_evid_t {
         * Attribute value
         */
        chunk_t value;
-       
+
        /**
         * Noskip flag
         */
@@ -249,7 +249,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
                entry->flags = flags;
                entry->depth = depth;
                entry->name = pts_comp_func_name_create(vendor_id, name, qualifier);
-               
+
                this->list->insert_last(this->list, entry);
        }
        status = SUCCESS;
index 4f93ee8854dec45418a5b0a8aa8c6fd035e65141..51088e62800db444b6c578383aacf0f4a201ae8a 100644 (file)
@@ -18,7 +18,7 @@
 #include <pa_tnc/pa_tnc_msg.h>
 #include <bio/bio_writer.h>
 #include <bio/bio_reader.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 typedef struct private_tcg_pts_attr_file_meta_t private_tcg_pts_attr_file_meta_t;
@@ -26,7 +26,7 @@ typedef struct private_tcg_pts_attr_file_meta_t private_tcg_pts_attr_file_meta_t
 /**
  * Unix-Style File Metadata
  * see section 3.17.3 of PTS Protocol: Binding to TNC IF-M Specification
- * 
+ *
  *                                        1                               2                               3
  *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
  *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -88,12 +88,12 @@ struct private_tcg_pts_attr_file_meta_t {
         * Attribute value
         */
        chunk_t value;
-       
+
        /**
         * Noskip flag
         */
        bool noskip_flag;
-       
+
        /**
         * PTS File Metadata
         */
@@ -136,7 +136,7 @@ METHOD(pa_tnc_attr_t, build, void,
        enumerator_t *enumerator;
        pts_file_metadata_t *entry;
        u_int64_t number_of_files;
-       
+
        if (this->value.ptr)
        {
                return;
@@ -163,7 +163,7 @@ METHOD(pa_tnc_attr_t, build, void,
                                                                                                  strlen(entry->filename)));
        }
        enumerator->destroy(enumerator);
-       
+
        this->value = chunk_clone(writer->get_buf(writer));
        writer->destroy(writer);
 }
@@ -179,7 +179,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        u_int64_t owner, group;
        chunk_t filename;
        status_t status = FAILED;
-       
+
        if (this->value.len < PTS_FILE_META_SIZE)
        {
                DBG1(DBG_TNC, "insufficient data for PTS Unix-Style file metadata header");
@@ -190,7 +190,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
        reader->read_uint64(reader, &number_of_files);
 
        this->metadata = pts_file_meta_create();
-       
+
        while (number_of_files--)
        {
                if (!reader->read_uint16(reader, &len))
@@ -243,7 +243,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
                        DBG1(DBG_TNC, "insufficient data for filename");
                        goto end;
                }
-               
+
                entry = malloc_thing(pts_file_metadata_t);
                entry->type = type;
                entry->filesize = filesize;
index 143cfa1a53d0f61054808e86772f79340b790a65..442cb12ce5f9ad106a72c9f481af423231d6453d 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <debug.h>
 #include <networking/host.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/condvar.h>
 #include <threading/mutex.h>
 
index 6e3394bb04ece640f4644a80b54e6c000ae87c42..5dbd1d7e0c5610320be7a9b549c53be514c427c2 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <threading/mutex.h>
 #include <threading/condvar.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_radius_config_t private_radius_config_t;
 
index 65de1c5abca00ed9c1a1eba10236842e1fd6b1e2..e10ab21b8de0142c58a0baafc0cbce838e92cd6f 100644 (file)
@@ -16,7 +16,7 @@
 #include "simaka_manager.h"
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 typedef struct private_simaka_manager_t private_simaka_manager_t;
index 64a67e56c85cbd4844c1a76ee15636911a125b1e..810cb06850928151f6fb1484ae9befa2a13a3fc7 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <crypto/hashers/hasher.h>
 #include <utils/identification.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <plugins/plugin.h>
 
 typedef struct simaka_manager_t simaka_manager_t;
index aa36a09748c11bd4256af8411893cf59a6cf5b5b..e7c7a0a8cf0ad97bfb2e1d2073f490f1ee7c2987 100644 (file)
@@ -18,7 +18,7 @@
 #include "simaka_manager.h"
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_simaka_message_t private_simaka_message_t;
 typedef struct hdr_t hdr_t;
index c627447e3be5f5c5c00bc1289cb8def6062819b6..094e1bcdc49be6db146a00c4d65f97c5460cac10 100644 (file)
@@ -5,6 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := \
 library.c chunk.c debug.c enum.c settings.c printf_hook.c \
 asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \
+collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \
+collections/linked_list.c \
 crypto/crypters/crypter.c crypto/hashers/hasher.c crypto/pkcs7.c crypto/pkcs9.c \
 crypto/proposal/proposal_keywords.c crypto/proposal/proposal_keywords_static.c \
 crypto/prfs/prf.c crypto/prfs/mac_prf.c \
@@ -29,7 +31,6 @@ processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
 selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
 utils.c utils/identification.c utils/lexparser.c \
-utils/linked_list.c utils/blocking_queue.c utils/hashtable.c utils/enumerator.c \
 utils/optionsfrom.c utils/capabilities.c utils/backtrace.c
 
 # adding the plugin source files
index 62649d9ec980380314df946bce13146d3ebed369..2fa9dabd1b12e33b7cb832981e13e10530567489 100644 (file)
@@ -3,6 +3,8 @@ ipseclib_LTLIBRARIES = libstrongswan.la
 libstrongswan_la_SOURCES = \
 library.c chunk.c debug.c enum.c settings.c printf_hook.c \
 asn1/asn1.c asn1/asn1_parser.c asn1/oid.c bio/bio_reader.c bio/bio_writer.c \
+collections/blocking_queue.c collections/enumerator.c collections/hashtable.c \
+collections/linked_list.c \
 crypto/crypters/crypter.c crypto/hashers/hasher.c crypto/pkcs7.c crypto/pkcs9.c \
 crypto/proposal/proposal_keywords.c crypto/proposal/proposal_keywords_static.c \
 crypto/prfs/prf.c crypto/prfs/mac_prf.c \
@@ -27,7 +29,6 @@ processing/jobs/callback_job.c processing/processor.c processing/scheduler.c \
 selectors/traffic_selector.c threading/thread.c threading/thread_value.c \
 threading/mutex.c threading/semaphore.c threading/rwlock.c threading/spinlock.c \
 utils.c utils/identification.c utils/lexparser.c \
-utils/linked_list.c utils/blocking_queue.c utils/hashtable.c utils/enumerator.c \
 utils/optionsfrom.c utils/capabilities.c utils/backtrace.c
 
 if USE_DEV_HEADERS
@@ -35,6 +36,8 @@ strongswan_includedir = ${dev_headers}
 nobase_strongswan_include_HEADERS = \
 library.h chunk.h debug.h enum.h settings.h printf_hook.h \
 asn1/asn1.h asn1/asn1_parser.h asn1/oid.h bio/bio_reader.h bio/bio_writer.h \
+collections/blocking_queue.h collections/enumerator.h collections/hashtable.h \
+collections/linked_list.h \
 crypto/crypters/crypter.h crypto/hashers/hasher.h crypto/mac.h \
 crypto/pkcs7.h crypto/pkcs9.h crypto/proposal/proposal_keywords.h \
 crypto/proposal/proposal_keywords_static.h \
@@ -66,7 +69,6 @@ threading/thread.h threading/thread_value.h \
 threading/mutex.h threading/condvar.h threading/spinlock.h threading/semaphore.h \
 threading/rwlock.h threading/rwlock_condvar.h threading/lock_profiler.h \
 utils.h utils/identification.h utils/lexparser.h \
-utils/linked_list.h utils/blocking_queue.h utils/hashtable.h utils/enumerator.h \
 utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \
 utils/leak_detective.h integrity_checker.h
 endif
similarity index 98%
rename from src/libstrongswan/utils/blocking_queue.c
rename to src/libstrongswan/collections/blocking_queue.c
index c70184198bea3c701c70d87971cbc97ae3c7c4c4..da335697014aad228872123e1c1d029a3302430f 100644 (file)
@@ -20,7 +20,7 @@
 #include <threading/mutex.h>
 #include <threading/thread.h>
 #include <threading/condvar.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_blocking_queue_t private_blocking_queue_t;
 
similarity index 99%
rename from src/libstrongswan/utils/blocking_queue.h
rename to src/libstrongswan/collections/blocking_queue.h
index cf2712cf46436f02e8da86d60aad2da02e400a38..9b014f71999151ec8331bcc0b0b9e16fd6812606 100644 (file)
@@ -17,7 +17,7 @@
 
 /**
  * @defgroup blocking_queue blocking_queue
- * @{ @ingroup utils
+ * @{ @ingroup collections
  */
 
 #ifndef BLOCKING_QUEUE_H_
similarity index 99%
rename from src/libstrongswan/utils/enumerator.h
rename to src/libstrongswan/collections/enumerator.h
index 8c3d701739a2439ebf6246d6d61c4ce9f7d0ab70..900c97385d54711da0a8bc22a1d7d1d3bfd8bf36 100644 (file)
@@ -15,7 +15,7 @@
 
 /**
  * @defgroup enumerator enumerator
- * @{ @ingroup utils
+ * @{ @ingroup collections
  */
 
 #ifndef ENUMERATOR_H_
similarity index 98%
rename from src/libstrongswan/utils/hashtable.h
rename to src/libstrongswan/collections/hashtable.h
index 0a21ca37369f5efcf3dfd2b692fa0f1bc85de103..e38850ded2ab2d1f626ceaf0066c32bb148e6568 100644 (file)
 
 /**
  * @defgroup hashtable hashtable
- * @{ @ingroup utils
+ * @{ @ingroup collections
  */
 
 #ifndef HASHTABLE_H_
 #define HASHTABLE_H_
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 typedef struct hashtable_t hashtable_t;
 
similarity index 99%
rename from src/libstrongswan/utils/linked_list.h
rename to src/libstrongswan/collections/linked_list.h
index 1b5518480f27bc9dbb939fb54ad8db56d0335596..da539a231b1a90125e8f761cb057e5f9e717afb2 100644 (file)
@@ -17,7 +17,7 @@
 
 /**
  * @defgroup linked_list linked_list
- * @{ @ingroup utils
+ * @{ @ingroup collections
  */
 
 #ifndef LINKED_LIST_H_
@@ -25,7 +25,7 @@
 
 typedef struct linked_list_t linked_list_t;
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 /**
  * Method to match elements in a linked list (used in find_* functions)
index 6ee4f9b6e589dfce4c032a9435df4f4bc52f09e3..9d1714339252fa10ebebf2989766bf2b20939f88 100644 (file)
@@ -18,7 +18,7 @@
 
 #include <library.h>
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/identification.h>
 #include <eap/eap.h>
 #include <credentials/certificates/certificate.h>
index 79484a04ccdb089c6bd77d4d8da5992f07865fe4..d8793558922675bd942b25da6a3ff2cc7732d373 100644 (file)
@@ -22,7 +22,7 @@
 #ifndef AUTH_CFG_H_
 #define AUTH_CFG_H_
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 typedef struct auth_cfg_t auth_cfg_t;
 typedef enum auth_rule_t auth_rule_t;
index 9a49797578a225768425df90e5b8682f7538445b..2f35eb6a53df006c5dae081d9c31dbb856c5f9bb 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef PKCS10_H_
 #define PKCS10_H_
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <credentials/certificates/certificate.h>
 
 typedef struct pkcs10_t pkcs10_t;
index 00171a7180612fef25fd5fc1466b22f193d282c1..4e8d4317f814a86442051ea80f0829cf95c0d9f8 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef X509_H_
 #define X509_H_
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <credentials/certificates/certificate.h>
 
 /* constraints are currently restricted to the range 0..127 */
index 4865984dd61c867ab714489d9d5c01d9220eaa5e..53ac13cbb513ef21dcf67b2acdf75e51a0e11b79 100644 (file)
@@ -17,8 +17,8 @@
 
 #include <stdint.h>
 
-#include <utils/linked_list.h>
-#include <utils/hashtable.h>
+#include <collections/linked_list.h>
+#include <collections/hashtable.h>
 #include <threading/rwlock.h>
 
 typedef struct private_cred_encoding_t private_cred_encoding_t;
index ff621012f0140e2724470b1a1f993b71c6ad979c..cb52b4182af431f92b28432c32e3bb9b668a0621 100644 (file)
@@ -18,7 +18,7 @@
 #include "credential_factory.h"
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/thread_value.h>
 #include <threading/rwlock.h>
 #include <credentials/certificates/x509.h>
index a96abdc699f454a741dd23c7189026d699ca5335..32dadc7706960a5663189a7874ad436936100167 100644 (file)
@@ -20,7 +20,7 @@
 #include <threading/thread_value.h>
 #include <threading/mutex.h>
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <credentials/sets/cert_cache.h>
 #include <credentials/sets/auth_cfg_wrapper.h>
 #include <credentials/certificates/x509.h>
index d9a47b7d7c36dbdf6cac701c5f4736e15e19a71a..73c5857345bc599a19d7663530690cf671cf69e7 100644 (file)
@@ -24,7 +24,7 @@
 typedef struct credential_manager_t credential_manager_t;
 
 #include <utils/identification.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <credentials/auth_cfg.h>
 #include <credentials/credential_set.h>
 #include <credentials/keys/private_key.h>
index fb18fb53dd554e48a232b6aacc112d11f5d52eba..49af5a07995078cb69a8f77172716d9b005ca1ae 100644 (file)
@@ -17,7 +17,7 @@
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/lexparser.h>
 
 #include "ietf_attributes.h"
index d00b8d12ef2c72085faee66b02e4ce2123443e08..900c6613e9fb8a2ddb74d5d46ad7a635ad21624b 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef SHARED_KEY_H_
 #define SHARED_KEY_H_
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <utils/identification.h>
 
 typedef struct shared_key_t shared_key_t;
index a7d0ed8f9c45be965e5473c55b8ba7af3ea6e88b..e8f0e7ec06686f5f8a074d142bcb3bba705e3ebb 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <library.h>
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /** cache size, a power of 2 for fast modulo */
 #define CACHE_SIZE 32
index e023e844398999999bed06dd9afcebf80e8b390a..d697a56ef5e65c1bdbd5cb5776049ed7c5df7a74 100644 (file)
@@ -18,7 +18,7 @@
 #include "mem_cred.h"
 
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_mem_cred_t private_mem_cred_t;
 
index eb46b065ba70f378774ba46fb93cc4395d69fc8e..20447207c64febc128370335b35388bc8dde2618 100644 (file)
@@ -27,7 +27,7 @@ typedef struct mem_cred_t mem_cred_t;
 
 #include <credentials/credential_set.h>
 #include <credentials/certificates/crl.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /**
  * Generic in-memory credential set.
index 3736ae38fc51896b7085fdfd57f251ff395d92e6..48300b0897ea30ecaed68987afd9ea9170695b29 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <debug.h>
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <crypto/crypto_tester.h>
 
 const char *default_plugin_name = "default";
index 01e84a133fc1d86d0ce94fb3935eda2c1a4bdfc4..56f0deddab032d02fdeccd08dcba78768fb94d7a 100644 (file)
@@ -21,7 +21,7 @@
 #include "crypto_tester.h"
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_crypto_tester_t private_crypto_tester_t;
 
index 0ec19f2cd01485b6945b2fd663ed6fede3b087f3..674fe04ed69a7b5939f08614031b51f902ec82a2 100644 (file)
@@ -30,7 +30,7 @@
 #include <crypto/pkcs9.h>
 #include <crypto/hashers/hasher.h>
 #include <crypto/crypters/crypter.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include "pkcs7.h"
 
index 7c9a6b03721ab97eddb5dccd722358f209a2b9f4..5af36d29e3d3dc7986bd31958e4909ac8fa734d3 100644 (file)
@@ -28,7 +28,7 @@ typedef struct pkcs7_t pkcs7_t;
 #include <credentials/keys/private_key.h>
 #include <crypto/pkcs9.h>
 #include <crypto/crypters/crypter.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 /**
  * PKCS#7 contentInfo object.
index d24ab1b802a440a38b013d3be4c33e98777d95d0..f3cc5d2f74a16b06b2e240d57f8879486773168b 100644 (file)
@@ -20,7 +20,7 @@
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include "pkcs9.h"
 
index 7356dc36727fbb2bbeb617b870664b42230373ac..4db504eb067cfef3aa497a5324297c959396b5fb 100644 (file)
@@ -38,7 +38,7 @@
 #include "proposal_keywords.h"
 #include "proposal_keywords_static.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/rwlock.h>
 
 typedef struct private_proposal_keywords_t private_proposal_keywords_t;
index dda29b5fbee1e857929b5fb940d1cd8088ccfa34..d46fc3d344878dde9a553a271c2feb29d6af7cbb 100644 (file)
@@ -25,7 +25,7 @@ typedef enum db_type_t db_type_t;
 typedef enum db_driver_t db_driver_t;
 typedef struct database_t database_t;
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 /**
  * Database column types
index 909522d64d2456038caf14226043107554391a3a..6c714ba511aa4f2def1c29b493dc8ed2745e085a 100644 (file)
@@ -15,7 +15,7 @@
 
 #include "database_factory.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/mutex.h>
 
 typedef struct private_database_factory_t private_database_factory_t;
index 9b363c7ebaf84963a86a520fc649e5b6a7da8eb9..ec1b5af5978a1107d5d2086dcb14742406168d4f 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <debug.h>
 #include <threading/rwlock.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_fetcher_manager_t private_fetcher_manager_t;
 
index 90a865a7867f8144460aa779aaaa98e25c74e496..db0c84545c0ffccf5dc754c886c4c30d1dbd4f87 100644 (file)
@@ -22,7 +22,7 @@
 #include <threading/thread.h>
 #include <utils/identification.h>
 #include <networking/host.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 #include <utils/backtrace.h>
 #include <selectors/traffic_selector.h>
 
index a2de74986c3aee29c28b178dcaebe4e51270c014..557a7a07ef3c9bf3c3dded88133051c8f8e77dd1 100644 (file)
@@ -22,6 +22,9 @@
  * @defgroup bio bio
  * @ingroup libstrongswan
  *
+ * @defgroup collections collections
+ * @ingroup libstrongswan
+ *
  * @defgroup credentials credentials
  * @ingroup libstrongswan
  *
index 55b07d3183718ff535349c02bf5bc1ff9d80ac80..c12beccbac10f06b5084ca19557e61203d4a1484 100644 (file)
@@ -24,8 +24,8 @@
 #include <threading/condvar.h>
 #include <threading/mutex.h>
 #include <threading/thread.h>
-#include <utils/hashtable.h>
-#include <utils/linked_list.h>
+#include <collections/hashtable.h>
+#include <collections/linked_list.h>
 
 /**
  * Default minimum and maximum number of threads
index b54d813df494c38e0ea2640600e7dde8123c76ac..5d697fdd059c380039029592bfad14659574a8a2 100644 (file)
@@ -17,7 +17,7 @@
 
 #include <debug.h>
 #include <asn1/asn1.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <credentials/certificates/x509.h>
 
 typedef struct private_constraints_validator_t private_constraints_validator_t;
index 1a20a804a7c28db1801ea94ee38138d43a8d03e3..12a8ff54f47b6a346b3436110f9ecc39866566f7 100644 (file)
@@ -23,7 +23,7 @@
 #include <chunk.h>
 #include <threading/thread_value.h>
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /* Older mysql.h headers do not define it, but we need it. It is not returned
  * in in MySQL 4 by default, but by MySQL 5. To avoid this problem, we catch
index e529ff8a593865c1ec5426c79312264593eb913c..1956bf6255d59626910225a85bb68609f0837c16 100644 (file)
@@ -43,7 +43,7 @@
 #include <openssl/x509v3.h>
 
 #include <debug.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 #include <credentials/certificates/x509.h>
 
 typedef struct private_openssl_crl_t private_openssl_crl_t;
index e85c5cc90ce5dd6eb62678236337127d18e1324e..a7c99a1efb8f7721ffe53562aec3e3c5cc89c9e2 100644 (file)
@@ -49,7 +49,7 @@
 
 #include <debug.h>
 #include <asn1/oid.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 
 typedef struct private_openssl_x509_t private_openssl_x509_t;
index 5b7883d83625faced23d71d2bd1a18d54cf51a46..ef936d4a1d6e4472a80cd3385e132b4d94de19fb 100644 (file)
@@ -17,7 +17,7 @@
 #include "pkcs11_manager.h"
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_pkcs11_creds_t private_pkcs11_creds_t;
 
index 0d89a97eb49da184a10fc9aad15333f91f42ec83..b7b2ada7d08bdfb40a19c4813796d09ab8da4798 100644 (file)
@@ -23,7 +23,7 @@
 #include <library.h>
 #include <debug.h>
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_pkcs11_library_t private_pkcs11_library_t;
 
index 50ed036ac93f7fd0ab71634248028820dcd386a1..81414a25f5d507ce39c1f539296da704f207996d 100644 (file)
@@ -31,7 +31,7 @@ typedef struct pkcs11_library_t pkcs11_library_t;
 
 #include <enum.h>
 #include <chunk.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 /**
  * Optional PKCS#11 features some libraries support, some not
index 83c383671221f952c502b3d9fdaac313af7fadec..52e46d322b4a71f3084066a9b2fcd61f2ee3c494 100644 (file)
@@ -16,7 +16,7 @@
 #include "pkcs11_manager.h"
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/thread.h>
 
 #include "pkcs11_library.h"
index dcdff66eb1570df872fc4361139e090c964d218c..7760f35928341ee4cbbe50e966c7f43dff4be408 100644 (file)
@@ -20,7 +20,7 @@
 
 #include <library.h>
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <threading/mutex.h>
 #include <threading/rwlock.h>
 
index 95a0bfc020f537be3b8d14d5c6663f815e3d3a13..007ef6a9e43e56b70464bf7d05ad2d2ede464228 100644 (file)
@@ -25,8 +25,8 @@
 #include <debug.h>
 #include <library.h>
 #include <integrity_checker.h>
-#include <utils/hashtable.h>
-#include <utils/linked_list.h>
+#include <collections/hashtable.h>
+#include <collections/linked_list.h>
 #include <plugins/plugin.h>
 
 typedef struct private_plugin_loader_t private_plugin_loader_t;
index 94181dbb6081404a6db5e56ea2bba858cca80a5d..6a8f8f6a10d800f43225ca46dca1043ba442c6ef 100644 (file)
@@ -24,7 +24,7 @@
 
 typedef struct plugin_loader_t plugin_loader_t;
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 /* to avoid circular references we can't include plugin_feature.h */
 struct plugin_feature_t;
index d6ca8c4fa3fd4824e32f203ca0507dac6239844d..ddfb952c7edb6e9a299effd16dfa977c622aaafb 100644 (file)
@@ -27,7 +27,7 @@
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
 #include <utils/identification.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/ietf_attributes/ietf_attributes.h>
 #include <credentials/keys/private_key.h>
index 2269eb453c6b8a43206ad2e9aa2102ec96dd9df4..09480df7c58e7f95f25f25000e8cadbfeb19b465 100644 (file)
@@ -35,7 +35,7 @@
 #include <asn1/asn1_parser.h>
 #include <crypto/hashers/hasher.h>
 #include <credentials/keys/private_key.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/identification.h>
 #include <selectors/traffic_selector.h>
 
index 47621103ef4da22de33547340588f8dca20485e3..a3bc4efb048cda7e9b55bd3d2898ea3b724b5966 100644 (file)
@@ -27,7 +27,7 @@ typedef struct revoked_t revoked_t;
 #include <asn1/asn1_parser.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/keys/private_key.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 /**
  * entry for a revoked certificate
index bbd1c5905f7d45fd755504c91757fdfb80dc2dc1..5f82118c87862ef55c7cd753abea1cfa6f4bbbfe 100644 (file)
@@ -21,7 +21,7 @@
 #include <asn1/oid.h>
 #include <asn1/asn1.h>
 #include <utils/identification.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/keys/private_key.h>
index 27497e0e3d9970fc42e7e0ba0568d40f2bcb09d4..42994a2917033ee3476424165dfeae0ba16b0f7e 100644 (file)
@@ -23,7 +23,7 @@
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
 #include <utils/identification.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <debug.h>
 
 #include <library.h>
index 9fa91fed23223ceadfab878cb1c12c7458e8b567..2fa8d413df4a243c794dc21a3143be5ae833f876 100644 (file)
@@ -23,7 +23,7 @@
 #include <asn1/asn1.h>
 #include <asn1/asn1_parser.h>
 #include <credentials/keys/private_key.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/identification.h>
 
 typedef struct private_x509_pkcs10_t private_x509_pkcs10_t;
index a5ddc8ff65cd159d4a7d31a6ec48e2bb72d26315..8258ccb33c8f830db850a350c8f28667eb7fcb10 100644 (file)
@@ -21,7 +21,7 @@
 #include <threading/condvar.h>
 #include <threading/semaphore.h>
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_callback_job_t private_callback_job_t;
 
index 5b7fd467cb0af6c93c3bacecb69a0da695ca3fe1..abeac76e38361762c9c9e1c3664e2751f4b3b489 100644 (file)
@@ -27,7 +27,7 @@
 #include <threading/condvar.h>
 #include <threading/mutex.h>
 #include <threading/thread_value.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_processor_t private_processor_t;
 
index 81f480a3da933f43056f902c1adf74148bc2d024..f0caad13982ce40712ff05a7829dae8540216e4a 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "traffic_selector.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <utils/identification.h>
 #include <debug.h>
 
index 8977cd9edbcab936f33399aac781193bd65f208d..9bdb7443459adb3a5e7e214f765f60f63e014221 100644 (file)
@@ -32,7 +32,7 @@
 #include "settings.h"
 
 #include "debug.h"
-#include "utils/linked_list.h"
+#include "collections/linked_list.h"
 #include "threading/rwlock.h"
 
 #define MAX_INCLUSION_LEVEL            10
index c8b50d0087018d9a52366cdd9e898acd992488a8..4246b3118d9d5dfe6df2aace2e44b49f1a94128e 100644 (file)
@@ -25,7 +25,7 @@
 typedef struct settings_t settings_t;
 
 #include "utils.h"
-#include "utils/enumerator.h"
+#include "collections/enumerator.h"
 
 /**
  * Convert a string value returned by a key/value enumerator to a boolean.
index 9ef514ebca5658eb6c82858265fc11aca9cb0740..33b09304b52d64b01e94b3786d181e0a75f2c361 100644 (file)
@@ -36,7 +36,7 @@ static inline pid_t gettid()
 
 #include <threading/thread_value.h>
 #include <threading/mutex.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 #include "thread.h"
 
index d43a4bc2f684ef8c96842b7b0e05f2edc67ba564..db55b7673324f1fc67770a8a1abefbaeb5c3b113 100644 (file)
@@ -29,7 +29,7 @@
 
 #include "enum.h"
 #include "debug.h"
-#include "utils/enumerator.h"
+#include "collections/enumerator.h"
 
 ENUM(status_names, SUCCESS, NEED_MORE,
        "SUCCESS",
index b6015fb358709a30a4d212435494400a92941df0..0b66832338a033566c1a3877ef0ff10ed1cefec0 100644 (file)
@@ -54,7 +54,7 @@ struct private_backtrace_t {
 #ifdef HAVE_BFD_H
 
 #include <bfd.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 #include <threading/mutex.h>
 
 /**
index 024fcea4b9e8c50d9ee399751eef7115c6faf3c0..8b2173afb26234d6b1a2f8b4bd4939fe7c2d4d29 100644 (file)
@@ -30,7 +30,7 @@ typedef enum id_match_t id_match_t;
 typedef enum id_part_t id_part_t;
 
 #include <chunk.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 /**
  * Matches returned from identification_t.match
index cface05380dce64bfcc228d78774eccd27f14d61..723f33098bd4dc7ae22f2a8c622e467d5549de78 100644 (file)
@@ -34,7 +34,7 @@
 #include <library.h>
 #include <debug.h>
 #include <utils/backtrace.h>
-#include <utils/hashtable.h>
+#include <collections/hashtable.h>
 
 typedef struct private_leak_detective_t private_leak_detective_t;
 
index 8a4fa7d77e5dd656191c7a35f3e4c4f2a198fbe8..6647129ba50c61dced896d0f10d913fc55f6b0c7 100644 (file)
@@ -16,7 +16,7 @@
 #include "tls_alert.h"
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 ENUM_BEGIN(tls_alert_desc_names, TLS_CLOSE_NOTIFY, TLS_CLOSE_NOTIFY,
        "close notify",
index a89201ad758c4912b0abe398cb513b080434d119..1bcc966d5944ec8a2d7d92ef1a1b4f782c9ef25c 100644 (file)
@@ -16,8 +16,8 @@
 #include "tls_cache.h"
 
 #include <debug.h>
-#include <utils/linked_list.h>
-#include <utils/hashtable.h>
+#include <collections/linked_list.h>
+#include <collections/hashtable.h>
 #include <threading/rwlock.h>
 
 typedef struct private_tls_cache_t private_tls_cache_t;
index 99e79eef5ebaf3494abbed1d63e3ddecf4972d06..5792ebf028b8d7e8b1e6254b6e77d65d1fb53e40 100644 (file)
@@ -22,7 +22,7 @@
 #define GATEWAY_H_
 
 #include <networking/host.h>
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 typedef struct gateway_t gateway_t;
 
index b6f3951c41aeee8d47adfdaf5273fed19d386e8b..207800bd239ab23c854518bf9ba683aca6fd1c30 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "gateway.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 
 typedef struct private_manager_t private_manager_t;
 
index 69459e5aa579a7b23a99f02c7aab0ec8a38154ad..4324e99fe486425cab16ab9c4650ed1f05f233d3 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef STORAGE_H_
 #define STORAGE_H_
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 
 typedef struct storage_t storage_t;
index 0c362fed1ff051cd6d8181cf2d772251f7f6bee6..bd11cb4f8a8dbf3935986e00eb473cfbdfc737e9 100644 (file)
@@ -21,7 +21,7 @@
 #ifndef XML_H_
 #define XML_H_
 
-#include <utils/enumerator.h>
+#include <collections/enumerator.h>
 
 typedef struct xml_t xml_t;
 
index 47e668b6cdd52f53704bf482470c58ccd7490219..34df6c2c7d010474c9f0f575428bbe7b8e6624ed 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <debug.h>
 #include <asn1/asn1.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <credentials/certificates/certificate.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/certificates/pkcs10.h>
index d050c70321a672678dbd1d28816853d794fab0f2..d90ddc251fd97d801be1c1a3636c18e3553de739 100644 (file)
@@ -19,7 +19,7 @@
 
 #include "pki.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <credentials/certificates/certificate.h>
 
 /**
index 4a50aa46392655b2b66fee6608fc0c79fcc4fed7..448360821428ee941125742508e0af7072fa6638 100644 (file)
@@ -17,7 +17,7 @@
 
 #include "pki.h"
 
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <credentials/certificates/certificate.h>
 #include <credentials/certificates/x509.h>
 #include <asn1/asn1.h>
index 4ada120edeaab7df47cd64fe45ba028a6e1523c8..dc53022f29123c15c9a25ec08924d37108f35922 100644 (file)
@@ -18,7 +18,7 @@
 #include "pki.h"
 
 #include <debug.h>
-#include <utils/linked_list.h>
+#include <collections/linked_list.h>
 #include <credentials/certificates/certificate.h>
 #include <credentials/certificates/x509.h>
 #include <credentials/certificates/crl.h>
index 78b0d7e7a0102d7ed091a1b2ec2b9cc16020fef8..2638ec84d2e2ad8af1eb7186ef575a5523781e03 100644 (file)
@@ -30,8 +30,8 @@
 #include <asn1/asn1.h>
 #include <asn1/oid.h>
 #include <utils/optionsfrom.h>
-#include <utils/enumerator.h>
-#include <utils/linked_list.h>
+#include <collections/enumerator.h>
+#include <collections/linked_list.h>
 #include <crypto/hashers/hasher.h>
 #include <crypto/crypters/crypter.h>
 #include <crypto/proposal/proposal_keywords.h>