valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored where parseInner gets called so late as possible and also to be consistent with desegmentation

Browse Source 
has to happen first for message transacation
This commit is contained in:
Samuel M Smith 2014-02-20 15:38:41 -07:00
parent 39cd23be91
commit c649449b03
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/transport/road/raet/stacking.py
View File

@ -211,8 +211,7 @@ class StackUdp(object):
trans = self.transactions.get(packet.index, None)
if trans:
if self.parseInner(packet):
trans.receive(packet)
trans.receive(packet)
return
if packet.data['cf']: #correspondent to stale transaction so drop
@ -226,9 +225,6 @@ class StackUdp(object):
'''
Reply to packet with corresponding transaction or action
'''
if not self.parseInner(packet):
return
if (packet.data['tk'] == raeting.trnsKinds.join and
packet.data['pk'] == raeting.pcktKinds.request and
packet.data['si'] == 0):

25
salt/transport/road/raet/transacting.py
View File

@ -175,7 +175,7 @@ class Joiner(Initiator):
"""
Process received packet belonging to this transaction
"""
super(Joiner, self).receive(packet)
super(Joiner, self).receive(packet) # self.rxPacket = packet
if packet.data['tk'] == raeting.trnsKinds.join:
if packet.data['pk'] == raeting.pcktKinds.ack: #pended
@ -227,6 +227,8 @@ class Joiner(Initiator):
'''
Process ack to join packet
'''
if not self.stack.parseInner(self.rxPacket):
return
#data = self.rxPacket.data
#body = self.rxPacket.body.data
#set timer for redo
@ -234,8 +236,10 @@ class Joiner(Initiator):
def accept(self):
'''
Perform acceptance in response to joint response packt
Perform acceptance in response to join response packt
'''
if not self.stack.parseInner(self.rxPacket):
return
data = self.rxPacket.data
body = self.rxPacket.body.data
@ -307,6 +311,8 @@ class Joinent(Correspondent):
Process join packet
Perform pend operation of pending remote device being accepted onto channel
'''
if not self.stack.parseInner(self.rxPacket):
return
data = self.rxPacket.data
body = self.rxPacket.body.data
@ -418,7 +424,7 @@ class Allower(Initiator):
"""
Process received packet belonging to this transaction
"""
super(Allower, self).receive(packet)
super(Allower, self).receive(packet) # self.rxPacket = packet
if packet.data['tk'] == raeting.trnsKinds.allow:
if packet.data['pk'] == raeting.pcktKinds.cookie:
@ -472,6 +478,8 @@ class Allower(Initiator):
'''
Process cookie packet
'''
if not self.stack.parseInner(self.rxPacket):
return
data = self.rxPacket.data
body = self.rxPacket.body.data
@ -546,8 +554,11 @@ class Allower(Initiator):
def allow(self):
'''
Process ackInitiate packet
Perform allowment in response to ack to initiate packet
'''
if not self.stack.parseInner(self.rxPacket):
return
self.stack.devices[self.rdid].allowed = True
self.remove()
@ -584,7 +595,7 @@ class Allowent(Correspondent):
"""
Process received packet belonging to this transaction
"""
super(Allowent, self).receive(packet)
super(Allowent, self).receive(packet) # self.rxPacket = packet
if packet.data['tk'] == raeting.trnsKinds.allow:
if packet.data['pk'] == raeting.pcktKinds.hello:
@ -613,6 +624,8 @@ class Allowent(Correspondent):
'''
Process hello packet
'''
if not self.stack.parseInner(self.rxPacket):
return
data = self.rxPacket.data
body = self.rxPacket.body.data
@ -670,6 +683,8 @@ class Allowent(Correspondent):
'''
Process initiate packet
'''
if not self.stack.parseInner(self.rxPacket):
return
data = self.rxPacket.data
body = self.rxPacket.body.data
@ -887,6 +902,8 @@ class Messengent(Correspondent):
'''
Process message packet
'''
if not self.stack.parseInner(self.rxPacket):
return
data = self.rxPacket.data
body = self.rxPacket.body.data
self.stack.udpRxMsgs.append(body)