pymscada 0.1.0a1__py3-none-any.whl → 0.1.0a4__py3-none-any.whl

pymscada/iodrivers/ping_client.py

@@ -0,0 +1,120 @@
+"""Network monitoring / scanning."""
+import asyncio
+import logging
+import socket
+import struct
+import time
+from pymscada.bus_client import BusClient
+from pymscada.periodic import Periodic
+from pymscada.iodrivers.ping_map import PingMaps
+
+
+ICMP_REQUEST = 8
+ICMP_REPLY = 0
+RATE = 60
+
+
+def checksum_chat(data):
+    """Calculate ICMP Checksum."""
+    if len(data) & 1:  # If the packet length is odd
+        data += b'\0'
+    res = 0
+    # Process two bytes at a time
+    for i in range(0, len(data), 2):
+        res += (data[i] << 8) + data[i + 1]
+    res = (res >> 16) + (res & 0xffff)
+    res += res >> 16
+    return (~res) & 0xffff  # Return ones' complement of the result
+
+
+class PingClientConnector:
+    """Ping a list of addresses."""
+
+    def __init__(self, mapping: PingMaps):
+        """Accept list of addresses, ip or name."""
+        self.mapping = mapping
+        self.dns = {}
+        self.addr_info = {}
+        self.socket = None
+        self.ping_id = 0
+        self.ping_dict = {}
+
+    async def poll(self):
+        """Do pings."""
+        self.reply_dict = {}
+        if self.socket is None:
+            self.socket = socket.socket(socket.AF_INET, socket.SOCK_RAW,
+                                        socket.IPPROTO_ICMP)
+            asyncio.get_event_loop().add_reader(self.socket,
+                                                self.read_response)
+        for ping_id, address in list(self.ping_dict.items()):
+            logging.info(f'failed {self.dns[address]} {ping_id}')
+            self.mapping.polled_data(self.dns[address], float('NAN'))
+            del self.ping_dict[ping_id]
+        self.send_ping()
+
+    def send_ping(self):
+        """Build and send ping messages."""
+        for address in self.dns.keys():
+            self.ping_id = (self.ping_id + 1) & 0xffff
+            self.ping_dict[self.ping_id] = address
+            logging.info(f'ping {address} id {self.ping_id}')
+            header = struct.pack("!BbHHh", ICMP_REQUEST, 0, 0, self.ping_id, 1)
+            data = struct.pack("!d", time.perf_counter()) + (60 * b'\0')
+            checksum = checksum_chat(header + data)
+            packet = struct.pack("!BbHHh", ICMP_REQUEST, 0, checksum,
+                                 self.ping_id, 1) + data
+            self.socket.sendto(packet, (address, 0))
+
+    def read_response(self):
+        """Match ping response."""
+        data, address = self.socket.recvfrom(1024)
+        msgtype, _, _, ping_id, _ = struct.unpack('!BBHHH', data[20:28])
+        if msgtype != ICMP_REPLY:
+            return
+        if ping_id in self.ping_dict:
+            latency = 1000 * (time.perf_counter() -
+                              struct.unpack('!d', data[28:36])[0])
+            name = self.dns[address[0]]
+            logging.info(f'success {name} {ping_id} {latency}ms')
+            self.mapping.polled_data(name, latency)
+            del self.ping_dict[ping_id]
+
+    async def start(self):
+        """Start pinging."""
+        loop = asyncio.get_event_loop()
+        for address in self.mapping.var_map.keys():
+            info = await loop.getaddrinfo(address, None, family=socket.AF_INET,
+                                          type=socket.SOCK_STREAM)
+            ip = info[0][4][0]
+            self.dns[ip] = address
+        self.periodic = Periodic(self.poll, RATE)
+        await self.periodic.start()
+
+
+class PingClient:
+    """Ping client."""
+
+    def __init__(self, bus_ip: str = '127.0.0.1', bus_port: int = 1324,
+                 tags: dict = {}) -> None:
+        """
+        Connect to bus on bus_ip:bus_port, ping a list.
+
+        Event loop must be running.
+        """
+        self.busclient = None
+        if bus_ip is not None:
+            self.busclient = BusClient(bus_ip, bus_port)
+        self.mapping = PingMaps(tags)
+        self.pinger = PingClientConnector(mapping=self.mapping)
+
+    async def _poll(self):
+        """For testing."""
+        for connection in self.connections:
+            await connection.poll()
+
+    async def start(self):
+        """Start bus connection and PLC polling."""
+        if self.busclient is not None:
+            await self.busclient.start()
+        await self.pinger.start()

