merging renaming of mode_t to ipsec_mode_t back to trunk

src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.c

@@ -724,7 +724,7 @@ static status_t add_sa(private_kernel_netlink_ipsec_t *this,
 					   u_int64_t expire_soft, u_int64_t expire_hard,
 					   u_int16_t enc_alg, u_int16_t enc_size,
 					   u_int16_t int_alg, u_int16_t int_size,
-					   prf_plus_t *prf_plus, mode_t mode,
+					   prf_plus_t *prf_plus, ipsec_mode_t mode,
 					   u_int16_t ipcomp, bool encap,
 					   bool replace)
 {
@@ -1305,7 +1305,7 @@ static status_t add_policy(private_kernel_netlink_ipsec_t *this,
 						   traffic_selector_t *src_ts,
 						   traffic_selector_t *dst_ts,
 						   policy_dir_t direction, protocol_id_t protocol,
-						   u_int32_t reqid, bool high_prio, mode_t mode,
+						   u_int32_t reqid, bool high_prio, ipsec_mode_t mode,
 						   u_int16_t ipcomp)
 {
 	iterator_t *iterator;
@@ -1660,11 +1660,11 @@ kernel_netlink_ipsec_t *kernel_netlink_ipsec_create()
 	/* public functions */
 	this->public.interface.get_spi = (status_t(*)(kernel_ipsec_t*,host_t*,host_t*,protocol_id_t,u_int32_t,u_int32_t*))get_spi;
 	this->public.interface.get_cpi = (status_t(*)(kernel_ipsec_t*,host_t*,host_t*,u_int32_t,u_int16_t*))get_cpi;
-	this->public.interface.add_sa  = (status_t(*)(kernel_ipsec_t *,host_t*,host_t*,u_int32_t,protocol_id_t,u_int32_t,u_int64_t,u_int64_t,u_int16_t,u_int16_t,u_int16_t,u_int16_t,prf_plus_t*,mode_t,u_int16_t,bool,bool))add_sa;
+	this->public.interface.add_sa  = (status_t(*)(kernel_ipsec_t *,host_t*,host_t*,u_int32_t,protocol_id_t,u_int32_t,u_int64_t,u_int64_t,u_int16_t,u_int16_t,u_int16_t,u_int16_t,prf_plus_t*,ipsec_mode_t,u_int16_t,bool,bool))add_sa;
 	this->public.interface.update_sa = (status_t(*)(kernel_ipsec_t*,u_int32_t,protocol_id_t,host_t*,host_t*,host_t*,host_t*,bool))update_sa;
 	this->public.interface.query_sa = (status_t(*)(kernel_ipsec_t*,host_t*,u_int32_t,protocol_id_t,u_int32_t*))query_sa;
 	this->public.interface.del_sa = (status_t(*)(kernel_ipsec_t*,host_t*,u_int32_t,protocol_id_t))del_sa;
-	this->public.interface.add_policy = (status_t(*)(kernel_ipsec_t*,host_t*,host_t*,traffic_selector_t*,traffic_selector_t*,policy_dir_t,protocol_id_t,u_int32_t,bool,mode_t,u_int16_t))add_policy;
+	this->public.interface.add_policy = (status_t(*)(kernel_ipsec_t*,host_t*,host_t*,traffic_selector_t*,traffic_selector_t*,policy_dir_t,protocol_id_t,u_int32_t,bool,ipsec_mode_t,u_int16_t))add_policy;
 	this->public.interface.query_policy = (status_t(*)(kernel_ipsec_t*,traffic_selector_t*,traffic_selector_t*,policy_dir_t,u_int32_t*))query_policy;
 	this->public.interface.del_policy = (status_t(*)(kernel_ipsec_t*,traffic_selector_t*,traffic_selector_t*,policy_dir_t))del_policy;
 	this->public.interface.destroy = (void(*)(kernel_ipsec_t*)) destroy;

src/charon/plugins/kernel_netlink/kernel_netlink_ipsec.h

@@ -45,4 +45,4 @@ struct kernel_netlink_ipsec_t {
  */
 kernel_netlink_ipsec_t *kernel_netlink_ipsec_create();
 
-#endif /* KERNEL_NETLINK_IPSEC_H_ */
+#endif /* KERNEL_NETLINK_IPSEC_H_ @} */

src/charon/plugins/kernel_netlink/kernel_netlink_plugin.h

@@ -46,4 +46,4 @@ struct kernel_netlink_plugin_t {
  */
 plugin_t *plugin_create();
 
-#endif /* KERNEL_NETLINK_PLUGIN_H_ */
+#endif /* KERNEL_NETLINK_PLUGIN_H_ @} */

src/charon/plugins/smp/smp.c

@@ -181,7 +181,7 @@ static void write_childend(xmlTextWriterPtr writer, child_sa_t *child, bool loca
  */
 static void write_child(xmlTextWriterPtr writer, child_sa_t *child)
 {
-	mode_t mode;
+	ipsec_mode_t mode;
 	encryption_algorithm_t encr;
 	integrity_algorithm_t int_algo;
 	size_t encr_len, int_len;

src/charon/plugins/stroke/stroke_list.c

@@ -127,7 +127,7 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
 	encryption_algorithm_t encr_alg;
 	integrity_algorithm_t int_alg;
 	size_t encr_len, int_len;
-	mode_t mode;
+	ipsec_mode_t mode;
 	
 	child_sa->get_stats(child_sa, &mode, &encr_alg, &encr_len,
 						&int_alg, &int_len, &rekey, &use_in, &use_out,
@@ -136,7 +136,7 @@ static void log_child_sa(FILE *out, child_sa_t *child_sa, bool all)
 	fprintf(out, "%12s{%d}:  %N, %N", 
 			child_sa->get_name(child_sa), child_sa->get_reqid(child_sa),
 			child_sa_state_names, child_sa->get_state(child_sa),
-			mode_names, mode);
+			ipsec_mode_names, mode);
 	
 	if (child_sa->get_state(child_sa) == CHILD_INSTALLED)
 	{