Use a seperate section for each nested struct member in INIT macro

src/libcharon/network/receiver.c

@@ -383,7 +383,9 @@ receiver_t *receiver_create()
 	u_int32_t now = time_monotonic(NULL);
 
 	INIT(this,
-		.public.destroy = _destroy,
+		.public = {
+			.destroy = _destroy,
+		},
 		.secret_switch = now,
 		.secret_offset = random() % now,
 	);

src/libcharon/plugins/addrblock/addrblock_plugin.c

@@ -61,7 +61,11 @@ plugin_t *addrblock_plugin_create()
 	private_addrblock_plugin_t *this;
 
 	INIT(this,
-		.public.plugin.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
 		.validator = addrblock_validator_create(),
 		.narrower = addrblock_narrow_create(),
 	);

src/libcharon/plugins/android/android_plugin.c

@@ -79,8 +79,10 @@ plugin_t *android_plugin_create()
 	private_android_plugin_t *this;
 
 	INIT(this,
-		.public.plugin = {
-			.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
 		},
 		.logger = android_logger_create(),
 		.handler = android_handler_create(),

src/libcharon/plugins/dhcp/dhcp_plugin.c

@@ -62,7 +62,11 @@ plugin_t *dhcp_plugin_create()
 	private_dhcp_plugin_t *this;
 
 	INIT(this,
-		.public.plugin.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
 		.socket = dhcp_socket_create(),
 	);
 

src/libcharon/plugins/eap_identity/eap_identity.c

@@ -157,7 +157,7 @@ eap_identity_t *eap_identity_create_peer(identification_t *server,
 
 	INIT(this,
 		.public =  {
-			.eap_method_interface = {
+			.eap_method = {
 				.initiate = _initiate_peer,
 				.process = _process_peer,
 				.get_type = _get_type,
@@ -182,13 +182,15 @@ eap_identity_t *eap_identity_create_server(identification_t *server,
 	private_eap_identity_t *this;
 
 	INIT(this,
-		.public.eap_method_interface = {
-			.initiate = _initiate_server,
-			.process = _process_server,
-			.get_type = _get_type,
-			.is_mutual = _is_mutual,
-			.get_msk = _get_msk,
-			.destroy = _destroy,
+		.public = {
+			.eap_method = {
+				.initiate = _initiate_server,
+				.process = _process_server,
+				.get_type = _get_type,
+				.is_mutual = _is_mutual,
+				.get_msk = _get_msk,
+				.destroy = _destroy,
+			},
 		},
 		.peer = peer->clone(peer),
 		.identity = chunk_empty,

src/libcharon/plugins/eap_identity/eap_identity.h

@@ -33,7 +33,7 @@ struct eap_identity_t {
 	/**
 	 * Implemented eap_method_t interface.
 	 */
-	eap_method_t eap_method_interface;
+	eap_method_t eap_method;
 };
 
 /**

src/libcharon/plugins/eap_md5/eap_md5.c

@@ -236,7 +236,7 @@ eap_md5_t *eap_md5_create_server(identification_t *server, identification_t *pee
 
 	INIT(this,
 		.public = {
-			.eap_method_interface = {
+			.eap_method = {
 				.initiate = _initiate_server,
 				.process = _process_server,
 				.get_type = _get_type,
@@ -247,8 +247,6 @@ eap_md5_t *eap_md5_create_server(identification_t *server, identification_t *pee
 		},
 		.peer = peer->clone(peer),
 		.server = server->clone(server),
-		.challenge = chunk_empty,
-		.identifier = 0,
 	);
 
 	/* generate a non-zero identifier */
@@ -267,18 +265,18 @@ eap_md5_t *eap_md5_create_peer(identification_t *server, identification_t *peer)
 	private_eap_md5_t *this;
 
 	INIT(this,
-		.public.eap_method_interface = {
-			.initiate = _initiate_peer,
-			.process = _process_peer,
-			.get_type = _get_type,
-			.is_mutual = _is_mutual,
-			.get_msk = _get_msk,
-			.destroy = _destroy,
+		.public = {
+			.eap_method = {
+				.initiate = _initiate_peer,
+				.process = _process_peer,
+				.get_type = _get_type,
+				.is_mutual = _is_mutual,
+				.get_msk = _get_msk,
+				.destroy = _destroy,
+			},
 		},
 		.peer = peer->clone(peer),
 		.server = server->clone(server),
-		.challenge = chunk_empty,
-		.identifier = 0,
 	);
 
 	return &this->public;

src/libcharon/plugins/eap_md5/eap_md5.h

@@ -33,7 +33,7 @@ struct eap_md5_t {
 	/**
 	 * Implemented eap_method_t interface.
 	 */
-	eap_method_t eap_method_interface;
+	eap_method_t eap_method;
 };
 
 /**

src/libcharon/plugins/eap_radius/eap_radius.c

@@ -313,13 +313,15 @@ eap_radius_t *eap_radius_create(identification_t *server, identification_t *peer
 	private_eap_radius_t *this;
 
 	INIT(this,
-		.public.eap_method_interface = {
-			.initiate = _initiate,
-			.process = _process,
-			.get_type = _get_type,
-			.is_mutual = _is_mutual,
-			.get_msk = _get_msk,
-			.destroy = _destroy,
+		.public = {
+			.eap_method = {
+				.initiate = _initiate,
+				.process = _process,
+				.get_type = _get_type,
+				.is_mutual = _is_mutual,
+				.get_msk = _get_msk,
+				.destroy = _destroy,
+			},
 		},
 		/* initially EAP_RADIUS, but is set to the method selected by RADIUS */
 		.type = EAP_RADIUS,

src/libcharon/plugins/eap_radius/eap_radius.h

@@ -33,7 +33,7 @@ struct eap_radius_t {
 	/**
 	 * Implemented eap_method_t interface.
 	 */
-	eap_method_t eap_method_interface;
+	eap_method_t eap_method;
 };
 
 /**

src/libcharon/plugins/eap_radius/eap_radius_plugin.c

@@ -151,7 +151,11 @@ plugin_t *eap_radius_plugin_create()
 	private_eap_radius_plugin_t *this;
 
 	INIT(this,
-		.public.plugin.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
 		.servers = linked_list_create(),
 	);
 

src/libcharon/plugins/eap_simaka_sql/eap_simaka_sql_plugin.c

@@ -85,8 +85,10 @@ plugin_t *eap_simaka_sql_plugin_create()
 							"charon.plugins.eap-simaka-sql.remove_used", FALSE);
 
 	INIT(this,
-		.public.plugin =  {
-			.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
 		},
 		.db = db,
 		.provider = eap_simaka_sql_provider_create(db, remove_used),

src/libcharon/plugins/eap_tls/eap_tls.c

@@ -422,13 +422,15 @@ static eap_tls_t *eap_tls_create(identification_t *server,
 	private_eap_tls_t *this;
 
 	INIT(this,
-		.public.eap_method = {
-			.initiate = _initiate,
-			.process = _process,
-			.get_type = _get_type,
-			.is_mutual = _is_mutual,
-			.get_msk = _get_msk,
-			.destroy = _destroy,
+		.public = {
+			.eap_method = {
+				.initiate = _initiate,
+				.process = _process,
+				.get_type = _get_type,
+				.is_mutual = _is_mutual,
+				.get_msk = _get_msk,
+				.destroy = _destroy,
+			},
 		},
 		.is_server = is_server,
 	);

src/libcharon/plugins/eap_tls/eap_tls_plugin.c

@@ -38,7 +38,9 @@ plugin_t *eap_tls_plugin_create()
 	eap_tls_plugin_t *this;
 
 	INIT(this,
-		.plugin.destroy = _destroy,
+		.plugin = {
+			.destroy = _destroy,
+		},
 	);
 
 	charon->eap->add_method(charon->eap, EAP_TLS, 0, EAP_SERVER,

src/libcharon/plugins/eap_ttls/eap_ttls.c

@@ -431,13 +431,15 @@ static eap_ttls_t *eap_ttls_create(identification_t *server,
 	private_eap_ttls_t *this;
 
 	INIT(this,
-		.public.eap_method = {
-			.initiate = _initiate,
-			.process = _process,
-			.get_type = _get_type,
-			.is_mutual = _is_mutual,
-			.get_msk = _get_msk,
-			.destroy = _destroy,
+		.public = {
+			.eap_method = {
+				.initiate = _initiate,
+				.process = _process,
+				.get_type = _get_type,
+				.is_mutual = _is_mutual,
+				.get_msk = _get_msk,
+				.destroy = _destroy,
+			},
 		},
 		.is_server = is_server,
 	);

src/libcharon/plugins/eap_ttls/eap_ttls_peer.c

@@ -49,12 +49,12 @@ struct private_eap_ttls_peer_t {
 	bool start_phase2;
 
 	/**
-     * Current phase 2 EAP method 
+     * Current phase 2 EAP method
 	 */
 	eap_method_t *method;
 
 	/**
-     * Pending outbound EAP message 
+     * Pending outbound EAP message
 	 */
 	eap_payload_t *out;
 
@@ -123,7 +123,7 @@ METHOD(tls_application_t, process, status_t,
 			return NEED_MORE;
 		}
 	}
-		
+
 	type = this->method->get_type(this->method, &vendor);
 
 	if (type != received_type || vendor != received_vendor)
@@ -156,7 +156,7 @@ METHOD(tls_application_t, process, status_t,
 				DBG1(DBG_IKE, "%N method failed", eap_type_names, type);
 			}
 			return FAILED;
- 	}		
+	}
 }
 
 METHOD(tls_application_t, build, status_t,
@@ -220,16 +220,16 @@ eap_ttls_peer_t *eap_ttls_peer_create(identification_t *server,
 	private_eap_ttls_peer_t *this;
 
 	INIT(this,
-		.public.application = {
-			.process = _process,
-			.build = _build,
-			.destroy = _destroy,
+		.public = {
+			.application = {
+				.process = _process,
+				.build = _build,
+				.destroy = _destroy,
+			},
 		},
 		.server = server->clone(server),
 		.peer = peer->clone(peer),
 		.start_phase2 = TRUE,
-		.method = NULL,
-		.out = NULL,
 		.avp = eap_ttls_avp_create(),
 	);
 

src/libcharon/plugins/eap_ttls/eap_ttls_plugin.c

@@ -38,7 +38,9 @@ plugin_t *eap_ttls_plugin_create()
 	eap_ttls_plugin_t *this;
 
 	INIT(this,
-		.plugin.destroy = _destroy,
+		.plugin = {
+			.destroy = _destroy,
+		},
 	);
 
 	charon->eap->add_method(charon->eap, EAP_TTLS, 0, EAP_SERVER,

src/libcharon/plugins/eap_ttls/eap_ttls_server.c

@@ -49,12 +49,12 @@ struct private_eap_ttls_server_t {
 	bool start_phase2;
 
 	/**
-     * Current phase 2 EAP method 
+     * Current phase 2 EAP method
 	 */
 	eap_method_t *method;
 
 	/**
-     * Pending outbound EAP message 
+     * Pending outbound EAP message
 	 */
 	eap_payload_t *out;
 
@@ -118,7 +118,7 @@ METHOD(tls_application_t, process, status_t,
 			return FAILED;
 		}
 	}
-		
+
 	if (!received_vendor && received_type == EAP_IDENTITY)
 	{
 		chunk_t eap_id;
@@ -184,7 +184,7 @@ METHOD(tls_application_t, process, status_t,
  			return FAILED;
 		}
 	}
-		
+
 	if (this->method == 0)
 	{
 		DBG1(DBG_IKE, "no %N phase2 method installed", eap_type_names, EAP_TTLS);
@@ -194,7 +194,7 @@ METHOD(tls_application_t, process, status_t,
 
 	status = this->method->process(this->method, in, &this->out);
 	in->destroy(in);
-	
+
 	switch (status)
 	{
 		case SUCCESS:
@@ -218,7 +218,7 @@ METHOD(tls_application_t, process, status_t,
 				DBG1(DBG_IKE, "%N method failed", eap_type_names, type);
 			}
 			return FAILED;
- 	}		
+ 	}
 	return status;
 }
 
@@ -285,16 +285,16 @@ eap_ttls_server_t *eap_ttls_server_create(identification_t *server,
 	private_eap_ttls_server_t *this;
 
 	INIT(this,
-		.public.application = {
-			.process = _process,
-			.build = _build,
-			.destroy = _destroy,
+		.public = {
+			.application = {
+				.process = _process,
+				.build = _build,
+				.destroy = _destroy,
+			},
 		},
 		.server = server->clone(server),
 		.peer = peer->clone(peer),
 		.start_phase2 = TRUE,
-		.method = NULL,
-		.out = NULL,
 		.avp = eap_ttls_avp_create(),
 	);
 

src/libcharon/plugins/farp/farp_plugin.c

@@ -60,7 +60,11 @@ plugin_t *farp_plugin_create()
 	private_farp_plugin_t *this;
 
 	INIT(this,
-		.public.plugin.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
 		.listener = farp_listener_create(),
 	);
 

src/libcharon/plugins/ha/ha_plugin.c

@@ -142,7 +142,11 @@ plugin_t *ha_plugin_create()
 	}
 
 	INIT(this,
-		.public.plugin.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
 	);
 
 	if (secret)

src/libcharon/plugins/kernel_klips/kernel_klips_ipsec.c

@@ -2598,18 +2598,20 @@ kernel_klips_ipsec_t *kernel_klips_ipsec_create()
 	private_kernel_klips_ipsec_t *this;
 
 	INIT(this,
-		.public.interface = {
-			.get_spi = _get_spi,
-			.get_cpi = _get_cpi,
-			.add_sa  = _add_sa,
-			.update_sa = _update_sa,
-			.query_sa = _query_sa,
-			.del_sa = _del_sa,
-			.add_policy = _add_policy,
-			.query_policy = _query_policy,
-			.del_policy = _del_policy,
-			.bypass_socket = _bypass_socket,
-			.destroy = _destroy,
+		.public = {
+			.interface = {
+				.get_spi = _get_spi,
+				.get_cpi = _get_cpi,
+				.add_sa  = _add_sa,
+				.update_sa = _update_sa,
+				.query_sa = _query_sa,
+				.del_sa = _del_sa,
+				.add_policy = _add_policy,
+				.query_policy = _query_policy,
+				.del_policy = _del_policy,
+				.bypass_socket = _bypass_socket,
+				.destroy = _destroy,
+			},
 		},
 		.policies = linked_list_create(),
 		.allocated_spis = linked_list_create(),

src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c

@@ -305,7 +305,7 @@ static u_int policy_hash(policy_entry_t *key)
  */
 static bool policy_equals(policy_entry_t *key, policy_entry_t *other_key)
 {
-	return memeq(&key->sel, &other_key->sel, 
+	return memeq(&key->sel, &other_key->sel,
 				 sizeof(struct xfrm_selector) + sizeof(u_int32_t)) &&
 		   key->direction == other_key->direction;
 }
@@ -1379,7 +1379,7 @@ METHOD(kernel_ipsec_t, query_sa, status_t,
 				case NLMSG_ERROR:
 				{
 					struct nlmsgerr *err = NLMSG_DATA(hdr);
-					
+
 					if (mark.value)
 					{
 						DBG1(DBG_KNL, "querying SAD entry with SPI %.8x  "
@@ -2202,18 +2202,20 @@ kernel_netlink_ipsec_t *kernel_netlink_ipsec_create()
 	int fd;
 
 	INIT(this,
-		.public.interface = {
-			.get_spi = _get_spi,
-			.get_cpi = _get_cpi,
-			.add_sa  = _add_sa,
-			.update_sa = _update_sa,
-			.query_sa = _query_sa,
-			.del_sa = _del_sa,
-			.add_policy = _add_policy,
-			.query_policy = _query_policy,
-			.del_policy = _del_policy,
-			.bypass_socket = _bypass_socket,
-			.destroy = _destroy,
+		.public = {
+			.interface = {
+				.get_spi = _get_spi,
+				.get_cpi = _get_cpi,
+				.add_sa  = _add_sa,
+				.update_sa = _update_sa,
+				.query_sa = _query_sa,
+				.del_sa = _del_sa,
+				.add_policy = _add_policy,
+				.query_policy = _query_policy,
+				.del_policy = _del_policy,
+				.bypass_socket = _bypass_socket,
+				.destroy = _destroy,
+			},
 		},
 		.policies = hashtable_create((hashtable_hash_t)policy_hash,
 									 (hashtable_equals_t)policy_equals, 32),

src/libcharon/plugins/kernel_pfkey/kernel_pfkey_ipsec.c

@@ -2154,18 +2154,20 @@ kernel_pfkey_ipsec_t *kernel_pfkey_ipsec_create()
 	private_kernel_pfkey_ipsec_t *this;
 
 	INIT(this,
-		.public.interface = {
-			.get_spi = _get_spi,
-			.get_cpi = _get_cpi,
-			.add_sa  = _add_sa,
-			.update_sa = _update_sa,
-			.query_sa = _query_sa,
-			.del_sa = _del_sa,
-			.add_policy = _add_policy,
-			.query_policy = _query_policy,
-			.del_policy = _del_policy,
-			.bypass_socket = _bypass_socket,
-			.destroy = _destroy,
+		.public = {
+			.interface = {
+				.get_spi = _get_spi,
+				.get_cpi = _get_cpi,
+				.add_sa  = _add_sa,
+				.update_sa = _update_sa,
+				.query_sa = _query_sa,
+				.del_sa = _del_sa,
+				.add_policy = _add_policy,
+				.query_policy = _query_policy,
+				.del_policy = _del_policy,
+				.bypass_socket = _bypass_socket,
+				.destroy = _destroy,
+			},
 		},
 		.policies = linked_list_create(),
 		.mutex = mutex_create(MUTEX_TYPE_DEFAULT),

src/libcharon/plugins/socket_default/socket_default_plugin.c

@@ -53,7 +53,11 @@ plugin_t *socket_default_plugin_create()
 	private_socket_default_plugin_t *this;
 
 	INIT(this,
-		.public.plugin.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
 		.socket = socket_default_socket_create(),
 	);
 

src/libcharon/plugins/socket_dynamic/socket_dynamic_plugin.c

@@ -53,7 +53,11 @@ plugin_t *socket_dynamic_plugin_create()
 	private_socket_dynamic_plugin_t *this;
 
 	INIT(this,
-		.public.plugin.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
 		.socket = socket_dynamic_socket_create(),
 	);
 

src/libcharon/plugins/socket_raw/socket_raw_plugin.c

@@ -53,7 +53,11 @@ plugin_t *socket_raw_plugin_create()
 	private_socket_raw_plugin_t *this;
 
 	INIT(this,
-		.public.plugin.destroy = _destroy,
+		.public = {
+			.plugin = {
+				.destroy = _destroy,
+			},
+		},
 		.socket = socket_raw_socket_create(),
 	);
 

src/libcharon/processing/jobs/inactivity_job.c

@@ -136,9 +136,11 @@ inactivity_job_t *inactivity_job_create(u_int32_t reqid, u_int32_t timeout,
 	private_inactivity_job_t *this;
 
 	INIT(this,
-		.public.job_interface = {
-			.execute = _execute,
-			.destroy = _destroy,
+		.public = {
+				.job_interface = {
+				.execute = _execute,
+				.destroy = _destroy,
+			},
 		},
 		.reqid = reqid,
 		.timeout = timeout,

src/libcharon/sa/authenticators/eap_authenticator.c

@@ -652,13 +652,6 @@ eap_authenticator_t *eap_authenticator_create_builder(ike_sa_t *ike_sa,
 		.received_nonce = received_nonce,
 		.sent_init = sent_init,
 		.sent_nonce = sent_nonce,
-		.msk = chunk_empty,
-		.method = NULL,
-		.eap_payload = NULL,
-		.eap_complete = FALSE,
-		.auth_complete = FALSE,
-		.eap_identity = NULL,
-		.require_mutual = FALSE,
 	);
 
 	return &this->public;
@@ -674,24 +667,19 @@ eap_authenticator_t *eap_authenticator_create_verifier(ike_sa_t *ike_sa,
 	private_eap_authenticator_t *this;
 
 	INIT(this,
-		.public.authenticator = {
-			.build = _build_server,
-			.process = _process_server,
-			.is_mutual = _is_mutual,
-			.destroy = _destroy,
+		.public = {
+			.authenticator = {
+				.build = _build_server,
+				.process = _process_server,
+				.is_mutual = _is_mutual,
+				.destroy = _destroy,
+			},
 		},
 		.ike_sa = ike_sa,
 		.received_init = received_init,
 		.received_nonce = received_nonce,
 		.sent_init = sent_init,
 		.sent_nonce = sent_nonce,
-		.msk = chunk_empty,
-		.method = NULL,
-		.eap_payload = NULL,
-		.eap_complete = FALSE,
-		.auth_complete = FALSE,
-		.eap_identity = NULL,
-		.require_mutual = FALSE,
 	);
 
 	return &this->public;

src/libcharon/sa/tasks/ike_vendor.c

@@ -123,12 +123,14 @@ ike_vendor_t *ike_vendor_create(ike_sa_t *ike_sa, bool initiator)
 	private_ike_vendor_t *this;
 
 	INIT(this,
-		.public.task = {
-			.build = _build,
-			.process = _process,
-			.migrate = _migrate,
-			.get_type = _get_type,
-			.destroy = _destroy,
+		.public = {
+			.task = {
+				.build = _build,
+				.process = _process,
+				.migrate = _migrate,
+				.get_type = _get_type,
+				.destroy = _destroy,
+			},
 		},
 		.initiator = initiator,
 		.ike_sa = ike_sa,