pymscada/iodrivers/ping_map.py

@@ -0,0 +1,43 @@
+"""Map between snmp MIB and Tag."""
+from time import time
+from pymscada.tag import Tag
+
+
+class PingMap:
+    """Do value updates for each tag."""
+
+    def __init__(self, tagname: str, addr: str):
+        """Initialise MIB map and Tag."""
+        self.last_value = None
+        self.tag = Tag(tagname, float)
+        self.addr = addr
+        self.map_bus = id(self)
+
+    def set_tag_value(self, value, time_us):
+        """Pass update from IO driver to tag value."""
+        if self.last_value is None:
+            self.last_value = value
+            return
+        if self.last_value != value:
+            self.tag.value = value, time_us, self.map_bus
+
+
+class PingMaps:
+    """Link tags with protocol connector."""
+
+    def __init__(self, tags: dict):
+        """Collect maps based on a tag dictionary."""
+        # use the tagname to access the map.
+        self.tag_map: dict[str, PingMap] = {}
+        # use the plc_name then variable name to access a list of maps.
+        self.var_map: dict[str, PingMap] = {}
+        for tagname, v in tags.items():
+            addr = v['addr']
+            map = PingMap(tagname, addr)
+            self.var_map[addr] = map
+            self.tag_map[tagname] = map
+
+    def polled_data(self, address, latency):
+        """Pass updates read from the PLC to the tags."""
+        time_us = int(time() * 1e6)
+        self.var_map[address].set_tag_value(latency, time_us)

pymscada/main.py

@@ -1,7 +1,9 @@
 """Main server entry point."""
 import argparse
 import asyncio
+from importlib.metadata import version
 import logging
+import sys
 from pymscada.bus_server import BusServer
 from pymscada.checkout import checkout
 from pymscada.config import Config
@@ -11,11 +13,15 @@ from pymscada.history import History
 from pymscada.iodrivers.logix_client import LogixClient
 from pymscada.iodrivers.modbus_client import ModbusClient
 from pymscada.iodrivers.modbus_server import ModbusServer
+from pymscada.iodrivers.ping_client import PingClient
 from pymscada.iodrivers.snmp_client import SnmpClient
 from pymscada.www_server import WwwServer
 from pymscada.validate import validate
 
 
+MODULES = {}
+
+
 async def bus(options):
     """Return bus module."""
     config = Config(options.config)
@@ -49,7 +55,7 @@ async def console(_options):
 
 async def _checkout(options):
     """Checkout files in current working directory."""
-    checkout(overwrite=options.overwrite)
+    checkout(overwrite=options.overwrite, diff=options.diff)
     return
 
 
@@ -81,59 +87,85 @@ async def logixclient(options):
     return LogixClient(**config)
 
 
+async def ping(options):
+    """Return logixclient module."""
+    if sys.platform.startswith("win"):
+        asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
+    config = Config(options.config)
+    return PingClient(**config)
+
+
 async def snmpclient(options):
     """Return snmpclient module."""
     config = Config(options.config)
     return SnmpClient(**config)
 
 
