Changes in uspace/srv/net/nil/eth/eth.c [ffa2c8ef:61bfc370] in mainline

File:

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

uspace/srv/net/nil/eth/eth.c

@@ -43 +43 @@
 #include <str.h>
 #include <errno.h>
-#include <ipc/nil.h>
+
+#include <ipc/ipc.h>
 #include <ipc/net.h>
 #include <ipc/services.h>
+
 #include <net/modules.h>
 #include <net_checksum.h>
@@ -52 +54 @@
 #include <protocol_map.h>
 #include <net/device.h>
-#include <netif_remote.h>
+#include <netif_interface.h>
 #include <net_interface.h>
-#include <il_remote.h>
+#include <nil_interface.h>
+#include <il_interface.h>
 #include <adt/measured_strings.h>
 #include <packet_client.h>
 #include <packet_remote.h>
-#include <nil_skel.h>
+#include <nil_local.h>
 
 #include "eth.h"
+#include "eth_header.h"
 
 /** The module name. */
@@ -68 +72 @@
 #define ETH_PREFIX \
         (sizeof(eth_header_t) + sizeof(eth_header_lsap_t) + \
-            sizeof(eth_header_snap_t))
+        sizeof(eth_header_snap_t))
 
 /** Reserved packet suffix length. */
-#define ETH_SUFFIX  (sizeof(eth_fcs_t))
+#define ETH_SUFFIX \
+        sizeof(eth_fcs_t)
 
 /** Maximum packet content length. */
-#define ETH_MAX_CONTENT  1500u
+#define ETH_MAX_CONTENT 1500u
 
 /** Minimum packet content length. */
