Groesz.org
/
progpib
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Update for Python3

This commit is contained in:
S Groesz 2020-11-10 01:47:47 +00:00
parent fbfb32f8b1
commit 85aaf1385e
7 changed files with 936 additions and 722 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
__pycache__
*.bak
*.swp
*.egg-info
*.bak2

6
pty-gpib-emulator/python/PTY_Interface.py
View File

@ -58,7 +58,7 @@ class Interface:
while (self.running): while (self.running):
tty_in = os.read(self.m, readLen) tty_in = os.read(self.m, readLen)
for tty_out in self.handleInput(tty_in): for tty_out in self.handleInput(tty_in):
os.write(self.m, tty_out) os.write(self.m, tty_out.encode())
##%% handleInput(tty_in) ##%% handleInput(tty_in)
@ -67,7 +67,7 @@ class Interface:
## address. That device must handle the command via dev.handleCMD(cmd, args) ## address. That device must handle the command via dev.handleCMD(cmd, args)
## ##
def handleInput(self, tty_in): def handleInput(self, tty_in):
tty_in = tty_in.strip() tty_in = tty_in.strip().decode()
if tty_in != "" and self.addr in self.devices: if tty_in != "" and self.addr in self.devices:
dev = self.devices[self.addr] dev = self.devices[self.addr]
@ -83,5 +83,5 @@ class Interface:
## ##
def addDevice(self, dev, addr): def addDevice(self, dev, addr):
self.devices[addr] = dev self.devices[addr] = dev

36
pty-gpib-emulator/python/enumerate_interfaces.py Normal file
View File

@ -0,0 +1,36 @@
# Use those functions to enumerate all interfaces available on the system using Python.
# found on <http://code.activestate.com/recipes/439093/#c1>
import socket
import fcntl
import struct
import array
def all_interfaces():
max_possible = 128 # arbitrary. raise if needed.
bytes = max_possible * 32
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
names = array.array('B', '\0' * bytes)
outbytes = struct.unpack('iL', fcntl.ioctl(
s.fileno(),
0x8912, # SIOCGIFCONF
struct.pack('iL', bytes, names.buffer_info()[0])
))[0]
namestr = names.tostring()
lst = []
for i in range(0, outbytes, 40):
name = namestr[i:i+16].split('\0', 1)[0]
ip = namestr[i+20:i+24]
lst.append((name, ip))
return lst
def format_ip(addr):
return str(ord(addr[0])) + '.' + \
str(ord(addr[1])) + '.' + \
str(ord(addr[2])) + '.' + \
str(ord(addr[3]))
ifs = all_interfaces()
for i in ifs:
print "%12s %s" % (i[0], format_ip(i[1]))

2
vendortools/enumip.py
View File

@ -51,6 +51,7 @@ IOCTL_SIOCGIFCONF = 0x8912
def enumIpUnix(): def enumIpUnix():
import fcntl import fcntl
# struct_size 40 if system is 64 bit
struct_size = 40 if (sys.maxsize > 2**32) else 32 struct_size = 40 if (sys.maxsize > 2**32) else 32
inbytes = 128 * struct_size # Maximum 128 interfaces inbytes = 128 * struct_size # Maximum 128 interfaces
@ -68,3 +69,4 @@ def enumIpUnix():
struct_size)] struct_size)]
return [ip for ip in iplist if ip != '127.0.0.1'] return [ip for ip in iplist if ip != '127.0.0.1']

156
vendortools/nfcli.py
View File

