added rfkill support

Updated HACKING.md and added license disclaimer to all python files.
And tidied up scripts.py
This commit is contained in:
Pranav Jerry 2021-07-25 14:06:17 +05:30
parent c8e98b2c4f
commit 9c6081ea87
No known key found for this signature in database
GPG Key ID: F1DCDC4FED0A0C5B
4 changed files with 80 additions and 31 deletions

View File

@ -12,11 +12,7 @@ relevant label.
## Contribute code ## Contribute code
To push to this repo, you need your username to be in the To push to this repo, you need your username to be in the
contributors list. contributors list. See issue #8.
To add you as a contributor, email any of the authors with
your username:
- `echo yvoervangbe cyhf akyarg ng qvfebbg qbg bet | tr 'A-Za-z' 'N-ZA-Mn-za-m' | sed 's/plus/+/' | sed 's/ at /@/' | sed 's/dot/./' | tr -d ' '`
## Packaging ## Packaging

View File

@ -1,3 +1,19 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# Copyright (C) 2021 The naxalnet Authors
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = "0.1.0a" __version__ = "0.1.0a"

View File

@ -1,5 +1,21 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# Copyright (C) 2021 The naxalnet Authors
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
from naxalnet.scripts import here_be_dragons from naxalnet.scripts import here_be_dragons
if __name__ == "__main__": if __name__ == "__main__":

View File

@ -23,8 +23,6 @@ with systemd-networkd and iwd
import sys import sys
from pathlib import Path from pathlib import Path
from shutil import copy from shutil import copy
# from dasbus.connection import SystemMessageBus
from dasbus.error import DBusError from dasbus.error import DBusError
from naxalnet.iwd import IWD, Device, Adapter from naxalnet.iwd import IWD, Device, Adapter
@ -35,13 +33,14 @@ AP_SSID = "NaxalNet"
AP_PASSWD = "naxalnet256" AP_PASSWD = "naxalnet256"
def here_be_dragons(): def copy_files():
# Copy networkd configs to volatile dir. """
# The D-Bus API does not support creating new interfaces Copy networkd configs to volatile dir.
# or linking to bridges. So we use config files. The D-Bus API does not support creating new interfaces
# See man:systemd.network(5) or linking to bridges. So we use config files.
See man:systemd.network(5)
"""
try:
print("Copying network config files") print("Copying network config files")
dest = Path(NETWORKD_VOLATILE_DIR) dest = Path(NETWORKD_VOLATILE_DIR)
src = Path(NETWORKD_CONFIGS) src = Path(NETWORKD_CONFIGS)
@ -52,6 +51,15 @@ def here_be_dragons():
# Copy all files in src to dest # Copy all files in src to dest
for i in src.iterdir(): for i in src.iterdir():
copy(i, dest) copy(i, dest)
def here_be_dragons():
"""
This function is run every time you
execute naxalnet from commandline
"""
try:
copy_files()
except PermissionError as error: except PermissionError as error:
print(error) print(error)
sys.exit("Make sure you are root") sys.exit("Make sure you are root")
@ -64,11 +72,11 @@ def here_be_dragons():
ap_devices = [] ap_devices = []
for i in devices: for i in devices:
d = Device(i) device = Device(i)
a = Adapter(d.adapter) adapter = Adapter(device.adapter)
if a.supports_mode("ad-hoc"): if adapter.supports_mode("ad-hoc"):
adhoc_devices.append(i) adhoc_devices.append(i)
if a.supports_mode("ap"): if adapter.supports_mode("ap"):
ap_devices.append(i) ap_devices.append(i)
if len(adhoc_devices) != 0: if len(adhoc_devices) != 0:
@ -76,19 +84,32 @@ def here_be_dragons():
adhoc_device = Device(adhoc_devices.pop()) adhoc_device = Device(adhoc_devices.pop())
# The same device is likely to have ap support too. # The same device is likely to have ap support too.
# But we can't start ad-hoc and ap on the same interface. # But we can't start ad-hoc and ap on the same interface.
# Remove dev1 from ap_devices if it exists there # Remove adhoc_device from ap_devices if it exists there
if adhoc_device.name in ap_devices: if adhoc_device.name in ap_devices:
ap_devices.remove(adhoc_device.name) ap_devices.remove(adhoc_device.name)
print("Working on ad-hoc") print("Working on ad-hoc")
# Turn on adapter if it is off
# See issue #9
adhoc_adapter = Adapter(adhoc_device.adapter)
if not adhoc_adapter.is_powered_on():
adhoc_adapter.power_on()
adhoc_device.reload()
adhoc_device.start_adhoc_open(ADHOC_SSID) adhoc_device.start_adhoc_open(ADHOC_SSID)
# Start Access point if ap_device is not empty, # Start Access point if ap_device is not empty,
# ie, we have more devices # ie, we have more devices
if len(ap_devices) != 0: if len(ap_devices) != 0:
print("Working on AP") print("Working on AP")
ap_device = Device(ap_devices.pop()) ap_device = Device(ap_devices.pop())
# Turn on adapter if it is off
# See issue #9
ap_adapter = Adapter(ap_device.adapter)
if not ap_adapter.is_powered_on():
ap_adapter.power_on()
ap_adapter.reload()
ap_device.start_ap(AP_SSID, AP_PASSWD) ap_device.start_ap(AP_SSID, AP_PASSWD)
except DBusError as error: except DBusError as error:
print(error) print(error)
sys.exit("An error occured while communicating with iwd") sys.exit("An error occured while communicating with iwd")
# naxalnet will print Bye if no errors occured
print("Bye") print("Bye")