Merge branch 'develop'

.travis.yml

@@ -8,7 +8,6 @@ sudo: required
 install:
   - sudo apt-get -qq update
   - sudo ./install.sh local
-  - python setup.py install
 before_script:
   - export PYTHONPATH=$(pwd)
 script: pytest

Dockerfile

@@ -1,34 +1,16 @@
 FROM debian:jessie
 
-RUN apt-get update \
-    && apt-get install -y curl \
-    && curl -s https://packagecloud.io/install/repositories/rolandoislas/drc-sim/script.deb.sh | bash
-RUN apt-get update \
-    && apt-get install -y \
-    wpasupplicant-drc \
-    python3 \
-    python3-dev \
-    python3-pip \
-    libffi-dev \
-    zlib1g-dev \
-    libjpeg-dev \
-    net-tools \
-    wireless-tools \
-    sysvinit-utils \
-    psmisc \
-    libavcodec-dev \
-    libswscale-dev \
-    rfkill \
-    isc-dhcp-client \
-    ifmetric
-
-ADD drc*.py /root/
+ADD drc-sim-backend /root/
 ADD setup.py /root/
 ADD src/ /root/src/
 ADD resources/ /root/resources/
 ADD MANIFEST.in /root/
-RUN cd /root/ && python3 setup.py install
+ADD install.sh /root/
+
+RUN apt-get update \
+    && cd /root/ \
+    && ./install.sh local
 
 ENV TERM xterm
-ENTRYPOINT ["drc-sim-backend.py", "--cli"]
+ENTRYPOINT ["drc-sim-backend", "--cli"]
 CMD ["-h"]

drc-info.py

@@ -6,19 +6,24 @@
 import time
 from threading import Thread
 
-from src.server.data import constants
 from src.server.data.struct import input, command
 
+PORT_WII_MSG = 50010
+PORT_WII_VID = 50020
+PORT_WII_AUD = 50021
+PORT_WII_HID = 50022
+PORT_WII_CMD = 50023
+
 sock_cmd = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-sock_cmd.bind(("192.168.1.10", constants.PORT_WII_CMD))
+sock_cmd.bind(("192.168.1.10", PORT_WII_CMD))
 sock_msg = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-sock_msg.bind(("192.168.1.10", constants.PORT_WII_MSG))
+sock_msg.bind(("192.168.1.10", PORT_WII_MSG))
 sock_hid = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-sock_hid.bind(("192.168.1.10", constants.PORT_WII_HID))
+sock_hid.bind(("192.168.1.10", PORT_WII_HID))
 sock_vid = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-sock_vid.bind(("192.168.1.10", constants.PORT_WII_VID))
+sock_vid.bind(("192.168.1.10", PORT_WII_VID))
 sock_aud = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-sock_aud.bind(("192.168.1.10", constants.PORT_WII_AUD))
+sock_aud.bind(("192.168.1.10", PORT_WII_AUD))
 
 json_dump = {}
 
@@ -34,9 +39,9 @@ def print_packet_cmd(sock):
     header = command.header.parse(data)
     if header.packet_type != 2:  # Only accept response packets
         return
-    size = 8
+    size = 8  # header size
     if header.cmd_id == 1:
-        data_string = codecs.encode(data[size + command.header_cmd1.sizeof():], "hex").decode()
+        data_string = codecs.encode(data[size:], "hex").decode()
         print("cmd 1: %s" % data_string)
         json_dump["1"] = data_string
     elif header.cmd_id == 0:
@@ -50,7 +55,7 @@ def print_packet_cmd(sock):
 
 
 def send_cmd(data):
-    sock_cmd.sendto(data, ("192.168.1.11", constants.PORT_WII_CMD + 100))
+    sock_cmd.sendto(data, ("192.168.1.11", PORT_WII_CMD + 100))
 
 
 def send_command_from_string(command_string, sid):

drc-sim-backend.py → drc-sim-backend

@@ -1,12 +1,16 @@
+#!/usr/bin/env python3
+import os
+import sys
+
 from src.server.data import constants
-from src.server.data.config_server import ConfigServer
-from src.server.util.logging.logger_wpa import LoggerWpa
 from src.server.data.args import Args
+from src.server.data.config_general import ConfigGeneral
 from src.server.ui.cli.cli_main import CliMain
 from src.server.util.logging.logger import Logger
 from src.server.util.logging.logger_backend import LoggerBackend
 from src.server.util.logging.logger_cli import LoggerCli
 from src.server.util.logging.logger_gui import LoggerGui
+from src.server.util.logging.logger_wpa import LoggerWpa
 from src.server.util.os_util import OsUtil
 
 
@@ -68,15 +72,28 @@ def log_level():
         LoggerWpa.warn("At this log level SSIDs are logged!")
 
 
+def check_root():
+    """
+    Exit if not root
+    :return: 
+    """
+    if os.getuid() != 0:
+        Logger.throw("Not running as root!")
+        sys.exit()
+    else:
+        Logger.extra("I am root!")
+
+
 def main():
     """
     Main entry point. Parses arguments, loads configuration files, initialized loggers and starts the main loop.
     :return: None
     """
     Args.parse_args()
-    ConfigServer.load()
-    ConfigServer.save()
+    ConfigGeneral.load()
+    ConfigGeneral.save()
     init_loggers()
+    check_root()
     Logger.info("Initializing drc-sim-backend version %s", constants.VERSION)
     Logger.info("Using \"%s\" as home folder.", constants.PATH_ROOT)
     log_level()