-def args():
+def add_subparser_defaults(
+        parser: argparse._SubParsersAction,
+        name: str, call, help: str, epilog: str):
+    """Add arguments common to all subparsers."""
+    s = parser.add_parser(name, help=help, epilog=epilog)
+    s.set_defaults(get_module=call, module=name)
+    s.add_argument('--config', metavar='file', default=None,
+                   help=f"Config file, default is '{name}.yaml'")
+    s.add_argument('--tags', metavar='file', default=None,
+                   help="Tags file, default is 'tags.yaml'")
+    s.add_argument('--verbose', action='store_true',
+                   help="Set level to logging.INFO")
+    return s
+
+
+def args(_version: str):
     """Read commandline arguments."""
     parser = argparse.ArgumentParser(
         prog='pymscada',
         description='Connect IO, logic, applications, and webpage UI',
-        epilog='Python Mobile SCADA'
+        epilog=f'Python Mobile SCADA {_version}'
     )
-    parser.add_argument('--config', metavar='file',
-                        help='Config file, default is "[module].yaml".')
-    parser.add_argument('--tags', metavar='file',
-                        help='Tags file, default is "tags.yaml".')
-    parser.add_argument('--verbose', action='store_true',
-                        help="Set level to logging.INFO.")
-    sp = parser.add_subparsers(title='module')
-    # Add individual module options, most use --config and --tags
-    s = sp.add_parser('bus', help='run the message bus')
-    s.set_defaults(get_module=bus)
-    s = sp.add_parser('wwwserver', help='serve web pages')
-    s.set_defaults(get_module=wwwserver)
-    s = sp.add_parser('history', help='collect and serve history')
-    s.set_defaults(get_module=history)
-    s = sp.add_parser('files', help='receive and send files')
-    s.set_defaults(get_module=files)
-    s = sp.add_parser('console', help='interactive bus console')
-    s.set_defaults(get_module=console)
-    s = sp.add_parser('checkout', help='create example config files')
-    s.set_defaults(get_module=_checkout)
-    s.add_argument('--overwrite', action='store_true', default=False,
-                   help='checkout may overwrite files, CARE!')
-    s = sp.add_parser('validate', help='validate config files')
-    s.set_defaults(get_module=_validate)
-    s.add_argument('--path', metavar='file',
-                   help='default is current working directory')
-    s = sp.add_parser('modbusserver', help='receive modbus commands')
-    s.set_defaults(get_module=modbusserver)
-    s = sp.add_parser('modbusclient', help='poll/write to modbus devices')
-    s.set_defaults(get_module=modbusclient)
-    s = sp.add_parser('logixclient', help='poll/write to logix devices')
-    s.set_defaults(get_module=logixclient)
-    s = sp.add_parser('snmpclient', help='poll to snmp oids')
-    s.set_defaults(get_module=snmpclient)
+    subparsers = parser.add_subparsers(title='module')
+    for module, func, help, epilog in [
+        ['bus', bus, 'run the message bus', None],
+        ['wwwserver', wwwserver, 'serve web pages', None],
+        ['history', history, 'collect and serve history', None],
+        ['files', files, 'receive and send files', None],
+        ['console', console, 'interactive bus console', None],
+        ['checkout', _checkout, 'create example config files', """
+            To add to systemd `f="pymscada-bus" && cp config/$f.service
+            /lib/systemd/system && systemctl enable $f && systemctl start
+            $f`"""],
+        ['validate', _validate, 'validate config files', None],
+        ['modbusserver', modbusserver, 'receive modbus messages', """
+            Needs `setcap CAP_NET_BIND_SERVICE=+eip /usr/bin/python3.nn` to
+            bind to port 502"""],
+        ['modbusclient', modbusclient, 'poll/write to modbus devices', None],
+        ['ping', ping, 'ping a list of addresses, return time', """
+            Needs `setcap CAP_NET_RAW+ep /usr/bin/python3.nn` to open SOCK_RAW
+            """],
+        ['logixclient', logixclient, 'poll/write to logix devices', None],
+        ['snmpclient', snmpclient, 'poll snmp oids', None],
+    ]:
+        modparser = add_subparser_defaults(subparsers, module, func, help,
+                                           epilog)
+        if module == 'checkout':
+            modparser.add_argument(
+                '--overwrite', action='store_true', default=False,
+                help='checkout may overwrite files, CARE!')
+            modparser.add_argument(
+                '--diff', action='store_true', default=False,
+                help='compare default with existing')
+        elif module == 'validate':
+            modparser.add_argument(
+                '--path', metavar='file',
+                help='default is current working directory')
     return parser.parse_args()
 
 
 async def run():
     """Run bus and wwwserver."""
