Changeset b5ba8f6 in mainline for uspace/srv/net/inetsrv/inetsrv.c

Timestamp:

2013-09-13T13:11:53Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1eaa3cf

Parents:

95027b5 (diff), 1c5f6f8 (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/inetsrv/inetsrv.c (modified) (6 diffs)

uspace/srv/net/inetsrv/inetsrv.c

@@ -68 +68 @@
 };
 
+static inet_addr_t broadcast4_all_hosts = {
+        .family = AF_INET,
+        .addr = 0xffffffff
+};
+
 static inet_addr_t multicast_all_nodes = {
         .family = AF_INET6,
@@ -119 +124 @@
         }
         
-        inet_sroute_t *sroute = inet_sroute_new();
-        if (sroute == NULL) {
-                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed creating default route (%d).", rc);
-                return ENOMEM;
-        }
-
-        inet_naddr(&sroute->dest, 0, 0, 0, 0, 0);
-        inet_addr(&sroute->router, 10, 0, 2, 2);
-        sroute->name = str_dup("default");
-        inet_sroute_add(sroute);
-
         rc = inet_link_discovery_start();
         if (rc != EOK)
@@ -186 +180 @@
 {
         inet_dir_t dir;
+        inet_link_t *ilink;
         int rc;
+
+        if (dgram->iplink != 0) {
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "dgram directly to iplink %zu",
+                    dgram->iplink);
+                /* Send packet directly to the specified IP link */
+                ilink = inet_link_get_by_id(dgram->iplink);
+                if (ilink == 0)
+                        return ENOENT;
+
+                if (dgram->src.family != AF_INET ||
+                        dgram->dest.family != AF_INET)
+                        return EINVAL;
+
+                return inet_link_send_dgram(ilink, dgram->src.addr,
+                    dgram->dest.addr, dgram, proto, ttl, df);
+        }
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "dgram to be routed");
+
+        /* Route packet using source/destination addresses */
 
         rc = inet_find_dir(&dgram->src, &dgram->dest, dgram->tos, &dir);
@@ -214 +229 @@
 
         /* Take source address from the address object */
+        if (remote->family == AF_INET && remote->addr == 0xffffffff) {
+                local->family = AF_INET;
+                local->addr = 0;
+                return EOK;
+        }
         inet_naddr_addr(&dir.aobj->naddr, local);
         return EOK;
@@ -282 +302 @@
         inet_dgram_t dgram;
         
-        dgram.tos = IPC_GET_ARG1(*icall);
-        
-        uint8_t ttl = IPC_GET_ARG2(*icall);
+        dgram.iplink = IPC_GET_ARG1(*icall);
+        dgram.tos = IPC_GET_ARG2(*icall);
+        
+        uint8_t ttl = IPC_GET_ARG3(*icall);
         int df = IPC_GET_ARG3(*icall);
         
@@ -524 +545 @@
         if ((addr != NULL) ||
             (inet_naddr_compare_mask(&solicited_node_mask, &packet->dest)) ||
-            (inet_addr_compare(&multicast_all_nodes, &packet->dest))) {
+            (inet_addr_compare(&multicast_all_nodes, &packet->dest)) || 
+            (inet_addr_compare(&broadcast4_all_hosts, &packet->dest))) {
                 /* Destined for one of the local addresses */