1 files changed, 64 insertions, 66 deletions

diff --git a/tinyNET/src/dhcp6/tnet_dhcp6_message.c b/tinyNET/src/dhcp6/tnet_dhcp6_message.c
index 4691714..9979335 100755
--- a/tinyNET/src/dhcp6/tnet_dhcp6_message.c
+++ b/tinyNET/src/dhcp6/tnet_dhcp6_message.c
@@ -32,65 +32,64 @@
 
 tnet_dhcp6_message_t* tnet_dhcp6_message_create(tnet_dhcp6_message_type_t type)
 {
-	return tsk_object_new(tnet_dhcp6_message_def_t, type);
+    return tsk_object_new(tnet_dhcp6_message_def_t, type);
 }
 
 tnet_dhcp6_request_t* tnet_dhcp6_request_create(tnet_dhcp6_message_type_t type)
 {
-	return tnet_dhcp6_message_create(type);
+    return tnet_dhcp6_message_create(type);
 }
 
 tsk_buffer_t* tnet_dhcp6_message_serialize(const tnet_dhcp6_ctx_t *ctx, const tnet_dhcp6_message_t *self)
 {
-	tsk_buffer_t* output = 0;
-	//uint8_t _1byte;
-	uint16_t _2bytes;
-	uint32_t _4bytes;
-
-	/* Check message validity */
-	if (!self){
-		goto bail;
-	}
-
-	output = tsk_buffer_create_null();
-
-	/*== msg-type + transaction-id */
-	_4bytes = (((uint32_t)(self->type)) << 24) | (self->transaction_id & 0xFFFFFF);
-	_4bytes = tnet_ntohl(_4bytes);
-	tsk_buffer_append(output, &(_4bytes), 4);
-
-	/*== Vendor class
-	*/
-	{
-		_2bytes = tnet_htons(dhcp6_code_vendor_class);
-		tsk_buffer_append(output, &(_2bytes), 2);
-		_2bytes = tnet_htons((unsigned short)(4 + tsk_strlen(ctx->vendor_class_data)));
-		tsk_buffer_append(output, &(_2bytes), 2);
-		_4bytes = tnet_ntohl(ctx->pen);
-		tsk_buffer_append(output, &(_4bytes), 4);
-		tsk_buffer_append(output, ctx->vendor_class_data, tsk_strlen(ctx->vendor_class_data));
-	}
-
-	/*== DHCP Options
-	*/
-	{
-		tsk_list_item_t *item;
-		tnet_dhcp6_option_t* option;
-		tsk_list_foreach(item, self->options)
-		{
-			option = (tnet_dhcp6_option_t*)item->data;
-			if (tnet_dhcp6_option_serialize(option, output)){
-				TSK_DEBUG_WARN("Failed to serialize DHCPv6 OPTION (%u)", option->code);
-			}
-		}
-	}
+    tsk_buffer_t* output = 0;
+    //uint8_t _1byte;
+    uint16_t _2bytes;
+    uint32_t _4bytes;
+
+    /* Check message validity */
+    if (!self) {
+        goto bail;
+    }
+
+    output = tsk_buffer_create_null();
+
+    /*== msg-type + transaction-id */
+    _4bytes = (((uint32_t)(self->type)) << 24) | (self->transaction_id & 0xFFFFFF);
+    _4bytes = tnet_ntohl(_4bytes);
+    tsk_buffer_append(output, &(_4bytes), 4);
+
+    /*== Vendor class
+    */
+    {
+        _2bytes = tnet_htons(dhcp6_code_vendor_class);
+        tsk_buffer_append(output, &(_2bytes), 2);
+        _2bytes = tnet_htons((unsigned short)(4 + tsk_strlen(ctx->vendor_class_data)));
+        tsk_buffer_append(output, &(_2bytes), 2);
+        _4bytes = tnet_ntohl(ctx->pen);
+        tsk_buffer_append(output, &(_4bytes), 4);
+        tsk_buffer_append(output, ctx->vendor_class_data, tsk_strlen(ctx->vendor_class_data));
+    }
+
+    /*== DHCP Options
+    */
+    {
+        tsk_list_item_t *item;
+        tnet_dhcp6_option_t* option;
+        tsk_list_foreach(item, self->options) {
+            option = (tnet_dhcp6_option_t*)item->data;
+            if (tnet_dhcp6_option_serialize(option, output)) {
+                TSK_DEBUG_WARN("Failed to serialize DHCPv6 OPTION (%u)", option->code);
+            }
+        }
+    }
 bail:
-	return output;
+    return output;
 }
 
 tnet_dhcp6_message_t* tnet_dhcp6_message_deserialize(const tnet_dhcp6_ctx_t *ctx, const uint8_t *data, tsk_size_t size)
 {
-	return 0;
+    return 0;
 }
 
 
@@ -100,32 +99,31 @@ tnet_dhcp6_message_t* tnet_dhcp6_message_deserialize(const tnet_dhcp6_ctx_t *ctx
 //
 static tsk_object_t* tnet_dhcp6_message_ctor(tsk_object_t * self, va_list * app)
 {
-	tnet_dhcp6_message_t *message = self;
-	if (message){
-		static uint16_t __dhcp6message_unique_tid = 0;//(uint32_t)tsk_time_epoch();
-
-		message->type = va_arg(*app, tnet_dhcp6_message_type_t);
-		message->transaction_id = ++__dhcp6message_unique_tid;
-		message->options = tsk_list_create();
-	}
-	return self;
+    tnet_dhcp6_message_t *message = self;
+    if (message) {
+        static uint16_t __dhcp6message_unique_tid = 0;//(uint32_t)tsk_time_epoch();
+
+        message->type = va_arg(*app, tnet_dhcp6_message_type_t);
+        message->transaction_id = ++__dhcp6message_unique_tid;
+        message->options = tsk_list_create();
+    }
+    return self;
 }
 
 static tsk_object_t* tnet_dhcp6_message_dtor(tsk_object_t * self)
 {
-	tnet_dhcp6_message_t *message = self;
-	if (message){
-		TSK_OBJECT_SAFE_FREE(message->options);
-	}
-	return self;
+    tnet_dhcp6_message_t *message = self;
+    if (message) {
+        TSK_OBJECT_SAFE_FREE(message->options);
+    }
+    return self;
 }
 
-static const tsk_object_def_t tnet_dhcp6_message_def_s =
-{
-	sizeof(tnet_dhcp6_message_t),
-	tnet_dhcp6_message_ctor,
-	tnet_dhcp6_message_dtor,
-	tsk_null,
+static const tsk_object_def_t tnet_dhcp6_message_def_s = {
+    sizeof(tnet_dhcp6_message_t),
+    tnet_dhcp6_message_ctor,
+    tnet_dhcp6_message_dtor,
+    tsk_null,
 };
 const tsk_object_def_t *tnet_dhcp6_message_def_t = &tnet_dhcp6_message_def_s;