- Timestamp:
- 02/02/19 20:38:30 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
titan/titan/network.h
r43399 r43413 181 181 savesettings = ostrcat(savesettings, "\n", 1, 0); 182 182 } 183 /*184 iface wlan0 inet dhcp185 pre-up wpa_supplicant -iwlan0 -c/etc/wpa_supplicant.wlan0.conf -B -dd -Dwext || true186 pre-down wpa_cli -iwlan0 terminate || true187 */188 189 183 #ifdef OEBUILD 190 printf("net->device: %s\n", net->device);191 184 if(ostrncmp(net->device, "wlan", 4) == 0) 192 185 { 193 186 savesettings = ostrcat(savesettings, "\n\tpre-up wpa_supplicant -i", 1, 0); 194 187 savesettings = ostrcat(savesettings, net->device, 1, 0); 188 savesettings = ostrcat(savesettings, " -c/mnt/network/wpa_supplicant.conf -B -dd -Dwext || true", 1, 0); 195 189 // savesettings = ostrcat(savesettings, " -c/mnt/network/wpa_supplicant.", 1, 0); 196 190 // savesettings = ostrcat(savesettings, net->device, 1, 0); 197 191 // savesettings = ostrcat(savesettings, ".conf -B -dd -Dwext || true", 1, 0); 198 savesettings = ostrcat(savesettings, " -c/mnt/network/wpa_supplicant.conf -B -dd -Dwext || true", 1, 0);199 192 200 193 savesettings = ostrcat(savesettings, "\n\tpre-down wpa_cli -i", 1, 0); … … 332 325 { 333 326 #ifdef OEBUILD 334 cmd = ostrcat(cmd, "/etc/init.d/networking ", 1, 0);327 cmd = ostrcat(cmd, "/etc/init.d/networking restart", 1, 0); 335 328 #else 336 329 cmd = ostrcat(cmd, "/etc/init.d/networking -i ", 1, 0); 337 330 cmd = ostrcat(cmd, net->device, 1, 0); 331 cmd = ostrcat(cmd, " restart", 1, 0); 338 332 #endif 339 cmd = ostrcat(cmd, " restart", 1, 0);340 333 tmpstr = ostrcat(tmpstr, command(cmd), 1, 1); 341 334 tmpstr = ostrcat(tmpstr, "\n\n", 1, 0); … … 348 341 { 349 342 #ifdef OEBUILD 350 cmd = ostrcat(cmd, "/etc/init.d/networking ", 1, 0);343 cmd = ostrcat(cmd, "/etc/init.d/networking restart", 1, 0); 351 344 #else 352 345 cmd = ostrcat(cmd, "/etc/init.d/networking -i ", 1, 0); 353 346 cmd = ostrcat(cmd, net->device, 1, 0); 347 cmd = ostrcat(cmd, " restart", 1, 0); 354 348 #endif 355 cmd = ostrcat(cmd, " restart", 1, 0);356 349 tmpstr = ostrcat(tmpstr, command(cmd), 1, 1); 357 350 free(cmd); cmd = NULL; … … 687 680 { 688 681 int ret = 0; 689 #if def OEBUILD682 #ifndef OEBUILD 690 683 system("killall wpa_supplicant; sleep 2; killall -9 wpa_supplicant"); 691 684 ret = system("wlan.sh"); … … 834 827 { 835 828 net->type = 1; //dhcp 836 #ifdef OEBUILD837 writeinterfaces();838 screennetwork_restart(NULL, 0);839 #endif840 829 screennetwork_adapterext(0, net->device); 841 830 } … … 881 870 changetext(tmp1, _("searching...")); 882 871 drawscreen(wlan, 0, 0); 883 #ifdef OEBUILD 884 system("ifconfig wlan0 up"); 885 system("ifconfig ra0 up"); 872 #ifndef OEBUILD 873 system("wlan.sh notstart"); 886 874 #endif 887 system("wlan.sh notstart");888 875 tmpstr = command("iwlist scanning | grep 'ESSID:' | sed 's/ESSID:\\\"\\\"/ESSID:\\\"unknown\\\"/' | sed 's/[ ]*ESSID://' | tr -d \\\""); 889 876
Note: See TracChangeset
for help on using the changeset viewer.