fix dhcp h.isValid on qemu 6.0 (#26)

* fix dhcp h.isValid on qemu 6.0 * add debugger for dlv
icexin · Jul 5, 2021 · ab05093 · ab05093
1 parent 5905260
commit ab05093
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,6 +4,19 @@
     // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
     "version": "0.2.0",
     "configurations": [
+        {
+            "name": "dlv-gdb",
+            "type": "go",
+            "request": "attach",
+            "mode": "local",
+            "cwd": "${workspaceFolder}",
+            "debugAdapter": "legacy",
+            "processId": 1234,
+            "backend": "gdbstub",
+            "dlvFlags": [
+                "${workspaceRoot}/kernel.elf",
+            ],
+        },
         {
             "type": "gdb",
             "request": "attach",
@@ -13,7 +26,8 @@
             "remote": true,
             "cwd": "${workspaceRoot}",
             "valuesFormatting": "parseText",
-            "gdbpath": "gdb",
+            // "gdbpath": "gdb",
+            "gdbpath": "x86_64-elf-gdb",
         },
     ]
 }
diff --git a/inet/dhcp/dhcp.go b/inet/dhcp/dhcp.go
@@ -100,7 +100,7 @@ func (h header) isValid() bool {
 	if h[1] != 0x01 || h[2] != 0x06 || h[3] != 0x00 {
 		return false
 	}
-	return bytes.Equal(h[236:240], magicCookie) && h[len(h)-1] == 0
+	return bytes.Equal(h[236:240], magicCookie)
 }
 
 func (h header) op() op           { return op(h[0]) }