Changeset 49d819b4 in mainline for uspace/srv/net/net/net.c

Timestamp:

2010-11-02T23:15:18Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7ae3d6f

Parents:

e06ef614 (diff), d0d1f4f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:~jakub/helenos/net.

File:

• uspace/srv/net/net/net.c (modified) (10 diffs)

uspace/srv/net/net/net.c

@@ -36 +36 @@
  */
 
+#include "net.h"
+
 #include <async.h>
 #include <ctype.h>
@@ -52 +54 @@
 
 #include <net/modules.h>
+#include <net/packet.h>
+#include <net/device.h>
+
 #include <adt/char_map.h>
 #include <adt/generic_char_map.h>
 #include <adt/measured_strings.h>
 #include <adt/module_map.h>
-#include <net/packet.h>
+
 #include <netif_remote.h>
-#include <net/device.h>
 #include <nil_interface.h>
 #include <net_interface.h>
 #include <ip_interface.h>
 
-#include "net.h"
-
-/** Networking module name.
- *
- */
+/** Networking module name. */
 #define NAME  "net"
 
-/** File read buffer size.
- *
- */
+/** File read buffer size. */
 #define BUFFER_SIZE  256
 
-/** Networking module global data.
- *
- */
+/** Networking module global data. */
 net_globals_t net_globals;
 
@@ -100 +96 @@
         measured_string_ref setting =
             measured_string_create_bulk(value, 0);
-        
         if (!setting)
                 return ENOMEM;
@@ -206 +201 @@
         unsigned int line_number = 0;
         size_t index = 0;
-        while ((!ferror(cfg)) && (!feof(cfg))) {
+        while (!ferror(cfg) && !feof(cfg)) {
                 int read = fgetc(cfg);
                 if ((read > 0) && (read != '\n') && (read != '\r')) {
@@ -326 +321 @@
         ipcarg_t phonehash;
         
-        if (ERROR_OCCURRED(net_initialize(client_connection))
-            || ERROR_OCCURRED(REGISTER_ME(SERVICE_NETWORKING, &phonehash))){
+        if (ERROR_OCCURRED(net_initialize(client_connection)) ||
+            ERROR_OCCURRED(REGISTER_ME(SERVICE_NETWORKING, &phonehash))) {
                 pm_destroy();
                 return ERROR_CODE;
@@ -379 +374 @@
     size_t count, char **data)
 {
-        if (!(configuration && (count > 0)))
+        if (!configuration || (count <= 0))
                 return EINVAL;
         
@@ -482 +477 @@
         /* Inter-network layer startup */
         switch (netif->il->service) {
-                case SERVICE_IP:
-                        ERROR_PROPAGATE(ip_device_req(netif->il->phone, netif->id,
-                            internet_service));
-                        break;
-                default:
-                        return ENOENT;
+        case SERVICE_IP:
+                ERROR_PROPAGATE(ip_device_req(netif->il->phone, netif->id,
+                    internet_service));
+                break;
+        default:
+                return ENOENT;
         }
         
@@ -511 +506 @@
         ERROR_DECLARE;
         
-        const char *conf_files[] = {"lo", "ne2k"};
+        const char *conf_files[] = {
+                "lo",
+                "ne2k"
+        };
         size_t count = sizeof(conf_files) / sizeof(char *);
         
@@ -603 +601 @@
         *answer_count = 0;
         switch (IPC_GET_METHOD(*call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        return EOK;
-                case NET_NET_GET_DEVICE_CONF:
-                        ERROR_PROPAGATE(measured_strings_receive(&strings, &data,
-                            IPC_GET_COUNT(call)));
-                        net_get_device_conf_req(0, IPC_GET_DEVICE(call), &strings,
-                            IPC_GET_COUNT(call), NULL);
-                        
-                        /* Strings should not contain received data anymore */
-                        free(data);
-                        
-                        ERROR_CODE = measured_strings_reply(strings, IPC_GET_COUNT(call));
-                        free(strings);
-                        return ERROR_CODE;
-                case NET_NET_GET_CONF:
-                        ERROR_PROPAGATE(measured_strings_receive(&strings, &data,
-                            IPC_GET_COUNT(call)));
-                        net_get_conf_req(0, &strings, IPC_GET_COUNT(call), NULL);
-                        
-                        /* Strings should not contain received data anymore */
-                        free(data);
-                        
-                        ERROR_CODE = measured_strings_reply(strings, IPC_GET_COUNT(call));
-                        free(strings);
-                        return ERROR_CODE;
-                case NET_NET_STARTUP:
-                        return startup();
+        case IPC_M_PHONE_HUNGUP:
+                return EOK;
+        case NET_NET_GET_DEVICE_CONF:
+                ERROR_PROPAGATE(measured_strings_receive(&strings, &data,
+                    IPC_GET_COUNT(call)));
+                net_get_device_conf_req(0, IPC_GET_DEVICE(call), &strings,
+                    IPC_GET_COUNT(call), NULL);
+                
+                /* Strings should not contain received data anymore */
+                free(data);
+                
+                ERROR_CODE = measured_strings_reply(strings, IPC_GET_COUNT(call));
+                free(strings);
+                return ERROR_CODE;
+        case NET_NET_GET_CONF:
+                ERROR_PROPAGATE(measured_strings_receive(&strings, &data,
+                    IPC_GET_COUNT(call)));
+                net_get_conf_req(0, &strings, IPC_GET_COUNT(call), NULL);
+                
+                /* Strings should not contain received data anymore */
+                free(data);
+                
+                ERROR_CODE = measured_strings_reply(strings, IPC_GET_COUNT(call));
+                free(strings);
+                return ERROR_CODE;
+        case NET_NET_STARTUP:
+                return startup();
         }
         return ENOTSUP;
@@ -661 +659 @@
                 int res = net_module_message(callid, &call, &answer, &answer_count);
                 
-                /* End if said to either by the message or the processing result */
+                /* End if told to either by the message or the processing result */
                 if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) || (res == EHANGUP))
                         return;