Code style, added missing function stub and function rename fix.

Change-Id: Ia5918c3641b06616d04b27053349324bec2e5e44

Author: Juha Heiskanen

source/Common_Protocols/icmpv6.c

@@ -571,7 +571,7 @@ int icmpv6_slaac_prefix_update(struct protocol_interface_info_entry *cur, const
     ns_list_foreach_safe(if_address_entry_t, e, &cur->ip_addresses) {
         if (e->source == ADDR_SOURCE_SLAAC && (e->prefix_len == prefix_len) && bitsequal(e->address, prefix_ptr, prefix_len)) {
 
-            addr_prefix_lifetime_update(cur, e, valid_lifetime, preferred_lifetime, 2 * 60 * 60);
+            addr_lifetime_update(cur, e, valid_lifetime, preferred_lifetime, 2 * 60 * 60);
             ret_val = 0;
         }
     }

source/Core/include/ns_address_internal.h

@@ -166,7 +166,7 @@ void addr_cb(struct protocol_interface_info_entry *interface, if_address_entry_t
 void addr_set_valid_lifetime(struct protocol_interface_info_entry *interface, if_address_entry_t *entry, uint32_t valid_lifetime);
 void addr_set_preferred_lifetime(struct protocol_interface_info_entry *interface, if_address_entry_t *entry, uint32_t preferred_lifetime);
 
-void addr_prefix_lifetime_update(struct protocol_interface_info_entry *interface, if_address_entry_t *address, uint32_t valid_lifetime, uint32_t preferred_lifetime, uint32_t threshold);
+void addr_lifetime_update(struct protocol_interface_info_entry *interface, if_address_entry_t *address, uint32_t valid_lifetime, uint32_t preferred_lifetime, uint32_t threshold);
 
 int_fast8_t addr_policy_table_add_entry(const uint8_t *prefix, uint8_t len, uint8_t precedence, uint8_t label);
 int_fast8_t addr_policy_table_delete_entry(const uint8_t *prefix, uint8_t len);

source/Core/ns_address_internal.c

@@ -1099,12 +1099,12 @@ void addr_set_preferred_lifetime(protocol_interface_info_entry_t *interface, if_
     }
 }
 
-void addr_prefix_lifetime_update(protocol_interface_info_entry_t *interface, if_address_entry_t *address, uint32_t valid_lifetime, uint32_t preferred_lifetime, uint32_t threshold)
+void addr_lifetime_update(protocol_interface_info_entry_t *interface, if_address_entry_t *address, uint32_t valid_lifetime, uint32_t preferred_lifetime, uint32_t threshold)
 {
     //Update Current lifetimes (see RFC 4862 for rules detail)
-    if (valid_lifetime > (threshold) || valid_lifetime > address->valid_lifetime) {
+    if (valid_lifetime > threshold || valid_lifetime > address->valid_lifetime) {
         addr_set_valid_lifetime(interface, address, valid_lifetime);
-    } else if (address->valid_lifetime <= (threshold)) {
+    } else if (address->valid_lifetime <= threshold) {
         //NOT Update Valid Lifetime
     } else {
         addr_set_valid_lifetime(interface, address, threshold);

source/DHCPv6_client/dhcpv6_client_service.c

@@ -185,7 +185,7 @@ int dhcp_solicit_resp_cb(uint16_t instance_id, void *ptr, uint8_t msg_name,  uin
             ns_list_foreach(if_address_entry_t, e, &cur->ip_addresses) {
                 if (memcmp(e->address, srv_data_ptr->iaNontemporalAddress.addressPrefix, 16) == 0) {
                     tr_debug("Depreacate address %s", trace_ipv6(srv_data_ptr->iaNontemporalAddress.addressPrefix));
-                    addr_prefix_lifetime_update(cur, e, 0, 0, 30*60); //Accept max 30 min lifetime
+                    addr_lifetime_update(cur, e, 0, 0, 30 * 60); //Accept max 30 min lifetime
                 }
             }
         }

source/RPL/rpl_upward.c

@@ -953,7 +953,7 @@ void rpl_dodag_update_unpublished_dio_prefix_finish(rpl_dodag_t *dodag)
      * too, except for the minimimum count requirement on 0 lifetime.
      */
     ns_list_foreach_safe(prefix_entry_t, entry, &dodag->prefixes) {
-        if ((entry->options & (RPL_PIO_PUBLISHED|RPL_PIO_AGE|RPL_PIO_HOLD_MASK)) == 0) {
+        if ((entry->options & (RPL_PIO_PUBLISHED | RPL_PIO_AGE | RPL_PIO_HOLD_MASK)) == 0) {
             rpl_dodag_delete_dio_prefix(dodag, entry);
         }
     }
@@ -1019,7 +1019,7 @@ static void rpl_dodag_age_prefixes(rpl_dodag_t *dodag, uint16_t seconds)
                  * keep advertising until we see our parent stop advertising it - deletion
                  * is handled in rpl_control_process_prefix_options.
                  */
-                if ((prefix->options & (RPL_PIO_PUBLISHED|RPL_PIO_HOLD_MASK)) == RPL_PIO_PUBLISHED) {
+                if ((prefix->options & (RPL_PIO_PUBLISHED | RPL_PIO_HOLD_MASK)) == RPL_PIO_PUBLISHED) {
                     rpl_dodag_delete_dio_prefix(dodag, prefix);
                 }
             }

test/nanostack/unittest/stub/address_stub.c

@@ -349,3 +349,8 @@ void addr_multicast_fwd_set_forwarding(struct protocol_interface_info_entry *int
 void addr_policy_remove_by_label(uint8_t label)
 {
 }
+
+void addr_lifetime_update(struct protocol_interface_info_entry *interface, if_address_entry_t *address, uint32_t valid_lifetime, uint32_t preferred_lifetime, uint32_t threshold)
+{
+
+}