Changes in uspace/srv/net/inetsrv/inetcfg.c [5a6cc679:a35b458] in mainline

File:

• uspace/srv/net/inetsrv/inetcfg.c (modified) (27 diffs)

uspace/srv/net/inetsrv/inetcfg.c

@@ -257 +257 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_create_static_srv()");
-        
+
         sysarg_t link_id = IPC_GET_ARG1(*icall);
-        
+
         ipc_callid_t callid;
         size_t size;
@@ -267 +267 @@
                 return;
         }
-        
+
         if (size != sizeof(inet_naddr_t)) {
                 async_answer_0(callid, EINVAL);
@@ -273 +273 @@
                 return;
         }
-        
+
         inet_naddr_t naddr;
         errno_t rc = async_data_write_finalize(callid, &naddr, size);
@@ -281 +281 @@
                 return;
         }
-        
+
         char *name;
         rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN,
@@ -289 +289 @@
                 return;
         }
-        
+
         sysarg_t addr_id = 0;
         rc = inetcfg_addr_create_static(name, &naddr, link_id, &addr_id);
@@ -312 +312 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_srv()");
-        
+
         sysarg_t addr_id = IPC_GET_ARG1(*icall);
-        
+
         inet_addr_info_t ainfo;
-        
+
         inet_naddr_any(&ainfo.naddr);
         ainfo.ilink = 0;
         ainfo.name = NULL;
-        
+
         errno_t rc = inetcfg_addr_get(addr_id, &ainfo);
         if (rc != EOK) {
@@ -326 +326 @@
                 return;
         }
-        
+
         ipc_callid_t callid;
         size_t size;
@@ -334 +334 @@
                 return;
         }
-        
+
         if (size != sizeof(inet_naddr_t)) {
                 async_answer_0(callid, EINVAL);
@@ -340 +340 @@
                 return;
         }
-        
+
         rc = async_data_read_finalize(callid, &ainfo.naddr, size);
         if (rc != EOK) {
@@ -347 +347 @@
                 return;
         }
-        
+
         if (!async_data_read_receive(&callid, &size)) {
                 async_answer_0(callid, EREFUSED);
@@ -353 +353 @@
                 return;
         }
-        
+
         rc = async_data_read_finalize(callid, ainfo.name,
             min(size, str_size(ainfo.name)));
         free(ainfo.name);
-        
-        if (rc != EOK) {
-                async_answer_0(callid, rc);
-                async_answer_0(iid, rc);
-                return;
-        }
-        
+
+        if (rc != EOK) {
+                async_answer_0(callid, rc);
+                async_answer_0(iid, rc);
+                return;
+        }
+
         async_answer_1(iid, rc, ainfo.ilink);
 }
@@ -584 +584 @@
                 return;
         }
-        
+
         if (size != sizeof(inet_naddr_t)) {
                 async_answer_0(callid, EINVAL);
@@ -590 +590 @@
                 return;
         }
-        
+
         inet_naddr_t dest;
         errno_t rc = async_data_write_finalize(callid, &dest, size);
@@ -598 +598 @@
                 return;
         }
-        
+
         if (!async_data_write_receive(&callid, &size)) {
                 async_answer_0(callid, EINVAL);
@@ -604 +604 @@
                 return;
         }
-        
+
         if (size != sizeof(inet_addr_t)) {
                 async_answer_0(callid, EINVAL);
@@ -610 +610 @@
                 return;
         }
-        
+
         inet_addr_t router;
         rc = async_data_write_finalize(callid, &router, size);
@@ -618 +618 @@
                 return;
         }
-        
+
         char *name;
         rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN,
@@ -626 +626 @@
                 return;
         }
-        
+
         sysarg_t sroute_id = 0;
         rc = inetcfg_sroute_create(name, &dest, &router, &sroute_id);
@@ -649 +649 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_get_srv()");
-        
+
         sysarg_t sroute_id = IPC_GET_ARG1(*icall);
-        
+
         inet_sroute_info_t srinfo;
-        
+
         inet_naddr_any(&srinfo.dest);
         inet_addr_any(&srinfo.router);
         srinfo.name = NULL;
-        
+
         errno_t rc = inetcfg_sroute_get(sroute_id, &srinfo);
         if (rc != EOK) {
@@ -663 +663 @@
                 return;
         }
-        
+
         ipc_callid_t callid;
         size_t size;
@@ -671 +671 @@
                 return;
         }
-        
+
         if (size != sizeof(inet_naddr_t)) {
                 async_answer_0(callid, EINVAL);
@@ -677 +677 @@
                 return;
         }
-        
+
         rc = async_data_read_finalize(callid, &srinfo.dest, size);
         if (rc != EOK) {
@@ -684 +684 @@
                 return;
         }
-        
+
         if (!async_data_read_receive(&callid, &size)) {
                 async_answer_0(callid, EREFUSED);
@@ -690 +690 @@
                 return;
         }
-        
+
         if (size != sizeof(inet_addr_t)) {
                 async_answer_0(callid, EINVAL);
@@ -696 +696 @@
                 return;
         }
-        
+
         rc = async_data_read_finalize(callid, &srinfo.router, size);
         if (rc != EOK) {
@@ -703 +703 @@
                 return;
         }
-        
+
         if (!async_data_read_receive(&callid, &size)) {
                 async_answer_0(callid, EREFUSED);
@@ -709 +709 @@
                 return;
         }
-        
+
         rc = async_data_read_finalize(callid, srinfo.name,
             min(size, str_size(srinfo.name)));
         free(srinfo.name);
-        
+
         async_answer_0(iid, rc);
 }