shithub: musw

Info  •  Files  •  Log  •  Branches

implemented a custom PDU/frame structure on top of UDP for game networking.

--- a/dat.h

+++ b/dat.h

@@ -23,6 +23,10 @@

 	SCRHB	= SCRH+2*Borderwidth

 };

+enum {

+	Framesize = 4+4+4+2,

+};

+

 typedef struct VModel VModel;

 typedef struct Sprite Sprite;

 typedef struct Particle Particle;

@@ -31,9 +35,11 @@

 typedef struct Star Star;

 typedef struct Universe Universe;

 typedef struct Derivative Derivative;

+

+typedef struct Frame Frame;

 typedef struct Conn Conn;

-typedef struct Player Player;

 typedef struct PInput PInput;

+typedef struct Player Player;

 typedef struct Lobby Lobby;

 typedef struct Party Party;

@@ -109,6 +115,16 @@

 {

 	Point2 dx; /* v */

 	Point2 dv; /* a */

+};

+

+struct Frame

+{

+	Udphdr *udp;

+	uint seq;

+	uint ack;

+	uint id;

+	ushort len;

+	uchar data[];

 };

 struct Conn

--- a/lobby.c

+++ b/lobby.c

@@ -1,5 +1,6 @@

 #include <u.h>

 #include <libc.h>

+#include <ip.h>

 #include <draw.h>

 #include "libgeometry/geometry.h"

 #include "dat.h"

--- a/musw.c

+++ b/musw.c

@@ -1,5 +1,6 @@

 #include <u.h>

 #include <libc.h>

+#include <ip.h>

 #include <bio.h>

 #include <thread.h>

 #include <draw.h>

@@ -219,12 +220,23 @@

 	uchar buf[1024];

 	int fd, n;

 	ulong kdown;

+	Frame *frame;

 	fd = *(int*)arg;

+	frame = emalloc(sizeof(Frame)+sizeof(kdown));

+	frame->udp = nil;

+	frame->seq = 223;

+	frame->ack = 222;

+	frame->id = ntruerand(100);

+	frame->len = sizeof(kdown);

 	for(;;){

 		kdown = recvul(kchan);

-		n = pack(buf, sizeof buf, "k", kdown);

+		frame->data[0] = kdown>>24;

+		frame->data[1] = kdown>>16;

+		frame->data[2] = kdown>>8;

+		frame->data[3] = kdown;

+		n = pack(buf, sizeof buf, "F", frame);

 		if(write(fd, buf, n) != n)

 			sysfatal("write: %r");

 	}

--- a/muswd.c

+++ b/muswd.c

@@ -20,26 +20,33 @@

 	ushort rport, lport;

 	ulong kdown;

 	Ioproc *io;

-	Udphdr *udp;

+//	Udphdr *udp;

+	Frame *frame;

 	fd = *(int*)arg;

 	io = ioproc();

+	frame = emalloc(sizeof(Frame));

 	while((n = ioread(io, fd, buf, sizeof buf)) > 0){

-		if(n < Udphdrsize)

-			continue;

-

-		udp = (Udphdr*)buf;

-		p = buf+Udphdrsize;

+//		if(n < Udphdrsize)

+//			continue;

+//

+//		udp = (Udphdr*)buf;

+		p = buf;

 		e = buf+n;

-		rport = udp->rport[0]<<8 | udp->rport[1];

-		lport = udp->lport[0]<<8 | udp->lport[1];

+		unpack(p, e-p, "F", frame);

-		unpack(p, e-p, "k", &kdown);

+		rport = frame->udp->rport[0]<<8 | frame->udp->rport[1];

+		lport = frame->udp->lport[0]<<8 | frame->udp->lport[1];

+		kdown = frame->data[0]<<24|

+			frame->data[1]<<16|

+			frame->data[2]<<8|

+			frame->data[3];

+

 		if(debug)

-			fprint(2, "%I!%d → %I!%d | %d (%d) rcvd %.*lub\n",

-				udp->raddr, rport, udp->laddr, lport, threadid(), getpid(), sizeof(kdown)*8, kdown);

+			fprint(2, "%I!%d → %I!%d | %d (%d) rcvd seq %ud ack %ud id %ud len %ud %.*lub\n",

+				frame->udp->raddr, rport, frame->udp->laddr, lport, threadid(), getpid(), frame->seq, frame->ack, frame->id, frame->len, sizeof(kdown)*8, kdown);

 	}

 	closeioproc(io);

 }

--- a/pack.c

+++ b/pack.c

@@ -1,10 +1,23 @@

 #include <u.h>

 #include <libc.h>

+#include <ip.h>

 #include <draw.h>

 #include "libgeometry/geometry.h"

 #include "dat.h"

 #include "fns.h"

+static ushort

+get2(uchar *p)

+{

+	return p[0]<<8 | p[1];

+}

+

+static void

+put2(uchar *p, ushort u)

+{

+	p[0] = u>>8, p[1] = u;

+}

+

 static ulong

 get4(uchar *p)

 {

@@ -24,6 +37,7 @@

 	ulong k;

 	FPdbleword d;

 	Point2 P;

+	Frame *F;

 	for(;;){

 		switch(*fmt++){

@@ -57,6 +71,19 @@

 			put4(p, k), p += 4;

 			break;

+		case 'F':

+			F = va_arg(a, Frame*);

+

+			if(p+Framesize+F->len > e)

+				goto err;

+

+			put4(p, F->seq), p += 4;

+			put4(p, F->ack), p += 4;

+			put4(p, F->id), p += 4;

+			put2(p, F->len), p += 2;

+			memmove(p, F->data, F->len), p += F->len;

+

+			break;

 		}

 	}

 err:

@@ -70,6 +97,7 @@

 	ulong k;

 	FPdbleword d;

 	Point2 P;

+	Frame *F;

 	for(;;){

 		switch(*fmt++){

@@ -98,6 +126,27 @@

 			k = get4(p), p += 4;

 			*va_arg(a, ulong*) = k;

+

+			break;

+		case 'F':

+			if(p+Udphdrsize+Framesize > e)

+				goto err;

+

+			F = va_arg(a, Frame*);

+

+			F->udp = (Udphdr*)p, p += Udphdrsize;

+			F->seq = get4(p), p += 4;

+			F->ack = get4(p), p += 4;

+			F->id = get4(p), p += 4;

+			F->len = get2(p), p += 2;

+

+			/* XXX: I'm not happy with this. */

+			if(p+F->len > e)

+				goto err;

+

+			F = erealloc(F, sizeof(Frame)+F->len);

+			memmove(F->data, p, F->len);

+			p += F->len;

 			break;

 		}

--- a/party.c

+++ b/party.c

@@ -1,5 +1,6 @@

 #include <u.h>

 #include <libc.h>

+#include <ip.h>

 #include <draw.h>

 #include "libgeometry/geometry.h"

 #include "dat.h"

--- a/physics.c

+++ b/physics.c

@@ -1,5 +1,6 @@

 #include <u.h>

 #include <libc.h>

+#include <ip.h>

 #include <draw.h>

 #include "libgeometry/geometry.h"

 #include "dat.h"

--- a/sprite.c

+++ b/sprite.c

@@ -1,5 +1,6 @@

 #include <u.h>

 #include <libc.h>

+#include <ip.h>

 #include <draw.h>

 #include "libgeometry/geometry.h"

 #include "dat.h"

--- a/universe.c

+++ b/universe.c

@@ -1,5 +1,6 @@

 #include <u.h>

 #include <libc.h>

+#include <ip.h>

 #include <draw.h>

 #include "libgeometry/geometry.h"

 #include "dat.h"