From 90c1a459d79f5b4e708f993d11f769c24fed5d47 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@apple2pic>
Date: Sun, 25 Jan 2015 13:10:10 -0800
Subject: [PATCH] Update WIP

---
 src/samplesrc/etherip.pla | 87 +++++++++++++++++++++++++++------------
 src/samplesrc/mon.pla     | 25 +++++++++++
 2 files changed, 86 insertions(+), 26 deletions(-)
 create mode 100644 src/samplesrc/mon.pla

diff --git a/src/samplesrc/etherip.pla b/src/samplesrc/etherip.pla
index 7a19622..95925ff 100644
--- a/src/samplesrc/etherip.pla
+++ b/src/samplesrc/etherip.pla
@@ -40,6 +40,17 @@ struc t_ip
     byte[IP_SIZE] ip_dst
     byte[]  ip_options
 end
+const IP_PROTO_ICMP = 1
+const IP_PROTO_UDP  = 2
+const IP_PROTO_TCP  = 3
+//
+// ICMP message format
+//
+struc t_icmp
+    byte icmp_type
+    byte icmp_code
+    word icmp_checksum
+end
 //
 // ARP packet
 //
@@ -211,7 +222,19 @@ end
 //
 // Write IP datagram
 //
-export def writeIP(dst, proto, packet)
+export def writeIP(dstip, proto, packet, len)
+    byte[t_ip] iphdr
+    
+    iphdr.ip_vers_hlen      = 0
+    iphdr.ip_service        = 0
+    iphdr:ip_length         = len
+    iphdr:ip_id             = 0
+    iphdr:ip_flags_fragofst = 0
+    iphdr.ip_ttl            = 1
+    iphdr.ip_proto          = proto
+    iphdr:ip_checksum       = 0
+    memcpy(@iphdr.ip_src, @localip, IP_SIZE)
+    memcpy(@ip_dst, @dstip, IP_SIZE)
 end
 //
 // Read IP datagram
@@ -222,38 +245,46 @@ end
 // Service incoming packets
 //
 def serviceIP
-    word pkt, len
+    word pkt, iphdr, ipopt, len
 
     len = recvEther
     if len
         len = len - t_ehdr
         when readEther(t_ehdr)=>ehdr_payload
-            is PAYLOAD_IP
-	        readEther(len)
-	        break
             is PAYLOAD_ARP
 	        pkt = readEther(len)
-	        if pkt=>arp_op == ARP_REPLY
-		    //
-		    // Fill in ARP cache
-		    //
-		    memcpy(@remoteha, @pkt=>arp_senderha, 10) // copy ha and ip
-		    putha(pkt+arp_senderha);putc('=');putip(pkt+arp_senderip);putln
-		elsif pkt=>arp_op == ARP_REQST
-		    //
-		    // Is this a request for me?
-		    //
-		    if pkt=>arp_targip:0 == localip:0 and pkt=>arp_targip:2 == localip:2
-		        memcpy(@dstMAC, pkt=>arp_senderha, MAC_SIZE)
-		        memcpy(@remoteha, @pkt=>arp_senderha, 10) // copy ha and ip
-		        opARP = ARP_REPLY
-			writeEther(@ARP, t_earp)
-                        putha(pkt+arp_senderha);putc('=');putip(pkt+arp_senderip);putln
-		    fin
-		else
-		    dumparp(pkt)
-		fin
+	        when pkt=>arp_op
+		    is ARP_REPLY
+		        //
+			// Fill in ARP cache
+			//
+			memcpy(@remoteha, @pkt=>arp_senderha, 10) // copy ha and ip
+			putha(pkt+arp_senderha);putc('=');putip(pkt+arp_senderip);putln
+			break
+		    is ARP_REQST
+		        //
+			// Is this a request for me?
+			//
+			if pkt=>arp_targip:0 == localip:0 and pkt=>arp_targip:2 == localip:2
+		            memcpy(@dstMAC, pkt=>arp_senderha, MAC_SIZE)
+			    memcpy(@remoteha, @pkt=>arp_senderha, 10) // copy ha and ip
+			    opARP = ARP_REPLY
+			    writeEther(@ARP, t_earp)
+			    putha(pkt+arp_senderha);putc('=');putip(pkt+arp_senderip);putln
+		        fin
+			break
+		    otherwise
+		        dumparp(pkt)
+		wend
 		break
+            is PAYLOAD_IP
+		len   = len - t_ip
+	        iphdr = readEther(t_ip)
+		if iphdr=>ip_length > t_ip
+		    len = len - (iphdr=>ip_length - t_ip)
+		    ipopt = readEther(iphdr=>ip_length - t_ip)
+		fin
+	        break
             otherwise
 		pkt = readEther(len)
 	        dumpehdr(pkt - t_ehdr)
@@ -261,11 +292,15 @@ def serviceIP
         wend
     fin
 end
+
 //
-// Start things off with an ARP request
+// Fill in MAC
 //
 memcpy(@srcMAC,  @MAC, MAC_SIZE)
 memcpy(@localha, @MAC, MAC_SIZE)
+//
+// Start things off with an ARP request
+//
 memset(@dstMAC,   MAC_SIZE, BROADCAST_MAC)
 memset(@remoteha, MAC_SIZE, 0)
 opARP = ARP_REQST
diff --git a/src/samplesrc/mon.pla b/src/samplesrc/mon.pla
new file mode 100644
index 0000000..04be5ac
--- /dev/null
+++ b/src/samplesrc/mon.pla
@@ -0,0 +1,25 @@
+import stdlib
+    predef syscall, call, memset, getc, gets, putc, puts, putln
+    predef memset, memcpy, modaddr, modexec
+    predef heapmark, heapallocalign, heapalloc, heaprelease
+    predef isugt, isuge, isult, isule
+    byte MACHID
+end
+byte bye = $20, $00, $BF, $65
+word paramsptr
+byte[7] params = 4
+
+//
+// Set 'BYE' params
+//
+paramsptr = @params
+//
+// Set up CTRL-Y to point to 'BYE' routine
+//
+^$3F8 = $4C
+*$3F9 = @bye
+//
+// Call into monitor
+//
+call(-151, 0, 0, 0, 0)
+done
\ No newline at end of file