@ -11,16 +11,18 @@ from enumip import *
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
def usage(): def usage():
print print()
print "Usage: nfcli --list --eth_addr=ADDR --ip_type=TYPE --ip_addr=IP, --netmask=MASK, --gateway=GW" print("Usage: nfcli --list --eth_addr=ADDR --ip_type=TYPE --ip_addr=IP,",
print "Search and configure Prologix GPIB-ETHERNET Controllers." "--netmask=MASK, --gateway=GW")
print "--help : display this help" print("Search and configure Prologix GPIB-ETHERNET Controllers.")
print "--list : search for controllers" print("--help : display this help")
print "--eth_addr=ADDR : configure controller with Ethernet address ADDR" print("--list : search for controllers")
print "--ip_type=TYPE : set controller ip address type to TYPE (\"static\" or \"dhcp\")" print("--eth_addr=ADDR : configure controller with Ethernet address ADDR")
print "--ip_addr=IP : set controller address to IP" print('--ip_type=TYPE : set controller ip address type to TYPE',
print "--netmask=MASK : set controller network mask to MASK" '("static" or "dhcp")')
print "--gateway=GW : set controller default gateway to GW" print("--ip_addr=IP : set controller address to IP")
print("--netmask=MASK : set controller network mask to MASK")
print("--gateway=GW : set controller default gateway to GW")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@ -37,19 +39,19 @@ def ValidateNetParams(ip_str, mask_str, gw_str):
try: try:
ip = socket.inet_aton(ip_str) ip = socket.inet_aton(ip_str)
except: except:
print "IP address is invalid." print("IP address is invalid.")
return False return False
try: try:
mask = socket.inet_aton(mask_str) mask = socket.inet_aton(mask_str)
except: except:
print "Network mask is invalid." print("Network mask is invalid.")
return False return False
try: try:
gw = socket.inet_aton(gw_str) gw = socket.inet_aton(gw_str)
except: except:
print "Gateway address is invalid." print("Gateway address is invalid.")
return False return False
# Validate network mask # Validate network mask
@ -59,12 +61,12 @@ def ValidateNetParams(ip_str, mask_str, gw_str):
# Exclude restricted masks # Exclude restricted masks
if (mask == 0) or (mask == 0xFFFFFFFF): if (mask == 0) or (mask == 0xFFFFFFFF):
print "Network mask is invalid." print("Network mask is invalid.")
return False return False
# Exclude non-left-contiguous masks # Exclude non-left-contiguous masks
if (((mask + (mask & -mask)) & 0xFFFFFFFF) != 0): if (((mask + (mask & -mask)) & 0xFFFFFFFF) != 0):
print "Network mask is not contiguous." print("Network mask is not contiguous.")
return False return False
@ -78,7 +80,7 @@ def ValidateNetParams(ip_str, mask_str, gw_str):
# Exclude restricted addresses # Exclude restricted addresses
# 0.0.0.0 is valid # 0.0.0.0 is valid
if ((gw != 0) and ((octet1 == 0) or (octet1 == 127) or (octet1 > 223))): if ((gw != 0) and ((octet1 == 0) or (octet1 == 127) or (octet1 > 223))):
print "Gateway address is invalid." print("Gateway address is invalid.")
return False return False
# Validate IP address # Validate IP address
@ -90,17 +92,17 @@ def ValidateNetParams(ip_str, mask_str, gw_str):
# Exclude restricted addresses # Exclude restricted addresses
if ((octet1 == 0) or (octet1 == 127) or (octet1 > 223)): if ((octet1 == 0) or (octet1 == 127) or (octet1 > 223)):
print "IP address is invalid." print("IP address is invalid.")
return False return False
# Exclude subnet network address # Exclude subnet network address
if ((ip & ~mask) == 0): if ((ip & ~mask) == 0):
print "IP address is invalid." print("IP address is invalid.")
return False return False
# Exclude subnet broadcast address # Exclude subnet broadcast address
if ((ip & ~mask) == (0xFFFFFFFF & ~mask)): if ((ip & ~mask) == (0xFFFFFFFF & ~mask)):
print "IP address is invalid." print("IP address is invalid.")
return False return False
return True return True
@ -139,9 +141,16 @@ def main():
eth_addr = None eth_addr = None
try: try:
opts, args = getopt.getopt(sys.argv[1:], '', ['help', 'list', 'eth_addr=', 'ip_type=', 'ip_addr=', 'netmask=', 'gateway=']) opts, args = getopt.getopt(sys.argv[1:], '',
except getopt.GetoptError, err: ['help',
print str(err) 'list',
'eth_addr=',
'ip_type=',
'ip_addr=',
'netmask=',
'gateway='])
except getopt.GetoptError as err:
print(err)
sys.exit(1) sys.exit(1)
# Check for unparsed parameters # Check for unparsed parameters
@ -150,7 +159,7 @@ def main():
sys.exit(1) sys.exit(1)
for o, a in opts: for o, a in opts:
if o == "--help": if o == "--help":
showhelp = True showhelp = True
elif o == "--list": elif o == "--list":
search = True search = True
@ -168,22 +177,22 @@ def main():
if (len(opts) == 0) or (showhelp): if (len(opts) == 0) or (showhelp):
usage() usage()
sys.exit(1) sys.exit(1)
if search: if search:
if not eth_addr is None: if not eth_addr is None:
print "--list and --eth_addr are not compatible." print("--list and --eth_addr are not compatible.")
invalid_args = True invalid_args = True
if not ip_type is None: if not ip_type is None:
print "--list and --ip_type are not compatible." print("--list and --ip_type are not compatible.")
invalid_args = True invalid_args = True
if not ip_addr is None: if not ip_addr is None:
print "--list and --ip_addr are not compatible." print("--list and --ip_addr are not compatible.")
invalid_args = True invalid_args = True
if not netmask is None: if not netmask is None:
print "--list and --netmask are not compatible." print("--list and --netmask are not compatible.")
invalid_args = True invalid_args = True
if not gateway is None: if not gateway is None:
print "--list and --gateway are not compatible." print("--list and --gateway are not compatible.")
invalid_args = True invalid_args = True
else: else:
@ -191,19 +200,19 @@ def main():
eth_addr = eth_addr.strip().replace(":", "").replace("-", "") eth_addr = eth_addr.strip().replace(":", "").replace("-", "")
eth_addr = eth_addr.decode('hex') eth_addr = eth_addr.decode('hex')
except: except:
print "Invalid Ethernet address." print("Invalid Ethernet address.")
sys.exit(1) sys.exit(1)
if len(eth_addr) != 6: if len(eth_addr) != 6:
print "Invalid Ethernet address." print("Invalid Ethernet address.")
sys.exit(1) sys.exit(1)
if ip_type in ["Static", "static"]: if ip_type.lower() in ["static"]:
ip_type = NF_IP_STATIC ip_type = NF_IP_STATIC
elif ip_type in ["Dynamic", "dynamic", "Dhcp", "dhcp"]: elif ip_type.lower in ["dynamic", "dhcp"]:
ip_type = NF_IP_DYNAMIC ip_type = NF_IP_DYNAMIC
else: else:
print "--ip_type must be 'static' or 'dhcp'." print("--ip_type must be 'static' or 'dhcp'.")
sys.exit(1) sys.exit(1)
if ip_type == NF_IP_STATIC: if ip_type == NF_IP_STATIC:
@ -227,17 +236,17 @@ def main():
if ip_addr is None: if ip_addr is None:
ip_addr = "0.0.0.0" ip_addr = "0.0.0.0"
else: else:
print "--ip_addr not allowed when --ip_type=dhcp." print("--ip_addr not allowed when --ip_type=dhcp.")
invalid_args = True invalid_args = True
if netmask is None: if netmask is None:
netmask = "0.0.0.0" netmask = "0.0.0.0"
else: else:
print "--netmask not allowed when --ip_type=dhcp." print("--netmask not allowed when --ip_type=dhcp.")
invalid_args = True invalid_args = True
if gateway is None: if gateway is None:
gateway = "0.0.0.0" gateway = "0.0.0.0"
else: else:
print "--gateway not allowed when --ip_type=dhcp." print("--gateway not allowed when --ip_type=dhcp.")
invalid_args = True invalid_args = True
if invalid_args: if invalid_args:
@ -246,33 +255,33 @@ def main():
global seq global seq
sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0) # sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
iplist = enumIp(); iplist = enumIp();
if len(iplist) == 0: if len(iplist) == 0:
print "Host has no IP address." print("Host has no IP address.")
sys.exit(1) sys.exit(1)
devices = {} devices = {}
for ip in iplist: for ip in iplist:
print "Searching through network interface:", ip print("Searching through network interface:", ip)
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) s.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1) s.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
port = 0 port = 0
try: try:
s.bind((ip, port)) s.bind((ip, port))
except socket.error, e: except socket.error as e:
print "Bind error on send socket:", e print("Bind error on send socket:", e)
sys.exit(1) sys.exit(1)
port = s.getsockname()[1] port = s.getsockname()[1]
r = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) r = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
r.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) r.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
@ -281,12 +290,12 @@ def main():
try: try:
r.bind(('', port)) r.bind(('', port))
except socket.error, e: except socket.error as e:
print "Bind error on receive socket:", e print("Bind error on receive socket:", e)
sys.exit(1) sys.exit(1)
d = Discover(s, r) d = Discover(s, r)
print print()
for k in d: for k in d:
d[k]['host_ip'] = ip d[k]['host_ip'] = ip
@ -296,15 +305,16 @@ def main():
r.close() r.close()
if search: if search:
print print()
print "Found", len(devices), "Prologix GPIB-ETHERNET Controller(s)." print("Found", len(devices), "Prologix GPIB-ETHERNET Controller(s).")
for key in devices: for key in devices:
PrintDetails(devices[key]) PrintDetails(devices[key])
print print()
else: else:
if eth_addr in devices: if eth_addr in devices:
print "Updating network settings of Prologix GPIB-ETHERNET Controller", FormatEthAddr(eth_addr) print("Updating Prologix GPIB-ETHERNET Controller settings",
FormatEthAddr(eth_addr))
device = devices[eth_addr] device = devices[eth_addr]
@ -317,11 +327,11 @@ def main():
try: try:
s.bind((device['host_ip'], port)) s.bind((device['host_ip'], port))
except socket.error, e: except socket.error as e:
print "Bind error on send socket:", e print("Bind error on send socket:", e)
sys.exit(1) sys.exit(1)
port = s.getsockname()[1] port = s.getsockname()[1]
r = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) r = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
r.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) r.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
@ -331,27 +341,31 @@ def main():
try: try:
r.bind(('', port)) r.bind(('', port))
except socket.error, e: except socket.error as e:
print "Bind error on receive socket:", e print("Bind error on receive socket:", e)
sys.exit(1) sys.exit(1)
result = Assignment(s, r, eth_addr, ip_type, ip_addr, netmask, gateway) result = Assignment(s, r, eth_addr, ip_type, ip_addr, netmask, gateway)
print print()
if len(result) == 0: if len(result) == 0:
print "Network settings update failed." print("Network settings update failed.")
else: else:
if result['result'] == NF_SUCCESS: if result['result'] == NF_SUCCESS:
print "Network settings updated successfully." print("Network settings updated successfully.")
else: else:
print "Network settings update failed." print("Network settings update failed.")
else: else:
print "Prologix GPIB-ETHERNET Controller", FormatEthAddr(eth_addr), "already configured for DHCP." print("Prologix GPIB-ETHERNET Controller",
FormatEthAddr(eth_addr),
"already configured for DHCP.")
else: else:
print "Prologix GPIB-ETHERNET Controller", FormatEthAddr(eth_addr), "not found." print("Prologix GPIB-ETHERNET Controller",
FormatEthAddr(eth_addr),
"not found.")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
if __name__ == "__main__": if __name__ == "__main__":
main() main()

