From 938f9bd53381bef8e8d9760e371ccb5618ef1a81 Mon Sep 17 00:00:00 2001 From: lgandx Date: Thu, 26 Dec 2013 10:28:45 -0500 Subject: [PATCH] minor fix --- Responder.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Responder.py b/Responder.py index f886f24..8059378 100644 --- a/Responder.py +++ b/Responder.py @@ -240,13 +240,16 @@ def Validate_NBT_NS(data,Wredirect): def Decode_Name(nbname): #From http://code.google.com/p/dpkt/ with author's permission. - if len(nbname) != 32: - return nbname - l = [] - for i in range(0, 32, 2): - l.append(chr(((ord(nbname[i]) - 0x41) << 4) | + try: + if len(nbname) != 32: + return nbname + l = [] + for i in range(0, 32, 2): + l.append(chr(((ord(nbname[i]) - 0x41) << 4) | ((ord(nbname[i+1]) - 0x41) & 0xf))) - return ''.join(l).split('\x00', 1)[0].strip() + return ''.join(l).split('\x00', 1)[0].strip() + except: + return "Illegal NetBIOS name" # NBT_NS Server class. class NB(BaseRequestHandler): @@ -1611,3 +1614,4 @@ if __name__ == '__main__': raise raw_input() +