~martijnbraam/ofonoctl

44c369c26476da87a0ba4334c4358b3f1214c871 — Martijn Braam 2 years ago e7fef73 master
Fixed duplicate ip errors
2 files changed, 15 insertions(+), 1 deletions(-)

M ofonoctl/__init__.py
M setup.py
M ofonoctl/__init__.py => ofonoctl/__init__.py +14 -0
@@ 191,12 191,20 @@ def action_wan(connect=False, resolv=False):
        print("Could not fetch contexts on the modem")
        exit(1)

    has_flushed = False

    result = []
    for path, properties in contexts:
        settings4 = properties['Settings']
        settings6 = properties['IPv6.Settings']
        if "Method" in settings4:
            s = settings4

            if connect and not has_flushed:
                cmd = ['ip', 'addr', 'flush', 'dev', s['Interface']]
                subprocess.check_output(cmd)
                has_flushed = True

            address = s["Address"] if s["Method"] == "static" else ""
            gateway = s["Gateway"] if s["Method"] == "static" else ""
            dns = ", ".join(s["DomainNameServers"]) if s["Method"] == "static" else ""


@@ 214,6 222,12 @@ def action_wan(connect=False, resolv=False):

        if "Method" in settings6:
            s = settings6

            if connect and not has_flushed:
                cmd = ['ip', 'addr', 'flush', 'dev', s['Interface']]
                subprocess.check_output(cmd)
                has_flushed = True

            address = s["Address"] if s["Method"] == "static" else ""
            gateway = s["Gateway"] if s["Method"] == "static" else ""
            dns = ", ".join(s["DomainNameServers"]) if s["Method"] == "static" else ""

M setup.py => setup.py +1 -1
@@ 2,7 2,7 @@ from setuptools import setup

setup(
    name='ofonoctl',
    version='0.4.0',
    version='0.4.1',
    packages=['ofonoctl'],
    url='https://git.sr.ht/~martijnbraam/ofonoctl',
    license='MIT',