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

uspace/srv/net/inetsrv/inet_link.c

@@ -154 +154 @@
         if (ilink->svc_name != NULL)
                 free(ilink->svc_name);
-        
+
         free(ilink);
 }
@@ -197 +197 @@
                 goto error;
         }
-        
+
         /*
          * Get the MAC address of the link. If the link has a MAC
@@ -221 +221 @@
 
         inet_addrobj_t *addr = NULL;
-        
+
         /* XXX FIXME Cannot rely on loopback being the first IP link service!! */
         if (first_link) {
                 addr = inet_addrobj_new();
-                
+
                 inet_naddr(&addr->naddr, 127, 0, 0, 1, 24);
                 first_link = false;
         }
-        
+
         if (addr != NULL) {
                 addr->ilink = ilink;
                 addr->name = str_dup("v4a");
-                
+
                 rc = inet_addrobj_add(addr);
                 if (rc == EOK) {
@@ -249 +249 @@
                 }
         }
-        
+
         inet_addrobj_t *addr6 = NULL;
-        
+
         if (first_link6) {
                 addr6 = inet_addrobj_new();
-                
+
                 inet_naddr6(&addr6->naddr, 0, 0, 0, 0, 0, 0, 0, 1, 128);
                 first_link6 = false;
         } else if (ilink->mac_valid) {
                 addr6 = inet_addrobj_new();
-                
+
                 addr128_t link_local;
                 inet_link_local_node_ip(ilink->mac, link_local);
-                
+
                 inet_naddr_set6(link_local, 64, &addr6->naddr);
         }
-        
+
         if (addr6 != NULL) {
                 addr6->ilink = ilink;
                 addr6->name = str_dup("v6a");
-                
+
                 rc = inet_addrobj_add(addr6);
                 if (rc == EOK) {
@@ -285 +285 @@
                 }
         }
-        
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Configured link '%s'.", ilink->svc_name);
         return EOK;
-        
+
 error:
         if (ilink->iplink != NULL)
                 iplink_close(ilink->iplink);
-        
+
         inet_link_delete(ilink);
         return rc;
@@ -319 +319 @@
         if (src_ver != ip_v4)
                 return EINVAL;
-        
+
         addr32_t dest_v4;
         ip_ver_t dest_ver = inet_addr_get(&dgram->dest, &dest_v4, NULL);
         if (dest_ver != ip_v4)
                 return EINVAL;
-        
+
         /*
          * Fill packet structure. Fragmentation is performed by
          * inet_pdu_encode().
          */
-        
+
         iplink_sdu_t sdu;
-        
+
         sdu.src = lsrc;
         sdu.dest = ldest;
-        
+
         inet_packet_t packet;
-        
+
         packet.src = dgram->src;
         packet.dest = dgram->dest;
@@ -342 +342 @@
         packet.proto = proto;
         packet.ttl = ttl;
-        
+
         /* Allocate identifier */
         fibril_mutex_lock(&ip_ident_lock);
         packet.ident = ++ip_ident;
         fibril_mutex_unlock(&ip_ident_lock);
-        
+
         packet.df = df;
         packet.data = dgram->data;
         packet.size = dgram->size;
-        
+
         errno_t rc;
         size_t offs = 0;
-        
+
         do {
                 /* Encode one fragment */
-                
+
                 size_t roffs;
                 rc = inet_pdu_encode(&packet, src_v4, dest_v4, offs, ilink->def_mtu,
@@ -363 +363 @@
                 if (rc != EOK)
                         return rc;
-                
+
                 /* Send the PDU */
                 rc = iplink_send(ilink->iplink, &sdu);
-                
+
                 free(sdu.data);
                 offs = roffs;
         } while (offs < packet.size);
-        
+
         return rc;
 }
@@ -394 +394 @@
         if (src_ver != ip_v6)
                 return EINVAL;
-        
+
         addr128_t dest_v6;
         ip_ver_t dest_ver = inet_addr_get(&dgram->dest, NULL, &dest_v6);
         if (dest_ver != ip_v6)
                 return EINVAL;
-        
+
         iplink_sdu6_t sdu6;
         addr48(ldest, sdu6.dest);
-        
+
         /*
          * Fill packet structure. Fragmentation is performed by
          * inet_pdu_encode6().
          */
-        
+
         inet_packet_t packet;
-        
+
         packet.src = dgram->src;
         packet.dest = dgram->dest;
@@ -415 +415 @@
         packet.proto = proto;
         packet.ttl = ttl;
-        
+
         /* Allocate identifier */
         fibril_mutex_lock(&ip_ident_lock);
         packet.ident = ++ip_ident;
         fibril_mutex_unlock(&ip_ident_lock);
-        
+
         packet.df = df;
         packet.data = dgram->data;
         packet.size = dgram->size;
-        
+
         errno_t rc;
         size_t offs = 0;
-        
+
         do {
                 /* Encode one fragment */
-                
+
                 size_t roffs;
                 rc = inet_pdu_encode6(&packet, src_v6, dest_v6, offs, ilink->def_mtu,
@@ -436 +436 @@
                 if (rc != EOK)
                         return rc;
-                
+
                 /* Send the PDU */
                 rc = iplink_send6(ilink->iplink, &sdu6);
-                
+
                 free(sdu6.data);
                 offs = roffs;
         } while (offs < packet.size);
-        
+
         return rc;
 }