-#define ETH_MIN_CONTENT  46u
+#define ETH_MIN_CONTENT 46u
 
 /** Maximum tagged packet content length. */
 #define ETH_MAX_TAGGED_CONTENT(flags) \
         (ETH_MAX_CONTENT - \
-            ((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? \
-            sizeof(eth_header_lsap_t) : 0) - \
-            (IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
+        ((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? \
+        sizeof(eth_header_lsap_t) : 0) - \
+        (IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
 
 /** Minimum tagged packet content length. */
 #define ETH_MIN_TAGGED_CONTENT(flags) \
         (ETH_MIN_CONTENT - \
-            ((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? \
-            sizeof(eth_header_lsap_t) : 0) - \
-            (IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
+        ((IS_8023_2_LSAP(flags) || IS_8023_2_SNAP(flags)) ? \
+        sizeof(eth_header_lsap_t) : 0) - \
+        (IS_8023_2_SNAP(flags) ? sizeof(eth_header_snap_t) : 0))
 
 /** Dummy flag shift value. */
-#define ETH_DUMMY_SHIFT  0
+#define ETH_DUMMY_SHIFT 0
 
 /** Mode flag shift value. */
-#define ETH_MODE_SHIFT  1
+#define ETH_MODE_SHIFT  1
 
 /** Dummy device flag.
  * Preamble and FCS are mandatory part of the packets.
  */
-#define ETH_DUMMY  (1 << ETH_DUMMY_SHIFT)
+#define ETH_DUMMY               (1 << ETH_DUMMY_SHIFT)
 
 /** Returns the dummy flag.
  * @see ETH_DUMMY
  */
-#define IS_DUMMY(flags)  ((flags) & ETH_DUMMY)
+#define IS_DUMMY(flags)         ((flags) & ETH_DUMMY)
 
 /** Device mode flags.
@@ -114 +119 @@
  * @see ETH_8023_2_SNAP
  */
-#define ETH_MODE_MASK  (3 << ETH_MODE_SHIFT)
+#define ETH_MODE_MASK           (3 << ETH_MODE_SHIFT)
 
 /** DIX Ethernet mode flag. */
-#define ETH_DIX  (1 << ETH_MODE_SHIFT)
-
-/** Return whether the DIX Ethernet mode flag is set.
- *
- * @param[in] flags Ethernet flags.
+#define ETH_DIX                 (1 << ETH_MODE_SHIFT)
+
+/** Returns whether the DIX Ethernet mode flag is set.
+ *
+ * @param[in] flags     The ethernet flags.
  * @see ETH_DIX
- *
- */
-#define IS_DIX(flags)  (((flags) & ETH_MODE_MASK) == ETH_DIX)
+ */
+#define IS_DIX(flags)           (((flags) & ETH_MODE_MASK) == ETH_DIX)
 
 /** 802.3 + 802.2 + LSAP mode flag. */
-#define ETH_8023_2_LSAP  (2 << ETH_MODE_SHIFT)
-
-/** Return whether the 802.3 + 802.2 + LSAP mode flag is set.
- *
- * @param[in] flags Ethernet flags.
+#define ETH_8023_2_LSAP         (2 << ETH_MODE_SHIFT)
+
+/** Returns whether the 802.3 + 802.2 + LSAP mode flag is set.
+ *
+ * @param[in] flags     The ethernet flags.
  * @see ETH_8023_2_LSAP
- *
- */
-#define IS_8023_2_LSAP(flags)  (((flags) & ETH_MODE_MASK) == ETH_8023_2_LSAP)
+ */
+#define IS_8023_2_LSAP(flags)   (((flags) & ETH_MODE_MASK) == ETH_8023_2_LSAP)
 
 /** 802.3 + 802.2 + LSAP + SNAP mode flag. */
-#define ETH_8023_2_SNAP  (3 << ETH_MODE_SHIFT)
-
-/** Return whether the 802.3 + 802.2 + LSAP + SNAP mode flag is set.
- *
- * @param[in] flags Ethernet flags.
+#define ETH_8023_2_SNAP         (3 << ETH_MODE_SHIFT)
+
+/** Returns whether the 802.3 + 802.2 + LSAP + SNAP mode flag is set.
+ *
+ * @param[in] flags     The ethernet flags.
  * @see ETH_8023_2_SNAP
- *
- */
-#define IS_8023_2_SNAP(flags)  (((flags) & ETH_MODE_MASK) == ETH_8023_2_SNAP)
+ */
+#define IS_8023_2_SNAP(flags)   (((flags) & ETH_MODE_MASK) == ETH_8023_2_SNAP)
 
 /** Type definition of the ethernet address type.
@@ -237 +239 @@
                 switch (IPC_GET_IMETHOD(*icall)) {
                 case NET_NIL_DEVICE_STATE:
-                        nil_device_state_msg_local(0, IPC_GET_DEVICE(*icall),
-                            IPC_GET_STATE(*icall));
-                        async_answer_0(iid, EOK);
+                        nil_device_state_msg_local(0, IPC_GET_DEVICE(icall),
+                            IPC_GET_STATE(icall));
+                        ipc_answer_0(iid, EOK);
                         break;
                 case NET_NIL_RECEIVED:
                         rc = packet_translate_remote(eth_globals.net_phone,
-                            &packet, IPC_GET_PACKET(*icall));
-                        if (rc == EOK)
+                            &packet, IPC_GET_PACKET(icall));
+                        if (rc == EOK) {
                                 rc = nil_received_msg_local(0,
-                                    IPC_GET_DEVICE(*icall), packet, 0);
-                        
-                        async_answer_0(iid, (sysarg_t) rc);
+                                    IPC_GET_DEVICE(icall), packet, 0);
+                        }
+                        ipc_answer_0(iid, (sysarg_t) rc);
                         break;
                 default:
-                        async_answer_0(iid, (sysarg_t) ENOTSUP);
+                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
                 }
                 
@@ -834 +836 @@
 }
 
-int nil_module_message(ipc_callid_t callid, ipc_call_t *call,
-    ipc_call_t *answer, size_t *answer_count)
+int nil_message_standalone(const char *name, ipc_callid_t callid,
+    ipc_call_t *call, ipc_call_t *answer, int *answer_count)
 {
         measured_string_t *address;
@@ -851 +853 @@
         
         case NET_NIL_DEVICE:
-                return eth_device_message(IPC_GET_DEVICE(*call),
-                    IPC_GET_SERVICE(*call), IPC_GET_MTU(*call));
+                return eth_device_message(IPC_GET_DEVICE(call),
+                    IPC_GET_SERVICE(call), IPC_GET_MTU(call));
         case NET_NIL_SEND:
                 rc = packet_translate_remote(eth_globals.net_phone, &packet,
-                    IPC_GET_PACKET(*call));
+                    IPC_GET_PACKET(call));
                 if (rc != EOK)
                         return rc;
-                return eth_send_message(IPC_GET_DEVICE(*call), packet,
-                    IPC_GET_SERVICE(*call));
+                return eth_send_message(IPC_GET_DEVICE(call), packet,
+                    IPC_GET_SERVICE(call));
         case NET_NIL_PACKET_SPACE:
-                rc = eth_packet_space_message(IPC_GET_DEVICE(*call), &addrlen,
+                rc = eth_packet_space_message(IPC_GET_DEVICE(call), &addrlen,
                     &prefix, &content, &suffix);
                 if (rc != EOK)
                         return rc;
-                IPC_SET_ADDR(*answer, addrlen);
-                IPC_SET_PREFIX(*answer, prefix);
-                IPC_SET_CONTENT(*answer, content);
-                IPC_SET_SUFFIX(*answer, suffix);
+                IPC_SET_ADDR(answer, addrlen);
+                IPC_SET_PREFIX(answer, prefix);
+                IPC_SET_CONTENT(answer, content);
+                IPC_SET_SUFFIX(answer, suffix);
                 *answer_count = 4;
                 return EOK;
         case NET_NIL_ADDR:
-                rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_LOCAL_ADDR,
+                rc = eth_addr_message(IPC_GET_DEVICE(call), ETH_LOCAL_ADDR,
                     &address);
                 if (rc != EOK)
@@ -878 +880 @@
                 return measured_strings_reply(address, 1);
         case NET_NIL_BROADCAST_ADDR:
-                rc = eth_addr_message(IPC_GET_DEVICE(*call), ETH_BROADCAST_ADDR,
+                rc = eth_addr_message(IPC_GET_DEVICE(call), ETH_BROADCAST_ADDR,
                     &address);
                 if (rc != EOK)
@@ -884 +886 @@
                 return measured_strings_reply(address, 1);
         case IPC_M_CONNECT_TO_ME:
-                return eth_register_message(NIL_GET_PROTO(*call),
-                    IPC_GET_PHONE(*call));
+                return eth_register_message(NIL_GET_PROTO(call),
+                    IPC_GET_PHONE(call));
         }
         
@@ -891 +893 @@
 }
 
+/** Default thread for new connections.
+ *
+ * @param[in] iid       The initial message identifier.
+ * @param[in] icall     The initial message call structure.
+ */
+static void nil_client_connection(ipc_callid_t iid, ipc_call_t *icall)
+{
+        /*
+         * Accept the connection
+         *  - Answer the first IPC_M_CONNECT_ME_TO call.
+         */
+        ipc_answer_0(iid, EOK);
+        
+        while (true) {
+                ipc_call_t answer;
+                int answer_count;
+                
+                /* Clear the answer structure */
+                refresh_answer(&answer, &answer_count);
+                
+                /* Fetch the next message */
+                ipc_call_t call;
+                ipc_callid_t callid = async_get_call(&call);
+                
+                /* Process the message */
+                int res = nil_module_message_standalone(NAME, callid, &call,
+                    &answer, &answer_count);
+                
+                /*
+                 * End if told to either by the message or the processing
+                 * result.
+                 */
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                    (res == EHANGUP))
+                        return;
+                
+                /* Answer the message */
+                answer_call(callid, res, &answer, answer_count);
+        }
+}
+
 int main(int argc, char *argv[])
 {
+        int rc;
+        
         /* Start the module */
-        return nil_module_start(SERVICE_ETHERNET);
+        rc = nil_module_start_standalone(nil_client_connection);
+        return rc;
 }