Home Explore Help
Sign In
Superglue
/
serverfiles
2
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

fixes in connectivity block

Danja Vasiliev 10 years ago
parent
7f7c962b15
commit
6b83813d9c
14 changed files with 95 additions and 150 deletions
Unified View Show Diff Stats
  1. 1 1
      openwrt/common/etc/config/network
  2. 3 3
      openwrt/common/etc/config/wireless
  3. 36 16
      openwrt/common/opt/lib/admin/admin2.cgi
  4. 6 0
      openwrt/common/opt/lib/resources/admin/admin.css
  5. 41 26
      openwrt/common/opt/lib/resources/admin/admin.js
  6. 0 92
      openwrt/common/opt/lib/resources/fonts/Titillium_Web/OFL.txt
  7. BIN
      openwrt/common/opt/lib/resources/img/defaultImage.png
  8. BIN
      openwrt/common/opt/lib/resources/img/favicon.ico
  9. 0 10
      openwrt/common/root/sgproxy.sh
  10. 0 1
      openwrt/common/usr/bin/dropbear
  11. 0 1
      openwrt/common/usr/sbin/dropbear
  12. BIN
      openwrt/common/usr/sbin/dropbear-2013.59
  13. BIN
      openwrt/common/usr/sbin/dropbear-2014.63
  14. 8 0
      openwrt/tools/make_fw.sh

+ 1 - 1
openwrt/common/etc/config/network
View File 

@@ -12,7 +12,7 @@ config interface 'lan'
 
 	option force_link '1'
 
 	option force_link '1'
 
 	option type 'bridge'
 
 	option type 'bridge'
 
 	option proto 'static'
 
 	option proto 'static'
 
-	option ipaddr '192.168.1.1'
 
+	option ipaddr '192.168.56.1'
 
 	option netmask '255.255.255.0'
 
 	option netmask '255.255.255.0'
 
 
 
 config interface 'wan'
 
 config interface 'wan'

+ 3 - 3
openwrt/common/etc/config/wireless
View File 

@@ -3,9 +3,9 @@ config wifi-device 'radio0'
 
 	option channel 'auto'
 
 	option channel 'auto'
 
 	option hwmode '11gn'
 
 	option hwmode '11gn'
 
 	option path 'platform/ar933x_wmac'
 
 	option path 'platform/ar933x_wmac'
 
-	option noscan '1'
 
+	## option noscan '1'
 
 	option htmode 'HT20'
 
 	option htmode 'HT20'
 
-	option country 'US' ## US regdom is 
+	option country 'DE'
 
 
 
 config wifi-iface
 
 config wifi-iface
 
 	option device 'radio0'
 
 	option device 'radio0'
 
@@ -20,7 +20,7 @@ config wifi-iface
 
 	option network 'wan'
 
 	option network 'wan'
 
 	option disabled '1'
 
 	option disabled '1'
 
 	option mode 'sta'
 
 	option mode 'sta'
 
-	option encryption 'psk2'
 
+	option encryption ''
 
 	option ssid ''
 
 	option ssid ''
 
 	option key ''
 
 	option key ''

+ 36 - 16
openwrt/common/opt/lib/admin/admin2.cgi
View File 

