diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-10-16 14:54:16 +0200 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-10-24 16:00:49 +0200 |
| commit | 12642a68314a400ee2ed8b0c4474287957696ef0 (patch) | |
| tree | cd7ea721666a5491967d4ff86f2760bd2fc9bf49 /src | |
| parent | fdee6b5f5a7d711d68a77088b1e757fb6452bdee (diff) | |
| download | strongswan-12642a68314a400ee2ed8b0c4474287957696ef0.tar.bz2 strongswan-12642a68314a400ee2ed8b0c4474287957696ef0.tar.xz | |
Moved data structures to new collections subfolder
Diffstat (limited to 'src')
229 files changed, 338 insertions, 332 deletions
diff --git a/src/checksum/checksum_builder.c b/src/checksum/checksum_builder.c index b083d54db..0d9e8fd85 100644 --- a/src/checksum/checksum_builder.c +++ b/src/checksum/checksum_builder.c @@ -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; diff --git a/src/dumm/bridge.c b/src/dumm/bridge.c index 85b6471b6..3f4fdce9f 100644 --- a/src/dumm/bridge.c +++ b/src/dumm/bridge.c @@ -17,7 +17,7 @@ #include <libbridge.h> #include <debug.h> -#include <utils/linked_list.h> +#include <collections/linked_list.h> #include "bridge.h" diff --git a/src/dumm/bridge.h b/src/dumm/bridge.h index c557de994..9d48092df 100644 --- a/src/dumm/bridge.h +++ b/src/dumm/bridge.h @@ -17,7 +17,7 @@ #define BRIDGE_H #include <library.h> -#include <utils/enumerator.h> +#include <collections/enumerator.h> typedef struct bridge_t bridge_t; diff --git a/src/dumm/cowfs.c b/src/dumm/cowfs.c index f708a293b..a6152bf25 100644 --- a/src/dumm/cowfs.c +++ b/src/dumm/cowfs.c @@ -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); diff --git a/src/dumm/dumm.c b/src/dumm/dumm.c index 59751fa09..4d0ca9bc2 100644 --- a/src/dumm/dumm.c +++ b/src/dumm/dumm.c @@ -24,7 +24,7 @@ #include <errno.h> #include <debug.h> -#include <utils/linked_list.h> +#include <collections/linked_list.h> #include "dumm.h" diff --git a/src/dumm/dumm.h b/src/dumm/dumm.h index 4bd20808c..7c7923c46 100644 --- a/src/dumm/dumm.h +++ b/src/dumm/dumm.h @@ -20,7 +20,7 @@ #include <signal.h> #include <library.h> -#include <utils/enumerator.h> +#include <collections/enumerator.h> #include "guest.h" #include "bridge.h" diff --git a/src/dumm/ext/dumm.c b/src/dumm/ext/dumm.c index ca9b29388..4c6a1484d 100644 --- a/src/dumm/ext/dumm.c +++ b/src/dumm/ext/dumm.c @@ -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 diff --git a/src/dumm/guest.c b/src/dumm/guest.c index 336f6effa..752d3075f 100644 --- a/src/dumm/guest.c +++ b/src/dumm/guest.c @@ -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" diff --git a/src/dumm/guest.h b/src/dumm/guest.h index 789f2310e..0da05d88c 100644 --- a/src/dumm/guest.h +++ b/src/dumm/guest.h @@ -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; diff --git a/src/dumm/iface.c b/src/dumm/iface.c index 214387e88..7ac3b7160 100644 --- a/src/dumm/iface.c +++ b/src/dumm/iface.c @@ -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" diff --git a/src/dumm/iface.h b/src/dumm/iface.h index c43113abd..ae886acc3 100644 --- a/src/dumm/iface.h +++ b/src/dumm/iface.h @@ -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" diff --git a/src/dumm/main.c b/src/dumm/main.c index 37e7ba8f7..4cdf4682f 100644 --- a/src/dumm/main.c +++ b/src/dumm/main.c @@ -15,7 +15,7 @@ #include "dumm.h" -#include <utils/linked_list.h> +#include <collections/linked_list.h> #include <sys/types.h> #include <unistd.h> diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.h b/src/frontends/android/jni/libandroidbridge/charonservice.h index 4b5839f5e..7391ea61d 100644 --- a/src/frontends/android/jni/libandroidbridge/charonservice.h +++ b/src/frontends/android/jni/libandroidbridge/charonservice.h @@ -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; diff --git a/src/libcharon/config/backend.h b/src/libcharon/config/backend.h index 458abc37f..aca3352ba 100644 --- a/src/libcharon/config/backend.h +++ b/src/libcharon/config/backend.h @@ -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. diff --git a/src/libcharon/config/backend_manager.c b/src/libcharon/config/backend_manager.c index f82b511b3..f47d5715a 100644 --- a/src/libcharon/config/backend_manager.c +++ b/src/libcharon/config/backend_manager.c @@ -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> diff --git a/src/libcharon/config/ike_cfg.h b/src/libcharon/config/ike_cfg.h index dc5832927..fa2aaa325 100644 --- a/src/libcharon/config/ike_cfg.h +++ b/src/libcharon/config/ike_cfg.h @@ -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> diff --git a/src/libcharon/config/peer_cfg.c b/src/libcharon/config/peer_cfg.c index 5b3d869de..3d4ff20b8 100644 --- a/src/libcharon/config/peer_cfg.c +++ b/src/libcharon/config/peer_cfg.c @@ -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, diff --git a/src/libcharon/config/peer_cfg.h b/src/libcharon/config/peer_cfg.h index 121f7589e..80913beba 100644 --- a/src/libcharon/config/peer_cfg.h +++ b/src/libcharon/config/peer_cfg.h @@ -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> diff --git a/src/libcharon/config/proposal.c b/src/libcharon/config/proposal.c index 4738d0563..e12fed7ba 100644 --- a/src/libcharon/config/proposal.c +++ b/src/libcharon/config/proposal.c @@ -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> diff --git a/src/libcharon/config/proposal.h b/src/libcharon/config/proposal.h index ff6267dae..77e200acc 100644 --- a/src/libcharon/config/proposal.h +++ b/src/libcharon/config/proposal.h @@ -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> diff --git a/src/libcharon/encoding/generator.c b/src/libcharon/encoding/generator.c index 2dfaf43df..2b6825c71 100644 --- a/src/libcharon/encoding/generator.c +++ b/src/libcharon/encoding/generator.c @@ -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> diff --git a/src/libcharon/encoding/message.h b/src/libcharon/encoding/message.h index 53298387e..2c11e4581 100644 --- a/src/libcharon/encoding/message.h +++ b/src/libcharon/encoding/message.h @@ -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. diff --git a/src/libcharon/encoding/parser.c b/src/libcharon/encoding/parser.c index e4b140c3e..9e7f8311b 100644 --- a/src/libcharon/encoding/parser.c +++ b/src/libcharon/encoding/parser.c @@ -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> diff --git a/src/libcharon/encoding/payloads/cp_payload.c b/src/libcharon/encoding/payloads/cp_payload.c index 40f6ae48f..f6f373f99 100644 --- a/src/libcharon/encoding/payloads/cp_payload.c +++ b/src/libcharon/encoding/payloads/cp_payload.c @@ -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", diff --git a/src/libcharon/encoding/payloads/cp_payload.h b/src/libcharon/encoding/payloads/cp_payload.h index 5eb1e06a7..c23bc0bb4 100644 --- a/src/libcharon/encoding/payloads/cp_payload.h +++ b/src/libcharon/encoding/payloads/cp_payload.h @@ -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. diff --git a/src/libcharon/encoding/payloads/encryption_payload.c b/src/libcharon/encoding/payloads/encryption_payload.c index 02e7b8bf3..6ba1b23a0 100644 --- a/src/libcharon/encoding/payloads/encryption_payload.c +++ b/src/libcharon/encoding/payloads/encryption_payload.c @@ -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> diff --git a/src/libcharon/encoding/payloads/ke_payload.h b/src/libcharon/encoding/payloads/ke_payload.h index 5942954d9..d3aa18484 100644 --- a/src/libcharon/encoding/payloads/ke_payload.h +++ b/src/libcharon/encoding/payloads/ke_payload.h @@ -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> /** diff --git a/src/libcharon/encoding/payloads/notify_payload.h b/src/libcharon/encoding/payloads/notify_payload.h index beec1e233..498c659b1 100644 --- a/src/libcharon/encoding/payloads/notify_payload.h +++ b/src/libcharon/encoding/payloads/notify_payload.h @@ -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. diff --git a/src/libcharon/encoding/payloads/proposal_substructure.c b/src/libcharon/encoding/payloads/proposal_substructure.c index 653f51a46..1616e8283 100644 --- a/src/libcharon/encoding/payloads/proposal_substructure.c +++ b/src/libcharon/encoding/payloads/proposal_substructure.c @@ -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> /** diff --git a/src/libcharon/encoding/payloads/proposal_substructure.h b/src/libcharon/encoding/payloads/proposal_substructure.h index 5d42a6116..bfa8b9daa 100644 --- a/src/libcharon/encoding/payloads/proposal_substructure.h +++ b/src/libcharon/encoding/payloads/proposal_substructure.h @@ -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> diff --git a/src/libcharon/encoding/payloads/sa_payload.c b/src/libcharon/encoding/payloads/sa_payload.c index adf19aa67..3a8d3a760 100644 --- a/src/libcharon/encoding/payloads/sa_payload.c +++ b/src/libcharon/encoding/payloads/sa_payload.c @@ -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 */ diff --git a/src/libcharon/encoding/payloads/sa_payload.h b/src/libcharon/encoding/payloads/sa_payload.h index 9a88cccd5..dac3043bf 100644 --- a/src/libcharon/encoding/payloads/sa_payload.h +++ b/src/libcharon/encoding/payloads/sa_payload.h @@ -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> diff --git a/src/libcharon/encoding/payloads/traffic_selector_substructure.c b/src/libcharon/encoding/payloads/traffic_selector_substructure.c index 378f5bbc3..15f791b95 100644 --- a/src/libcharon/encoding/payloads/traffic_selector_substructure.c +++ b/src/libcharon/encoding/payloads/traffic_selector_substructure.c @@ -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; diff --git a/src/libcharon/encoding/payloads/transform_substructure.c b/src/libcharon/encoding/payloads/transform_substructure.c index a4a920b60..a85027561 100644 --- a/src/libcharon/encoding/payloads/transform_substructure.c +++ b/src/libcharon/encoding/payloads/transform_substructure.c @@ -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; diff --git a/src/libcharon/encoding/payloads/transform_substructure.h b/src/libcharon/encoding/payloads/transform_substructure.h index 947df24f9..97717e65b 100644 --- a/src/libcharon/encoding/payloads/transform_substructure.h +++ b/src/libcharon/encoding/payloads/transform_substructure.h @@ -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> diff --git a/src/libcharon/encoding/payloads/ts_payload.c b/src/libcharon/encoding/payloads/ts_payload.c index a7678da73..8dfa47bc2 100644 --- a/src/libcharon/encoding/payloads/ts_payload.c +++ b/src/libcharon/encoding/payloads/ts_payload.c @@ -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; diff --git a/src/libcharon/encoding/payloads/ts_payload.h b/src/libcharon/encoding/payloads/ts_payload.h index 5a92655dc..933245c62 100644 --- a/src/libcharon/encoding/payloads/ts_payload.h +++ b/src/libcharon/encoding/payloads/ts_payload.h @@ -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> diff --git a/src/libcharon/network/socket.h b/src/libcharon/network/socket.h index 2eccc4d3f..f6c8a8660 100644 --- a/src/libcharon/network/socket.h +++ b/src/libcharon/network/socket.h @@ -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> /** diff --git a/src/libcharon/network/socket_manager.c b/src/libcharon/network/socket_manager.c index d2736de8e..bf1fe5ba2 100644 --- a/src/libcharon/network/socket_manager.c +++ b/src/libcharon/network/socket_manager.c @@ -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; diff --git a/src/libcharon/plugins/android/android_handler.c b/src/libcharon/plugins/android/android_handler.c index c5e98d315..29dbbbfd0 100644 --- a/src/libcharon/plugins/android/android_handler.c +++ b/src/libcharon/plugins/android/android_handler.c @@ -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> diff --git a/src/libcharon/plugins/certexpire/certexpire_export.c b/src/libcharon/plugins/certexpire/certexpire_export.c index 8e046d0fe..1b912171a 100644 --- a/src/libcharon/plugins/certexpire/certexpire_export.c +++ b/src/libcharon/plugins/certexpire/certexpire_export.c @@ -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> diff --git a/src/libcharon/plugins/certexpire/certexpire_export.h b/src/libcharon/plugins/certexpire/certexpire_export.h index 64281d0bd..7b75f2c92 100644 --- a/src/libcharon/plugins/certexpire/certexpire_export.h +++ b/src/libcharon/plugins/certexpire/certexpire_export.h @@ -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. diff --git a/src/libcharon/plugins/dhcp/dhcp_provider.c b/src/libcharon/plugins/dhcp/dhcp_provider.c index 8bc547462..f83efda5d 100644 --- a/src/libcharon/plugins/dhcp/dhcp_provider.c +++ b/src/libcharon/plugins/dhcp/dhcp_provider.c @@ -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; diff --git a/src/libcharon/plugins/dhcp/dhcp_socket.c b/src/libcharon/plugins/dhcp/dhcp_socket.c index f469c5a35..46d4c64ef 100644 --- a/src/libcharon/plugins/dhcp/dhcp_socket.c +++ b/src/libcharon/plugins/dhcp/dhcp_socket.c @@ -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> diff --git a/src/libcharon/plugins/dhcp/dhcp_transaction.c b/src/libcharon/plugins/dhcp/dhcp_transaction.c index 83f822dd8..22d3f3fdf 100644 --- a/src/libcharon/plugins/dhcp/dhcp_transaction.c +++ b/src/libcharon/plugins/dhcp/dhcp_transaction.c @@ -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; diff --git a/src/libcharon/plugins/duplicheck/duplicheck_listener.c b/src/libcharon/plugins/duplicheck/duplicheck_listener.c index 4f59e034f..7c6c13786 100644 --- a/src/libcharon/plugins/duplicheck/duplicheck_listener.c +++ b/src/libcharon/plugins/duplicheck/duplicheck_listener.c @@ -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> diff --git a/src/libcharon/plugins/duplicheck/duplicheck_notify.c b/src/libcharon/plugins/duplicheck/duplicheck_notify.c index 06a88ed7d..cd5d4970b 100644 --- a/src/libcharon/plugins/duplicheck/duplicheck_notify.c +++ b/src/libcharon/plugins/duplicheck/duplicheck_notify.c @@ -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" diff --git a/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c index 0d71c3d97..96f437583 100644 --- a/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c +++ b/src/libcharon/plugins/eap_mschapv2/eap_mschapv2.c @@ -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> diff --git a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c index f164f67ed..7bff989fc 100644 --- a/src/libcharon/plugins/eap_radius/eap_radius_accounting.c +++ b/src/libcharon/plugins/eap_radius/eap_radius_accounting.c @@ -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; diff --git a/src/libcharon/plugins/eap_radius/eap_radius_forward.c b/src/libcharon/plugins/eap_radius/eap_radius_forward.c index 2dd38ea2f..e9124877c 100644 --- a/src/libcharon/plugins/eap_radius/eap_radius_forward.c +++ b/src/libcharon/plugins/eap_radius/eap_radius_forward.c @@ -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; diff --git a/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.c b/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.c index de3b69382..ec1686910 100644 --- a/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.c +++ b/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.c @@ -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> diff --git a/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.h b/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.h index c8e9e0359..3fa0ea381 100644 --- a/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.h +++ b/src/libcharon/plugins/eap_sim_file/eap_sim_file_triplets.h @@ -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; diff --git a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.c b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.c index 5f78c967a..b5bbdd60f 100644 --- a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.c +++ b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_card.c @@ -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; diff --git a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c index 3070b808a..32225d2e0 100644 --- a/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c +++ b/src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_provider.c @@ -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; diff --git a/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.c b/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.c index 870d72781..5bc5fd382 100644 --- a/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.c +++ b/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_card.c @@ -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; diff --git a/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c b/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c index b1a9a7f7c..937095ec1 100644 --- a/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c +++ b/src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_provider.c @@ -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; diff --git a/src/libcharon/plugins/farp/farp_listener.c b/src/libcharon/plugins/farp/farp_listener.c index d1df4cc27..81d5d2405 100644 --- a/src/libcharon/plugins/farp/farp_listener.c +++ b/src/libcharon/plugins/farp/farp_listener.c @@ -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; diff --git a/src/libcharon/plugins/ha/ha_attribute.c b/src/libcharon/plugins/ha/ha_attribute.c index ae6296462..981def6a3 100644 --- a/src/libcharon/plugins/ha/ha_attribute.c +++ b/src/libcharon/plugins/ha/ha_attribute.c @@ -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; diff --git a/src/libcharon/plugins/ha/ha_cache.c b/src/libcharon/plugins/ha/ha_cache.c index e21b461a7..ce1afe6f9 100644 --- a/src/libcharon/plugins/ha/ha_cache.c +++ b/src/libcharon/plugins/ha/ha_cache.c @@ -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> diff --git a/src/libcharon/plugins/ha/ha_cache.h b/src/libcharon/plugins/ha/ha_cache.h index 39f1947a8..5e3936a20 100644 --- a/src/libcharon/plugins/ha/ha_cache.h +++ b/src/libcharon/plugins/ha/ha_cache.h @@ -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> diff --git a/src/libcharon/plugins/ha/ha_segments.c b/src/libcharon/plugins/ha/ha_segments.c index fb07809ef..688e09bdc 100644 --- a/src/libcharon/plugins/ha/ha_segments.c +++ b/src/libcharon/plugins/ha/ha_segments.c @@ -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> diff --git a/src/libcharon/plugins/lookip/lookip_listener.c b/src/libcharon/plugins/lookip/lookip_listener.c index 91d1235ec..d2388f6b5 100644 --- a/src/libcharon/plugins/lookip/lookip_listener.c +++ b/src/libcharon/plugins/lookip/lookip_listener.c @@ -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; diff --git a/src/libcharon/plugins/lookip/lookip_socket.c b/src/libcharon/plugins/lookip/lookip_socket.c index 5c6e0e3c9..dc1a80b83 100644 --- a/src/libcharon/plugins/lookip/lookip_socket.c +++ b/src/libcharon/plugins/lookip/lookip_socket.c @@ -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" diff --git a/src/libcharon/plugins/medcli/medcli_creds.c b/src/libcharon/plugins/medcli/medcli_creds.c index 9c4a0b756..677229b9f 100644 --- a/src/libcharon/plugins/medcli/medcli_creds.c +++ b/src/libcharon/plugins/medcli/medcli_creds.c @@ -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; diff --git a/src/libcharon/plugins/medsrv/medsrv_creds.c b/src/libcharon/plugins/medsrv/medsrv_creds.c index 3ae80f64c..0d99c4f77 100644 --- a/src/libcharon/plugins/medsrv/medsrv_creds.c +++ b/src/libcharon/plugins/medsrv/medsrv_creds.c @@ -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; diff --git a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c index 33f16cc45..a5e919348 100644 --- a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c +++ b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c @@ -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 diff --git a/src/libcharon/plugins/stroke/stroke_attribute.c b/src/libcharon/plugins/stroke/stroke_attribute.c index 85fb94e9e..0f3c38986 100644 --- a/src/libcharon/plugins/stroke/stroke_attribute.c +++ b/src/libcharon/plugins/stroke/stroke_attribute.c @@ -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; diff --git a/src/libcharon/plugins/stroke/stroke_ca.c b/src/libcharon/plugins/stroke/stroke_ca.c index 763b4cc0f..f8026875f 100644 --- a/src/libcharon/plugins/stroke/stroke_ca.c +++ b/src/libcharon/plugins/stroke/stroke_ca.c @@ -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> diff --git a/src/libcharon/plugins/stroke/stroke_cred.c b/src/libcharon/plugins/stroke/stroke_cred.c index de80327e4..4ecb63d19 100644 --- a/src/libcharon/plugins/stroke/stroke_cred.c +++ b/src/libcharon/plugins/stroke/stroke_cred.c @@ -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> diff --git a/src/libcharon/plugins/stroke/stroke_cred.h b/src/libcharon/plugins/stroke/stroke_cred.h index 83e648819..c37d05808 100644 --- a/src/libcharon/plugins/stroke/stroke_cred.h +++ b/src/libcharon/plugins/stroke/stroke_cred.h @@ -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; diff --git a/src/libcharon/plugins/stroke/stroke_handler.c b/src/libcharon/plugins/stroke/stroke_handler.c index 523151efb..fef8cab67 100644 --- a/src/libcharon/plugins/stroke/stroke_handler.c +++ b/src/libcharon/plugins/stroke/stroke_handler.c @@ -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; diff --git a/src/libcharon/plugins/stroke/stroke_list.c b/src/libcharon/plugins/stroke/stroke_list.c index c012ff25d..b3a20a6c7 100644 --- a/src/libcharon/plugins/stroke/stroke_list.c +++ b/src/libcharon/plugins/stroke/stroke_list.c @@ -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> diff --git a/src/libcharon/plugins/stroke/stroke_socket.c b/src/libcharon/plugins/stroke/stroke_socket.c index 14f36cde5..2771f0146 100644 --- a/src/libcharon/plugins/stroke/stroke_socket.c +++ b/src/libcharon/plugins/stroke/stroke_socket.c @@ -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" diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc.c b/src/libcharon/plugins/tnc_imc/tnc_imc.c index a1f2d770f..d8e9d0995 100644 --- a/src/libcharon/plugins/tnc_imc/tnc_imc.c +++ b/src/libcharon/plugins/tnc_imc/tnc_imc.c @@ -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; diff --git a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c b/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c index 65ec81dae..20ad208b7 100644 --- a/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c +++ b/src/libcharon/plugins/tnc_imc/tnc_imc_manager.c @@ -19,7 +19,7 @@ #include <tncifimc.h> -#include <utils/linked_list.h> +#include <collections/linked_list.h> #include <debug.h> #include <daemon.h> diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv.c b/src/libcharon/plugins/tnc_imv/tnc_imv.c index f0b150743..e82cfc92d 100644 --- a/src/libcharon/plugins/tnc_imv/tnc_imv.c +++ b/src/libcharon/plugins/tnc_imv/tnc_imv.c @@ -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; diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c b/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c index 396d5d854..11b98d8ca 100644 --- a/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c +++ b/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.c @@ -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; diff --git a/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.h b/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.h index 6d65a2521..66d03b2f8 100644 --- a/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.h +++ b/src/libcharon/plugins/tnc_imv/tnc_imv_recommendations.h @@ -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 diff --git a/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c b/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c index bca43985f..79aac45ed 100644 --- a/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c +++ b/src/libcharon/plugins/tnc_pdp/tnc_pdp_connections.c @@ -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; diff --git a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c b/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c index 515e85804..2094ec5e8 100644 --- a/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c +++ b/src/libcharon/plugins/tnc_tnccs/tnc_tnccs_manager.c @@ -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: { diff --git a/src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c b/src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c index c9397722b..1f63de323 100644 --- a/src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c +++ b/src/libcharon/plugins/tnccs_11/batch/tnccs_batch.c @@ -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> diff --git a/src/libcharon/plugins/tnccs_11/messages/tnccs_msg.h b/src/libcharon/plugins/tnccs_11/messages/tnccs_msg.h index e0b54449a..88d6f07aa 100644 --- a/src/libcharon/plugins/tnccs_11/messages/tnccs_msg.h +++ b/src/libcharon/plugins/tnccs_11/messages/tnccs_msg.h @@ -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> /** diff --git a/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c b/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c index 2f932637a..3bf048a41 100644 --- a/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c +++ b/src/libcharon/plugins/tnccs_20/batch/pb_tnc_batch.c @@ -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, diff --git a/src/libcharon/plugins/tnccs_20/tnccs_20.c b/src/libcharon/plugins/tnccs_20/tnccs_20.c index 44e1d278f..4d917ed39 100644 --- a/src/libcharon/plugins/tnccs_20/tnccs_20.c +++ b/src/libcharon/plugins/tnccs_20/tnccs_20.c @@ -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; diff --git a/src/libcharon/plugins/uci/uci_parser.h b/src/libcharon/plugins/uci/uci_parser.h index 7217e507a..230c35e86 100644 --- a/src/libcharon/plugins/uci/uci_parser.h +++ b/src/libcharon/plugins/uci/uci_parser.h @@ -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; diff --git a/src/libcharon/plugins/unit_tester/tests/test_enumerator.c b/src/libcharon/plugins/unit_tester/tests/test_enumerator.c index edbf0f5bb..83b78c092 100644 --- a/src/libcharon/plugins/unit_tester/tests/test_enumerator.c +++ b/src/libcharon/plugins/unit_tester/tests/test_enumerator.c @@ -13,7 +13,7 @@ * for more details. */ -#include <utils/linked_list.h> +#include <collections/linked_list.h> /******************************************************************************* diff --git a/src/libcharon/plugins/unit_tester/tests/test_hashtable.c b/src/libcharon/plugins/unit_tester/tests/test_hashtable.c index bd79e12f7..5513f6707 100644 --- a/src/libcharon/plugins/unit_tester/tests/test_hashtable.c +++ b/src/libcharon/plugins/unit_tester/tests/test_hashtable.c @@ -14,7 +14,7 @@ */ #include <library.h> -#include <utils/hashtable.h> +#include <collections/hashtable.h> static u_int hash(char *key) { diff --git a/src/libcharon/plugins/unit_tester/tests/test_med_db.c b/src/libcharon/plugins/unit_tester/tests/test_med_db.c index ae1d08e15..75244ab8f 100644 --- a/src/libcharon/plugins/unit_tester/tests/test_med_db.c +++ b/src/libcharon/plugins/unit_tester/tests/test_med_db.c @@ -15,7 +15,7 @@ #include <library.h> #include <daemon.h> -#include <utils/enumerator.h> +#include <collections/enumerator.h> #include <unistd.h> diff --git a/src/libcharon/plugins/unit_tester/tests/test_mysql.c b/src/libcharon/plugins/unit_tester/tests/test_mysql.c index 252441ef8..eda238623 100644 --- a/src/libcharon/plugins/unit_tester/tests/test_mysql.c +++ b/src/libcharon/plugins/unit_tester/tests/test_mysql.c @@ -15,7 +15,7 @@ #include <library.h> #include <daemon.h> -#include <utils/enumerator.h> +#include <collections/enumerator.h> /******************************************************************************* * mysql simple test diff --git a/src/libcharon/plugins/unit_tester/tests/test_sqlite.c b/src/libcharon/plugins/unit_tester/tests/test_sqlite.c index dd8d1955e..99490b566 100644 --- a/src/libcharon/plugins/unit_tester/tests/test_sqlite.c +++ b/src/libcharon/plugins/unit_tester/tests/test_sqlite.c @@ -15,7 +15,7 @@ #include <library.h> #include <daemon.h> -#include <utils/enumerator.h> +#include <collections/enumerator.h> #include <unistd.h> diff --git a/src/libcharon/plugins/unity/unity_handler.c b/src/libcharon/plugins/unity/unity_handler.c index b2aeba605..446f51293 100644 --- a/src/libcharon/plugins/unity/unity_handler.c +++ b/src/libcharon/plugins/unity/unity_handler.c @@ -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; diff --git a/src/libcharon/plugins/updown/updown_handler.c b/src/libcharon/plugins/updown/updown_handler.c index b2ac02e85..3a644380a 100644 --- a/src/libcharon/plugins/updown/updown_handler.c +++ b/src/libcharon/plugins/updown/updown_handler.c @@ -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; diff --git a/src/libcharon/plugins/whitelist/whitelist_listener.c b/src/libcharon/plugins/whitelist/whitelist_listener.c index 64ef04800..382ee3b8b 100644 --- a/src/libcharon/plugins/whitelist/whitelist_listener.c +++ b/src/libcharon/plugins/whitelist/whitelist_listener.c @@ -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; diff --git a/src/libcharon/processing/jobs/mediation_job.h b/src/libcharon/processing/jobs/mediation_job.h index 41485cbc6..6a1475102 100644 --- a/src/libcharon/processing/jobs/mediation_job.h +++ b/src/libcharon/processing/jobs/mediation_job.h @@ -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. diff --git a/src/libcharon/sa/eap/eap_manager.c b/src/libcharon/sa/eap/eap_manager.c index 520c0ce56..1886307e9 100644 --- a/src/libcharon/sa/eap/eap_manager.c +++ b/src/libcharon/sa/eap/eap_manager.c @@ -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; diff --git a/src/libcharon/sa/ike_sa.c b/src/libcharon/sa/ike_sa.c index d9118fc49..0005188ad 100644 --- a/src/libcharon/sa/ike_sa.c +++ b/src/libcharon/sa/ike_sa.c @@ -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> diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c index cccf5d0d1..38c5b4ac5 100644 --- a/src/libcharon/sa/ike_sa_manager.c +++ b/src/libcharon/sa/ike_sa_manager.c @@ -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) */ diff --git a/src/libcharon/sa/ikev1/keymat_v1.c b/src/libcharon/sa/ikev1/keymat_v1.c index cff344a34..eb642109b 100644 --- a/src/libcharon/sa/ikev1/keymat_v1.c +++ b/src/libcharon/sa/ikev1/keymat_v1.c @@ -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; diff --git a/src/libcharon/sa/ikev1/phase1.c b/src/libcharon/sa/ikev1/phase1.c index 4096141ec..636e06af6 100644 --- a/src/libcharon/sa/ikev1/phase1.c +++ b/src/libcharon/sa/ikev1/phase1.c @@ -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; diff --git a/src/libcharon/sa/ikev2/connect_manager.c b/src/libcharon/sa/ikev2/connect_manager.c index 5fdcea1ab..c4e5ea7a0 100644 --- a/src/libcharon/sa/ikev2/connect_manager.c +++ b/src/libcharon/sa/ikev2/connect_manager.c @@ -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> diff --git a/src/libcharon/sa/ikev2/mediation_manager.c b/src/libcharon/sa/ikev2/mediation_manager.c index 60eeb5d4b..bf5b2f4b3 100644 --- a/src/libcharon/sa/ikev2/mediation_manager.c +++ b/src/libcharon/sa/ikev2/mediation_manager.c @@ -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; diff --git a/src/libcharon/sa/shunt_manager.c b/src/libcharon/sa/shunt_manager.c index 5af43fb91..94be7d433 100644 --- a/src/libcharon/sa/shunt_manager.c +++ b/src/libcharon/sa/shunt_manager.c @@ -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; diff --git a/src/libcharon/sa/shunt_manager.h b/src/libcharon/sa/shunt_manager.h index 12ff08558..28a795dc9 100644 --- a/src/libcharon/sa/shunt_manager.h +++ b/src/libcharon/sa/shunt_manager.h @@ -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; diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c index d068ce484..69b23e1df 100644 --- a/src/libcharon/sa/trap_manager.c +++ b/src/libcharon/sa/trap_manager.c @@ -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; diff --git a/src/libcharon/sa/trap_manager.h b/src/libcharon/sa/trap_manager.h index 928b2a49f..e3d355662 100644 --- a/src/libcharon/sa/trap_manager.h +++ b/src/libcharon/sa/trap_manager.h @@ -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; diff --git a/src/libcharon/sa/xauth/xauth_manager.c b/src/libcharon/sa/xauth/xauth_manager.c index 432c9c0ab..f0602a673 100644 --- a/src/libcharon/sa/xauth/xauth_manager.c +++ b/src/libcharon/sa/xauth/xauth_manager.c @@ -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; diff --git a/src/libfast/dispatcher.c b/src/libfast/dispatcher.c index 63c872e35..6b89635ae 100644 --- a/src/libfast/dispatcher.c +++ b/src/libfast/dispatcher.c @@ -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 diff --git a/src/libfast/session.c b/src/libfast/session.c index cf14dbeb6..87a157b61 100644 --- a/src/libfast/session.c +++ b/src/libfast/session.c @@ -21,7 +21,7 @@ #include <fcgiapp.h> #include <stdio.h> -#include <utils/linked_list.h> +#include <collections/linked_list.h> #define COOKIE_LEN 16 diff --git a/src/libhydra/attributes/attribute_handler.h b/src/libhydra/attributes/attribute_handler.h index 6014ef0fa..91fa4e5b0 100644 --- a/src/libhydra/attributes/attribute_handler.h +++ b/src/libhydra/attributes/attribute_handler.h @@ -23,7 +23,7 @@ #include <chunk.h> #include <utils/identification.h> -#include <utils/linked_list.h> +#include <collections/linked_list.h> #include "attributes.h" diff --git a/src/libhydra/attributes/attribute_manager.c b/src/libhydra/attributes/attribute_manager.c index 000d2e082..dd3963b7f 100644 --- a/src/libhydra/attributes/attribute_manager.c +++ b/src/libhydra/attributes/attribute_manager.c @@ -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; diff --git a/src/libhydra/attributes/attribute_provider.h b/src/libhydra/attributes/attribute_provider.h index 82d0ee3c2..adfd4a516 100644 --- a/src/libhydra/attributes/attribute_provider.h +++ b/src/libhydra/attributes/attribute_provider.h @@ -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; diff --git a/src/libhydra/attributes/mem_pool.c b/src/libhydra/attributes/mem_pool.c index 1e150c794..1c5ea53de 100644 --- a/src/libhydra/attributes/mem_pool.c +++ b/src/libhydra/attributes/mem_pool.c @@ -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) diff --git a/src/libhydra/kernel/kernel_interface.c b/src/libhydra/kernel/kernel_interface.c index 5320ee2e9..79a2ab938 100644 --- a/src/libhydra/kernel/kernel_interface.c +++ b/src/libhydra/kernel/kernel_interface.c @@ -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; diff --git a/src/libhydra/kernel/kernel_net.h b/src/libhydra/kernel/kernel_net.h index 0de93eaee..0f2e31cc9 100644 --- a/src/libhydra/kernel/kernel_net.h +++ b/src/libhydra/kernel/kernel_net.h @@ -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> diff --git a/src/libhydra/plugins/attr/attr_provider.c b/src/libhydra/plugins/attr/attr_provider.c index c1c3cd895..ca3221979 100644 --- a/src/libhydra/plugins/attr/attr_provider.c +++ b/src/libhydra/plugins/attr/attr_provider.c @@ -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 diff --git a/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c b/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c index d875dab04..2c1d7e9b3 100644 --- a/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c +++ b/src/libhydra/plugins/kernel_klips/kernel_klips_ipsec.c @@ -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> diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c index a6aa34b89..8cd19a245 100644 --- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c +++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c @@ -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 */ diff --git a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c index e5f070e13..b39ffa3ac 100644 --- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c +++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c @@ -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) */ diff --git a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c index ed541ad67..e1a838419 100644 --- a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c +++ b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c @@ -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> diff --git a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c index 0ead65785..6d5245636 100644 --- a/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c +++ b/src/libhydra/plugins/kernel_pfroute/kernel_pfroute_net.c @@ -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 diff --git a/src/libimcv/ietf/ietf_attr_attr_request.c b/src/libimcv/ietf/ietf_attr_attr_request.c index 44ad70a0f..1b0931950 100644 --- a/src/libimcv/ietf/ietf_attr_attr_request.c +++ b/src/libimcv/ietf/ietf_attr_attr_request.c @@ -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); diff --git a/src/libimcv/ietf/ietf_attr_installed_packages.c b/src/libimcv/ietf/ietf_attr_installed_packages.c index 786051da1..e0ff748f9 100644 --- a/src/libimcv/ietf/ietf_attr_installed_packages.c +++ b/src/libimcv/ietf/ietf_attr_installed_packages.c @@ -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); } /** diff --git a/src/libimcv/ietf/ietf_attr_port_filter.c b/src/libimcv/ietf/ietf_attr_port_filter.c index 811ccbcf9..34bcf895c 100644 --- a/src/libimcv/ietf/ietf_attr_port_filter.c +++ b/src/libimcv/ietf/ietf_attr_port_filter.c @@ -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); } /** diff --git a/src/libimcv/imc/imc_agent.h b/src/libimcv/imc/imc_agent.h index 7c361361f..aef10c0d7 100644 --- a/src/libimcv/imc/imc_agent.h +++ b/src/libimcv/imc/imc_agent.h @@ -27,7 +27,7 @@ #include <tncifimc.h> #include <pen/pen.h> -#include <utils/linked_list.h> +#include <collections/linked_list.h> #include <library.h> diff --git a/src/libimcv/imc/imc_msg.c b/src/libimcv/imc/imc_msg.c index 80fc5205e..48a295575 100644 --- a/src/libimcv/imc/imc_msg.c +++ b/src/libimcv/imc/imc_msg.c @@ -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; diff --git a/src/libimcv/imv/imv_agent.h b/src/libimcv/imv/imv_agent.h index 4a4e71858..0ef784094 100644 --- a/src/libimcv/imv/imv_agent.h +++ b/src/libimcv/imv/imv_agent.h @@ -27,7 +27,7 @@ #include <tncifimv.h> #include <pen/pen.h> -#include <utils/linked_list.h> +#include <collections/linked_list.h> #include <library.h> diff --git a/src/libimcv/imv/imv_msg.c b/src/libimcv/imv/imv_msg.c index 9781c28bf..e69121a4b 100644 --- a/src/libimcv/imv/imv_msg.c +++ b/src/libimcv/imv/imv_msg.c @@ -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; diff --git a/src/libimcv/os_info/os_info.c b/src/libimcv/os_info/os_info.c index 576d27c68..8846c84cd 100644 --- a/src/libimcv/os_info/os_info.c +++ b/src/libimcv/os_info/os_info.c @@ -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 { diff --git a/src/libimcv/pa_tnc/pa_tnc_attr_manager.c b/src/libimcv/pa_tnc/pa_tnc_attr_manager.c index 1de89d87d..3df660e01 100644 --- a/src/libimcv/pa_tnc/pa_tnc_attr_manager.c +++ b/src/libimcv/pa_tnc/pa_tnc_attr_manager.c @@ -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); } diff --git a/src/libimcv/pa_tnc/pa_tnc_msg.c b/src/libimcv/pa_tnc/pa_tnc_msg.c index b324a6910..b7cdd37c2 100644 --- a/src/libimcv/pa_tnc/pa_tnc_msg.c +++ b/src/libimcv/pa_tnc/pa_tnc_msg.c @@ -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); diff --git a/src/libimcv/plugins/imc_test/imc_test_state.c b/src/libimcv/plugins/imc_test/imc_test_state.c index 7d2db7c34..fba018d1a 100644 --- a/src/libimcv/plugins/imc_test/imc_test_state.c +++ b/src/libimcv/plugins/imc_test/imc_test_state.c @@ -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; } diff --git a/src/libimcv/plugins/imv_os/imv_os.c b/src/libimcv/plugins/imv_os/imv_os.c index c56c7358e..3bfe89d2e 100644 --- a/src/libimcv/plugins/imv_os/imv_os.c +++ b/src/libimcv/plugins/imv_os/imv_os.c @@ -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, diff --git a/src/libimcv/plugins/imv_scanner/imv_scanner.c b/src/libimcv/plugins/imv_scanner/imv_scanner.c index ad7591b39..4d9762cb6 100644 --- a/src/libimcv/plugins/imv_scanner/imv_scanner.c +++ b/src/libimcv/plugins/imv_scanner/imv_scanner.c @@ -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); diff --git a/src/libimcv/plugins/imv_test/imv_test_state.c b/src/libimcv/plugins/imv_test/imv_test_state.c index 67f22c062..53d4c07b3 100644 --- a/src/libimcv/plugins/imv_test/imv_test_state.c +++ b/src/libimcv/plugins/imv_test/imv_test_state.c @@ -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; } diff --git a/src/libipsec/ipsec_event_relay.c b/src/libipsec/ipsec_event_relay.c index 34222258c..19643d5dd 100644 --- a/src/libipsec/ipsec_event_relay.c +++ b/src/libipsec/ipsec_event_relay.c @@ -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; diff --git a/src/libipsec/ipsec_policy_mgr.c b/src/libipsec/ipsec_policy_mgr.c index 41ba792c3..dd904ba39 100644 --- a/src/libipsec/ipsec_policy_mgr.c +++ b/src/libipsec/ipsec_policy_mgr.c @@ -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 diff --git a/src/libipsec/ipsec_policy_mgr.h b/src/libipsec/ipsec_policy_mgr.h index ae0a29868..dfa4b12c3 100644 --- a/src/libipsec/ipsec_policy_mgr.h +++ b/src/libipsec/ipsec_policy_mgr.h @@ -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> diff --git a/src/libipsec/ipsec_processor.c b/src/libipsec/ipsec_processor.c index 353f0e7e0..4d3649d4c 100644 --- a/src/libipsec/ipsec_processor.c +++ b/src/libipsec/ipsec_processor.c @@ -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; diff --git a/src/libipsec/ipsec_sa_mgr.c b/src/libipsec/ipsec_sa_mgr.c index 35ad6c171..32f2cdb73 100644 --- a/src/libipsec/ipsec_sa_mgr.c +++ b/src/libipsec/ipsec_sa_mgr.c @@ -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; diff --git a/src/libpts/plugins/imc_attestation/imc_attestation.c b/src/libpts/plugins/imc_attestation/imc_attestation.c index ee3d5c82e..9086f7263 100644 --- a/src/libpts/plugins/imc_attestation/imc_attestation.c +++ b/src/libpts/plugins/imc_attestation/imc_attestation.c @@ -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"); diff --git a/src/libpts/plugins/imc_attestation/imc_attestation_state.c b/src/libpts/plugins/imc_attestation/imc_attestation_state.c index b3d35102b..5ff50c0bc 100644 --- a/src/libpts/plugins/imc_attestation/imc_attestation_state.c +++ b/src/libpts/plugins/imc_attestation/imc_attestation_state.c @@ -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; } diff --git a/src/libpts/plugins/imv_attestation/imv_attestation.c b/src/libpts/plugins/imv_attestation/imv_attestation.c index a5175d96e..e3536d164 100644 --- a/src/libpts/plugins/imv_attestation/imv_attestation.c +++ b/src/libpts/plugins/imv_attestation/imv_attestation.c @@ -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"); diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_process.h b/src/libpts/plugins/imv_attestation/imv_attestation_process.h index b809ccfab..73b4251e0 100644 --- a/src/libpts/plugins/imv_attestation/imv_attestation_process.h +++ b/src/libpts/plugins/imv_attestation/imv_attestation_process.h @@ -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> diff --git a/src/libpts/plugins/imv_attestation/imv_attestation_state.c b/src/libpts/plugins/imv_attestation/imv_attestation_state.c index aa91bf215..d5724f6ba 100644 --- a/src/libpts/plugins/imv_attestation/imv_attestation_state.c +++ b/src/libpts/plugins/imv_attestation/imv_attestation_state.c @@ -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)) { diff --git a/src/libpts/pts/components/pts_component_manager.c b/src/libpts/pts/components/pts_component_manager.c index e330aeebf..40fea1cec 100644 --- a/src/libpts/pts/components/pts_component_manager.c +++ b/src/libpts/pts/components/pts_component_manager.c @@ -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); } diff --git a/src/libpts/pts/pts.h b/src/libpts/pts/pts.h index aad73c4b6..423a4c802 100644 --- a/src/libpts/pts/pts.h +++ b/src/libpts/pts/pts.h @@ -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 diff --git a/src/libpts/pts/pts_file_meas.c b/src/libpts/pts/pts_file_meas.c index 4fece6b3c..344914fc6 100644 --- a/src/libpts/pts/pts_file_meas.c +++ b/src/libpts/pts/pts_file_meas.c @@ -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, diff --git a/src/libpts/pts/pts_file_meta.c b/src/libpts/pts/pts_file_meta.c index 6ed1c01b4..c97c2d770 100644 --- a/src/libpts/pts/pts_file_meta.c +++ b/src/libpts/pts/pts_file_meta.c @@ -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; diff --git a/src/libpts/tcg/tcg_pts_attr_file_meas.c b/src/libpts/tcg/tcg_pts_attr_file_meas.c index 01c4361e1..8138a5f2e 100644 --- a/src/libpts/tcg/tcg_pts_attr_file_meas.c +++ b/src/libpts/tcg/tcg_pts_attr_file_meas.c @@ -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)) diff --git a/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c b/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c index a631e9891..378168375 100644 --- a/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c +++ b/src/libpts/tcg/tcg_pts_attr_req_func_comp_evid.c @@ -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; diff --git a/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c b/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c index 4f93ee885..51088e628 100644 --- a/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c +++ b/src/libpts/tcg/tcg_pts_attr_unix_file_meta.c @@ -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; diff --git a/src/libradius/radius_client.c b/src/libradius/radius_client.c index 143cfa1a5..442cb12ce 100644 --- a/src/libradius/radius_client.c +++ b/src/libradius/radius_client.c @@ -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> diff --git a/src/libradius/radius_config.c b/src/libradius/radius_config.c index 6e3394bb0..5dbd1d7e0 100644 --- a/src/libradius/radius_config.c +++ b/src/libradius/radius_config.c @@ -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; diff --git a/src/libsimaka/simaka_manager.c b/src/libsimaka/simaka_manager.c index 65de1c5ab..e10ab21b8 100644 --- a/src/libsimaka/simaka_manager.c +++ b/src/libsimaka/simaka_manager.c @@ -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; diff --git a/src/libsimaka/simaka_manager.h b/src/libsimaka/simaka_manager.h index 64a67e56c..810cb0685 100644 --- a/src/libsimaka/simaka_manager.h +++ b/src/libsimaka/simaka_manager.h @@ -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; diff --git a/src/libsimaka/simaka_message.c b/src/libsimaka/simaka_message.c index aa36a0974..e7c7a0a8c 100644 --- a/src/libsimaka/simaka_message.c +++ b/src/libsimaka/simaka_message.c @@ -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; diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk index c627447e3..094e1bcdc 100644 --- a/src/libstrongswan/Android.mk +++ b/src/libstrongswan/Android.mk @@ -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 diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am index 62649d9ec..2fa9dabd1 100644 --- a/src/libstrongswan/Makefile.am +++ b/src/libstrongswan/Makefile.am @@ -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 diff --git a/src/libstrongswan/utils/blocking_queue.c b/src/libstrongswan/collections/blocking_queue.c index c70184198..da3356970 100644 --- a/src/libstrongswan/utils/blocking_queue.c +++ b/src/libstrongswan/collections/blocking_queue.c @@ -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; diff --git a/src/libstrongswan/utils/blocking_queue.h b/src/libstrongswan/collections/blocking_queue.h index cf2712cf4..9b014f719 100644 --- a/src/libstrongswan/utils/blocking_queue.h +++ b/src/libstrongswan/collections/blocking_queue.h @@ -17,7 +17,7 @@ /** * @defgroup blocking_queue blocking_queue - * @{ @ingroup utils + * @{ @ingroup collections */ #ifndef BLOCKING_QUEUE_H_ diff --git a/src/libstrongswan/utils/enumerator.c b/src/libstrongswan/collections/enumerator.c index 53c94f9dd..53c94f9dd 100644 --- a/src/libstrongswan/utils/enumerator.c +++ b/src/libstrongswan/collections/enumerator.c diff --git a/src/libstrongswan/utils/enumerator.h b/src/libstrongswan/collections/enumerator.h index 8c3d70173..900c97385 100644 --- a/src/libstrongswan/utils/enumerator.h +++ b/src/libstrongswan/collections/enumerator.h @@ -15,7 +15,7 @@ /** * @defgroup enumerator enumerator - * @{ @ingroup utils + * @{ @ingroup collections */ #ifndef ENUMERATOR_H_ diff --git a/src/libstrongswan/utils/hashtable.c b/src/libstrongswan/collections/hashtable.c index d181d8ec8..d181d8ec8 100644 --- a/src/libstrongswan/utils/hashtable.c +++ b/src/libstrongswan/collections/hashtable.c diff --git a/src/libstrongswan/utils/hashtable.h b/src/libstrongswan/collections/hashtable.h index 0a21ca373..e38850ded 100644 --- a/src/libstrongswan/utils/hashtable.h +++ b/src/libstrongswan/collections/hashtable.h @@ -15,13 +15,13 @@ /** * @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; diff --git a/src/libstrongswan/utils/linked_list.c b/src/libstrongswan/collections/linked_list.c index 1ff80999b..1ff80999b 100644 --- a/src/libstrongswan/utils/linked_list.c +++ b/src/libstrongswan/collections/linked_list.c diff --git a/src/libstrongswan/utils/linked_list.h b/src/libstrongswan/collections/linked_list.h index 1b5518480..da539a231 100644 --- a/src/libstrongswan/utils/linked_list.h +++ b/src/libstrongswan/collections/linked_list.h @@ -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) diff --git a/src/libstrongswan/credentials/auth_cfg.c b/src/libstrongswan/credentials/auth_cfg.c index 6ee4f9b6e..9d1714339 100644 --- a/src/libstrongswan/credentials/auth_cfg.c +++ b/src/libstrongswan/credentials/auth_cfg.c @@ -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> diff --git a/src/libstrongswan/credentials/auth_cfg.h b/src/libstrongswan/credentials/auth_cfg.h index 79484a04c..d87935589 100644 --- a/src/libstrongswan/credentials/auth_cfg.h +++ b/src/libstrongswan/credentials/auth_cfg.h @@ -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; diff --git a/src/libstrongswan/credentials/certificates/pkcs10.h b/src/libstrongswan/credentials/certificates/pkcs10.h index 9a4979757..2f35eb6a5 100644 --- a/src/libstrongswan/credentials/certificates/pkcs10.h +++ b/src/libstrongswan/credentials/certificates/pkcs10.h @@ -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; diff --git a/src/libstrongswan/credentials/certificates/x509.h b/src/libstrongswan/credentials/certificates/x509.h index 00171a718..4e8d4317f 100644 --- a/src/libstrongswan/credentials/certificates/x509.h +++ b/src/libstrongswan/credentials/certificates/x509.h @@ -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 */ diff --git a/src/libstrongswan/credentials/cred_encoding.c b/src/libstrongswan/credentials/cred_encoding.c index 4865984dd..53ac13cbb 100644 --- a/src/libstrongswan/credentials/cred_encoding.c +++ b/src/libstrongswan/credentials/cred_encoding.c @@ -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; diff --git a/src/libstrongswan/credentials/credential_factory.c b/src/libstrongswan/credentials/credential_factory.c index ff621012f..cb52b4182 100644 --- a/src/libstrongswan/credentials/credential_factory.c +++ b/src/libstrongswan/credentials/credential_factory.c @@ -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> diff --git a/src/libstrongswan/credentials/credential_manager.c b/src/libstrongswan/credentials/credential_manager.c index a96abdc69..32dadc770 100644 --- a/src/libstrongswan/credentials/credential_manager.c +++ b/src/libstrongswan/credentials/credential_manager.c @@ -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> diff --git a/src/libstrongswan/credentials/credential_manager.h b/src/libstrongswan/credentials/credential_manager.h index d9a47b7d7..73c585734 100644 --- a/src/libstrongswan/credentials/credential_manager.h +++ b/src/libstrongswan/credentials/credential_manager.h @@ -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> diff --git a/src/libstrongswan/credentials/ietf_attributes/ietf_attributes.c b/src/libstrongswan/credentials/ietf_attributes/ietf_attributes.c index fb18fb53d..49af5a079 100644 --- a/src/libstrongswan/credentials/ietf_attributes/ietf_attributes.c +++ b/src/libstrongswan/credentials/ietf_attributes/ietf_attributes.c @@ -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" diff --git a/src/libstrongswan/credentials/keys/shared_key.h b/src/libstrongswan/credentials/keys/shared_key.h index d00b8d12e..900c6613e 100644 --- a/src/libstrongswan/credentials/keys/shared_key.h +++ b/src/libstrongswan/credentials/keys/shared_key.h @@ -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; diff --git a/src/libstrongswan/credentials/sets/cert_cache.c b/src/libstrongswan/credentials/sets/cert_cache.c index a7d0ed8f9..e8f0e7ec0 100644 --- a/src/libstrongswan/credentials/sets/cert_cache.c +++ b/src/libstrongswan/credentials/sets/cert_cache.c @@ -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 diff --git a/src/libstrongswan/credentials/sets/mem_cred.c b/src/libstrongswan/credentials/sets/mem_cred.c index e023e8443..d697a56ef 100644 --- a/src/libstrongswan/credentials/sets/mem_cred.c +++ b/src/libstrongswan/credentials/sets/mem_cred.c @@ -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; diff --git a/src/libstrongswan/credentials/sets/mem_cred.h b/src/libstrongswan/credentials/sets/mem_cred.h index eb46b065b..20447207c 100644 --- a/src/libstrongswan/credentials/sets/mem_cred.h +++ b/src/libstrongswan/credentials/sets/mem_cred.h @@ -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. diff --git a/src/libstrongswan/crypto/crypto_factory.c b/src/libstrongswan/crypto/crypto_factory.c index 3736ae38f..48300b089 100644 --- a/src/libstrongswan/crypto/crypto_factory.c +++ b/src/libstrongswan/crypto/crypto_factory.c @@ -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"; diff --git a/src/libstrongswan/crypto/crypto_tester.c b/src/libstrongswan/crypto/crypto_tester.c index 01e84a133..56f0dedda 100644 --- a/src/libstrongswan/crypto/crypto_tester.c +++ b/src/libstrongswan/crypto/crypto_tester.c @@ -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; diff --git a/src/libstrongswan/crypto/pkcs7.c b/src/libstrongswan/crypto/pkcs7.c index 0ec19f2cd..674fe04ed 100644 --- a/src/libstrongswan/crypto/pkcs7.c +++ b/src/libstrongswan/crypto/pkcs7.c @@ -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" diff --git a/src/libstrongswan/crypto/pkcs7.h b/src/libstrongswan/crypto/pkcs7.h index 7c9a6b037..5af36d29e 100644 --- a/src/libstrongswan/crypto/pkcs7.h +++ b/src/libstrongswan/crypto/pkcs7.h @@ -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. diff --git a/src/libstrongswan/crypto/pkcs9.c b/src/libstrongswan/crypto/pkcs9.c index d24ab1b80..f3cc5d2f7 100644 --- a/src/libstrongswan/crypto/pkcs9.c +++ b/src/libstrongswan/crypto/pkcs9.c @@ -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" diff --git a/src/libstrongswan/crypto/proposal/proposal_keywords.c b/src/libstrongswan/crypto/proposal/proposal_keywords.c index 7356dc367..4db504eb0 100644 --- a/src/libstrongswan/crypto/proposal/proposal_keywords.c +++ b/src/libstrongswan/crypto/proposal/proposal_keywords.c @@ -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; diff --git a/src/libstrongswan/database/database.h b/src/libstrongswan/database/database.h index dda29b5fb..d46fc3d34 100644 --- a/src/libstrongswan/database/database.h +++ b/src/libstrongswan/database/database.h @@ -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 diff --git a/src/libstrongswan/database/database_factory.c b/src/libstrongswan/database/database_factory.c index 909522d64..6c714ba51 100644 --- a/src/libstrongswan/database/database_factory.c +++ b/src/libstrongswan/database/database_factory.c @@ -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; diff --git a/src/libstrongswan/fetcher/fetcher_manager.c b/src/libstrongswan/fetcher/fetcher_manager.c index 9b363c7eb..ec1b5af59 100644 --- a/src/libstrongswan/fetcher/fetcher_manager.c +++ b/src/libstrongswan/fetcher/fetcher_manager.c @@ -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; diff --git a/src/libstrongswan/library.c b/src/libstrongswan/library.c index 90a865a78..db0c84545 100644 --- a/src/libstrongswan/library.c +++ b/src/libstrongswan/library.c @@ -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> diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h index a2de74986..557a7a07e 100644 --- a/src/libstrongswan/library.h +++ b/src/libstrongswan/library.h @@ -22,6 +22,9 @@ * @defgroup bio bio * @ingroup libstrongswan * + * @defgroup collections collections + * @ingroup libstrongswan + * * @defgroup credentials credentials * @ingroup libstrongswan * diff --git a/src/libstrongswan/networking/host_resolver.c b/src/libstrongswan/networking/host_resolver.c index 55b07d318..c12beccba 100644 --- a/src/libstrongswan/networking/host_resolver.c +++ b/src/libstrongswan/networking/host_resolver.c @@ -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 diff --git a/src/libstrongswan/plugins/constraints/constraints_validator.c b/src/libstrongswan/plugins/constraints/constraints_validator.c index b54d813df..5d697fdd0 100644 --- a/src/libstrongswan/plugins/constraints/constraints_validator.c +++ b/src/libstrongswan/plugins/constraints/constraints_validator.c @@ -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; diff --git a/src/libstrongswan/plugins/mysql/mysql_database.c b/src/libstrongswan/plugins/mysql/mysql_database.c index 1a20a804a..12a8ff54f 100644 --- a/src/libstrongswan/plugins/mysql/mysql_database.c +++ b/src/libstrongswan/plugins/mysql/mysql_database.c @@ -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 diff --git a/src/libstrongswan/plugins/openssl/openssl_crl.c b/src/libstrongswan/plugins/openssl/openssl_crl.c index e529ff8a5..1956bf625 100644 --- a/src/libstrongswan/plugins/openssl/openssl_crl.c +++ b/src/libstrongswan/plugins/openssl/openssl_crl.c @@ -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; diff --git a/src/libstrongswan/plugins/openssl/openssl_x509.c b/src/libstrongswan/plugins/openssl/openssl_x509.c index e85c5cc90..a7c99a1ef 100644 --- a/src/libstrongswan/plugins/openssl/openssl_x509.c +++ b/src/libstrongswan/plugins/openssl/openssl_x509.c @@ -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; diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c b/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c index 5b7883d83..ef936d4a1 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_creds.c @@ -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; diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c index 0d89a97eb..b7b2ada7d 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_library.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_library.c @@ -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; diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_library.h b/src/libstrongswan/plugins/pkcs11/pkcs11_library.h index 50ed036ac..81414a25f 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_library.h +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_library.h @@ -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 diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c index 83c383671..52e46d322 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_manager.c @@ -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" diff --git a/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c b/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c index dcdff66eb..7760f3592 100644 --- a/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c +++ b/src/libstrongswan/plugins/pkcs11/pkcs11_plugin.c @@ -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> diff --git a/src/libstrongswan/plugins/plugin_loader.c b/src/libstrongswan/plugins/plugin_loader.c index 95a0bfc02..007ef6a9e 100644 --- a/src/libstrongswan/plugins/plugin_loader.c +++ b/src/libstrongswan/plugins/plugin_loader.c @@ -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; diff --git a/src/libstrongswan/plugins/plugin_loader.h b/src/libstrongswan/plugins/plugin_loader.h index 94181dbb6..6a8f8f6a1 100644 --- a/src/libstrongswan/plugins/plugin_loader.h +++ b/src/libstrongswan/plugins/plugin_loader.h @@ -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; diff --git a/src/libstrongswan/plugins/x509/x509_ac.c b/src/libstrongswan/plugins/x509/x509_ac.c index d6ca8c4fa..ddfb952c7 100644 --- a/src/libstrongswan/plugins/x509/x509_ac.c +++ b/src/libstrongswan/plugins/x509/x509_ac.c @@ -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> diff --git a/src/libstrongswan/plugins/x509/x509_cert.c b/src/libstrongswan/plugins/x509/x509_cert.c index 2269eb453..09480df7c 100644 --- a/src/libstrongswan/plugins/x509/x509_cert.c +++ b/src/libstrongswan/plugins/x509/x509_cert.c @@ -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> diff --git a/src/libstrongswan/plugins/x509/x509_crl.c b/src/libstrongswan/plugins/x509/x509_crl.c index 47621103e..a3bc4efb0 100644 --- a/src/libstrongswan/plugins/x509/x509_crl.c +++ b/src/libstrongswan/plugins/x509/x509_crl.c @@ -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 diff --git a/src/libstrongswan/plugins/x509/x509_ocsp_request.c b/src/libstrongswan/plugins/x509/x509_ocsp_request.c index bbd1c5905..5f82118c8 100644 --- a/src/libstrongswan/plugins/x509/x509_ocsp_request.c +++ b/src/libstrongswan/plugins/x509/x509_ocsp_request.c @@ -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> diff --git a/src/libstrongswan/plugins/x509/x509_ocsp_response.c b/src/libstrongswan/plugins/x509/x509_ocsp_response.c index 27497e0e3..42994a291 100644 --- a/src/libstrongswan/plugins/x509/x509_ocsp_response.c +++ b/src/libstrongswan/plugins/x509/x509_ocsp_response.c @@ -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> diff --git a/src/libstrongswan/plugins/x509/x509_pkcs10.c b/src/libstrongswan/plugins/x509/x509_pkcs10.c index 9fa91fed2..2fa8d413d 100644 --- a/src/libstrongswan/plugins/x509/x509_pkcs10.c +++ b/src/libstrongswan/plugins/x509/x509_pkcs10.c @@ -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; diff --git a/src/libstrongswan/processing/jobs/callback_job.c b/src/libstrongswan/processing/jobs/callback_job.c index a5ddc8ff6..8258ccb33 100644 --- a/src/libstrongswan/processing/jobs/callback_job.c +++ b/src/libstrongswan/processing/jobs/callback_job.c @@ -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; diff --git a/src/libstrongswan/processing/processor.c b/src/libstrongswan/processing/processor.c index 5b7fd467c..abeac76e3 100644 --- a/src/libstrongswan/processing/processor.c +++ b/src/libstrongswan/processing/processor.c @@ -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; diff --git a/src/libstrongswan/selectors/traffic_selector.c b/src/libstrongswan/selectors/traffic_selector.c index 81f480a3d..f0caad139 100644 --- a/src/libstrongswan/selectors/traffic_selector.c +++ b/src/libstrongswan/selectors/traffic_selector.c @@ -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> diff --git a/src/libstrongswan/settings.c b/src/libstrongswan/settings.c index 8977cd9ed..9bdb74434 100644 --- a/src/libstrongswan/settings.c +++ b/src/libstrongswan/settings.c @@ -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 diff --git a/src/libstrongswan/settings.h b/src/libstrongswan/settings.h index c8b50d008..4246b3118 100644 --- a/src/libstrongswan/settings.h +++ b/src/libstrongswan/settings.h @@ -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. diff --git a/src/libstrongswan/threading/thread.c b/src/libstrongswan/threading/thread.c index 9ef514ebc..33b09304b 100644 --- a/src/libstrongswan/threading/thread.c +++ b/src/libstrongswan/threading/thread.c @@ -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" diff --git a/src/libstrongswan/utils.c b/src/libstrongswan/utils.c index d43a4bc2f..db55b7673 100644 --- a/src/libstrongswan/utils.c +++ b/src/libstrongswan/utils.c @@ -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", diff --git a/src/libstrongswan/utils/backtrace.c b/src/libstrongswan/utils/backtrace.c index b6015fb35..0b6683233 100644 --- a/src/libstrongswan/utils/backtrace.c +++ b/src/libstrongswan/utils/backtrace.c @@ -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> /** diff --git a/src/libstrongswan/utils/identification.h b/src/libstrongswan/utils/identification.h index 024fcea4b..8b2173afb 100644 --- a/src/libstrongswan/utils/identification.h +++ b/src/libstrongswan/utils/identification.h @@ -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 diff --git a/src/libstrongswan/utils/leak_detective.c b/src/libstrongswan/utils/leak_detective.c index cface0538..723f33098 100644 --- a/src/libstrongswan/utils/leak_detective.c +++ b/src/libstrongswan/utils/leak_detective.c @@ -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; diff --git a/src/libtls/tls_alert.c b/src/libtls/tls_alert.c index 8a4fa7d77..6647129ba 100644 --- a/src/libtls/tls_alert.c +++ b/src/libtls/tls_alert.c @@ -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", diff --git a/src/libtls/tls_cache.c b/src/libtls/tls_cache.c index a89201ad7..1bcc966d5 100644 --- a/src/libtls/tls_cache.c +++ b/src/libtls/tls_cache.c @@ -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; diff --git a/src/manager/gateway.h b/src/manager/gateway.h index 99e79eef5..5792ebf02 100644 --- a/src/manager/gateway.h +++ b/src/manager/gateway.h @@ -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; diff --git a/src/manager/manager.c b/src/manager/manager.c index b6f3951c4..207800bd2 100644 --- a/src/manager/manager.c +++ b/src/manager/manager.c @@ -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; diff --git a/src/manager/storage.h b/src/manager/storage.h index 69459e5aa..4324e99fe 100644 --- a/src/manager/storage.h +++ b/src/manager/storage.h @@ -21,7 +21,7 @@ #ifndef STORAGE_H_ #define STORAGE_H_ -#include <utils/enumerator.h> +#include <collections/enumerator.h> typedef struct storage_t storage_t; diff --git a/src/manager/xml.h b/src/manager/xml.h index 0c362fed1..bd11cb4f8 100644 --- a/src/manager/xml.h +++ b/src/manager/xml.h @@ -21,7 +21,7 @@ #ifndef XML_H_ #define XML_H_ -#include <utils/enumerator.h> +#include <collections/enumerator.h> typedef struct xml_t xml_t; diff --git a/src/pki/commands/issue.c b/src/pki/commands/issue.c index 47e668b6c..34df6c2c7 100644 --- a/src/pki/commands/issue.c +++ b/src/pki/commands/issue.c @@ -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> diff --git a/src/pki/commands/req.c b/src/pki/commands/req.c index d050c7032..d90ddc251 100644 --- a/src/pki/commands/req.c +++ b/src/pki/commands/req.c @@ -19,7 +19,7 @@ #include "pki.h" -#include <utils/linked_list.h> +#include <collections/linked_list.h> #include <credentials/certificates/certificate.h> /** diff --git a/src/pki/commands/self.c b/src/pki/commands/self.c index 4a50aa463..448360821 100644 --- a/src/pki/commands/self.c +++ b/src/pki/commands/self.c @@ -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> diff --git a/src/pki/commands/signcrl.c b/src/pki/commands/signcrl.c index 4ada120ed..dc53022f2 100644 --- a/src/pki/commands/signcrl.c +++ b/src/pki/commands/signcrl.c @@ -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> diff --git a/src/scepclient/scepclient.c b/src/scepclient/scepclient.c index 78b0d7e7a..2638ec84d 100644 --- a/src/scepclient/scepclient.c +++ b/src/scepclient/scepclient.c @@ -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> |