From d1d37fb13ea94cffb7966b813508e6cdf92dd730 Mon Sep 17 00:00:00 2001
From: dschmenk <dschmenk@sbcglobal.net>
Date: Thu, 24 Dec 2015 14:37:46 -0800
Subject: [PATCH] Small updates
---
src/chatsrc/chat.pla | 2 +-
src/chatsrc/chatserver/chat-version.xml | 6 ++++--
src/chatsrc/chatserver/client.py | 2 +-
src/chatsrc/chatserver/clientfiles/CHAT | Bin 2066 -> 2067 bytes
src/chatsrc/chatserver/clientfiles/DHCP | Bin 1964 -> 1945 bytes
src/chatsrc/chatserver/server.py | 3 +--
src/libsrc/dhcp.pla | 14 ++++++--------
7 files changed, 13 insertions(+), 14 deletions(-)
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 349b21cef4d5305186300115b3ea72d5bc520840..d2f7717606713bf9e100a052583854a6704147a4 100644
GIT binary patch
delta 242
zcmWNJF$+Oq6ox;Y@1&dM7I!fzG1wTC!63I-ETW_glA@3@NCq8cPzE0sgFj%C!NOpW
z!KnNMf54zj-r?yy?=zg0y|z93gQrivKsKK#g&Li9vv(YmMUxq^%t^@tEJ>LSIp$1k
zZbb6Leqnnx8(Wh^v@!{8NeVZu9m!}VF35obS`n=ZuYo#t3%d&+fDxF2Ir>SnT;X@E
zit>QG5kGkRh5vwJWtbiDvyvbPgD6^z{SwDbvL!BVg?(ngEJOH;*=*svb=iCQ0}}*3
Aod5s;
delta 241
zcmbO%FiC)M<wnK=W-ei8562LN<ebdZ%{9!N%=InItc@Ma42|7D+|SG~aWb>$#NEuS
z6OS-6H(mnruLAjOEUXjxS(qDDSQsW6vT!z90BIW*(MAUrhDK)~b^~G`pjaSKEE33$
z0pbK8KOM-=0kVsLxB`e9fw%)GzKw;o@c@v0jD;bn@f48p6e#!!Xz({6`zH|p2l821
zMH_`!85$*lSP6(#Ss5m3vI;jE0BKWJ&PHb-9nQ)<v51wmu?)zb$jUl#29P~xav1ww
E0M;Wu_y7O^
diff --git a/src/chatsrc/chatserver/clientfiles/DHCP b/src/chatsrc/chatserver/clientfiles/DHCP
index 88843117dc80f8e621d97d2f971c225ec908c2c4..c30e2a0a4800a5d3485c63d4c643c2afe5693ec6 100644
GIT binary patch
delta 156
zcmZ3(Ka-zPVIre4HwO?LSi#5$#2fW9Sr{26&tfrSoH6+#i`iyD)=tLU87vGF7qJL5
zE@xqA+z!Nhf%pIr9|PhGK)K66xf?+CZ6Lk}<Ua)Rp8@HYEUb-hfnpzk>~AbAjlY2G
kzd+2$%FxKl$}o|GRiKd<NDHvCHi`hn#DQ3PGC%uV06*F+@Bjb+
delta 186
zcmbQqzlNVtdm^JUHv<qHSW(Rg#2fW9S(vmKC(mRtW1K$u0*e_}mXbi0ih!7p48vwN
z)=tLynJf$w7qbX7u3%wk+yTV<fcPK~9|z)#K)EYGxtl=t9U#6B<Ua!Pp9ASvEUb<1
zfMOqk?C&frjlY5He?ZK{%FxIL#GF7Zz{)UDm{p)r0!T}<vNp;C#gu?pjg^7n^3BVK
M51#Rv%*H+$0KSMeO8@`>
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