Changeset a35b458 in mainline for uspace/srv/net/inetsrv/icmpv6.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/icmpv6.c (modified) (10 diffs)

uspace/srv/net/inetsrv/icmpv6.c

@@ -50 +50 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv_echo_request()");
-        
+
         if (dgram->size < sizeof(icmpv6_message_t))
                 return EINVAL;
-        
+
         icmpv6_message_t *request = (icmpv6_message_t *) dgram->data;
         size_t size = dgram->size;
-        
+
         addr128_t src_v6;
         ip_ver_t src_ver = inet_addr_get(&dgram->src, NULL, &src_v6);
-        
+
         addr128_t dest_v6;
         ip_ver_t dest_ver = inet_addr_get(&dgram->dest, NULL, &dest_v6);
-        
+
         if ((src_ver != dest_ver) || (src_ver != ip_v6))
                 return EINVAL;
-        
+
         icmpv6_message_t *reply = calloc(1, size);
         if (reply == NULL)
                 return ENOMEM;
-        
+
         memcpy(reply, request, size);
-        
+
         reply->type = ICMPV6_ECHO_REPLY;
         reply->code = 0;
         reply->checksum = 0;
-        
+
         inet_dgram_t rdgram;
-        
+
         inet_get_srcaddr(&dgram->src, 0, &rdgram.src);
         rdgram.dest = dgram->src;
@@ -84 +84 @@
         rdgram.data = reply;
         rdgram.size = size;
-        
+
         icmpv6_phdr_t phdr;
-        
+
         host2addr128_t_be(dest_v6, phdr.src_addr);
         host2addr128_t_be(src_v6, phdr.dest_addr);
@@ -92 +92 @@
         memset(phdr.zeroes, 0, 3);
         phdr.next = IP_PROTO_ICMPV6;
-        
+
         uint16_t cs_phdr =
             inet_checksum_calc(INET_CHECKSUM_INIT, &phdr,
             sizeof(icmpv6_phdr_t));
-        
+
         uint16_t cs_all = inet_checksum_calc(cs_phdr, reply, size);
-        
+
         reply->checksum = host2uint16_t_be(cs_all);
-        
+
         errno_t rc = inet_route_packet(&rdgram, IP_PROTO_ICMPV6,
             INET6_HOP_LIMIT_MAX, 0);
-        
+
         free(reply);
-        
+
         return rc;
 }
@@ -112 +112 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv_echo_reply()");
-        
+
         if (dgram->size < sizeof(icmpv6_message_t))
                 return EINVAL;
-        
+
         inetping_sdu_t sdu;
-        
+
         sdu.src = dgram->src;
         sdu.dest = dgram->dest;
-        
+
         icmpv6_message_t *reply = (icmpv6_message_t *) dgram->data;
-        
+
         sdu.seq_no = uint16_t_be2host(reply->un.echo.seq_no);
         sdu.data = reply + sizeof(icmpv6_message_t);
         sdu.size = dgram->size - sizeof(icmpv6_message_t);
-        
+
         uint16_t ident = uint16_t_be2host(reply->un.echo.ident);
-        
+
         return inetping_recv(ident, &sdu);
 }
@@ -135 +135 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "icmpv6_recv()");
-        
+
         if (dgram->size < 1)
                 return EINVAL;
-        
+
         uint8_t type = *(uint8_t *) dgram->data;
-        
+
         switch (type) {
         case ICMPV6_ECHO_REQUEST:
@@ -153 +153 @@
                 break;
         }
-        
+
         return EINVAL;
 }
@@ -163 +163 @@
         if (rdata == NULL)
                 return ENOMEM;
-        
+
         icmpv6_message_t *request = (icmpv6_message_t *) rdata;
-        
+
         request->type = ICMPV6_ECHO_REQUEST;
         request->code = 0;
@@ -171 +171 @@
         request->un.echo.ident = host2uint16_t_be(ident);
         request->un.echo.seq_no = host2uint16_t_be(sdu->seq_no);
-        
+
         memcpy(rdata + sizeof(icmpv6_message_t), sdu->data, sdu->size);
-        
+
         inet_dgram_t dgram;
-        
+
         dgram.src = sdu->src;
         dgram.dest = sdu->dest;
@@ -182 +182 @@
         dgram.data = rdata;
         dgram.size = rsize;
-        
+
         icmpv6_phdr_t phdr;
-        
+
         assert(sdu->src.version == ip_v6);
         assert(sdu->dest.version == ip_v6);
-        
+
         host2addr128_t_be(sdu->src.addr6, phdr.src_addr);
         host2addr128_t_be(sdu->dest.addr6, phdr.dest_addr);
@@ -193 +193 @@
         memset(phdr.zeroes, 0, 3);
         phdr.next = IP_PROTO_ICMPV6;
-        
+
         uint16_t cs_phdr =
             inet_checksum_calc(INET_CHECKSUM_INIT, &phdr,
             sizeof(icmpv6_phdr_t));
-        
+
         uint16_t cs_all = inet_checksum_calc(cs_phdr, rdata, rsize);
-        
+
         request->checksum = host2uint16_t_be(cs_all);
-        
+
         errno_t rc = inet_route_packet(&dgram, IP_PROTO_ICMPV6,
             INET6_HOP_LIMIT_MAX, 0);
-        
+
         free(rdata);
-        
+
         return rc;
 }