Changeset 8e7c9fe in mainline for uspace/srv/net/dhcp/dhcp.c

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/srv/net/dhcp/dhcp.c (modified) (2 diffs)

uspace/srv/net/dhcp/dhcp.c

@@ -304 +304 @@
                         break;
                 case opt_dns_server:
-                        if (opt_len != 4)
+                        if (opt_len < 4 || opt_len % 4 != 0)
                                 return EINVAL;
+                        /* XXX Handle multiple DNS servers properly */
                         inet_addr_set(dhcp_uint32_decode(&msgb[i]),
                             &offer->dns_server);
@@ -435 +436 @@
 
         dlink->link_id = link_id;
-        dlink->timeout = fibril_timer_create();
+        dlink->timeout = fibril_timer_create(NULL);
         if (dlink->timeout == NULL) {
                 rc = ENOMEM;