Changeset ee2fa30a in mainline

Timestamp:

2011-06-22T23:28:56Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b366a6f4

Parents:

ef09a7a

Message:

undo development effort which was neither finished nor properly debugged yet
(this unbreaks networking once again)

Location:

uspace

Files:

• lib/net/il/ip_remote.c (modified) (1 diff)
• lib/net/include/ip_remote.h (modified) (1 diff)
• lib/net/include/netif_skel.h (modified) (1 diff)
• lib/net/include/nil_remote.h (modified) (1 diff)
• lib/net/netif/netif_skel.c (modified) (4 diffs)
• srv/hw/netif/ne2000/ne2000.c (modified) (1 diff)
• srv/net/net/net.c (modified) (2 diffs)
• srv/net/netif/lo/lo.c (modified) (1 diff)

uspace/lib/net/il/ip_remote.c

@@ -123 +123 @@
  *
  */
-int ip_device_req_remote(async_sess_t *sess, device_id_t device_id)
-{
-        return generic_device_req_remote(sess, NET_IP_DEVICE, device_id, 0, 0);
+int ip_device_req_remote(async_sess_t *sess, device_id_t device_id,
+    services_t service)
+{
+        return generic_device_req_remote(sess, NET_IP_DEVICE, device_id, 0,
+            service);
 }
 

uspace/lib/net/include/ip_remote.h

@@ -48 +48 @@
 extern int ip_received_error_msg_remote(async_sess_t *, device_id_t, packet_t *,
     services_t, services_t);
-extern int ip_device_req_remote(async_sess_t *, device_id_t);
+extern int ip_device_req_remote(async_sess_t *, device_id_t, services_t);
 extern int ip_add_route_req_remote(async_sess_t *, device_id_t, in_addr_t,
     in_addr_t, in_addr_t);

uspace/lib/net/include/netif_skel.h

@@ -205 +205 @@
 extern packet_t *netif_packet_get_1(size_t);
 
-extern int netif_module_start(sysarg_t);
+extern int netif_module_start(void);
 
 #endif

uspace/lib/net/include/nil_remote.h

@@ -58 +58 @@
             packet_get_id(packet), sender, 0)
 
-#define nil_device_req(sess, device_id, mtu) \
-        generic_device_req_remote(sess, NET_NIL_DEVICE, device_id, mtu, 0)\
+#define nil_device_req(sess, device_id, mtu, netif_service) \
+        generic_device_req_remote(sess, NET_NIL_DEVICE, device_id, mtu, \
+            netif_service)
 
 extern int nil_device_state_msg(async_sess_t *, device_id_t, sysarg_t);

uspace/lib/net/netif/netif_skel.c

@@ -228 +228 @@
 }
 
+/** Register the device notification receiver,
+ *
+ * Register a network interface layer module as the device
+ * notification receiver.
+ *
+ * @param[in] sess      Session to the network interface layer module.
+ *
+ * @return EOK on success.
+ * @return ELIMIT if there is another module registered.
+ *
+ */
+static int register_message(async_sess_t *sess)
+{
+        fibril_rwlock_write_lock(&netif_globals.lock);
+        if (netif_globals.nil_sess != NULL) {
+                fibril_rwlock_write_unlock(&netif_globals.lock);
+                return ELIMIT;
+        }
+        
+        netif_globals.nil_sess = sess;
+        
+        fibril_rwlock_write_unlock(&netif_globals.lock);
+        return EOK;
+}
+
 /** Process the netif module messages.
  *
@@ -257 +282 @@
                 return EOK;
         
+        async_sess_t *callback =
+            async_callback_receive_start(EXCHANGE_SERIALIZE, call);
+        if (callback)
+                return register_message(callback);
+        
         switch (IPC_GET_IMETHOD(*call)) {
         case NET_NETIF_PROBE:
@@ -358 +388 @@
  * messages in an infinite loop.
  *
- * @param[in] nil_service Network interface layer service.
- *
  * @return EOK on success.
  * @return Other error codes as defined for each specific module
@@ -365 +393 @@
  *
  */
-int netif_module_start(sysarg_t nil_service)
+int netif_module_start(void)
 {
         async_set_client_connection(netif_client_connection);
         
         netif_globals.sess = connect_to_service(SERVICE_NETWORKING);
-        netif_globals.nil_sess = connect_to_service(nil_service);
+        netif_globals.nil_sess = NULL;
         netif_device_map_initialize(&netif_globals.device_map);
         

uspace/srv/hw/netif/ne2000/ne2000.c

@@ -404 +404 @@
 {
         /* Start the module */
-        return netif_module_start(SERVICE_ETHERNET);
+        return netif_module_start();
 }
 

uspace/srv/net/net/net.c

@@ -479 +479 @@
         
         /* Network interface layer startup */
+        services_t internet_service;
         if (netif->nil) {
                 setting = measured_strings_find(&netif->configuration, (uint8_t *) CONF_MTU, 0);
@@ -486 +487 @@
                 
                 int mtu = setting ? strtol((char *) setting->value, NULL, 10) : 0;
-                
-                rc = nil_device_req(netif->nil->sess, netif->id, mtu);
+                rc = nil_device_req(netif->nil->sess, netif->id, mtu,
+                    netif->driver->service);
                 if (rc != EOK)
                         return rc;
-        }
+                
+                internet_service = netif->nil->service;
+        } else
+                internet_service = netif->driver->service;
         
         /* Inter-network layer startup */
-        rc = ip_device_req(netif->il->sess, netif->id);
+        rc = ip_device_req(netif->il->sess, netif->id, internet_service);
         if (rc != EOK)
                 return rc;

uspace/srv/net/netif/lo/lo.c

@@ -225 +225 @@
 {
         /* Start the module */
-        return netif_module_start(SERVICE_NILDUMMY);
+        return netif_module_start();
 }