diff options
author | Martin Willi <martin@strongswan.org> | 2009-09-04 14:50:23 +0200 |
---|---|---|
committer | Martin Willi <martin@strongswan.org> | 2009-09-04 14:50:23 +0200 |
commit | 323f9f990fb28583bfaaaad04f9934c0f0e62052 (patch) | |
tree | 99a9f789388077bd6b2d51516d45b5d0112e3c9c /src/charon/plugins | |
parent | 7daf5226b74e14a6e0f1a888b0be26f3d246f9f8 (diff) | |
download | strongswan-323f9f990fb28583bfaaaad04f9934c0f0e62052.tar.bz2 strongswan-323f9f990fb28583bfaaaad04f9934c0f0e62052.tar.xz |
replaces four spaces by tabs, where appropriate
Diffstat (limited to 'src/charon/plugins')
-rw-r--r-- | src/charon/plugins/eap_gtc/eap_gtc.c | 6 | ||||
-rw-r--r-- | src/charon/plugins/eap_sim/eap_sim.c | 2 | ||||
-rw-r--r-- | src/charon/plugins/kernel_netlink/kernel_netlink_net.c | 12 | ||||
-rw-r--r-- | src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c | 4 | ||||
-rw-r--r-- | src/charon/plugins/medcli/medcli_creds.c | 2 | ||||
-rw-r--r-- | src/charon/plugins/medsrv/medsrv_creds.c | 2 | ||||
-rw-r--r-- | src/charon/plugins/nm/gnome/auth-dialog/main.c | 2 | ||||
-rw-r--r-- | src/charon/plugins/nm/gnome/properties/nm-strongswan.c | 14 | ||||
-rw-r--r-- | src/charon/plugins/nm/nm_service.c | 6 | ||||
-rw-r--r-- | src/charon/plugins/smp/smp.c | 36 | ||||
-rw-r--r-- | src/charon/plugins/sql/sql_attribute.h | 6 | ||||
-rw-r--r-- | src/charon/plugins/stroke/stroke_ca.h | 6 | ||||
-rw-r--r-- | src/charon/plugins/stroke/stroke_config.h | 6 | ||||
-rw-r--r-- | src/charon/plugins/stroke/stroke_socket.h | 6 |
14 files changed, 55 insertions, 55 deletions
diff --git a/src/charon/plugins/eap_gtc/eap_gtc.c b/src/charon/plugins/eap_gtc/eap_gtc.c index f5e08bb6b..f81e42cba 100644 --- a/src/charon/plugins/eap_gtc/eap_gtc.c +++ b/src/charon/plugins/eap_gtc/eap_gtc.c @@ -83,7 +83,7 @@ static status_t initiate_peer(private_eap_gtc_t *this, eap_payload_t **out) * PAM conv callback function */ static int auth_conv(int num_msg, const struct pam_message **msg, - struct pam_response **resp, char *password) + struct pam_response **resp, char *password) { struct pam_response *response; @@ -103,9 +103,9 @@ static int auth_conv(int num_msg, const struct pam_message **msg, */ static bool authenticate(char *service, char *user, char *password) { - pam_handle_t *pamh = NULL; + pam_handle_t *pamh = NULL; static struct pam_conv conv; - int ret; + int ret; conv.conv = (void*)auth_conv; conv.appdata_ptr = password; diff --git a/src/charon/plugins/eap_sim/eap_sim.c b/src/charon/plugins/eap_sim/eap_sim.c index f439bd248..56d79281d 100644 --- a/src/charon/plugins/eap_sim/eap_sim.c +++ b/src/charon/plugins/eap_sim/eap_sim.c @@ -709,7 +709,7 @@ static status_t peer_process_challenge(private_eap_sim_t *this, * process an EAP-SIM/Response/Challenge message */ static status_t server_process_challenge(private_eap_sim_t *this, - eap_payload_t *in, eap_payload_t **out) + eap_payload_t *in, eap_payload_t **out) { chunk_t message, data; sim_attribute_t attribute; diff --git a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c b/src/charon/plugins/kernel_netlink/kernel_netlink_net.c index 4b2a05f8f..d73f2c9cf 100644 --- a/src/charon/plugins/kernel_netlink/kernel_netlink_net.c +++ b/src/charon/plugins/kernel_netlink/kernel_netlink_net.c @@ -952,17 +952,17 @@ static status_t manage_ipaddr(private_kernel_netlink_net_t *this, int nlmsg_type chunk = ip->get_address(ip); - hdr = (struct nlmsghdr*)request; + hdr = (struct nlmsghdr*)request; hdr->nlmsg_flags = NLM_F_REQUEST | NLM_F_ACK | flags; hdr->nlmsg_type = nlmsg_type; hdr->nlmsg_len = NLMSG_LENGTH(sizeof(struct ifaddrmsg)); msg = (struct ifaddrmsg*)NLMSG_DATA(hdr); - msg->ifa_family = ip->get_family(ip); - msg->ifa_flags = 0; - msg->ifa_prefixlen = 8 * chunk.len; - msg->ifa_scope = RT_SCOPE_UNIVERSE; - msg->ifa_index = if_index; + msg->ifa_family = ip->get_family(ip); + msg->ifa_flags = 0; + msg->ifa_prefixlen = 8 * chunk.len; + msg->ifa_scope = RT_SCOPE_UNIVERSE; + msg->ifa_index = if_index; netlink_add_attribute(hdr, IFA_LOCAL, chunk, sizeof(request)); diff --git a/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c index 57e3a92e3..0ebdafad3 100644 --- a/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c +++ b/src/charon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c @@ -682,8 +682,8 @@ static traffic_selector_t* sadb_address2ts(struct sadb_address *address) host_t *host; /* The Linux 2.6 kernel does not set the protocol and port information - * in the src and dst sadb_address extensions of the SADB_ACQUIRE message. - */ + * in the src and dst sadb_address extensions of the SADB_ACQUIRE message. + */ host = host_create_from_sockaddr((sockaddr_t*)&address[1]) ; ts = traffic_selector_create_from_subnet(host, address->sadb_address_prefixlen, address->sadb_address_proto, host->get_port(host)); diff --git a/src/charon/plugins/medcli/medcli_creds.c b/src/charon/plugins/medcli/medcli_creds.c index 777913628..9729df3f5 100644 --- a/src/charon/plugins/medcli/medcli_creds.c +++ b/src/charon/plugins/medcli/medcli_creds.c @@ -218,7 +218,7 @@ static enumerator_t* create_cert_enumerator(private_medcli_creds_t *this, */ static void destroy(private_medcli_creds_t *this) { - free(this); + free(this); } /** diff --git a/src/charon/plugins/medsrv/medsrv_creds.c b/src/charon/plugins/medsrv/medsrv_creds.c index 2127f5660..8d1643908 100644 --- a/src/charon/plugins/medsrv/medsrv_creds.c +++ b/src/charon/plugins/medsrv/medsrv_creds.c @@ -138,7 +138,7 @@ static enumerator_t* create_cert_enumerator(private_medsrv_creds_t *this, */ static void destroy(private_medsrv_creds_t *this) { - free(this); + free(this); } /** diff --git a/src/charon/plugins/nm/gnome/auth-dialog/main.c b/src/charon/plugins/nm/gnome/auth-dialog/main.c index 4ff926b22..f2716f2d0 100644 --- a/src/charon/plugins/nm/gnome/auth-dialog/main.c +++ b/src/charon/plugins/nm/gnome/auth-dialog/main.c @@ -101,7 +101,7 @@ static char* get_connection_type(char *uuid) if (found) { key = g_strdup_printf ("%s/%s/%s", found, - NM_SETTING_VPN_SETTING_NAME, "method"); + NM_SETTING_VPN_SETTING_NAME, "method"); method = gconf_client_get_string(client, key, NULL); g_free(found); g_free(key); diff --git a/src/charon/plugins/nm/gnome/properties/nm-strongswan.c b/src/charon/plugins/nm/gnome/properties/nm-strongswan.c index 0c55d3abc..4b69296b4 100644 --- a/src/charon/plugins/nm/gnome/properties/nm-strongswan.c +++ b/src/charon/plugins/nm/gnome/properties/nm-strongswan.c @@ -110,9 +110,9 @@ check_validity (StrongswanPluginUiWidget *self, GError **error) str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); if (!str || !strlen (str)) { g_set_error (error, - STRONGSWAN_PLUGIN_UI_ERROR, - STRONGSWAN_PLUGIN_UI_ERROR_INVALID_PROPERTY, - "address"); + STRONGSWAN_PLUGIN_UI_ERROR, + STRONGSWAN_PLUGIN_UI_ERROR_INVALID_PROPERTY, + "address"); return FALSE; } return TRUE; @@ -275,8 +275,8 @@ get_widget (NMVpnPluginUiWidgetInterface *iface) static gboolean update_connection (NMVpnPluginUiWidgetInterface *iface, - NMConnection *connection, - GError **error) + NMConnection *connection, + GError **error) { StrongswanPluginUiWidget *self = STRONGSWAN_PLUGIN_UI_WIDGET (iface); StrongswanPluginUiWidgetPrivate *priv = STRONGSWAN_PLUGIN_UI_WIDGET_GET_PRIVATE (self); @@ -358,7 +358,7 @@ update_connection (NMVpnPluginUiWidgetInterface *iface, static gboolean save_secrets (NMVpnPluginUiWidgetInterface *iface, - NMConnection *connection, GError **error) + NMConnection *connection, GError **error) { /* no secrets to save */ return TRUE; @@ -386,7 +386,7 @@ nm_vpn_plugin_ui_widget_interface_new (NMConnection *connection, GError **error) priv->xml = glade_xml_new (glade_file, "strongswan-vbox", GETTEXT_PACKAGE); if (priv->xml == NULL) { g_set_error (error, STRONGSWAN_PLUGIN_UI_ERROR, 0, - "could not load required resources at %s", glade_file); + "could not load required resources at %s", glade_file); g_free (glade_file); g_object_unref (object); return NULL; diff --git a/src/charon/plugins/nm/nm_service.c b/src/charon/plugins/nm/nm_service.c index d896a432d..412a97fa3 100644 --- a/src/charon/plugins/nm/nm_service.c +++ b/src/charon/plugins/nm/nm_service.c @@ -254,7 +254,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection, if (!address || !*address) { g_set_error(err, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Gateway address missing."); + "Gateway address missing."); return FALSE; } str = nm_setting_vpn_get_data_item(vpn, "virtual"); @@ -297,7 +297,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection, if (!cert) { g_set_error(err, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_BAD_ARGUMENTS, - "Loading gateway certificate failed."); + "Loading gateway certificate failed."); return FALSE; } x509 = (x509_t*)cert; @@ -476,7 +476,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection, charon->ike_sa_manager->checkin_and_destroy(charon->ike_sa_manager, ike_sa); g_set_error(err, NM_VPN_PLUGIN_ERROR, NM_VPN_PLUGIN_ERROR_LAUNCH_FAILED, - "Initiating failed."); + "Initiating failed."); return FALSE; } charon->ike_sa_manager->checkin(charon->ike_sa_manager, ike_sa); diff --git a/src/charon/plugins/smp/smp.c b/src/charon/plugins/smp/smp.c index 8a4c27ce0..66e4fa6d9 100644 --- a/src/charon/plugins/smp/smp.c +++ b/src/charon/plugins/smp/smp.c @@ -508,8 +508,8 @@ static void request_query(xmlTextReaderPtr reader, xmlTextWriterPtr writer) { /* <query> */ xmlTextWriterStartElement(writer, "query"); - while (xmlTextReaderRead(reader)) - { + while (xmlTextReaderRead(reader)) + { if (xmlTextReaderNodeType(reader) == XML_READER_TYPE_ELEMENT) { if (streq(xmlTextReaderConstName(reader), "ikesalist")) @@ -535,8 +535,8 @@ static void request_control(xmlTextReaderPtr reader, xmlTextWriterPtr writer) { /* <control> */ xmlTextWriterStartElement(writer, "control"); - while (xmlTextReaderRead(reader)) - { + while (xmlTextReaderRead(reader)) + { if (xmlTextReaderNodeType(reader) == XML_READER_TYPE_ELEMENT) { if (streq(xmlTextReaderConstName(reader), "ikesaterminate")) @@ -649,8 +649,8 @@ static job_requeue_t process(int *fdp) } /* read message type and id */ - while (xmlTextReaderRead(reader)) - { + while (xmlTextReaderRead(reader)) + { if (xmlTextReaderNodeType(reader) == XML_READER_TYPE_ELEMENT && streq(xmlTextReaderConstName(reader), "message")) { @@ -658,20 +658,20 @@ static job_requeue_t process(int *fdp) type = xmlTextReaderGetAttribute(reader, "type"); break; } - } + } - /* process message */ - if (id && type) + /* process message */ + if (id && type) { - if (streq(type, "request")) - { - request(reader, id, fd); - } - else - { - /* response(reader, id) */ - } - } + if (streq(type, "request")) + { + request(reader, id, fd); + } + else + { + /* response(reader, id) */ + } + } xmlFreeTextReader(reader); return JOB_REQUEUE_FAIR;; } diff --git a/src/charon/plugins/sql/sql_attribute.h b/src/charon/plugins/sql/sql_attribute.h index 6d4958d32..358ab92af 100644 --- a/src/charon/plugins/sql/sql_attribute.h +++ b/src/charon/plugins/sql/sql_attribute.h @@ -36,9 +36,9 @@ struct sql_attribute_t { attribute_provider_t provider; /** - * Destroy a sql_attribute instance. - */ - void (*destroy)(sql_attribute_t *this); + * Destroy a sql_attribute instance. + */ + void (*destroy)(sql_attribute_t *this); }; /** diff --git a/src/charon/plugins/stroke/stroke_ca.h b/src/charon/plugins/stroke/stroke_ca.h index ae55fe8e7..21af912ea 100644 --- a/src/charon/plugins/stroke/stroke_ca.h +++ b/src/charon/plugins/stroke/stroke_ca.h @@ -67,9 +67,9 @@ struct stroke_ca_t { void (*check_for_hash_and_url)(stroke_ca_t *this, certificate_t* cert); /** - * Destroy a stroke_ca instance. - */ - void (*destroy)(stroke_ca_t *this); + * Destroy a stroke_ca instance. + */ + void (*destroy)(stroke_ca_t *this); }; /** diff --git a/src/charon/plugins/stroke/stroke_config.h b/src/charon/plugins/stroke/stroke_config.h index 3ed2f994f..05e4665ca 100644 --- a/src/charon/plugins/stroke/stroke_config.h +++ b/src/charon/plugins/stroke/stroke_config.h @@ -53,9 +53,9 @@ struct stroke_config_t { void (*del)(stroke_config_t *this, stroke_msg_t *msg); /** - * Destroy a stroke_config instance. - */ - void (*destroy)(stroke_config_t *this); + * Destroy a stroke_config instance. + */ + void (*destroy)(stroke_config_t *this); }; /** diff --git a/src/charon/plugins/stroke/stroke_socket.h b/src/charon/plugins/stroke/stroke_socket.h index ae5481677..2aac8be9b 100644 --- a/src/charon/plugins/stroke/stroke_socket.h +++ b/src/charon/plugins/stroke/stroke_socket.h @@ -29,9 +29,9 @@ typedef struct stroke_socket_t stroke_socket_t; struct stroke_socket_t { /** - * Destroy a stroke_socket instance. - */ - void (*destroy)(stroke_socket_t *this); + * Destroy a stroke_socket instance. + */ + void (*destroy)(stroke_socket_t *this); }; /** |