Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
clientbot
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
aleajactaest
clientbot
Commits
3478c162
Commit
3478c162
authored
May 30, 2019
by
aleajactaest
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adding check file msg.xml & database.xml (compare server and client)
parent
16113852
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
34 additions
and
11 deletions
+34
-11
client.py
client.py
+34
-11
No files found.
client.py
View file @
3478c162
...
...
@@ -41,6 +41,7 @@ import lzma
import
socket
import
struct
import
xml.etree.ElementTree
as
ET
import
hashlib
class
BitStream
():
...
...
@@ -144,10 +145,10 @@ class BitStream():
self
.
pushChar
(
x
)
#y = ord(x)
#self.internalSerial(y, 8)
def
pushArray
Char
(
self
,
valeur
,
size
):
def
pushArray
Uint8
(
self
,
valeur
,
size
):
' ex.: pushArrayChar([0,1,3,4]) '
for
i
in
valeur
:
self
.
push
Char
(
i
)
self
.
push
Uint8
(
i
)
# ------------------------------------
def
readSerial
(
self
,
nbits
):
...
...
@@ -240,10 +241,10 @@ class BitStream():
tmp
+=
x
_size
-=
1
return
tmp
def
readArray
Char
(
self
,
size
):
def
readArray
Uint8
(
self
,
size
):
ret
=
[]
for
i
in
range
(
0
,
size
):
ret
.
append
(
self
.
read
Char
())
ret
.
append
(
self
.
read
Uint8
())
return
ret
# ------------------------------------
...
...
@@ -277,8 +278,18 @@ class BitStream():
return
ret
def
getTextMD5
(
dataRawXml
):
log
=
logging
.
getLogger
(
'myLogger'
)
dataNew
=
''
for
data
in
dataRawXml
:
pass
if
data
!=
'
\r
'
:
# '\015' ignore caractère \r\n =>
dataNew
+=
data
else
:
log
.
debug
(
"***** data:%d"
%
(
ord
(
data
)))
m
=
hashlib
.
md5
()
m
.
update
(
dataNew
.
encode
(
'utf-8'
))
#print(m.hexdigest())
#print(m.digest())
return
m
.
digest
()
def
Test
():
a
=
BitStream
()
...
...
@@ -1488,6 +1499,8 @@ class ClientNetworkConnection:
self
.
_LastAckInLongAck
=
0
self
.
_MsgXmlMD5
=
None
self
.
_DatabaseXmlMD5
=
None
self
.
msgXml
=
None
self
.
databaseXml
=
None
def
cookiesInit
(
self
,
UserAddr
,
UserKey
,
UserId
):
self
.
UserAddr
=
UserAddr
...
...
@@ -1581,10 +1594,20 @@ class ClientNetworkConnection:
_LatestSync
=
msg
.
readUint32
()
self
.
log
.
debug
(
"%d %d %d"
%
(
_Synchronize
,
stime
,
_LatestSync
))
# khanat-opennel-code/code/ryzom/client/src/network_connection.cpp : void CNetworkConnection::receiveSystemSync(CBitMemStream &msgin)
MsgData
=
msg
.
readArray
Char
(
16
)
DatabaseData
=
msg
.
readArray
Char
(
16
)
MsgData
=
msg
.
readArray
Uint8
(
16
)
DatabaseData
=
msg
.
readArray
Uint8
(
16
)
self
.
log
.
debug
(
"MsgData:"
+
str
(
MsgData
))
self
.
log
.
debug
(
"DatabaseData:"
+
str
(
DatabaseData
))
md5Msg
=
bytes
(
MsgData
)
md5Database
=
bytes
(
DatabaseData
)
if
md5Msg
==
self
.
_MsgXmlMD5
:
self
.
log
.
info
(
"Check MD5 msg.xml : OK"
)
else
:
self
.
log
.
error
(
"Check MD5 msg.xml : KO"
)
if
md5Database
==
self
.
_DatabaseXmlMD5
:
self
.
log
.
info
(
"Check MD5 database.xml : OK"
)
else
:
self
.
log
.
error
(
"Check MD5 database.xml : KO"
)
self
.
log
.
error
(
"TODO"
)
#self.sendSystemAckSync()
...
...
@@ -1592,10 +1615,10 @@ class ClientNetworkConnection:
pass
def
EmulateFirst
(
self
,
msgRawXml
,
databaseRawXml
):
msgXml
=
ET
.
fromstring
(
msgRawXml
)
ET
.
dump
(
msgXml
)
databaseXml
=
ET
.
fromstring
(
databaseRawXml
)
ET
.
dump
(
databaseXml
)
self
.
msgXml
=
ET
.
fromstring
(
msgRawXml
)
#
ET.dump(msgXml)
self
.
databaseXml
=
ET
.
fromstring
(
databaseRawXml
)
#
ET.dump(databaseXml)
self
.
_MsgXmlMD5
=
getTextMD5
(
msgRawXml
)
self
.
_DatabaseXmlMD5
=
getTextMD5
(
databaseRawXml
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment