fixed KeyError on timessent in sndrcv when an error happens during a send

scapy/contrib/isotp.py

@@ -643,7 +643,7 @@ def recv(self, x=0xffff):
         return msg
 
     @staticmethod
-    def select(sockets, remain=None):
+    def select(sockets, remain=conf.recv_poll_rate):
         """This function is called during sendrecv() routine to wait for
         sockets to be ready to receive
         """

scapy/contrib/isotp.uts

@@ -1124,6 +1124,57 @@ assert(sent)
 assert(rx2 is not None)
 assert(rx2 == msg)
 
+
+= ISOTPSoftSocket sr1 timeout with short frame
+~ needs_root linux
+
+evt = threading.Event()
+msg = ISOTP(b'\x11\x22\x33')
+rx = None
+finished = False
+
+def sender():
+    global evt, rx, msg, finished
+    with ISOTPSoftSocket(new_can_socket(iface0), 0x123, 0x321) as sock:
+        evt.set()
+        rx = sock.sr1(msg, timeout=0.1, verbose=True)
+        finished = True
+
+txThread = threading.Thread(target=sender)
+txThread.start()
+
+evt.wait()
+txThread.join(5)
+
+assert(rx is None)
+assert(finished)
+
+
+
+= ISOTPSoftSocket sr1 timeout with long frame
+~ needs_root linux
+
+evt = threading.Event()
+msg = ISOTP(b'\x11\x22\x33\x11\x22\x33\x11\x22\x33\x11\x22\x33')
+rx = None
+finished = False
+
+def sender():
+    global evt, rx, msg, finished
+    with ISOTPSoftSocket(new_can_socket(iface0), 0x123, 0x321) as sock:
+        evt.set()
+        rx = sock.sr1(msg, timeout=0.1, verbose=True)
+        finished = True
+
+txThread = threading.Thread(target=sender)
+txThread.start()
+
+evt.wait()
+txThread.join(5)
+
+assert(rx is None)
+assert(finished)
+
 = ISOTPSoftSocket sr1 and ISOTP test vice versa
 ~ needs_root linux
 

scapy/sendrecv.py

@@ -230,7 +230,8 @@ def sndrcv(pks, pkt, timeout=None, inter=0, verbose=None, chainCC=False,
         if listable:
             i = 0
             for p in (pkt if isinstance(pkt, list) else [pkt]):
-                p.sent_time = timessent[i]
+                if i in timessent:
+                    p.sent_time = timessent[i]
                 i += 1
 
         if store_unanswered: