diff --git a/src/chatsrc/chat.pla b/src/chatsrc/chat.pla index 28892a2..cd48508 100644 --- a/src/chatsrc/chat.pla +++ b/src/chatsrc/chat.pla @@ -196,7 +196,7 @@ else fin hellopkt:2 = version chatpkt:2 = version -puts("CHAT cliet version:"); puti(version); putln +puts("CHAT client version:"); puti(version); putln if !iNet:initIP() return -1 fin diff --git a/src/chatsrc/chatserver/chat-version.xml b/src/chatsrc/chatserver/chat-version.xml index 249eb1e..8ad03be 100644 --- a/src/chatsrc/chatserver/chat-version.xml +++ b/src/chatsrc/chatserver/chat-version.xml @@ -10,10 +10,12 @@ <file name="UPDATE" type="0xFE" aux="0x1000" mask="0x0080"/> <file name="CHAT" type="0xFE" aux="0x1000" mask="0x0100"/> <file name="AUTORUN" type="0x06" aux="0x0000" mask="0x0200"/> - <file name="VERSION" type="0x06" aux="4" mask="0x0400"/> - <current level="4"/> + <file name="VERSION" type="0x06" aux="6" mask="0x0400"/> + <current level="6"/> <version level="1" updates="0x0000"/> <version level="2" updates="0x0180"/> <version level="3" updates="0x0380"/> <version level="4" updates="0x0408"/> + <version level="5" updates="0x0440"/> + <version level="6" updates="0x0580"/> </chat> diff --git a/src/chatsrc/chatserver/client.py b/src/chatsrc/chatserver/client.py index 5383451..ca7487f 100755 --- a/src/chatsrc/chatserver/client.py +++ b/src/chatsrc/chatserver/client.py @@ -3,7 +3,7 @@ import sys, struct, socket, select server = ("localhost", 0x6502) myhandle = "Python" -VERSION = 4 +VERSION = 6 if len(sys.argv) > 1: server = (sys.argv[1], 0x6502) diff --git a/src/chatsrc/chatserver/clientfiles/CHAT b/src/chatsrc/chatserver/clientfiles/CHAT index 349b21c..d2f7717 100644 Binary files a/src/chatsrc/chatserver/clientfiles/CHAT and b/src/chatsrc/chatserver/clientfiles/CHAT differ diff --git a/src/chatsrc/chatserver/clientfiles/DHCP b/src/chatsrc/chatserver/clientfiles/DHCP index 8884311..c30e2a0 100644 Binary files a/src/chatsrc/chatserver/clientfiles/DHCP and b/src/chatsrc/chatserver/clientfiles/DHCP differ diff --git a/src/chatsrc/chatserver/server.py b/src/chatsrc/chatserver/server.py index ebae48a..160562c 100755 --- a/src/chatsrc/chatserver/server.py +++ b/src/chatsrc/chatserver/server.py @@ -13,13 +13,12 @@ chat_vers = [] def client_add(address, port, handle): global client_list client_list[address] = (port, handle) + print "Welcome, ", handle, "@", address, ":", port def broadcast(handle, msg): global client_list if msg: print handle, ": ", msg - else: - print "Welcome, ", handle bcastmsg = struct.pack('<HHHBc8p32p', 0x7EDA, VERSION, 0, 0xCA, 'C', handle, msg) for c in client_list: client = (c, client_list[c][0]) diff --git a/src/libsrc/dhcp.pla b/src/libsrc/dhcp.pla index 6186793..9b5f560 100644 --- a/src/libsrc/dhcp.pla +++ b/src/libsrc/dhcp.pla @@ -81,9 +81,9 @@ byte[4] ones = $FF, $FF, $FF, $FF // // Default static net IP addresses // -byte localdns = 0,0,0,0 -byte localgw = 192,168,123,1 -byte localip = 192,168,123,10 +byte localdns = 8,8,8,8 +byte localgw = 192,168,1,1 +byte localip = 192,168,1,10 byte localnet = 255,255,255,0 // // Pre-configured DHCP packet @@ -252,7 +252,7 @@ repeat optsSRV = 255 DHCP.dhcp_secs.1 = retry iNet:sendUDP(portDHCP, 0, DHCP_SERVER_PORT, @DHCP, @optsSRV - @DHCP + 1) - for timeout = 1 to 1000 + for timeout = 0 to 1000 iNet:serviceIP() if optsOP.2 == DHCP_ACK break @@ -263,8 +263,6 @@ until retry > 4 or optsOP.2 == DHCP_ACK iNet:closeUDP(portDHCP) iNet:setInterfaceIP(@localip, @localnet, @localgw) puts(@boundstr);putip(@localip);putc('/');putip(@localnet);putln -if localdns:0 | localdns:2 - iNet:setDNS(@localdns) - puts(@dnsstr);putip(@localdns);putln -fin +iNet:setDNS(@localdns) +puts(@dnsstr);putip(@localdns);putln done