1316
vendortools/nfutil.py
View File

File diff suppressed because it is too large Load Diff

137
vendortools/prologic_sim.py Normal file
View File

@ -0,0 +1,137 @@
# Prologic GPIB-LAN simulator
from datetime import datetime
import socket
NETFINDER_SERVER_PORT = 3040
NF_IDENTIFY = 0
NF_IDENTIFY_REPLY = 1
NF_ASSIGNMENT = 2
NF_ASSIGNMENT_REPLY = 3
NF_FLASH_ERASE = 4
NF_FLASH_ERASE_REPLY = 5
NF_BLOCK_SIZE = 6
NF_BLOCK_SIZE_REPLY = 7
NF_BLOCK_WRITE = 8
NF_BLOCK_WRITE_REPLY = 9
NF_VERIFY = 10
NF_VERIFY_REPLY = 11
NF_REBOOT = 12
NF_SET_ETHERNET_ADDRESS = 13
NF_SET_ETHERNET_ADDRESS_REPLY = 14
NF_TEST = 15
NF_TEST_REPLY = 16
NF_SUCCESS = 0
NF_CRC_MISMATCH = 1
NF_INVALID_MEMORY_TYPE = 2
NF_INVALID_SIZE = 3
NF_INVALID_IP_TYPE = 4
NF_MAGIC = 0x5A
NF_IP_DYNAMIC = 0
NF_IP_STATIC = 1
NF_ALERT_OK = 0x00
NF_ALERT_WARN = 0x01
NF_ALERT_ERROR = 0xFF
NF_MODE_BOOTLOADER = 0
NF_MODE_APPLICATION = 1
NF_MEMORY_FLASH = 0
NF_MEMORY_EEPROM = 1
NF_REBOOT_CALL_BOOTLOADER = 0
NF_REBOOT_RESET = 1
HEADER_FMT = "!2cH6s2x"
IDENTIFY_FMT = HEADER_FMT
IDENTIFY_REPLY_FMT = "!H6c4s4s4s4s4s4s32s"
ASSIGNMENT_FMT = "!3xc4s4s4s32x"
ASSIGNMENT_REPLY_FMT = "!c3x"
FLASH_ERASE_FMT = HEADER_FMT
FLASH_ERASE_REPLY_FMT = HEADER_FMT
BLOCK_SIZE_FMT = HEADER_FMT
BLOCK_SIZE_REPLY_FMT = "!H2x"
BLOCK_WRITE_FMT = "!cxHI"
BLOCK_WRITE_REPLY_FMT = "!c3x"
VERIFY_FMT = HEADER_FMT
VERIFY_REPLY_FMT = "!c3x"
REBOOT_FMT = "!c3x"
SET_ETHERNET_ADDRESS_FMT = "!6s2x"
SET_ETHERNET_ADDRESS_REPLY_FMT = HEADER_FMT
TEST_FMT = HEADER_FMT
TEST_REPLY_FMT = "!32s"
MAX_ATTEMPTS = 10
MAX_TIMEOUT = 0.5
class gpib_eth():
"""
Prologix GPIB Ethernet Simulator Version 1.0
Emulates HW Version 1.2; SW Version 1.6.6.0; BOOT Version ?;
"""
def __init__(self):
self.up_time = datetime.now()
self.ip_addr = bytes([192, 168, 0, 128])
self.mode = NF_MODE_APPLICATION # [BOOTLOADER, APPLICATION]
self.alert = NF_ALERT_OK
self.ip_type = NF_IP_DYNAMIC # [DYNAMIC, STATIC]
self.eth_addr = b'\xF0' * 6 # MAC address 6 bytes
self.ip_netmask = bytes([255, 255, 255, 0])
self.ip_gateway = bytes([192, 168, 0, 1])
self.app_version = bytes([1, 6, 6, 0])
self.bootloader_version = bytes([1, 0, 0, 0]) # ??
self.hw_version = bytes([1, 2, 0, 0])
self.name = "Virtual Prologic GPIB-Eth Device"# 32 char string
def identify(self, seq):
# packet header (HEADER_FMT):
# 1 byte - NF_MAGIC
# 1 byte - NF_IDENTIFY_REPLY
# 2 byte - seq (unsigned short)
# 6 byte - eth_addr
# 2 byte - 2x Null (pad bytes)
#
# identify body (IDENTIFY_REPLY_FMT):
# 1 byte - Uptime days
# 1 byte - Uptime hours
# 1 byte - Uptime minutes
# 1 byte - Uptime seconds
# 1 byte - self.mode
# 1 byte - self.alert
# 1 byte - self.ip_type
# 4 byte - self.ip_addr
# 4 byte - self.ip_gateway
# 4 byte - self.app_version
# 4 byte - self.boootloader_version
# 4 byte - self.hw_version
# 32 byte - self.name
pass # To Do
def send(self, msg):
"""
Send data (msg)
"""
def receive(self):
"""
Receive data (msg)
"""
# Identify Command (IDENTIFY_FMT):
# 1 byte - NF_MAGIC
# 1 byte - NF_IDENTIFY
# 2 byte - sequence ID (unsigned short)
# 6 byte - Eth addr ((b'\xFF' * 6) for broadcast)
# 2 byte - Null byte x2 (pad bytes) [EOM ?]
rcv_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
rcv_sock.bind(('<broadcast>', NETFINDER_SERVER_PORT))
msg = rcv_sock.recvfrom(1024)
return msg