Merge pull request #13 from dimrozakis/ping

Change ping parser implementation

requirements.txt

@@ -1,3 +1,4 @@
 django
 netaddr
-ipython
+ipython==5
+https://github.com/ssteinerx/pingparser/archive/master.zip

scripts/install.sh

@@ -39,7 +39,7 @@ apt-get install -yq --no-install-recommends \
     python python-pip openvpn uwsgi uwsgi-plugin-python
 
 pip install -U pip
-pip install -U django netaddr ipython
+pip install -r $DIR/vpn-proxy/requirements.txt
 
 echo "VPN_SERVER_REMOTE_ADDRESS = \"$VPN_IP\"" > $DIR/vpn-proxy/conf.d/0000-vpn-ip.py
 SOURCE_CIDRS=`echo "$SOURCE_CIDRS" | sed 's/ /", "/g'`

vpn-proxy/app/views.py

@@ -88,7 +88,15 @@ def ping(request, tunnel_id, target):
         hostname = tunnel.client
     else:
         hostname = target
-    cmd = ['ping', '-c', '10', '-i', '0.4', '-W', '1', '-q', '-I',
+    pkts = 10
+    if request.GET.get('pkts'):
+        try:
+            pkts = int(request.GET['pkts'])
+        except (ValueError, TypeError) as exc:
+            log.warning("Couldn't cast pkts param (%s) to int: %r",
+                        request.GET['pkts'], exc)
+
+    cmd = ['ping', '-c', str(pkts), '-i', '0.4', '-W', '1', '-q', '-I',
            str(tunnel.name), str(hostname)]
     ping_output = subprocess.Popen(cmd, stdout=subprocess.PIPE)
     ping_parsed = pingparser.parse(ping_output.stdout.read())