@@ -134,13 +134,19 @@ wanSet() {
 
     ##     option proto 'dhcp' (and no 'option ifname' specified!)
 
     ##     option proto 'dhcp' (and no 'option ifname' specified!)
 
 
 
     logThis "wan.ifname=$POST_wanifname"
 
     logThis "wan.ifname=$POST_wanifname"
 
-    if [[ $POST_wanifname == 'eth0' ]]; then
 
+    if [[ $POST_wanifname =~ 'eth' ]]; then
 
       doUci set wanifname $POST_wanifname
 
       doUci set wanifname $POST_wanifname
 
       doUci set wanwifacedis '1'
 
       doUci set wanwifacedis '1'
 
-    elif [[ $POST_wanifname == 'wlan1' ]]; then
 
+    elif [[ $POST_wanifname =~ 'wlan' ]]; then
 
       doUci set wanifname ''
 
       doUci set wanifname ''
 
       doUci set wanwifacedis ''
 
       doUci set wanwifacedis ''
 
     fi
 
     fi
 
+    ## case of dir505
 
+    if [[ $POST_wanifname == 'eth1' ]]; then
 
+      doUci set lanifname ''
 
+    elif [[ $POST_wanifname == 'wlan0' ]]; then
 
+      doUci set lanifname 'eth1'
 
+    fi
 
     if [[ $POST_wanproto == 'dhcp' ]]; then
 
     if [[ $POST_wanproto == 'dhcp' ]]; then
 
       doUci set wanproto dhcp
 
       doUci set wanproto dhcp
 
       doUci set wanipaddr ''
 
       doUci set wanipaddr ''
 
@@ -159,7 +165,7 @@ wanSet() {
 
       doUci set wandns $POST_wandns
 
       doUci set wandns $POST_wandns
 
     fi
 
     fi
 
 
 
-    if [[ $POST_wanifname == 'wlan1' ]]; then
 
+    if [[ $POST_wanifname =~ 'wlan' ]]; then
 
       ssidChange || showMesg 'wanSet: Wireless configuration failed'
 
       ssidChange || showMesg 'wanSet: Wireless configuration failed'
 
     else
 
     else
 
       doUci commit network &&
 
       doUci commit network &&
 
@@ -177,11 +183,18 @@ ssidChange() {
 
   ## check for iface
 
   ## check for iface
 
   [[ $POST_iface =~ ^('wan'|'lan')$ ]] || showMesg 'Error changing wireless settings' '5' 'unknown or unconfigured interface'
 
   [[ $POST_iface =~ ^('wan'|'lan')$ ]] || showMesg 'Error changing wireless settings' '5' 'unknown or unconfigured interface'
 
   logThis "$POST_iface is being set"
 
   logThis "$POST_iface is being set"
 
+  setQueryVars
 
 
 
   _p=$POST_iface
 
   _p=$POST_iface
 
 
 
   ## default enc for now
 
   ## default enc for now
 
-  local _enc='psk2'
 
+  local _enc='none'
 
+  if [[ $POST_wanenc == 'wpa2' ]]; then
 
+    _enc='psk2'
 
+  elif [[ $POST_wanenc == 'wpa1' ]]; then
 
+    _enc='psk'
 
+  fi
 
+
 
   if [[ $POST_iface == 'wan' ]]; then
 
   if [[ $POST_iface == 'wan' ]]; then
 
     local _mode='sta'
 
     local _mode='sta'
 
     local _ssid="${POST_wanssid}"
 
     local _ssid="${POST_wanssid}"
 
@@ -214,7 +227,7 @@ ssidChange() {
 
       lanAddr
 
       lanAddr
 
     fi
 
     fi
 
   fi
 
   fi
 
-
 
+  doUci commit network
 
   doUci commit wireless
 
   doUci commit wireless
 
   _ERR=$?
 
   _ERR=$?
 
 
 
@@ -424,6 +437,7 @@ doUci() {
 
     wanssid) _ARG='wireless.@wifi-iface[1].ssid';;
 
     wanssid) _ARG='wireless.@wifi-iface[1].ssid';;
 
     wanenc) _ARG='wireless.@wifi-iface[1].encryption';;
 
     wanenc) _ARG='wireless.@wifi-iface[1].encryption';;
 
     wankey) _ARG='wireless.@wifi-iface[1].key';;
 
     wankey) _ARG='wireless.@wifi-iface[1].key';;
 
+    lanifname) _ARG='network.lan.ifname';;
 
     lanipaddr) _ARG='network.lan.ipaddr';;
 
     lanipaddr) _ARG='network.lan.ipaddr';;
 
     wanifname) _ARG='network.wan.ifname';;
 
     wanifname) _ARG='network.wan.ifname';;
 
     wanproto) _ARG='network.wan.proto';;
 
     wanproto) _ARG='network.wan.proto';;
 
