Changeset 15d0046 in mainline for uspace/srv/net/dhcp/dhcp.c

Timestamp:

2014-09-12T13:22:33Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

9b20126

Parents:

8db09e4 (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

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;