Changeset d7ff048 in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2011-10-08T13:08:53Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bf08ff0

Parents:

8367d1d (diff), 80099c19 (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 mainline changes

File:

• uspace/srv/net/il/ip/ip.c (modified) (22 diffs)

uspace/srv/net/il/ip/ip.c

@@ -354 +354 @@
         ip_netif->routing = NET_DEFAULT_IP_ROUTING;
         configuration = &names[0];
-
+        
         /* Get configuration */
         rc = net_get_device_conf_req(ip_globals.net_sess, ip_netif->device_id,
@@ -406 +406 @@
                         return ENOTSUP;
                 }
-
+                
                 if (configuration[6].value) {
                         ip_netif->arp = get_running_module(&ip_globals.modules,
@@ -417 +417 @@
                         }
                 }
+                
                 if (configuration[7].value)
                         ip_netif->routing = (configuration[7].value[0] == 'y');
-
+                
                 net_free_settings(configuration, data);
         }
-
+        
         /* Bind netif service which also initializes the device */
         ip_netif->sess = nil_bind_service(ip_netif->service,
@@ -432 +433 @@
                 return ENOENT;
         }
-
+        
         /* Has to be after the device netif module initialization */
         if (ip_netif->arp) {
@@ -448 +449 @@
                 }
         }
-
+        
         /* Get packet dimensions */
         rc = nil_packet_size_req(ip_netif->sess, ip_netif->device_id,
@@ -461 +462 @@
                 ip_netif->packet_dimension.content = IP_MIN_CONTENT;
         }
-
+        
         index = ip_netifs_add(&ip_globals.netifs, ip_netif->device_id, ip_netif);
         if (index < 0)
@@ -478 +479 @@
                 printf("%s: Default gateway (%s)\n", NAME, defgateway);
         }
-
+        
         return EOK;
 }
 
-static int ip_device_req_local(device_id_t device_id, services_t netif)
+static int ip_device_req_local(nic_device_id_t device_id, services_t netif)
 {
         ip_netif_t *ip_netif;
@@ -498 +499 @@
                 return rc;
         }
-
+        
         ip_netif->device_id = device_id;
         ip_netif->service = netif;
-        ip_netif->state = NETIF_STOPPED;
-
+        ip_netif->state = NIC_STATE_STOPPED;
+        
         fibril_rwlock_write_lock(&ip_globals.netifs_lock);
 
@@ -594 +595 @@
         while (index >= 0) {
                 netif = ip_netifs_get_index(&ip_globals.netifs, index);
-                if (netif && (netif->state == NETIF_ACTIVE)) {
+                if (netif && (netif->state == NIC_STATE_ACTIVE)) {
                         route = ip_netif_find_route(netif, destination);
                         if (route)
@@ -1142 +1143 @@
 }
 
-static int ip_send_msg_local(device_id_t device_id, packet_t *packet,
+static int ip_send_msg_local(nic_device_id_t device_id, packet_t *packet,
     services_t sender, services_t error)
 {
@@ -1258 +1259 @@
  * @return              ENOENT if device is not found.
  */
-static int ip_device_state_message(device_id_t device_id, device_state_t state)
+static int ip_device_state_message(nic_device_id_t device_id,
+    nic_device_state_t state)
 {
         ip_netif_t *netif;
@@ -1272 +1274 @@
         fibril_rwlock_write_unlock(&ip_globals.netifs_lock);
 
-        printf("%s: Device %d changed state to %d\n", NAME, device_id, state);
+        printf("%s: Device %d changed state to '%s'\n", NAME, device_id,
+            nic_device_state_to_string(state));
 
         return EOK;
@@ -1312 +1315 @@
  *                      tl_received_msg() function.
  */
-static int ip_deliver_local(device_id_t device_id, packet_t *packet,
+static int ip_deliver_local(nic_device_id_t device_id, packet_t *packet,
     ip_header_t *header, services_t error)
 {
@@ -1413 +1416 @@
  *                      is disabled.
  */
-static int ip_process_packet(device_id_t device_id, packet_t *packet)
+static int ip_process_packet(nic_device_id_t device_id, packet_t *packet)
 {
         ip_header_t *header;
@@ -1514 +1517 @@
  *
  */
-static int ip_packet_size_message(device_id_t device_id, size_t *addr_len,
+static int ip_packet_size_message(nic_device_id_t device_id, size_t *addr_len,
     size_t *prefix, size_t *content, size_t *suffix)
 {
@@ -1572 +1575 @@
  * @return              ENOENT if device is not found.
  */
-static int ip_mtu_changed_message(device_id_t device_id, size_t mtu)
+static int ip_mtu_changed_message(nic_device_id_t device_id, size_t mtu)
 {
         ip_netif_t *netif;
@@ -1629 +1632 @@
                         async_answer_0(iid, (sysarg_t) rc);
                         break;
-                
+                case NET_IL_ADDR_CHANGED:
+                        async_answer_0(iid, (sysarg_t) EOK);
+                        break;
+
                 default:
                         async_answer_0(iid, (sysarg_t) ENOTSUP);
@@ -1689 +1695 @@
 }
 
-static int ip_add_route_req_local(device_id_t device_id, in_addr_t address,
+static int ip_add_route_req_local(nic_device_id_t device_id, in_addr_t address,
     in_addr_t netmask, in_addr_t gateway)
 {
@@ -1723 +1729 @@
 }
 
-static int ip_set_gateway_req_local(device_id_t device_id, in_addr_t gateway)
+static int ip_set_gateway_req_local(nic_device_id_t device_id,
+    in_addr_t gateway)
 {
         ip_netif_t *netif;
@@ -1757 +1764 @@
  *
  */
-static int ip_received_error_msg_local(device_id_t device_id,
+static int ip_received_error_msg_local(nic_device_id_t device_id,
     packet_t *packet, services_t target, services_t error)
 {
@@ -1818 +1825 @@
 static int ip_get_route_req_local(ip_protocol_t protocol,
     const struct sockaddr *destination, socklen_t addrlen,
-    device_id_t *device_id, void **header, size_t *headerlen)
+    nic_device_id_t *device_id, void **header, size_t *headerlen)
 {
         struct sockaddr_in *address_in;
@@ -1909 +1916 @@
         size_t suffix;
         size_t content;
-        device_id_t device_id;
+        nic_device_id_t device_id;
         int rc;