ref: d396821b5f425aec2ef4800e19633a3e0d93b78d
parent: 79c6aab927e4b7c6a1ba4fbf90b96d42f3762705
author: Noam Preil <noam@pixelhero.dev>
date: Sat Dec 28 00:39:16 EST 2024
server: handle partial packets, write call shim
--- a/notebook
+++ b/notebook
@@ -2220,3 +2220,63 @@
Yep, works with the patch reapplied, hello from Jasnah/14!
I'll add "make neoventi work with disks that require aligned reads" to the todo list and ignore for now :)
+
+Okay, so, now I have it spinning up with the write shim to make sure we have paramters parsed correctly...
+static void
+vtwrite(VtConn conn, char *buf, u16int len)
+{+ char *data;
+ data = &buf[8];
+ vterr(conn, buf, "TODO: write(data len %d)", len);
+}
+
+vacfs ain't gonna cut it this time. venti/write to the rescue!
+
+venti(1):
+ Write writes at most 56 kilobytes of data from standard
+ input to the server host and prints the resulting score to
+ standard output. If the -t option is omitted, write uses
+ type 0, denoting a data block. If the -z option is given,
+ write zero truncates the block before writing it to the
+ server.
+
+so, `echo hello | venti/write -h tcp!127.1!14011` ought to do it :)
+
+./7.neoventi: TODO partial packet
+
+hehehe or bugs. Cool. Not another regression / environment issue this time, since mk vac works just fine.
+
+I have a commented out vtrecv under that sysfatal in the loop, guess we'll see what happens if I trust past me without reading it? :P
+
+annnd loops forever. cool. add some debugging prints...
+
+Reading packet from buffer, size 8, current offset in packet is 0
+Read length from packet: 12
+partly missing?
+read 2, expected 8
+
+
+okay, how abot now?
+
+abandoning client: TODO: write(data len 6)
+
+that's more like it!
+
+It's even better, actually:
+
+
+- sysfatal("TODO partial packet");+-// vtrecv(conn, packetbuf);
++// sysfatal("TODO partial packet");+
+just had to remove the sysfatal, the logic was actually correct. IIRC I'd added that just because I couldn't test it at the time :P
+
+% echo -n hello | venti/write -h tcp!127.1!14011
+venti/write: vtwrite: neoventi: TODO: write(data len 5)
+
+Perfect, now to just print the data to be super sure...
+
+Well, after committing the fix :)
+
+Also, noted that venti/write at the least is doing two write()s to venti instead of just the one. Unsure how I feel about this. It should be possible to do that more optimally without any tradeoffs i think. TODO.
+
--- a/server.c
+++ b/server.c
@@ -92,13 +92,24 @@
vtsend(conn, buf, addr.size+2, VtRread, 0);
}
+static void
+vtwrite(VtConn conn, char *buf, u16int len)
+{+ char *data;
+ data = &buf[8];
+ vterr(conn, buf, "TODO: write(data len %d)", len);
+}
+
static int
-vtconnhandle(VtConn conn, char *buf)
+vtconnhandle(VtConn conn, char *buf, u16int len)
{ switch(buf[2]){case VtTread:
vtread(conn, buf);
return 1;
+ case VtTwrite:
+ vtwrite(conn, buf, len-6);
+ return 1;
case VtTgoodbye:
vthangup(conn);
case VtTsync:
@@ -146,6 +157,7 @@
while(offset+2 < sz){// As long as there's a complete packet, process it.
u16int len = U16GET(buf + offset);
+ print("Read length from packet: %d\n", len); if(2 + offset + len > sz){// missing part of packet!
break;
@@ -158,7 +170,7 @@
// into VtConn and pass both the source and destination buffer around a lot.
// Not important right now.
memcpy(packetbuf, buf+offset, 2+len);
- vtconnhandle(conn, packetbuf);
+ vtconnhandle(conn, packetbuf, len);
offset += 2+len;
}
if(offset == sz){@@ -166,8 +178,6 @@
offset = 0;
continue;
}
- sysfatal("TODO partial packet");-// vtrecv(conn, packetbuf);
}
}