Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix multiple PDU processing #18

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix multiple PDU processing #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions pyagentx/network.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def emit(self, record):
import time
import threading
import Queue
import struct

import pyagentx
from pyagentx.pdu import PDU
Expand All @@ -27,6 +28,7 @@ def __init__(self, queue, oid_list, sethandlers):
self._queue = queue
self._oid_list = oid_list
self._sethandlers = sethandlers
self._recv_buf = ''

self.session_id = 0
self.transaction_id = 0
Expand Down Expand Up @@ -65,11 +67,18 @@ def send_pdu(self, pdu):
self.socket.send(pdu.encode())

def recv_pdu(self):
buf = self.socket.recv(1024)
if not buf: return None
if len(self._recv_buf) < 20:
self._recv_buf += self.socket.recv(1024)
if len(self._recv_buf) < 20:
return None
payload_len = struct.unpack('!L', self._recv_buf[16:20])[0]
logger.debug('buffer length {}, pdu length {}'.format(len(self._recv_buf), 20+payload_len))
pdu = PDU()
pdu.decode(buf)
pdu.decode(self._recv_buf[:20+payload_len])
self._recv_buf = self._recv_buf[20+payload_len:]
if self.debug: pdu.dump()
if len(self._recv_buf) > 0:
logger.debug('remaining buffer length {}'.format(len(self._recv_buf)))
return pdu


Expand Down