@@ -475,8 +489,7 @@ doUci() {
 
 ## ie: htmlhead "<meta http-equiv='refresh' content='2;URL=http://${HTTP_REFERER}'>"
 
 ## ie: htmlhead "<meta http-equiv='refresh' content='2;URL=http://${HTTP_REFERER}'>"
 
 
 
 htmlHead() {
 
 htmlHead() {
 
-_echo "<!-- obnoxious code below, keep your ports tight -->
 
+_echo "<!doctype html>
 
-<!doctype html>
 
 <html>
 
 <html>
 
 <head>
 
 <head>
 
 <meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
 
 <meta http-equiv='Content-Type' content='text/html; charset=UTF-8' />
 
@@ -521,12 +534,10 @@ if [[ "${REQUEST_METHOD^^}" == "POST" ]]; then
 
   esac
 
   esac
 
 fi
 
 fi
 
 
 
-## if URL is not (just) /admin
 
+## all other requests redirect to /admin/
 
-#if [[ "${REQUEST_METHOD^^}" == "GET" ]]; then
 
+if [[ "${REQUEST_URI/\/admin\//}" ]]; then
 
-  if [[ "${REQUEST_URI/\/admin\//}" ]]; then
 
+ headerPrint '301' '/admin/' 
-   headerPrint '301' '/admin/' 
+fi
 
-  fi
 
-#fi
 
 
 
 headerPrint '200'
 
 headerPrint '200'
 
 htmlHead
 
 htmlHead
 
@@ -542,6 +553,14 @@ IFS=','
 
 wan=( $(ifaceStat wan) )
 
 wan=( $(ifaceStat wan) )
 
 IFS=$_IFS
 
 IFS=$_IFS
 
 
 
+eth='eth0'
 
+wlan='wlan1'
 
+
 
+if [[ ${devmod} =~ 'DIR-505' ]]; then
 
+  eth='eth1'
 
+  wlan='wlan0'
 
+fi
 
+
 
 sgvpn=$(doUci get sgopenvpnenable)
 
 sgvpn=$(doUci get sgopenvpnenable)
 
 ddomain=$(doUci get sgddnsdomain)
 
 ddomain=$(doUci get sgddnsdomain)
 
 dsubdomain=$(doUci get sgddnssubdomain)
 
 dsubdomain=$(doUci get sgddnssubdomain)
 
@@ -570,8 +589,8 @@ wankey=$(doUci get wankey)
 
   <div style='display:inline-flex'>
 
   <div style='display:inline-flex'>
 
   <div style='display:inline-block;'>
 
   <div style='display:inline-block;'>
 
   <select name='wanifname' id='wanifname' style='display:block'>
 
   <select name='wanifname' id='wanifname' style='display:block'>
 
-  <option value='eth0' id='eth' <% ( [[ $wanifname =~ ('eth') ]] && _echo 'selected' ) %> >Wired (WAN port)</option>
 
+  <option value='<% _echo $eth %>' id='eth' <% ( [[ $wanifname =~ ('eth') ]] && _echo 'selected' ) %>>Wired (WAN port)</option>
 
-  <option value='wlan1' id='wlan' <% ( [[ $wanifname =~ ('wlan') ]] && _echo 'selected' ) %> >Wireless (WiFi)</option>
 
+  <option value='<% _echo $wlan %>' id='wlan' <% ( [[ $wanifname =~ ('wlan') ]] && _echo 'selected' ) %>>Wireless (WiFi)</option>
 
   </select>
 
   </select>
 
   <fieldset id='wanwifi' <% ( [[ $wanifname =~ ('wlan') ]] && _echo "class='show elem'" || _echo "class='hide elem'" ) %>>
 
   <fieldset id='wanwifi' <% ( [[ $wanifname =~ ('wlan') ]] && _echo "class='show elem'" || _echo "class='hide elem'" ) %>>
 
     
     
@@ -582,7 +601,8 @@ wankey=$(doUci get wankey)
 
     _echo "<option id=$wanssid selected>$wanssid</option>"
 
     _echo "<option id=$wanssid selected>$wanssid</option>"
 
   fi %>
 
   fi %>
 
   </select>
 
   </select>
 
-  <input type='password' name='wankey' placeholder='passphrase' value='<% _echo $wankey %>'>
 
+  <input type='hidden' id='wanenc' name='wanenc' class='elem' value='none'>
 
+  <input type='password' name='wankey' placeholder='wpa passphrase' value='<% _echo $wankey %>'>
 
 
 
   </fieldset>
 
   </fieldset>

+ 6 - 0
openwrt/common/opt/lib/resources/admin/admin.css
View File 

@@ -44,8 +44,14 @@ select {
 
   background-size: 12px;
 
   background-size: 12px;
 
   background-position: 180px;
 
   background-position: 180px;
 
   cursor: pointer;
 
   cursor: pointer;
 
+/*  height: 100%; */
 
 }
 
 }
 
 
 
+select option {
 
+/*  height: 50px; */
 
+}
 
+
 
+
 
 input {
 
 input {
 
   text-indent: 4px;
 
   text-indent: 4px;
 
   background: #fcfcfc;
 
   background: #fcfcfc;

+ 41 - 26
openwrt/common/opt/lib/resources/admin/admin.js
View File 

@@ -1,6 +1,6 @@
 
 document.addEventListener('DOMContentLoaded', function() {
 
 document.addEventListener('DOMContentLoaded', function() {
 
 
 
-/* make wanted 'elem' class elements to array or vars */
 
+/* add class='elem' elements to array 'el' */
 
 var el = [];
 
 var el = [];
 
 (function() {
 
 (function() {
 
   x = document.getElementsByClassName('elem');
 
   x = document.getElementsByClassName('elem');
 
@@ -11,15 +11,6 @@ var el = [];
 
   }
 
   }
 
 })();
 
 })();
 
 
 
-/*
 
-var uploadbtn = document.getElementById('uploadbtn');
 
-var uploadfile = document.getElementById('uploadfile');
 
-var wanconf = document.getElementById('wanconf');
 
-var wanssid = document.getElementById('wanssid');
 
-var wanwifi = document.getElementById('wanwifi');
 
-var wanaddr = document.getElementById('wanaddr');
 
-*/
 
-
 
 el['uploadbtn'].addEventListener('change', function (e) {
 
 el['uploadbtn'].addEventListener('change', function (e) {
 
   el['uploadfile'].value = this.value.replace(/^.*\\/, "");
 
   el['uploadfile'].value = this.value.replace(/^.*\\/, "");
 
   var len = el['uploadfile'].value.length - 7;
 
   var len = el['uploadfile'].value.length - 7;
 
@@ -41,16 +32,23 @@ for (var i=0; i < submitbtns.length; i++){
 
 }
 
 }
 
 
 
 el['wanconf'].addEventListener('change', function(e) { 
 el['wanconf'].addEventListener('change', function(e) { 
-  wanChange(e.target)
 
+  wanChange(e.target);
 
+  e.stopPropagation();
 
+});
 
+
 
+el['wanssid'].addEventListener('change', function(e) { 
+  if (enc = document.getElementById(e.target.value).getAttribute('data-enc')) {
 
+    el['wanenc'].value = enc;
 
+  }
 
   e.stopPropagation();
 
   e.stopPropagation();
 
 });
 
 });
 
 
 
 el['wanssid'].addEventListener('focus', function(e) {
 
 el['wanssid'].addEventListener('focus', function(e) {
 
   if (e.target.length == 1) {
 
   if (e.target.length == 1) {
 
     iwScan(e.target);
 
     iwScan(e.target);
 
-    e.target.blur();
 
+    // e.target.blur();
 
-    getFirstchild(e.target).blur();
 
+    //getFirstchild(e.target).blur();
 
-    getFirstchild(e.target).style.display = 'none';
 
+    //getFirstchild(e.target).style.display = 'none';
 
   } else {
 
   } else {
 
     iwScan(e.target);
 
     iwScan(e.target);
 
   }
 
   }
 
@@ -62,7 +60,7 @@ function wanChange(e) {
 
   switch (e[e.selectedIndex].id) {
 
   switch (e[e.selectedIndex].id) {
 
     case 'wlan':
 
     case 'wlan':
 
       el['wanwifi'].setAttribute('class','show');
 
       el['wanwifi'].setAttribute('class','show');
 
-      //iwScan(el['wanssid']);
 
+      iwScan(el['wanssid']);
 
       break;
 
       break;
 
     case 'dhcp':
 
     case 'dhcp':
 
     //  wanaddr.setAttribute('class','hide');
 
     //  wanaddr.setAttribute('class','hide');
 
@@ -93,26 +91,43 @@ function iwScan(e) {
 
     e.insertBefore(scan_el, e.firstChild);
 
     e.insertBefore(scan_el, e.firstChild);
 
   } else scan_el = document.getElementById('scan');
 
   } else scan_el = document.getElementById('scan');
 
   scan_el.textContent = 'scanning for networks..';
 
   scan_el.textContent = 'scanning for networks..';
 
-  scan_el.selected = 1;
 
+  scan_el.selected = true;
 
   ajaxReq('POST', '/admin/iwscan', 'null', function(xhr) {
 
   ajaxReq('POST', '/admin/iwscan', 'null', function(xhr) {
 
     res = JSON.parse(xhr['response']);
 
     res = JSON.parse(xhr['response']);
 
     aps = res['results'].sort(compSort); /* get APs */
 
     aps = res['results'].sort(compSort); /* get APs */
 
     aps_num = Object.keys(aps).length;
 
     aps_num = Object.keys(aps).length;
 
+    function updateAp() {
 
+      ap.setAttribute('data-bssid',  aps[i]['bssid']);
 
+      ap.setAttribute('data-quality',  aps[i]['quality']);
 
+      if (aps[i]['encryption']['enabled']) {
 
+        // WPA[1,2] present
 
+        if (aps[i]['encryption']['wpa']) {
 
+          // choose last (highest) WPA version
 
+          wpa = aps[i]['encryption']['wpa'][aps[i]['encryption']['wpa'].length - 1];
 
+          //console.log(ap.id + ':' + 'wpa' + wpa);
 
+          ap.setAttribute('data-enc', 'wpa' + wpa);
 
+        // assume WEP
 
+        } else {
 
+          ap.setAttribute('data-enc', 'wep');
 
+        }
 
+      // Open AP
 
+      } else {
 
+        ap.setAttribute('data-enc', 'none');
 
+      }
 
+    }
 
     for (i = 0; i < aps_num; i++) {
 
     for (i = 0; i < aps_num; i++) {
 
       // check if AP is already in the DOM
 
       // check if AP is already in the DOM
 
       if (document.getElementById(aps[i]['ssid'])) {
 
       if (document.getElementById(aps[i]['ssid'])) {
 
         //console.log('found ' + aps[i]['ssid'] + ' entry');
 
         //console.log('found ' + aps[i]['ssid'] + ' entry');
 
-        /* TODO: update existing records */
 
+        /* TODO: remove duplicate code */
 
+        ap = document.getElementById(aps[i]['ssid']);
 
+        //console.log('update: ');
 
+        updateAp();
 
       } else {
 
       } else {
 
         ap = document.createElement('option');
 
         ap = document.createElement('option');
 
         ap.id = aps[i]['ssid'];
 
         ap.id = aps[i]['ssid'];
 
-        ap.setAttribute('data-bssid',  aps[i]['bssid']);
 
+        //console.log('add: ');
 
-        ap.setAttribute('data-quality',  aps[i]['quality']);
 
+        updateAp();
 
-        if (aps[i]['encryption']['enabled']) {
 
-          ap.setAttribute('data-enc', 'wpa2');
 
-        } else {
 
-          ap.setAttribute('data-enc', 'false');
 
-        }
 
         ap.textContent = aps[i]['ssid'] ? aps[i]['ssid'] : '[hidden network]';
 
         ap.textContent = aps[i]['ssid'] ? aps[i]['ssid'] : '[hidden network]';
 
         e.appendChild(ap);
 
         e.appendChild(ap);
 
       }
 
       }
 
@@ -123,10 +138,10 @@ function iwScan(e) {
 
       console.log('no scan results');
 
       console.log('no scan results');
 
     }
 
     }
 
   });
 
   });
 
-  e.blur();
 
+  // e.blur();
 
   // just focusing someother element 
   // just focusing someother element 
   // document.getElementById('wansubmit').focus();
 
   // document.getElementById('wansubmit').focus();
 
-  return
 
+  return false;
 
 }
 
 }
 
 
 
 /* v simple XHR */
 
 /* v simple XHR */

+ 0 - 92
openwrt/common/opt/lib/resources/fonts/Titillium_Web/OFL.txt
View File 

@@ -1,92 +0,0 @@
 
-Copyright (c) 2009-2011 by Accademia di Belle Arti di Urbino and students of MA course of Visual design. Some rights reserved.

-This Font Software is licensed under the SIL Open Font License, Version 1.1.

-This license is copied below, and is also available with a FAQ at:

-http://scripts.sil.org/OFL

-

-

------------------------------------------------------------

-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007

------------------------------------------------------------

-

-PREAMBLE

-The goals of the Open Font License (OFL) are to stimulate worldwide

-development of collaborative font projects, to support the font creation

-efforts of academic and linguistic communities, and to provide a free and

-open framework in which fonts may be shared and improved in partnership

-with others.

-

-The OFL allows the licensed fonts to be used, studied, modified and

-redistributed freely as long as they are not sold by themselves. The

-fonts, including any derivative works, can be bundled, embedded, 

-redistributed and/or sold with any software provided that any reserved

-names are not used by derivative works. The fonts and derivatives,

-however, cannot be released under any other type of license. The

-requirement for fonts to remain under this license does not apply

-to any document created using the fonts or their derivatives.

-

-DEFINITIONS

-"Font Software" refers to the set of files released by the Copyright

-Holder(s) under this license and clearly marked as such. This may

-include source files, build scripts and documentation.

-

-"Reserved Font Name" refers to any names specified as such after the

-copyright statement(s).

-

-"Original Version" refers to the collection of Font Software components as

-distributed by the Copyright Holder(s).

-

-"Modified Version" refers to any derivative made by adding to, deleting,

-or substituting -- in part or in whole -- any of the components of the

-Original Version, by changing formats or by porting the Font Software to a

-new environment.

-

-"Author" refers to any designer, engineer, programmer, technical

-writer or other person who contributed to the Font Software.

-

-PERMISSION & CONDITIONS

-Permission is hereby granted, free of charge, to any person obtaining

-a copy of the Font Software, to use, study, copy, merge, embed, modify,

-redistribute, and sell modified and unmodified copies of the Font

-Software, subject to the following conditions:

-

-1) Neither the Font Software nor any of its individual components,

-in Original or Modified Versions, may be sold by itself.

-

-2) Original or Modified Versions of the Font Software may be bundled,

-redistributed and/or sold with any software, provided that each copy

-contains the above copyright notice and this license. These can be

-included either as stand-alone text files, human-readable headers or

-in the appropriate machine-readable metadata fields within text or

-binary files as long as those fields can be easily viewed by the user.

-

-3) No Modified Version of the Font Software may use the Reserved Font

-Name(s) unless explicit written permission is granted by the corresponding

-Copyright Holder. This restriction only applies to the primary font name as

-presented to the users.

-

-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font

-Software shall not be used to promote, endorse or advertise any

-Modified Version, except to acknowledge the contribution(s) of the

-Copyright Holder(s) and the Author(s) or with their explicit written

-permission.

-

-5) The Font Software, modified or unmodified, in part or in whole,

-must be distributed entirely under this license, and must not be

-distributed under any other license. The requirement for fonts to

-remain under this license does not apply to any document created

-using the Font Software.

-

-TERMINATION

-This license becomes null and void if any of the above conditions are

-not met.

-

-DISCLAIMER

-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF

-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE

-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,

-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL

-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM

-OTHER DEALINGS IN THE FONT SOFTWARE.

BIN
openwrt/common/opt/lib/resources/img/defaultImage.png
View File


BIN
openwrt/common/opt/lib/resources/img/favicon.ico
View File


+ 0 - 10
openwrt/common/root/sgproxy.sh
View File 

@@ -1,10 +0,0 @@
 
-#!/bin/bash
 
-
 
-_SRV='usr.superglue.it'
 
-
 
-while read x
 
-  do echo "$x"
 
-  done < <(ssh -N -T -R "$_SRV":0:localhost:80 sgproxy@"$_SRV" -p443  -o ExitOnForwardFailure=yes 2>&1)
 
-
 
-  #ssh -N -T -R usr.superglue.it:0:localhost:80 sgproxy@usr.superglue.it -p443  -o ExitOnForwardFailure=yes #-y -y
 
-

+ 0 - 1
openwrt/common/usr/bin/dropbear
View File 

@@ -1 +0,0 @@
 
-../sbin/dropbear

+ 0 - 1
openwrt/common/usr/sbin/dropbear
View File 

@@ -1 +0,0 @@
 
-dropbear-2013.59

BIN
openwrt/common/usr/sbin/dropbear-2013.59
View File


BIN
openwrt/common/usr/sbin/dropbear-2014.63
View File


+ 8 - 0
openwrt/tools/make_fw.sh
View File 

@@ -54,6 +54,9 @@ _OPENWRT_REVISION="$_PWD/openwrt.revision"
 
 ## browser extension (if any)
 
 ## browser extension (if any)
 
 _EXT_SRC="$_PWD/../../editor/build/superglue-firefox.xpi"
 
 _EXT_SRC="$_PWD/../../editor/build/superglue-firefox.xpi"
 
 
 
+## include devTools?
 
+_DEV_TOOLS=false
 
+
 
 ## get OpenWRT revision
 
 ## get OpenWRT revision
 
 _OPENWRT=$(fgrep -m1 'REVISION:=' $_IMAGEBUILDER/include/version.mk || echo 'r00000')
 
 _OPENWRT=$(fgrep -m1 'REVISION:=' $_IMAGEBUILDER/include/version.mk || echo 'r00000')
 
 _OPENWRT=${_OPENWRT/REVISION:=/}
 
 _OPENWRT=${_OPENWRT/REVISION:=/}
 
@@ -96,6 +99,11 @@ for _TARGET in $_TARGETS; do
 
   cp -Ra $_TARGET/* $_TARGET.tmp/
 
   cp -Ra $_TARGET/* $_TARGET.tmp/
 
    sleep 1
 
    sleep 1
 
 
 
+  if [ $_DEVTOOLS = false ]; then
 
+    echo 'removing devTools..'
 
+    rm -Rf $_TARGET.tmp/opt/lib/devTools
 
+  fi
 
+  
   if [[ -e $_EXT_SRC ]]; then
 
   if [[ -e $_EXT_SRC ]]; then
 
     echo 'copying browser extension..'
 
     echo 'copying browser extension..'
 
     _EXT_DST="$_TARGET.tmp/opt/lib/extension/superglue.xpi"
 
     _EXT_DST="$_TARGET.tmp/opt/lib/extension/superglue.xpi"