Changeset a35b458 in mainline for uspace/srv/net/inetsrv/ndp.c

Timestamp:

2018-03-02T20:10:49Z (7 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

• uspace/srv/net/inetsrv/ndp.c (modified) (8 diffs)

uspace/srv/net/inetsrv/ndp.c

@@ -68 +68 @@
         inet_dgram_t dgram;
         ndp_pdu_encode(packet, &dgram);
-        
+
         inet_link_send_dgram6(link, packet->target_hw_addr, &dgram,
             IP_PROTO_ICMPV6, INET6_HOP_LIMIT_MAX, 0);
-        
+
         free(dgram.data);
-        
+
         return EOK;
 }
@@ -86 +86 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "ndp_received()");
-        
+
         ndp_packet_t packet;
         errno_t rc = ndp_pdu_decode(dgram, &packet);
         if (rc != EOK)
                 return rc;
-        
+
         inet_addr_t sender;
         inet_addr_set6(packet.sender_proto_addr, &sender);
-        
+
         inet_addr_t target;
         inet_addr_set6(packet.target_proto_addr, &target);
-        
+
         inet_addrobj_t *laddr;
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "NDP PDU decoded; opcode: %d",
             packet.opcode);
-        
+
         switch (packet.opcode) {
         case ICMPV6_NEIGHBOUR_SOLICITATION:
@@ -111 +111 @@
                         if (rc != EOK)
                                 return rc;
-                        
+
                         ndp_packet_t reply;
-                        
+
                         reply.opcode = ICMPV6_NEIGHBOUR_ADVERTISEMENT;
                         addr48(laddr->ilink->mac, reply.sender_hw_addr);
@@ -119 +119 @@
                         addr48(packet.sender_hw_addr, reply.target_hw_addr);
                         addr128(packet.sender_proto_addr, reply.target_proto_addr);
-                        
+
                         ndp_send_packet(laddr->ilink, &reply);
                 }
-                
+
                 break;
         case ICMPV6_NEIGHBOUR_ADVERTISEMENT:
@@ -129 +129 @@
                         return ntrans_add(packet.sender_proto_addr,
                             packet.sender_hw_addr);
-                
+
                 break;
         case ICMPV6_ROUTER_ADVERTISEMENT:
@@ -136 +136 @@
                 return ENOTSUP;
         }
-        
+
         return EOK;
 }
@@ -159 +159 @@
                 return EOK;
         }
-        
+
         errno_t rc = ntrans_lookup(ip_addr, mac_addr);
         if (rc == EOK)
                 return EOK;
-        
+
         ndp_packet_t packet;
-        
+
         packet.opcode = ICMPV6_NEIGHBOUR_SOLICITATION;
         addr48(ilink->mac, packet.sender_hw_addr);
@@ -172 +172 @@
         addr48_solicited_node(ip_addr, packet.target_hw_addr);
         ndp_solicited_node_ip(ip_addr, packet.target_proto_addr);
-        
+
         rc = ndp_send_packet(ilink, &packet);
         if (rc != EOK)
                 return rc;
-        
+
         (void) ntrans_wait_timeout(NDP_REQUEST_TIMEOUT);
-        
+
         return ntrans_lookup(ip_addr, mac_addr);
 }