-    options = args()
+    _version = version("pymscada")
+    logging.warning(f'pymscada {_version} starting')
+    options = args(_version)
     if options.verbose:
         logging.basicConfig(level=logging.INFO)
     if options.config is None:

pymscada-0.1.0a4.dist-info/METADATA

@@ -0,0 +1,88 @@
+Metadata-Version: 2.1
+Name: pymscada
+Version: 0.1.0a4
+Summary: Shared tag value SCADA with python backup and Angular UI
+Author-Email: Jamie Walton <jamie@walton.net.nz>
+License: GPL-3.0-or-later
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: JavaScript
+Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
+Classifier: Operating System :: OS Independent
+Classifier: Environment :: Console
+Classifier: Development Status :: 1 - Planning
+Requires-Python: >=3.9
+Requires-Dist: PyYAML>=6.0.1
+Requires-Dist: aiohttp>=3.8.5
+Requires-Dist: pymscada-html<=0.1.0
+Requires-Dist: cerberus>=1.3.5
+Requires-Dist: pycomm3>=1.2.14
+Requires-Dist: pysnmplib>=5.0.24
+Description-Content-Type: text/markdown
+
+# pymscada
+#### [Docs](https://github.com/jamie0walton/pymscada/blob/main/docs/README.md)
+
+#### [@Github](https://github.com/jamie0walton/pymscada/blob/main/README.md)
+
+## Python Mobile SCADA
+
+```pymscada``` read / write to Modbus and Logix PLCs. Read SNMP OIDs.
+Collect history values and provide the ability to set values and trends
+and issue commands.
+
+User interface is via a web client embedded in this package. Examples included
+for securing with Apache as a proxy.
+
+Configuration with text yaml files, including the web page which are
+procedurally built.
+
+# See also
+
+- The angular project [angmscada](https://github.com/jamie0walton/angmscada)
+- Python container for the compiled angular pages [pymscada-html](https://github.com/jamie0walton/pymscada-html)
+
+# Licence
+
+```pymscada``` is distributed under the GPLv3 [license](./LICENSE).
+
+# Use
+Checkout the example files.
+```bash
+mscada@raspberrypi:~/test $ pymscada checkout
+making 'history' folder
+making pdf dir
+making config dir
+Creating  /home/mscada/test/config/modbusclient.yaml
+Creating  /home/mscada/test/config/pymscada-history.service
+Creating  /home/mscada/test/config/wwwserver.yaml
+Creating  /home/mscada/test/config/pymscada-demo-modbus_plc.service
+Creating  /home/mscada/test/config/files.yaml
+Creating  /home/mscada/test/config/pymscada-modbusserver.service
+Creating  /home/mscada/test/config/pymscada-wwwserver.service
+Creating  /home/mscada/test/config/simulate.yaml
+Creating  /home/mscada/test/config/tags.yaml
+Creating  /home/mscada/test/config/history.yaml
+Creating  /home/mscada/test/config/pymscada-files.service
+Creating  /home/mscada/test/config/bus.yaml
+Creating  /home/mscada/test/config/modbusserver.yaml
+Creating  /home/mscada/test/config/modbus_plc.py
+Creating  /home/mscada/test/config/pymscada-modbusclient.service
+Creating  /home/mscada/test/config/pymscada-bus.service
+Creating  /home/mscada/test/config/README.md
+mscada@raspberrypi:~/test $ pymscada validate
+WARNING:root:pymscada 0.1.0 starting
+Config files in ./ valid.
+``` 
+
+Runs on a Raspberry Pi and includes preconfigured systemd files to
+automate running the services. Mostly works on Windows, works better
+on linux.
+
+Modules can be run from the command line, although you need
+a terminal for each running module (better with systemd).
+```bash
+pymscada bus --config bus.yaml
+pymscada wwwserver --config wwwserver.yaml --tags tags.yaml
+pymscada history --config history.yaml --tags tags.yaml
+python weather.py
+```

{pymscada-0.1.0a1.dist-info → pymscada-0.1.0a4.dist-info}/RECORD

@@ -1,12 +1,12 @@
-pymscada-0.1.0a1.dist-info/METADATA,sha256=R9y7IP2V-N_bLjOnpq3ON5JF36C6ZFG_pi4v5FYNts4,9947
-pymscada-0.1.0a1.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
-pymscada-0.1.0a1.dist-info/entry_points.txt,sha256=AcZZ7HFj8k1ztP6ge-5bdRinYF8glW2s6lFEQG3esN4,57
-pymscada-0.1.0a1.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+pymscada-0.1.0a4.dist-info/METADATA,sha256=wO0mKOshzVvaWM04iMsTSmdS11hvPc1uf7ieZOMg8xQ,3214
+pymscada-0.1.0a4.dist-info/WHEEL,sha256=N2J68yzZqJh3mI_Wg92rwhw0rtJDFpZj9bwQIMJgaVg,90
+pymscada-0.1.0a4.dist-info/entry_points.txt,sha256=AcZZ7HFj8k1ztP6ge-5bdRinYF8glW2s6lFEQG3esN4,57
+pymscada-0.1.0a4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 pymscada/__init__.py,sha256=D_4aEDWkW6xMVQane3CbehBKPxT3FCaDY_QpFwglCe8,653
 pymscada/__main__.py,sha256=WcyVlrYOoDdktJhOoyubTOycMwpayksFdxwelRU5xpQ,272
 pymscada/bus_client.py,sha256=A6EI3OafyOBKd8UVFXS4K39SpmwBoFE-kSIwldVeDKE,8695
 pymscada/bus_server.py,sha256=-Bn4rfdE4OWXE0av459sROnCwAqV0VKFWulF0m1abHE,11255
-pymscada/checkout.py,sha256=c8Fy--Oz4GMXaOO48VmySyI31Y2qjxL-_Tuh7V29JeY,2236
+pymscada/checkout.py,sha256=NcnrfETIknaUIDlpcUrjBN3e2iri-wCVjE_QAGECjxA,3361
 pymscada/config.py,sha256=vwGxieaJBYXiHNQEOYVDFaPuGmnUlCnbNm_W9bugKlc,1851
 pymscada/console.py,sha256=sw1k6eXY53S8qMR-kx8pHOyhXHHt88e4RTcXmC7AQlw,946
 pymscada/demo/README.md,sha256=iNcVbCTkq-d4agLV-979lNRaqf_hbJCn3OFzY-6qfU8,880
@@ -17,7 +17,8 @@ pymscada/demo/history.yaml,sha256=mn_Xf4h_bK6vwZVQ0Iz9BzJpwWok2gEgSKbDgEM8AOQ,46
 pymscada/demo/logixclient.yaml,sha256=G_NlJhBYwT1a9ceHDgO6fCNKFmBM2pVO_t9Xa1NqlRY,912
 pymscada/demo/modbus_plc.py,sha256=3zZHHbyrdxyryEHBeNIw-fpcDGcS1MaJiqEwQDr6zWI,2397
 pymscada/demo/modbusclient.yaml,sha256=geeCsUJZkkEj7jjXR_Yk6R5zA5Ta9IczrHsARz7ZgXY,1099
-pymscada/demo/modbusserver.yaml,sha256=wBeLHiT2V0KLOgXXPdATy20tmlIudJQDiRMJGxBZrPc,941
+pymscada/demo/modbusserver.yaml,sha256=67_mED6jXgtnzlDIky9Cg4j-nXur06iz9ve3JUwSyG8,1133
+pymscada/demo/ping.yaml,sha256=r_VBGTLU5r4cZi9bIGL3M4eNw70KnoBptOUoNrSbnFY,210
 pymscada/demo/pymscada-bus.service,sha256=rRTFwHaS8XWd9YAIB3cET4QvASaIO9emmxFiUAbl14g,257
 pymscada/demo/pymscada-demo-modbus_plc.service,sha256=jmgk_peoxwKVXe-LbyK2VluMS1JMmoTud4JZHi9Tgec,316
 pymscada/demo/pymscada-files.service,sha256=yGTxYnmQ_QBjIzItFatw_uIg_cG11vadLDaR0C9pPEk,322
@@ -25,23 +26,25 @@ pymscada/demo/pymscada-history.service,sha256=kEU_RsrRSmEUE-nR23n2q2yZxjALm_nCrJ
 pymscada/demo/pymscada-io-logixclient.service,sha256=gvnCJgUeqnIgnuN-Wf1XhB0FJxVYyLksmMO7JC0wT-Y,344
 pymscada/demo/pymscada-io-modbusclient.service,sha256=4tenKcrfRi0iMdv8-k2gtMQA4OPTM59zAyKpovwemxM,344
 pymscada/demo/pymscada-io-modbusserver.service,sha256=FqCMD3EJKoiq6EbYnoijRLX5UeUWbZrNzDs50eQj7iE,344
+pymscada/demo/pymscada-io-ping.service,sha256=d1n32srVKGd8qo8JWeBYEEznCRZWRWaBQLOYzdqEXWg,327
 pymscada/demo/pymscada-io-snmpclient.service,sha256=wrA2kDR3bgO30lP_lNJrIsVXNQiXmWKnphoqUj3QTRI,339
 pymscada/demo/pymscada-wwwserver.service,sha256=uDnqzfvAdAnTrqOCqDm1PN7SmeMSuOdmAhorHPJdEVI,366
 pymscada/demo/snmpclient.yaml,sha256=z8iACrFvMftYUtqGrRjPZYZTpn7aOXI-Kp675NAM8cU,2013
-pymscada/demo/tags.yaml,sha256=X6Jz0YvbPrqJixesFURNhtMSWC9hGJ6c4QOtKM6fs8s,4058
-pymscada/demo/wwwserver.yaml,sha256=KDbe3mmslcK1L0ZnuvtOhhuJG-Hyw9OztMz813pChYw,1920
+pymscada/demo/tags.yaml,sha256=GH90X3QRBANUhvd2E9OuyIoiZD25OBihHHlDBw1uzlw,4231
+pymscada/demo/wwwserver.yaml,sha256=jyboShIbwkwgMAcFLkpn88VMvGfoc7a44jNrI_B6OqY,12493
 pymscada/files.py,sha256=kEkiD7j5k69EK4jfMHEp-lbTnulYyrtUjkQDa5xmGPc,1784
 pymscada/history.py,sha256=yAUfjzo4O3w9-hGEAbtvz9UseMTwRVz7NqS832RtvIs,9455
 pymscada/iodrivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pymscada/iodrivers/logix_client.py,sha256=wDhl0pCqs_k7Hd1MtbOuBrEx9emOwDrLJqBNussH1qU,2806
 pymscada/iodrivers/logix_map.py,sha256=ljjBAMJcw199v1V5u0Yfl38U6zbZzba5mdY4I3ZvdIM,5401
-pymscada/iodrivers/modbus_client.py,sha256=Qt0adM8RgnQEWSlISS9JS7zjjOVIggklB8jMuxP-A3U,9566
-pymscada/iodrivers/modbus_map.py,sha256=oFCCkHeGQudSPKhiUnSK3gg2WL_O25wuRCQXEZfpqcA,7172
+pymscada/iodrivers/modbus_client.py,sha256=mo7VRLWi4W2J5Ft3M6Y5jSbK5vbd6wn4R2dncbiL4nU,9529
+pymscada/iodrivers/modbus_map.py,sha256=ihkb6xEXNQa5JDFklajjq4W8I4UHPsdOGe2MyHHwXYw,7172
 pymscada/iodrivers/modbus_server.py,sha256=nnUjd6iCny_Abylk06J8dq4slNAyNPQC2Rw2ZWEElKM,6507
+pymscada/iodrivers/ping_client.py,sha256=dIR4SuKeNCu2FyhUNfTbkv-El3qPFMb0zUG1GJSD-80,4166
+pymscada/iodrivers/ping_map.py,sha256=EbOteqfEYKIOMqPymROJ4now2If-ekEj6jnM5hthoSA,1403
 pymscada/iodrivers/snmp_client.py,sha256=fBBE7SJjfcf9Y9zKRqgGMktnk6RoVMVc5Mj05ffk6ds,2601
-pymscada/iodrivers/snmp_client2.py,sha256=pdn5dYyEv4q-ubA0zQ8X-3tQDYxGC7f7Xexa7QPaL40,1675
 pymscada/iodrivers/snmp_map.py,sha256=rCTniik40Yy6avooIW8PqWanrnUglwBLKReIM7Ab5lA,2369
-pymscada/main.py,sha256=Z0JPf5VWFkpt57_c-9reJrWkVh13BO3Ee-oxTJBG_iU,4823
+pymscada/main.py,sha256=KbKX_NzEAX7uwmx9Ms4vbgq4kvg-Aiw5eMjxS8D3A5M,5998
 pymscada/misc.py,sha256=0Cj6OFhQonyhyk9x0BG5MiS-6EPk_w6zvavt8o_Hlf0,622
 pymscada/pdf/__init__.py,sha256=WsDDgkWnZBJbt2-cJCdc2NvRAv_T4a7WOC1Q0k_l0gI,29
 pymscada/pdf/one.pdf,sha256=eoJ45DrAjVZrwmwdA_EAz1fwmT44eRnt_tkc2pmMrKY,1488
@@ -50,7 +53,8 @@ pymscada/periodic.py,sha256=MLlL93VLvFqBBgjO1Us1t0aLHTZ5BFdW0B__G02T1nQ,1235
 pymscada/protocol_constants.py,sha256=ndFeuzhWjKTr_ahvmGJc6Cs5pYkHM8CRgNNDe0Tqecs,1997
 pymscada/samplers.py,sha256=t0IscgsCm5YByioOZ6aOKMO_guDFS_wxnJSiOGKI4Nw,2583
 pymscada/tag.py,sha256=Q2EgacTnsxnGLM_zoHYsVWdwmd1faqfbxw9byI5fCgY,9463
+pymscada/tools/snmp_client2.py,sha256=pdn5dYyEv4q-ubA0zQ8X-3tQDYxGC7f7Xexa7QPaL40,1675
 pymscada/tools/walk.py,sha256=OgpprUbKLhEWMvJGfU1ckUt_PFEpwZVOD8HucCgzmOc,1625
 pymscada/validate.py,sha256=VPpAVEwfgori5OREEwWlbPoPxz5Tfqr6dw-O5pINHyI,13125
 pymscada/www_server.py,sha256=BW6-ctE5BgyFDiyUJsOpe3c06DRp8k83MCGjwPh5fco,11473
-pymscada-0.1.0a1.dist-info/RECORD,,
+pymscada-0.1.0a4.dist-info/RECORD,,