denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some whitespace and code style fixes.

Browse Source
This commit is contained in:
Tobias Brunner
2010-09-02 19:01:23 +02:00
parent 74f15e9320
commit 211943be23
4 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/kernel/kernel_interface.h
+21 -15
View File
@@ -182,7 +182,7 @@ struct kernel_interface_t {
* @param dst dest address of SA * @param dst dest address of SA
* @param src_ts traffic selector to match traffic source * @param src_ts traffic selector to match traffic source
* @param dst_ts traffic selector to match traffic dest * @param dst_ts traffic selector to match traffic dest
* @param direction direction of traffic, POLICY_IN, POLICY_OUT, POLICY_FWD * @param direction direction of traffic, POLICY_(IN|OUT|FWD)
* @param spi SPI of SA * @param spi SPI of SA
* @param protocol protocol to use to protect traffic (AH/ESP) * @param protocol protocol to use to protect traffic (AH/ESP)
* @param reqid unique ID of an SA to use to enforce policy * @param reqid unique ID of an SA to use to enforce policy
@@ -210,7 +210,7 @@ struct kernel_interface_t {
* *
* @param src_ts traffic selector to match traffic source * @param src_ts traffic selector to match traffic source
* @param dst_ts traffic selector to match traffic dest * @param dst_ts traffic selector to match traffic dest
* @param direction direction of traffic, POLICY_IN, POLICY_OUT, POLICY_FWD * @param direction direction of traffic, POLICY_(IN|OUT|FWD)
* @param mark optional mark * @param mark optional mark
* @param[out] use_time the time of this SA's last use * @param[out] use_time the time of this SA's last use
* @return SUCCESS if operation completed * @return SUCCESS if operation completed
@@ -231,7 +231,7 @@ struct kernel_interface_t {
* *
* @param src_ts traffic selector to match traffic source * @param src_ts traffic selector to match traffic source
* @param dst_ts traffic selector to match traffic dest * @param dst_ts traffic selector to match traffic dest
* @param direction direction of traffic, POLICY_IN, POLICY_OUT, POLICY_FWD * @param direction direction of traffic, POLICY_(IN|OUT|FWD)
* @param mark optional mark * @param mark optional mark
* @param unrouted TRUE, if this policy is unrouted from the kernel * @param unrouted TRUE, if this policy is unrouted from the kernel
* @return SUCCESS if operation completed * @return SUCCESS if operation completed
@@ -272,7 +272,7 @@ struct kernel_interface_t {
* Get the interface name of a local address. * Get the interface name of a local address.
* *
* @param host address to get interface name from * @param host address to get interface name from
* @return allocated interface name, or NULL if not found * @return allocated interface name, or NULL if not found
*/ */
char* (*get_interface) (kernel_interface_t *this, host_t *host); char* (*get_interface) (kernel_interface_t *this, host_t *host);
@@ -324,10 +324,11 @@ struct kernel_interface_t {
* @param src_ip sourc ip of the route * @param src_ip sourc ip of the route
* @param if_name name of the interface the route is bound to * @param if_name name of the interface the route is bound to
* @return SUCCESS if operation completed * @return SUCCESS if operation completed
* ALREADY_DONE if the route already exists * ALREADY_DONE if the route already exists
*/ */
status_t (*add_route) (kernel_interface_t *this, chunk_t dst_net, u_int8_t prefixlen, status_t (*add_route) (kernel_interface_t *this, chunk_t dst_net,
host_t *gateway, host_t *src_ip, char *if_name); u_int8_t prefixlen, host_t *gateway, host_t *src_ip,
char *if_name);
/** /**
* Delete a route. * Delete a route.
@@ -339,8 +340,9 @@ struct kernel_interface_t {
* @param if_name name of the interface the route is bound to * @param if_name name of the interface the route is bound to
* @return SUCCESS if operation completed * @return SUCCESS if operation completed
*/ */
status_t (*del_route) (kernel_interface_t *this, chunk_t dst_net, u_int8_t prefixlen, status_t (*del_route) (kernel_interface_t *this, chunk_t dst_net,
host_t *gateway, host_t *src_ip, char *if_name); u_int8_t prefixlen, host_t *gateway, host_t *src_ip,
char *if_name);
/** /**
* Set up a bypass policy for a given socket. * Set up a bypass policy for a given socket.
@@ -363,36 +365,40 @@ struct kernel_interface_t {
* @param ip returned ip (has to be destroyed) * @param ip returned ip (has to be destroyed)
* @return SUCCESS if address found * @return SUCCESS if address found
*/ */
status_t (*get_address_by_ts) (kernel_interface_t *this, status_t (*get_address_by_ts)(kernel_interface_t *this,
traffic_selector_t *ts, host_t **ip); traffic_selector_t *ts, host_t **ip);
/** /**
* Register an ipsec kernel interface constructor on the manager. * Register an ipsec kernel interface constructor on the manager.
* *
* @param create constructor to register * @param create constructor to register
*/ */
void (*add_ipsec_interface)(kernel_interface_t *this, kernel_ipsec_constructor_t create); void (*add_ipsec_interface)(kernel_interface_t *this,
kernel_ipsec_constructor_t create);
/** /**
* Unregister an ipsec kernel interface constructor. * Unregister an ipsec kernel interface constructor.
* *
* @param create constructor to unregister * @param create constructor to unregister
*/ */
void (*remove_ipsec_interface)(kernel_interface_t *this, kernel_ipsec_constructor_t create); void (*remove_ipsec_interface)(kernel_interface_t *this,
kernel_ipsec_constructor_t create);
/** /**
* Register a network kernel interface constructor on the manager. * Register a network kernel interface constructor on the manager.
* *
* @param create constructor to register * @param create constructor to register
*/ */
void (*add_net_interface)(kernel_interface_t *this, kernel_net_constructor_t create); void (*add_net_interface)(kernel_interface_t *this,
kernel_net_constructor_t create);
/** /**
* Unregister a network kernel interface constructor. * Unregister a network kernel interface constructor.
* *
* @param create constructor to unregister * @param create constructor to unregister
*/ */
void (*remove_net_interface)(kernel_interface_t *this, kernel_net_constructor_t create); void (*remove_net_interface)(kernel_interface_t *this,
kernel_net_constructor_t create);
/** /**
* Destroys a kernel_interface_manager_t object. * Destroys a kernel_interface_manager_t object.
src/libcharon/kernel/kernel_ipsec.h
+3 -3
View File
@@ -213,7 +213,7 @@ struct kernel_ipsec_t {
* @param dst dest address of SA * @param dst dest address of SA
* @param src_ts traffic selector to match traffic source * @param src_ts traffic selector to match traffic source
* @param dst_ts traffic selector to match traffic dest * @param dst_ts traffic selector to match traffic dest
* @param direction direction of traffic, POLICY_IN, POLICY_OUT, POLICY_FWD * @param direction direction of traffic, POLICY_(IN|OUT|FWD)
* @param spi SPI of SA * @param spi SPI of SA
* @param protocol protocol to use to protect traffic (AH/ESP) * @param protocol protocol to use to protect traffic (AH/ESP)
* @param reqid unique ID of an SA to use to enforce policy * @param reqid unique ID of an SA to use to enforce policy
@@ -242,7 +242,7 @@ struct kernel_ipsec_t {
* *
* @param src_ts traffic selector to match traffic source * @param src_ts traffic selector to match traffic source
* @param dst_ts traffic selector to match traffic dest * @param dst_ts traffic selector to match traffic dest
* @param direction direction of traffic, POLICY_IN, POLICY_OUT, POLICY_FWD * @param direction direction of traffic, POLICY_(IN|OUT|FWD)
* @param mark optional mark * @param mark optional mark
* @param[out] use_time the monotonic timestamp of this SA's last use * @param[out] use_time the monotonic timestamp of this SA's last use
* @return SUCCESS if operation completed * @return SUCCESS if operation completed
@@ -263,7 +263,7 @@ struct kernel_ipsec_t {
* *
* @param src_ts traffic selector to match traffic source * @param src_ts traffic selector to match traffic source
* @param dst_ts traffic selector to match traffic dest * @param dst_ts traffic selector to match traffic dest
* @param direction direction of traffic, POLICY_IN, POLICY_OUT, POLICY_FWD * @param direction direction of traffic, POLICY_(IN|OUT|FWD)
* @param mark optional mark * @param mark optional mark
* @param unrouted TRUE, if this policy is unrouted from the kernel * @param unrouted TRUE, if this policy is unrouted from the kernel
* @return SUCCESS if operation completed * @return SUCCESS if operation completed
src/libcharon/kernel/kernel_net.h
+8 -6
View File
@@ -64,7 +64,7 @@ struct kernel_net_t {
* Get the interface name of a local address. * Get the interface name of a local address.
* *
* @param host address to get interface name from * @param host address to get interface name from
* @return allocated interface name, or NULL if not found * @return allocated interface name, or NULL if not found
*/ */
char* (*get_interface) (kernel_net_t *this, host_t *host); char* (*get_interface) (kernel_net_t *this, host_t *host);
@@ -116,10 +116,11 @@ struct kernel_net_t {
* @param src_ip sourc ip of the route * @param src_ip sourc ip of the route
* @param if_name name of the interface the route is bound to * @param if_name name of the interface the route is bound to
* @return SUCCESS if operation completed * @return SUCCESS if operation completed
* ALREADY_DONE if the route already exists * ALREADY_DONE if the route already exists
*/ */
status_t (*add_route) (kernel_net_t *this, chunk_t dst_net, u_int8_t prefixlen, status_t (*add_route) (kernel_net_t *this, chunk_t dst_net,
host_t *gateway, host_t *src_ip, char *if_name); u_int8_t prefixlen, host_t *gateway, host_t *src_ip,
char *if_name);
/** /**
* Delete a route. * Delete a route.
@@ -131,8 +132,9 @@ struct kernel_net_t {
* @param if_name name of the interface the route is bound to * @param if_name name of the interface the route is bound to
* @return SUCCESS if operation completed * @return SUCCESS if operation completed
*/ */
status_t (*del_route) (kernel_net_t *this, chunk_t dst_net, u_int8_t prefixlen, status_t (*del_route) (kernel_net_t *this, chunk_t dst_net,
host_t *gateway, host_t *src_ip, char *if_name); u_int8_t prefixlen, host_t *gateway, host_t *src_ip,
char *if_name);
/** /**
* Destroy the implementation. * Destroy the implementation.
src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c
+1 -1
View File
@@ -225,7 +225,7 @@ static int get_vip_refcount(private_kernel_netlink_net_t *this, host_t* ip)
/** /**
* start a roaming job. We delay it for a second and fire only one job * start a roaming job. We delay it for a second and fire only one job
* for multiple events. Otherwise we would create two many jobs. * for multiple events. Otherwise we would create too many jobs.
*/ */
static void fire_roam_job(private_kernel_netlink_net_t *this, bool address) static void fire_roam_job(private_kernel_netlink_net_t *this, bool address)
{ {