Compared files  

Left
/fw/roborock.vacuum.p5/3.5.4_0528/xout/_root/opt/rockrobo/wlan/wifi_start.sh
Last modified2020-01-18 02:19:22
Size6.5 Kb (266 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
/fw/roborock.vacuum.p5/3.5.8_0698/xout/_root/opt/rockrobo/wlan/wifi_start.sh
Last modified2020-04-20 11:07:13
Size6.9 Kb (274 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged8259
Inserted27
Deleted11
Ignored00
Changed414




   Comparison Details  

122 skipped lines
123 123         echo iface wlan0 inet dhcp                >> ${INTERFACES_STA_CONF}
124 124         echo wpa-conf ${WPA_CONF}               >> ${INTERFACES_STA_CONF}
125 125     fi
  126     SSID=$(cat ${WIFI_CONFIG_FILE} | grep "^[[:space:]]*ssid="| sed 's/ssid=\"//g' |sed 's/\"$//g')
126     SSID=`cat ${WIFI_CONFIG_FILE} | grep "^[[:space:]]*ssid="| sed 's/ssid=//g'` 127     SSID_NO_ESCAPE=$(cat ${WIFI_CONFIG_FILE} | grep "^[[:space:]]*ssid="| sed 's/ssid=\"//g' |sed 's/\"$//g' |sed 's/\\\(.\)/\1/g')
127     PASSWD=`cat ${WIFI_CONFIG_FILE} | grep "^[[:space:]]*psk=" | sed 's/psk=//g'` 128     PASSWD=$(cat ${WIFI_CONFIG_FILE} | grep "^[[:space:]]*psk=" | sed 's/psk=\"//g' |sed 's/\"$//g' |sed 's/\\\(.\)/\1/g')
128 129     if [ -z "$PASSWD" ]; then
129 130         echo "network={"> $WPA_CONF
130 131         echo "       ssid=$SSID"    >> $WPA_CONF
131 132         echo "       key_mgmt=NONE" >> $WPA_CONF
132 133         echo "}"    >> $WPA_CONF
133 134     else
  135         #wpa_passphrase can only handle password with lenght of 8~63
  136         PASS_LEN=${#PASSWD}
  137         if [ $PASS_LEN -lt 8 -o $PASS_LEN -gt 64 ]; then
  138             PASSWD="invalidpassword"
  139         fi
  140  
134 141         #wpa_passphrase "$SSID" "$PASSWD" > $WPA_CONF
  142         HEX_PSK=$(wpa_passphrase "$SSID_NO_ESCAPE" "$PASSWD" |grep "psk=")
135 143         echo "ap_scan=1">  $WPA_CONF
136 144         echo "network={">> $WPA_CONF
137         echo "       ssid=$SSID"    >> $WPA_CONF 145         echo        ssid=P\"$SSID\""      >> $WPA_CONF
138 146         echo "       scan_ssid=1"               >> $WPA_CONF
139         echo "       psk=$PASSWD"   >> $WPA_CONF 147         echo "$HEX_PSK"     >> $WPA_CONF
140 148         echo "}"    >> $WPA_CONF
141 149     fi
142 150  
10 skipped lines
153 161     # STA mode
154 162     set_led blink
155 163     ifconfig wlan0 up
156     wpa_supplicant -D nl80211 -B -i wlan0 -C /var/run/wpa_supplicant -c $WPA_CONF >/dev/null 2>&1 164     wpa_supplicant -D nl80211 -B -i wlan0 -C /var/run/wpa_supplicant -c $WPA_CONF -dt -f /var/log/syslog
157     udhcpc -b -i wlan0 >/dev/null 2>&1 165     #udhcpc -b -i wlan0 >/dev/null 2>&1
  166     udhcpc -S -b -i wlan0
158 167     echo "set wifi sta mode"
159 168 }
160 169 prepare()
6 skipped lines
167 176     iw mon.wlan0 del >/dev/null 2>&1
168 177     killall wpa_supplicant >/dev/null 2>&1
169 178     killall udhcpc >/dev/null 2>&1 
170     killall dhclient >/dev/null 2>&1  
171 179     if [ -e $DEVICE_CONF ]; then
172 180         SET_MAC=`cat $DEVICE_CONF | grep -i "^[[:space:]]*mac[[:space:]]*=" | cut -d '=' -f 2`
173 181     fi
93 skipped lines

   Text comparison Options  

Syntax colouring language used: Shell
Match character case: yes.
Match line endings: no.
Match spaces

At start of lines: yes,
In middle of lines: yes,
At end of lines: yes.
Blank lines as empty lines: no.
Activate comparison algorithm
At word level: yes,
At character level: no.


   Legend  

Unchanged lineExample of unchanged line
Modified lineExample of modified line
Added lineExample of added line
Removed lineExample of removed line
Ignored lineExample of ignored line