Changeset 13124
- Timestamp:
- 10/22/09 00:04:57 (1 month ago)
- Files:
-
- src/router/services/networking/brcm_80211x.c (modified) (3 diffs)
- src/router/services/networking/firewall.c (modified) (2 diffs)
- src/router/services/networking/madwifi.c (modified) (8 diffs)
- src/router/services/networking/madwifi_11n.c (modified) (6 diffs)
- src/router/services/networking/network.c (modified) (25 diffs)
- src/router/services/networking/rt2880.c (modified) (6 diffs)
- src/router/services/networking/udhcpc.c (modified) (3 diffs)
- src/router/services/services/anchorfree.c (modified) (2 diffs)
- src/router/services/services/chillispot.c (modified) (1 diff)
- src/router/services/services/freeradius.c (modified) (4 diffs)
- src/router/services/services/services.c (modified) (8 diffs)
- src/router/services/services/usb_hotplug.c (modified) (1 diff)
- src/router/services/services/vlantagging.c (modified) (2 diffs)
- src/router/services/sysinit/defaults.c (modified) (2 diffs)
- src/router/services/sysinit/sysinit-adm5120.c (modified) (6 diffs)
- src/router/services/sysinit/sysinit-broadcom.c (modified) (8 diffs)
- src/router/services/sysinit/sysinit-ca8.c (modified) (1 diff)
- src/router/services/sysinit/sysinit-dir300.c (modified) (2 diffs)
- src/router/services/sysinit/sysinit-fonera.c (modified) (1 diff)
- src/router/services/sysinit/sysinit-gateworx.c (modified) (20 diffs)
- src/router/services/sysinit/sysinit-lsx.c (modified) (2 diffs)
- src/router/services/sysinit/sysinit-rcaa01.c (modified) (1 diff)
- src/router/services/sysinit/sysinit-rt2880.c (modified) (4 diffs)
- src/router/services/sysinit/sysinit.c (modified) (6 diffs)
- src/router/services/tools/mii_mgr.c (modified) (3 diffs)
- src/router/services/tools/overclock_atheros.c (modified) (2 diffs)
- src/router/services/tools/reset_defaults.c (modified) (1 diff)
- src/router/services/tools/site_survey_madwifi.c (modified) (1 diff)
- src/router/services/tools/site_survey_ralink.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
src/router/services/networking/brcm_80211x.c
r12928 r13124 203 203 nvram_nget("%s_peap8021xanon", prefix)); 204 204 } 205 if (strlen(nvram_nget("%s_peap8021xaddopt", prefix)) > 0) { 205 if (strlen(nvram_nget("%s_peap8021xaddopt", prefix)) > 206 0) { 206 207 sprintf(ath, "%s_peap8021xaddopt", prefix); 207 208 fprintf(fp, "\t"); // tab … … 238 239 nvram_nget("%s_ttls8021xanon", prefix)); 239 240 } 240 if (strlen(nvram_nget("%s_ttls8021xaddopt", prefix)) > 0) { 241 if (strlen(nvram_nget("%s_ttls8021xaddopt", prefix)) > 242 0) { 241 243 sprintf(ath, "%s_ttls8021xaddopt", prefix); 242 244 fprintf(fp, "\t"); // tab … … 266 268 nvram_nget("%s_leap8021xanon", prefix)); 267 269 } 268 if (strlen(nvram_nget("%s_leap8021xaddopt", prefix)) > 0) { 270 if (strlen(nvram_nget("%s_leap8021xaddopt", prefix)) > 271 0) { 269 272 sprintf(ath, "%s_leap8021xaddopt", prefix); 270 273 fprintf(fp, "\t"); // tab src/router/services/networking/firewall.c
r13092 r13124 771 771 // MASQUERADE " 772 772 // "--to-ports 5056-5071\n", wanface); 773 if (nvram_match("dtag_vlan8", "1") && nvram_match("wan_vdsl", "1")) { 773 if (nvram_match("dtag_vlan8", "1") 774 && nvram_match("wan_vdsl", "1")) { 774 775 save2file 775 776 ("-A POSTROUTING -o %s -j SNAT --to-source %s\n", … … 1959 1960 #endif 1960 1961 #ifdef HAVE_VNCREPEATER 1961 if (nvram_match("vncr_enable", "1") && strlen(wanface)) 1962 { 1962 if (nvram_match("vncr_enable", "1") && strlen(wanface)) { 1963 1963 save2file("-A INPUT -p tcp -i %s --dport 5900 -j ACCEPT\n", 1964 1964 wanface); 1965 1965 save2file("-A INPUT -p tcp -i %s --dport 5500 -j ACCEPT\n", 1966 1966 wanface); 1967 }1967 } 1968 1968 #endif 1969 1969 src/router/services/networking/madwifi.c
r12996 r13124 73 73 // returns the number of installed atheros devices/cards 74 74 75 76 75 static void deconfigure_single(int count) 77 76 { … … 81 80 char wifivifs[16]; 82 81 #ifdef HAVE_MADWIFI_MIMO 83 if (is_ar5008(count)) 84 { 85 deconfigure_single_11n(count); 86 return; 87 } 82 if (is_ar5008(count)) { 83 deconfigure_single_11n(count); 84 return; 85 } 88 86 #endif 89 87 … … 368 366 nvram_nget("%s_peap8021xanon", prefix)); 369 367 } 370 if (strlen(nvram_nget("%s_peap8021xaddopt", prefix)) > 0) { 368 if (strlen(nvram_nget("%s_peap8021xaddopt", prefix)) > 369 0) { 371 370 sprintf(ath, "%s_peap8021xaddopt", prefix); 372 371 fprintf(fp, "\t"); // tab … … 403 402 nvram_nget("%s_ttls8021xanon", prefix)); 404 403 } 405 if (strlen(nvram_nget("%s_ttls8021xaddopt", prefix)) > 0) { 404 if (strlen(nvram_nget("%s_ttls8021xaddopt", prefix)) > 405 0) { 406 406 sprintf(ath, "%s_ttls8021xaddopt", prefix); 407 407 fprintf(fp, "\t"); // tab … … 437 437 nvram_nget("%s_leap8021xanon", prefix)); 438 438 } 439 if (strlen(nvram_nget("%s_leap8021xaddopt", prefix)) > 0) { 439 if (strlen(nvram_nget("%s_leap8021xaddopt", prefix)) > 440 0) { 440 441 sprintf(ath, "%s_leap8021xaddopt", prefix); 441 442 fprintf(fp, "\t"); // tab … … 595 596 nvram_nget("%s_radius_key", prefix)); 596 597 char check[64]; 597 sprintf(check, "%s_radius2_ipaddr",prefix);598 nvram_default_get(check, "0.0.0.0");598 sprintf(check, "%s_radius2_ipaddr", prefix); 599 nvram_default_get(check, "0.0.0.0"); 599 600 600 601 if (!nvram_nmatch("", "%s_radius2_ipaddr", prefix) 601 && !nvram_nmatch("0.0.0.0", "%s_radius2_ipaddr",prefix) 602 && !nvram_nmatch("0.0.0.0", "%s_radius2_ipaddr", 603 prefix) 602 604 && !nvram_nmatch("", "%s_radius2_port", prefix)) { 603 605 fprintf(fp, "auth_server_addr=%s\n", … … 957 959 958 960 #ifdef HAVE_MADWIFI_MIMO 959 if (is_ar5008(count)) 960 { 961 configure_single_11n(count); 962 return; 963 } 961 if (is_ar5008(count)) { 962 configure_single_11n(count); 963 return; 964 } 964 965 #endif 965 966 char *next; … … 1029 1030 countvaps++; 1030 1031 } 1031 if (countvaps <4)1032 countvaps=4;1032 if (countvaps < 4) 1033 countvaps = 4; 1033 1034 if (countvaps > vapcount) 1034 1035 vapcount = countvaps; src/router/services/networking/madwifi_11n.c
r12996 r13124 73 73 // returns the number of installed atheros devices/cards 74 74 75 76 75 void deconfigure_single_11n(int count) 77 76 { … … 118 117 119 118 } 120 121 119 122 120 static int need_commit = 0; … … 168 166 169 167 } 170 171 172 173 174 168 175 169 #define SIOCSSCANLIST (SIOCDEVPRIVATE+6) … … 508 502 countvaps++; 509 503 } 510 if (countvaps <4)511 countvaps=4;504 if (countvaps < 4) 505 countvaps = 4; 512 506 if (countvaps > vapcount) 513 507 vapcount = countvaps; … … 563 557 564 558 } else if (!strcmp(apm, "ap") || !strcmp(apm, "wdsap")) 565 sysprintf("80211n_wlanconfig %s create wlandev %s wlanmode ap", dev,566 wif);559 sysprintf("80211n_wlanconfig %s create wlandev %s wlanmode ap", 560 dev, wif); 567 561 else 568 562 sysprintf … … 1128 1122 hwaddr = nvram_get(wdsmacname); 1129 1123 if (hwaddr != NULL) { 1130 sysprintf("80211n_wlanconfig %s nawdslist %s", primary, hwaddr); 1124 sysprintf("80211n_wlanconfig %s nawdslist %s", primary, 1125 hwaddr); 1131 1126 set_rate(dev, primary); 1132 1127 } src/router/services/networking/network.c
r13109 r13124 642 642 } 643 643 644 645 644 void reset_hwaddr(char *ifname) 646 645 { … … 741 740 int s; 742 741 static char eabuf[32]; 743 static char lan_ifname[64]; //= strdup(nvram_safe_get("lan_ifname"));744 static char wan_ifname[64]; //= strdup(nvram_safe_get("wan_ifname"));745 static char lan_ifnames[128]; //= strdup(nvram_safe_get("lan_ifnames"));742 static char lan_ifname[64]; //= strdup(nvram_safe_get("lan_ifname")); 743 static char wan_ifname[64]; //= strdup(nvram_safe_get("wan_ifname")); 744 static char lan_ifnames[128]; //= strdup(nvram_safe_get("lan_ifnames")); 746 745 static char name[80]; 747 746 char *next, *svbuf; … … 749 748 static char wl_face[10]; 750 749 751 strcpy(lan_ifname, nvram_safe_get("lan_ifname")); 750 strcpy(lan_ifname, nvram_safe_get("lan_ifname")); 752 751 strcpy(wan_ifname, nvram_safe_get("wan_ifname")); 753 strcpy(lan_ifnames, nvram_safe_get("lan_ifnames")); 754 752 strcpy(lan_ifnames, nvram_safe_get("lan_ifnames")); 753 755 754 if (strlen(nvram_safe_get("wan_default")) > 0) { 756 755 PORTSETUPWAN(nvram_safe_get("wan_default")); // setup … … 763 762 // by network 764 763 // setup 765 766 /* 767 * add wan ifname to lan_ifnames if we use fullswitch 768 */ 769 if (nvram_match("fullswitch", "1") 770 && (getSTA() || getWET() 771 || nvram_match("wan_proto", "disabled"))) { 772 if (!nvram_match("fullswitch_set", "1")) { 773 nvram_set("lan_default", lan_ifnames); 774 nvram_set("fullswitch_set", "1"); 775 } 776 sprintf(lan_ifnames, "%s %s", nvram_safe_get("lan_default"), 777 nvram_safe_get("wan_default")); 778 strcpy(wan_ifname, ""); 779 } else { 780 if (nvram_match("fullswitch_set", "1")) { 781 strcpy(lan_ifnames, nvram_safe_get("lan_default")); 782 nvram_unset("lan_default"); 783 strcpy(wan_ifname, nvram_safe_get("wan_default")); 784 nvram_unset("fullswitch_set"); 785 } 786 } 787 } 788 789 764 765 /* 766 * add wan ifname to lan_ifnames if we use fullswitch 767 */ 768 if (nvram_match("fullswitch", "1") 769 && (getSTA() || getWET() 770 || nvram_match("wan_proto", "disabled"))) { 771 if (!nvram_match("fullswitch_set", "1")) { 772 nvram_set("lan_default", lan_ifnames); 773 nvram_set("fullswitch_set", "1"); 774 } 775 sprintf(lan_ifnames, "%s %s", 776 nvram_safe_get("lan_default"), 777 nvram_safe_get("wan_default")); 778 strcpy(wan_ifname, ""); 779 } else { 780 if (nvram_match("fullswitch_set", "1")) { 781 strcpy(lan_ifnames, 782 nvram_safe_get("lan_default")); 783 nvram_unset("lan_default"); 784 strcpy(wan_ifname, 785 nvram_safe_get("wan_default")); 786 nvram_unset("fullswitch_set"); 787 } 788 } 789 } 790 790 791 791 if ((s = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) < 0) … … 797 797 if (getSTA() || getWET() || CANBRIDGE()) { 798 798 nvram_setz(lan_ifnames, 799 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 ath0 ath1 ath2 ath3 ath4 ath5");799 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 ath0 ath1 ath2 ath3 ath4 ath5"); 800 800 PORTSETUPWAN(""); 801 801 } else { 802 802 nvram_setz(lan_ifnames, 803 "eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 ath0 ath1 ath2 ath3 ath4 ath5");803 "eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 ath0 ath1 ath2 ath3 ath4 ath5"); 804 804 PORTSETUPWAN("eth0"); 805 805 } … … 1011 1011 strcpy(mac, nvram_safe_get("et0macaddr")); 1012 1012 #endif 1013 1014 1015 1013 1016 1014 #if defined(HAVE_LS2) || defined(HAVE_SOLO51) … … 1140 1138 if (nvram_match("intel_eth", "1")) 1141 1139 nvram_setz(lan_ifnames, 1142 "ixp0 eth0 eth1 ath0 ath1 ath2 ath3 ofdm");1140 "ixp0 eth0 eth1 ath0 ath1 ath2 ath3 ofdm"); 1143 1141 else 1144 1142 nvram_setz(lan_ifnames, 1145 "ixp0 ath0 ath1 ath2 ath3 ofdm");1143 "ixp0 ath0 ath1 ath2 ath3 ofdm"); 1146 1144 PORTSETUPWAN(""); 1147 1145 } else if (getRouterBrand() == ROUTER_BOARD_GATEWORX_GW2345) { 1148 1146 if (nvram_match("intel_eth", "1")) 1149 1147 nvram_setz(lan_ifnames, 1150 "ixp0 ixp1 eth0 eth1 ath0 ath1 ath2 ath3 ofdm");1148 "ixp0 ixp1 eth0 eth1 ath0 ath1 ath2 ath3 ofdm"); 1151 1149 else 1152 1150 nvram_setz(lan_ifnames, 1153 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm");1151 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm"); 1154 1152 PORTSETUPWAN(""); 1155 1153 } else { 1156 1154 if (nvram_match("intel_eth", "1")) 1157 1155 nvram_setz(lan_ifnames, 1158 "ixp0 ixp1 eth0 eth1 ath0 ath1 ath2 ath3 ofdm");1156 "ixp0 ixp1 eth0 eth1 ath0 ath1 ath2 ath3 ofdm"); 1159 1157 else 1160 1158 nvram_setz(lan_ifnames, 1161 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm");1159 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm"); 1162 1160 PORTSETUPWAN(""); 1163 1161 } … … 1166 1164 if (nvram_match("intel_eth", "1")) 1167 1165 nvram_setz(lan_ifnames, 1168 "eth0 eth1 ixp0 ath0 ath1 ath2 ath3 ofdm");1166 "eth0 eth1 ixp0 ath0 ath1 ath2 ath3 ofdm"); 1169 1167 else 1170 1168 nvram_setz(lan_ifnames, 1171 "ixp0 ath0 ath1 ath2 ath3 ofdm");1169 "ixp0 ath0 ath1 ath2 ath3 ofdm"); 1172 1170 PORTSETUPWAN("ixp0"); 1173 1171 } else if (getRouterBrand() == ROUTER_BOARD_GATEWORX_GW2345) { … … 1175 1173 if (nvram_match("intel_eth", "1")) 1176 1174 nvram_setz(lan_ifnames, 1177 "eth0 eth1 ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm");1175 "eth0 eth1 ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm"); 1178 1176 else 1179 1177 nvram_setz(lan_ifnames, 1180 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm");1178 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm"); 1181 1179 PORTSETUPWAN("ixp0"); 1182 1180 #else 1183 1181 if (nvram_match("intel_eth", "1")) 1184 1182 nvram_setz(lan_ifnames, 1185 "eth0 eth1 ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm");1183 "eth0 eth1 ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm"); 1186 1184 else 1187 1185 nvram_setz(lan_ifnames, 1188 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm");1186 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm"); 1189 1187 PORTSETUPWAN("ixp1"); 1190 1188 #endif … … 1193 1191 if (nvram_match("intel_eth", "1")) 1194 1192 nvram_setz(lan_ifnames, 1195 "eth0 eth1 ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm");1193 "eth0 eth1 ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm"); 1196 1194 else 1197 1195 nvram_setz(lan_ifnames, 1198 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm");1196 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm"); 1199 1197 1200 1198 PORTSETUPWAN("ixp0"); … … 1203 1201 if (nvram_match("intel_eth", "1")) 1204 1202 nvram_setz(lan_ifnames, 1205 "eth0 eth1 ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm");1203 "eth0 eth1 ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm"); 1206 1204 else 1207 1205 nvram_setz(lan_ifnames, 1208 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm");1206 "ixp0 ixp1 ath0 ath1 ath2 ath3 ofdm"); 1209 1207 1210 1208 PORTSETUPWAN("ixp1"); … … 1231 1229 #ifdef HAVE_NOWIFI 1232 1230 nvram_setz(lan_ifnames, 1233 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10");1231 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10"); 1234 1232 #else 1235 1233 if (nvram_match("wifi_bonding", "1")) 1236 1234 nvram_setz(lan_ifnames, 1237 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 bond0");1235 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 bond0"); 1238 1236 else 1239 1237 nvram_setz(lan_ifnames, 1240 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 ath0 ath1 ath2 ath3 ath4 ath5 ath6 ath7 ath8");1238 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 ath0 ath1 ath2 ath3 ath4 ath5 ath6 ath7 ath8"); 1241 1239 1242 1240 #endif … … 1245 1243 #ifdef HAVE_NOWIFI 1246 1244 nvram_setz(lan_ifnames, 1247 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10");1245 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10"); 1248 1246 #else 1249 1247 if (nvram_match("wifi_bonding", "1")) 1250 1248 nvram_setz(lan_ifnames, 1251 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 bond0");1249 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 bond0"); 1252 1250 else 1253 1251 nvram_setz(lan_ifnames, 1254 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 ath0 ath1 ath2 ath3 ath4 ath5 ath6 ath7 ath8");1252 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 ath0 ath1 ath2 ath3 ath4 ath5 ath6 ath7 ath8"); 1255 1253 #endif 1256 1254 PORTSETUPWAN(""); … … 1258 1256 #ifdef HAVE_NOWIFI 1259 1257 nvram_setz(lan_ifnames, 1260 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10");1258 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10"); 1261 1259 #else 1262 1260 if (nvram_match("wifi_bonding", "1")) 1263 1261 nvram_setz(lan_ifnames, 1264 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 bond0");1262 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 bond0"); 1265 1263 else 1266 1264 nvram_setz(lan_ifnames, 1267 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 ath0 ath1 ath2 ath3 ath4 ath5 ath6 ath7 ath8");1265 "eth0 eth1 eth2 eth3 eth4 eth5 eth6 eth7 eth8 eth9 eth10 ath0 ath1 ath2 ath3 ath4 ath5 ath6 ath7 ath8"); 1268 1266 #endif 1269 1267 #ifdef HAVE_GW700 … … 1274 1272 1275 1273 } 1276 1274 1277 1275 strncpy(ifr.ifr_name, "eth0", IFNAMSIZ); 1278 1276 ioctl(s, SIOCGIFHWADDR, &ifr); … … 1289 1287 #endif 1290 1288 1291 if (!nvram_match("lan_ifname", lan_ifname) 1292 || !nvram_match("wan_ifname", wan_ifname) 1293 || !nvram_match("lan_ifnames", lan_ifnames)) 1294 { 1289 if (!nvram_match("lan_ifname", lan_ifname) 1290 || !nvram_match("wan_ifname", wan_ifname) 1291 || !nvram_match("lan_ifnames", lan_ifnames)) { 1295 1292 nvram_set("lan_ifname", lan_ifname); 1296 1293 nvram_set("wan_ifname", wan_ifname); 1297 1294 nvram_set("lan_ifnames", lan_ifnames); 1298 nvram_commit();1299 }1295 nvram_commit(); 1296 } 1300 1297 1301 1298 cprintf("lan ifname = %s\n", lan_ifname); … … 1558 1555 wl_iovar_set(name, 1559 1556 "wet_host_mac", 1560 ifr. 1561 ifr_hwaddr.sa_data,1557 ifr.ifr_hwaddr. 1558 sa_data, 1562 1559 ETHER_ADDR_LEN); 1563 1560 } … … 1675 1672 } 1676 1673 } 1677 1678 1674 #ifdef HAVE_EAD 1679 1675 if (strlen(eadline) > 0) … … 2204 2200 eval("ifconfig", ifname, "up"); 2205 2201 } 2206 2207 2202 2208 2203 void start_wan(int status) … … 2469 2464 } else { 2470 2465 2471 if (wlifname && (!strcmp(wan_ifname, wlifname) || nvram_match("wan_proto", "l2tp") || nvram_match("wan_proto","pppoe") || nvram_match("wan_proto","pptp"))) // sta mode2466 if (wlifname && (!strcmp(wan_ifname, wlifname) || nvram_match("wan_proto", "l2tp") || nvram_match("wan_proto", "pppoe") || nvram_match("wan_proto", "pptp"))) // sta mode 2472 2467 { 2473 2468 getWirelessMac(mac); … … 2517 2512 if (nvram_match("wan_proto", "pppoe")) { 2518 2513 ifr.ifr_mtu = atoi(getMTU(wan_ifname)); // default ethernet frame size 2519 } else 2514 } else 2520 2515 #endif 2521 2516 #ifdef HAVE_PPTP 2522 2517 if (nvram_match("wan_proto", "pptp")) { 2523 2518 ifr.ifr_mtu = atoi(getMTU(wan_ifname)); // default ethernet frame size 2524 } else 2519 } else 2525 2520 #endif 2526 2521 #ifdef HAVE_L2TP … … 2782 2777 2783 2778 fprintf(fp, "nic-%s\n", vlannic); 2784 vdsl_fuckup(vlannic); /* work around for DTAG DSLAMS */2779 vdsl_fuckup(vlannic); /* work around for DTAG DSLAMS */ 2785 2780 } else { 2786 2781 char *ifn = enable_dtag_vlan(0); … … 2825 2820 } 2826 2821 fprintf(fp, "nic-%s\n", vlannic); 2827 vdsl_fuckup(vlannic); /* work around for DTAG DSLAMS */2822 vdsl_fuckup(vlannic); /* work around for DTAG DSLAMS */ 2828 2823 } else { 2829 2824 sprintf(vlannic, "%s.0008", pppoe_wan_ifname); … … 3036 3031 if (isClient()) { 3037 3032 wan_ifname = getSTA(); 3038 } else3033 } else 3039 3034 wan_ifname = pppoe_wan_ifname; 3040 3035 3041 3036 start_dhcpc(wan_ifname); 3042 3037 } … … 3829 3824 3830 3825 cprintf("action: %s\n", action); 3831 #ifdef HAVE_BCMMODERN 3826 #ifdef HAVE_BCMMODERN 3832 3827 if (!strcmp(action, "add")) { 3833 #else 3828 #else 3834 3829 if (!strcmp(action, "register")) { 3835 3830 #endif src/router/services/networking/rt2880.c
r13069 r13124 159 159 nvram_nget("%s_peap8021xanon", prefix)); 160 160 } 161 if (strlen(nvram_nget("%s_peap8021xaddopt", prefix)) > 0) { 161 if (strlen(nvram_nget("%s_peap8021xaddopt", prefix)) > 162 0) { 162 163 sprintf(ath, "%s_peap8021xaddopt", prefix); 163 164 fprintf(fp, "\t"); // tab … … 194 195 nvram_nget("%s_ttls8021xanon", prefix)); 195 196 } 196 if (strlen(nvram_nget("%s_ttls8021xaddopt", prefix)) > 0) { 197 if (strlen(nvram_nget("%s_ttls8021xaddopt", prefix)) > 198 0) { 197 199 sprintf(ath, "%s_ttls8021xaddopt", prefix); 198 200 fprintf(fp, "\t"); // tab … … 222 224 nvram_nget("%s_leap8021xanon", prefix)); 223 225 } 224 if (strlen(nvram_nget("%s_leap8021xaddopt", prefix)) > 0) { 226 if (strlen(nvram_nget("%s_leap8021xaddopt", prefix)) > 227 0) { 225 228 sprintf(ath, "%s_leap8021xaddopt", prefix); 226 229 fprintf(fp, "\t"); // tab … … 398 401 #if defined(HAVE_DIR600) || defined(HAVE_AR670W) 399 402 char mac[32]; 400 strcpy(mac, nvram_default_get("et0macaddr_safe","00:11:22:33:44:55"));403 strcpy(mac, nvram_default_get("et0macaddr_safe", "00:11:22:33:44:55")); 401 404 MAC_ADD(mac); 402 405 MAC_ADD(mac); … … 1100 1103 if (isSTA()) { 1101 1104 #if defined(HAVE_DIR600) || defined(HAVE_AR670W) 1102 if (nvram_match("mac_clone_enable", "1") && 1103 nvram_invmatch("def_whwaddr", "00:00:00:00:00:00") && 1104 nvram_invmatch("def_whwaddr", "")) { 1105 sysprintf("insmod rt2860v2_sta mac=%s",nvram_safe_get("def_whwaddr")); 1106 }else { 1107 sysprintf("insmod rt2860v2_sta mac=%s",mac); 1105 if (nvram_match("mac_clone_enable", "1") && 1106 nvram_invmatch("def_whwaddr", "00:00:00:00:00:00") && 1107 nvram_invmatch("def_whwaddr", "")) { 1108 sysprintf("insmod rt2860v2_sta mac=%s", 1109 nvram_safe_get("def_whwaddr")); 1110 } else { 1111 sysprintf("insmod rt2860v2_sta mac=%s", mac); 1108 1112 } 1109 1113 #else 1110 if (nvram_match("mac_clone_enable", "1") && 1111 nvram_invmatch("def_whwaddr", "00:00:00:00:00:00") && 1112 nvram_invmatch("def_whwaddr", "")) { 1113 sysprintf("insmod rt2860v2_sta mac=%s",nvram_safe_get("def_whwaddr")); 1114 }else { 1115 insmod("rt2860v2_sta"); 1114 if (nvram_match("mac_clone_enable", "1") && 1115 nvram_invmatch("def_whwaddr", "00:00:00:00:00:00") && 1116 nvram_invmatch("def_whwaddr", "")) { 1117 sysprintf("insmod rt2860v2_sta mac=%s", 1118 nvram_safe_get("def_whwaddr")); 1119 } else { 1120 insmod("rt2860v2_sta"); 1116 1121 } 1117 1122 #endif … … 1141 1146 } else { 1142 1147 #if defined(HAVE_DIR600) || defined(HAVE_AR670W) 1143 if (nvram_match("mac_clone_enable", "1") && 1144 nvram_invmatch("def_whwaddr", "00:00:00:00:00:00") && 1145 nvram_invmatch("def_whwaddr", "")) { 1146 sysprintf("insmod rt2860v2_ap mac=%s",nvram_safe_get("def_whwaddr")); 1147 }else { 1148 sysprintf("insmod rt2860v2_ap mac=%s",mac); 1148 if (nvram_match("mac_clone_enable", "1") && 1149 nvram_invmatch("def_whwaddr", "00:00:00:00:00:00") && 1150 nvram_invmatch("def_whwaddr", "")) { 1151 sysprintf("insmod rt2860v2_ap mac=%s", 1152 nvram_safe_get("def_whwaddr")); 1153 } else { 1154 sysprintf("insmod rt2860v2_ap mac=%s", mac); 1149 1155 } 1150 1156 #else 1151 if (nvram_match("mac_clone_enable", "1") && 1152 nvram_invmatch("def_whwaddr", "00:00:00:00:00:00") && 1153 nvram_invmatch("def_whwaddr", "")) { 1154 sysprintf("insmod rt2860v2_ap mac=%s",nvram_safe_get("def_whwaddr")); 1155 }else { 1156 insmod("rt2860v2_ap"); 1157 if (nvram_match("mac_clone_enable", "1") && 1158 nvram_invmatch("def_whwaddr", "00:00:00:00:00:00") && 1159 nvram_invmatch("def_whwaddr", "")) { 1160 sysprintf("insmod rt2860v2_ap mac=%s", 1161 nvram_safe_get("def_whwaddr")); 1162 } else { 1163 insmod("rt2860v2_ap"); 1157 1164 } 1158 1165 #endif src/router/services/networking/udhcpc.c
r12978 r13124 331 331 || i++ < 10) ; 332 332 333 334 333 struct dns_lists *dns_list = NULL; 335 334 … … 346 345 free(dns_list); 347 346 } 348 // route_add(wan_ifname, 0, "0.0.0.0",349 // nvram_safe_get("wan_gateway"), "0.0.0.0");347 // route_add(wan_ifname, 0, "0.0.0.0", 348 // nvram_safe_get("wan_gateway"), "0.0.0.0"); 350 349 351 350 /* … … 359 358 360 359 route_add(wan_ifname, 0, 361 nvram_safe_get("l2tp_server_ip"), 362 nvram_safe_get("wan_gateway"), 363 "255.255.255.255"); 360 nvram_safe_get("l2tp_server_ip"), 361 nvram_safe_get("wan_gateway"), "255.255.255.255"); 364 362 365 363 start_firewall(); src/router/services/services/anchorfree.c
r12759 r13124 252 252 eval("rm", "-f", "/tmp/.anchorfree"); 253 253 char callbuffer[512]; 254 255 sprintf(callbuffer,"wget -q -O /tmp/.anchorfree \"http://afhrp.anchorfree.com/register.php?" 256 "pid=0001&" "uid=%s&" "email=%s&" "ssid=%s&" "addr=%s&" 257 "addr2=%s&" "city=%s&" "zip=%s&" "state=%s&" "country=%s&" 258 "cat=%s&" "publish=%s\"", devid, email, ssid, addr, addr2, 259 city, zip, state, country, cat, 260 nvram_safe_get("af_publish")); 254 255 sprintf(callbuffer, 256 "wget -q -O /tmp/.anchorfree \"http://afhrp.anchorfree.com/register.php?" 257 "pid=0001&" "uid=%s&" "email=%s&" "ssid=%s&" "addr=%s&" 258 "addr2=%s&" "city=%s&" "zip=%s&" "state=%s&" 259 "country=%s&" "cat=%s&" "publish=%s\"", devid, email, 260 ssid, addr, addr2, city, zip, state, country, cat, 261 nvram_safe_get("af_publish")); 261 262 system(callbuffer); 262 263 FILE *response = fopen("/tmp/.anchorfree", "rb"); … … 396 397 eval("rm", "-f", "/tmp/.anchorfree"); 397 398 char callbuffer[512]; 398 399 sprintf(callbuffer, "wget -q -O- \"http://afhrp.anchorfree.com/unregister.php?"400 "uid=%s&"401 "sid=%s\"", nvram_safe_get("af_hash"),402 nvram_safe_get("af_serviceid"));399 400 sprintf(callbuffer, 401 "wget -q -O- \"http://afhrp.anchorfree.com/unregister.php?" 402 "uid=%s&" "sid=%s\"", nvram_safe_get("af_hash"), 403 nvram_safe_get("af_serviceid")); 403 404 system(callbuffer); 404 405 } src/router/services/services/chillispot.c
r12904 r13124 43 43 int i; 44 44 45 stop_chilli(); //ensure that its stopped45 stop_chilli(); //ensure that its stopped 46 46 if (!nvram_match("chilli_enable", "1")) 47 47 return; src/router/services/services/freeradius.c
r12866 r13124 35 35 #include <radiusdb.h> 36 36 37 38 37 void start_gen_radius_cert(void) 39 38 { 40 if (nvram_match("cert_running", "1") && pidof("openssl") > 0)41 return;//already running39 if (nvram_match("cert_running", "1") && pidof("openssl") > 0) 40 return; //already running 42 41 FILE *fp = fopen("/jffs/etc/freeradius/radiusd.conf", "rb"); 43 42 if (NULL == fp) { … … 48 47 fclose(fp); 49 48 50 gen_cert("/jffs/etc/freeradius/certs/server.cnf", TYPE_SERVER,nvram_safe_get("radius_common"),nvram_safe_get("radius_passphrase")); 51 gen_cert("/jffs/etc/freeradius/certs/ca.cnf", TYPE_CA,nvram_safe_get("radius_common"),nvram_safe_get("radius_passphrase")); 52 nvram_set("cert_running","1"); 49 gen_cert("/jffs/etc/freeradius/certs/server.cnf", TYPE_SERVER, 50 nvram_safe_get("radius_common"), 51 nvram_safe_get("radius_passphrase")); 52 gen_cert("/jffs/etc/freeradius/certs/ca.cnf", TYPE_CA, 53 nvram_safe_get("radius_common"), 54 nvram_safe_get("radius_passphrase")); 55 nvram_set("cert_running", "1"); 53 56 //this takes a long time (depending from the cpu speed) 54 57 system("cd /jffs/etc/freeradius/certs && ./bootstrap"); 55 sysprintf("sed \"s/private_key_password = whatever/private_key_password = %s/g\" /etc/freeradius/eap.conf > /jffs/etc/freeradius/eap.conf",nvram_safe_get("radius_passphrase")); 56 nvram_set("cert_running","0"); 58 sysprintf 59 ("sed \"s/private_key_password = whatever/private_key_password = %s/g\" /etc/freeradius/eap.conf > /jffs/etc/freeradius/eap.conf", 60 nvram_safe_get("radius_passphrase")); 61 nvram_set("cert_running", "0"); 57 62 } 58 63 … … 93 98 fclose(fp); 94 99 95 sysprintf("sed \"s/port = 0/port = %s/g\" /etc/freeradius/radiusd.conf > /jffs/etc/freeradius/radiusd.conf",nvram_safe_get("radius_port")); 96 sysprintf("sed \"s/private_key_password = whatever/private_key_password = %s/g\" /etc/freeradius/eap.conf > /jffs/etc/freeradius/eap.conf",nvram_safe_get("radius_passphrase")); 100 sysprintf 101 ("sed \"s/port = 0/port = %s/g\" /etc/freeradius/radiusd.conf > /jffs/etc/freeradius/radiusd.conf", 102 nvram_safe_get("radius_port")); 103 sysprintf 104 ("sed \"s/private_key_password = whatever/private_key_password = %s/g\" /etc/freeradius/eap.conf > /jffs/etc/freeradius/eap.conf", 105 nvram_safe_get("radius_passphrase")); 97 106 98 107 fp = fopen("/jffs/etc/freeradius/certs/server.pem", "rb"); … … 105 114 106 115 /* generate clients */ 107 {108 struct radiusclientdb *db = loadradiusclientdb();109 if (db)110 116 { 111 fp = fopen("/jffs/etc/freeradius/clients.conf", "wb"); 112 system("touch /jffs/etc/freeradius/clients.manual"); 113 fprintf(fp, "$INCLUDE clients.manual\n"); 114 115 for (i = 0; i < db->usercount; i++) { 116 if (!db->users[i].clientsize) 117 continue; 118 if (!db->users[i].client || !strlen(db->users[i].client)) 119 continue; 120 fprintf(fp, "client %s {\n" 121 "\tsecret = %s\n" 122 "\tshortname = DD-WRT-RADIUS\n}\n",db->users[i].client, db->users[i].passwd); 117 struct radiusclientdb *db = loadradiusclientdb(); 118 if (db) { 119 fp = fopen("/jffs/etc/freeradius/clients.conf", "wb"); 120 system("touch /jffs/etc/freeradius/clients.manual"); 121 fprintf(fp, "$INCLUDE clients.manual\n"); 122 123 for (i = 0; i < db->usercount; i++) { 124 if (!db->users[i].clientsize) 125 continue; 126 if (!db->users[i].client 127 || !strlen(db->users[i].client)) 128 continue; 129 fprintf(fp, "client %s {\n" 130 "\tsecret = %s\n" 131 "\tshortname = DD-WRT-RADIUS\n}\n", 132 db->users[i].client, 133 db->users[i].passwd); 134 } 135 136 fclose(fp); 137 freeradiusclientdb(db); 138 } 123 139 } 124 125 126 fclose(fp); 127 freeradiusclientdb(db); 140 141 /* now generate users */ 142 { 143 struct radiusdb *db = loadradiusdb(); 144 if (db) { 145 fp = fopen("/jffs/etc/freeradius/users", "wb"); 146 system("touch /jffs/etc/freeradius/users.manual"); 147 fprintf(fp, "$INCLUDE users.manual\n"); 148 fprintf(fp, 149 "DEFAULT FreeRADIUS-Proxied-To == 127.0.0.1\n" 150 "\tSession-Timeout := 3600,\n" 151 "\tUser-Name := \"%%{User-Name}\",\n" 152 "\tAcct-Interim-Interval := 300,\n" 153 "\tFall-Through = Yes\n\n"); 154 time_t tm; 155 struct tm tm_time; 156 for (i = 0; i < db->usercount; i++) { 157 if (!db->users[i].usersize) 158 continue; 159 if (!db->users[i].user 160 || !strlen(db->users[i].user)) 161 continue; 162 fprintf(fp, 163 "%s Cleartext-Password := \"%s\"", 164 db->users[i].user, db->users[i].passwd); 165 if (db->users[i].expiration) { 166 tm = db->users[i].expiration * 24 * 60 * 167 60; 168 memcpy(&tm_time, localtime(&tm), 169 sizeof(tm_time)); 170 char datebuf[128]; 171 strftime(datebuf, sizeof(datebuf), 172 "%d %b %Y", &tm_time); 173 fprintf(fp, ", Expiration == \"%s\"\n", 174 datebuf); 175 } else 176 fprintf(fp, "\n"); 177 if (db->users[i].downstream) { 178 fprintf(fp, 179 "\tWISPr-Bandwidth-Max-Down := %d", 180 db->users[i].downstream * 1024); 181 } 182 if (db->users[i].upstream) { 183 if (db->users[i].downstream) 184 fprintf(fp, ",\n"); 185 fprintf(fp, 186 "\tWISPr-Bandwidth-Max-Up := %d\n", 187 db->users[i].upstream * 1024); 188 } 189 fprintf(fp, "\n"); 190 } 191 fclose(fp); 192 freeradiusdb(db); 193 } 128 194 } 129 }130 131 /* now generate users */132 {133 struct radiusdb *db = loadradiusdb();134 if (db)135 {136 fp = fopen("/jffs/etc/freeradius/users", "wb");137 system("touch /jffs/etc/freeradius/users.manual");138 fprintf(fp, "$INCLUDE users.manual\n");139 fprintf(fp, "DEFAULT FreeRADIUS-Proxied-To == 127.0.0.1\n"140 "\tSession-Timeout := 3600,\n"141 "\tUser-Name := \"%%{User-Name}\",\n"142 "\tAcct-Interim-Interval := 300,\n"143 "\tFall-Through = Yes\n\n");144 time_t tm;145 struct tm tm_time;146 for (i = 0; i < db->usercount; i++) {147 if (!db->users[i].usersize)148 continue;149 if (!db->users[i].user || !strlen(db->users[i].user))150 continue;151 fprintf(fp, "%s Cleartext-Password := \"%s\"",db->users[i].user, db->users[i].passwd);152 if (db->users[i].expiration)153 {154 tm=db->users[i].expiration*24*60*60;155 memcpy(&tm_time, localtime(&tm), sizeof(tm_time));156 char datebuf[128];157 strftime(datebuf, sizeof(datebuf), "%d %b %Y", &tm_time);158 fprintf(fp,", Expiration == \"%s\"\n",datebuf);159 }else160 fprintf(fp,"\n");161 if (db->users[i].downstream)162 {163 fprintf(fp, "\tWISPr-Bandwidth-Max-Down := %d",164 db->users[i].downstream * 1024);165 }166 if (db->users[i].upstream) {167 if (db->users[i].downstream)168 fprintf(fp, ",\n");169 fprintf(fp, "\tWISPr-Bandwidth-Max-Up := %d\n",170 db->users[i].upstream * 1024);171 }172 fprintf(fp,"\n");173 }174 fclose(fp);175 freeradiusdb(db);176 }177 }178 195 ret = _evalpid(radiusd_argv, NULL, 0, &pid); 179 196 src/router/services/services/services.c
r13018 r13124 1075 1075 #ifdef HAVE_PPTP 1076 1076 stop_pptp(); 1077 #endif 1077 #endif 1078 1078 stop_l2tp(); 1079 1079 stop_l2tp(); … … 1101 1101 port = 1701 1102 1102 ;auth file = /etc/xl2tpd/xl2tp-secrets 1103 1104 1103 1105 1104 [lac fbnl2tpserver] … … 1115 1114 */ 1116 1115 1117 1118 1116 fprintf(fp, "[global]\n"); // Global section 1119 1117 fprintf(fp, "port = 1701\n"); // Bind address 1120 fprintf(fp, "[lac %s]\n", nvram_safe_get("l2tp_server_name"));1121 fprintf(fp, "lns = %s\n", nvram_safe_get("l2tp_server_name"));1118 fprintf(fp, "[lac %s]\n", nvram_safe_get("l2tp_server_name")); 1119 fprintf(fp, "lns = %s\n", nvram_safe_get("l2tp_server_name")); 1122 1120 fprintf(fp, "require chap = yes\n"); 1123 1121 fprintf(fp, "refuse pap = yes\n"); 1124 1122 fprintf(fp, "require authentication = yes\n"); 1125 fprintf(fp, "name = %s\n", username);1123 fprintf(fp, "name = %s\n", username); 1126 1124 fprintf(fp, "pppoptfile = /tmp/ppp/options\n"); 1127 1125 fprintf(fp, "length bit = yes\n"); … … 1136 1134 } 1137 1135 1138 if (nvram_match("mtu_enable", "1")) { 1139 if (atoi(nvram_safe_get("wan_mtu")) > 0) { 1140 fprintf(fp, "mtu %s\n", 1141 nvram_safe_get("wan_mtu")); 1142 fprintf(fp, "mru %s\n", 1143 nvram_safe_get("wan_mtu")); 1144 } 1145 1136 if (nvram_match("mtu_enable", "1")) { 1137 if (atoi(nvram_safe_get("wan_mtu")) > 0) { 1138 fprintf(fp, "mtu %s\n", 1139 nvram_safe_get("wan_mtu")); 1140 fprintf(fp, "mru %s\n", 1141 nvram_safe_get("wan_mtu")); 1146 1142 } 1147 1143 1148 1144 } 1149 1145 1150 1146 fprintf(fp, "defaultroute\n"); // Add a default route to the … … 1159 1155 // fprintf(fp, "persist\n"); // Do not exit after a connection is 1160 1156 // terminated. 1161 1162 1157 1163 1158 if (nvram_match("ppp_demand", "1")) { // demand mode … … 1202 1197 fprintf(fp, "lock\n"); 1203 1198 fprintf(fp, "noauth\n"); 1204 // fprintf(fp, "debug\n");1199 // fprintf(fp, "debug\n"); 1205 1200 1206 1201 fclose(fp); … … 1261 1256 else 1262 1257 eval("listen", nvram_safe_get("lan_ifname")); 1263 } else 1264 {1265 sysprintf("echo \"c %s\" > /var/run/xl2tpd/l2tp-control",nvram_safe_get("l2tp_server_name"));1258 } else { 1259 sysprintf("echo \"c %s\" > /var/run/xl2tpd/l2tp-control", 1260 nvram_safe_get("l2tp_server_name")); 1266 1261 } 1267 1262 … … 1457 1452 if (nvram_match("wan_proto", "l2tp")) { 1458 1453 1459 sysprintf("echo \"c %s\" > /var/run/xl2tpd/l2tp-control",nvram_safe_get("l2tp_server_name")); 1454 sysprintf("echo \"c %s\" > /var/run/xl2tpd/l2tp-control", 1455 nvram_safe_get("l2tp_server_name")); 1460 1456 return; 1461 1457 } src/router/services/services/usb_hotplug.c
r12806 r13124 225 225 if (stat(path, &tmp_stat) == 0) //file exists 226 226 { 227 setenv("PATH","/sbin:/bin:/usr/sbin:/usr/bin:/jffs/sbin:/jffs/bin:/jffs/usr/sbin:/jffs/usr/bin:/mmc/sbin:/mmc/bin:/mmc/usr/sbin:/mmc/usr/bin:/opt/bin:/opt/sbin:/opt/usr/bin:/opt/usr/sbin",1); 228 setenv("LD_LIBRARY_PATH","/lib:/usr/lib:/jffs/lib:/jffs/usr/lib:/mmc/lib:/mmc/usr/lib:/opt/lib:/opt/usr/lib",1); 227 setenv("PATH", 228 "/sbin:/bin:/usr/sbin:/usr/bin:/jffs/sbin:/jffs/bin:/jffs/usr/sbin:/jffs/usr/bin:/mmc/sbin:/mmc/bin:/mmc/usr/sbin:/mmc/usr/bin:/opt/bin:/opt/sbin:/opt/usr/bin:/opt/usr/sbin", 229 1); 230 setenv("LD_LIBRARY_PATH", 231 "/lib:/usr/lib:/jffs/lib:/jffs/usr/lib:/mmc/lib:/mmc/usr/lib:/opt/lib:/opt/usr/lib", 232 1); 229 233 system(path); 230 234 } src/router/services/services/vlantagging.c
r12495 r13124 80 80 } 81 81 if (!prio) 82 prio="0";82 prio = "0"; 83 83 eval("vconfig", "set_name_type", "DEV_PLUS_VID_NO_PAD"); 84 84 eval("vconfig", "add", tag, port); … … 86 86 87 87 sprintf(vlan_name, "%s.%s", tag, port); 88 eval("vconfig", vlan_name,"set_egress_map","0",prio);88 eval("vconfig", vlan_name, "set_egress_map", "0", prio); 89 89 90 90 char var[64]; src/router/services/sysinit/defaults.c
r13074 r13124 1292 1292 #else 1293 1293 {"wk_mode", "router", 0}, /* Network mode [gateway|router] */ 1294 #endif // HAVE_ESR66501294 #endif // HAVE_ESR6650 1295 1295 #else 1296 1296 {"wk_mode", "gateway", 0}, /* Network mode [gateway|router] */ … … 2625 2625 {"vncr_enable", "0", 0}, 2626 2626 #endif 2627 {"warn_enabled", "0",0},2628 {"warn_connlimit", "500",0},2627 {"warn_enabled", "0", 0}, 2628 {"warn_connlimit", "500", 0}, 2629 2629 {0, 0, 0} 2630 2630 }; src/router/services/sysinit/sysinit-adm5120.c
r12477 r13124 295 295 strncpy(ifr.ifr_name, "eth0", IFNAMSIZ); 296 296 ioctl(s, SIOCGIFHWADDR, &ifr); 297 memcpy((unsigned char *)ifr. 298 ifr_hwaddr.sa_data, mac, 6);297 memcpy((unsigned char *)ifr.ifr_hwaddr. 298 sa_data, mac, 6); 299 299 ioctl(s, SIOCSIFHWADDR, &ifr); 300 300 close(s); … … 306 306 nvram_set("et0macaddr_safe", 307 307 ether_etoa((unsigned char *) 308 ifr.ifr_hwaddr. 309 sa_data, eabuf)); 308 ifr. 309 ifr_hwaddr.sa_data, 310 eabuf)); 310 311 close(s); 311 312 } … … 342 343 ether_etoa((unsigned 343 344 char *) 344 ifr. 345 ifr_hwaddr. 346 sa_data, 347 eabuf)); 345 ifr.ifr_hwaddr.sa_data, eabuf)); 348 346 close(s); 349 347 } … … 379 377 strncpy(ifr.ifr_name, "eth0", IFNAMSIZ); 380 378 ioctl(s, SIOCGIFHWADDR, &ifr); 381 memcpy((unsigned char *)ifr. 382 ifr_hwaddr.sa_data, 383 params.addr[0].mac, 6); 379 memcpy((unsigned char *)ifr.ifr_hwaddr. 380 sa_data, params.addr[0].mac, 6); 384 381 ioctl(s, SIOCSIFHWADDR, &ifr); 385 382 close(s); … … 389 386 strncpy(ifr.ifr_name, "eth1", IFNAMSIZ); 390 387 ioctl(s, SIOCGIFHWADDR, &ifr); 391 memcpy((unsigned char *)ifr. 392 ifr_hwaddr.sa_data, 393 params.addr[1].mac, 6); 388 memcpy((unsigned char *)ifr.ifr_hwaddr. 389 sa_data, params.addr[1].mac, 6); 394 390 ioctl(s, SIOCSIFHWADDR, &ifr); 395 391 close(s); … … 401 397 nvram_set("et0macaddr_safe", 402 398 ether_etoa((unsigned char *) 403 ifr.ifr_hwaddr. 404 sa_data, eabuf)); 399 ifr. 400 ifr_hwaddr.sa_data, 401 eabuf)); 405 402 close(s); 406 403 } src/router/services/sysinit/sysinit-broadcom.c
r13092 r13124 692 692 case ROUTER_NETGEAR_WNR3500L: 693 693 case ROUTER_WRT320N: 694 nvram_set("lan_ifnames", "vlan1 eth1"); 694 nvram_set("lan_ifnames", "vlan1 eth1"); 695 695 nvram_set("wan_ifname", "vlan2"); 696 696 nvram_set("wan_ifname2", "vlan2"); 697 697 nvram_set("wan_default", "vlan2"); 698 698 nvram_set("wan_ifnames", "vlan2"); 699 nvram_set("wl0_ifname", "eth1"); 700 if (nvram_match("vlan1ports", "1 2 3 4 8*") || nvram_match("vlan2ports", "0 8u"))701 {702 nvram_set("vlan1ports", "4 3 2 1 8*"); 699 nvram_set("wl0_ifname", "eth1"); 700 if (nvram_match("vlan1ports", "1 2 3 4 8*") 701 || nvram_match("vlan2ports", "0 8u")) { 702 nvram_set("vlan1ports", "4 3 2 1 8*"); 703 703 nvram_set("vlan2ports", "0 8"); 704 704 need_reboot = 1; 705 }705 } 706 706 break; 707 707 … … 956 956 nvram_set("pci/1/1/ledbh1", "135"); 957 957 nvram_set("pci/1/2/ledbh0", "11"); 958 nvram_set("pci/1/2/ledbh2", "135"); 958 nvram_set("pci/1/2/ledbh2", "135"); 959 959 nvram_set("pci/1/1/boardflags2", "0x0400"); 960 960 nvram_set("pci/1/2/boardflags2", "0x0602"); … … 1260 1260 } 1261 1261 break; 1262 1263 case ROUTER_NETGEAR_WNR3500L: //usb power fix (gpio 12)1262 1263 case ROUTER_NETGEAR_WNR3500L: //usb power fix (gpio 12) 1264 1264 if (nvram_match("boardflags", "0x00001710")) { 1265 1265 nvram_set("boardflags", "0x00000710"); … … 1640 1640 clk2 = 75; 1641 1641 // nvram_set ("clkfreq", "150,75"); 1642 // clk2_1 = 75;1643 // clk2_2 = 33;1644 // // nvram_set ("clkfreq", "150,75,33");1642 // clk2_1 = 75; 1643 // clk2_2 = 33; 1644 // // nvram_set ("clkfreq", "150,75,33"); 1645 1645 break; 1646 1646 case 183: … … 1716 1716 // nvram_set ("clkfreq", "280,120"); 1717 1717 break; 1718 // case 288:1719 // clk2_1 = 144;1720 // clk2_2 = 32;1721 // // nvram_set ("clkfreq", "288,144,32");1722 // break;1718 // case 288: 1719 // clk2_1 = 144; 1720 // clk2_2 = 32; 1721 // // nvram_set ("clkfreq", "288,144,32"); 1722 // break; 1723 1723 case 300: 1724 1724 clk2 = 120; … … 1819 1819 nvram_set("vlan2ports", ""); 1820 1820 nvram_set("vlan7ports", vlan7ports); 1821 if (nvram_match("dtag_vlan8", "1") && nvram_match("wan_vdsl", "1")) { 1821 if (nvram_match("dtag_vlan8", "1") 1822 && nvram_match("wan_vdsl", "1")) { 1822 1823 nvram_set("vlan8ports", vlan7ports); 1823 1824 } … … 1861 1862 nvram_set("vlan1ports", ""); 1862 1863 nvram_set("vlan7ports", vlan7ports); 1863 if (nvram_match("dtag_vlan8", "1") && nvram_match("wan_vdsl", "1")) { 1864 if (nvram_match("dtag_vlan8", "1") 1865 && nvram_match("wan_vdsl", "1")) { 1864 1866 nvram_set("vlan8ports", vlan7ports); 1865 1867 } … … 1922 1924 fprintf(stderr, "enable vlan port mapping %s/%s\n", 1923 1925 nvram_safe_get("vlan0ports"), vlan7ports); 1924 if (!nvram_match("dtag_vlan8", "1") || nvram_match("wan_vdsl", "0")) { 1926 if (!nvram_match("dtag_vlan8", "1") 1927 || nvram_match("wan_vdsl", "0")) { 1925 1928 sysprintf 1926 1929 ("echo \"%s\" > /proc/switch/%s/vlan/0/ports", src/router/services/sysinit/sysinit-ca8.c
r12736 r13124 141 141 142 142 strcpy(macaddr, 143 ether_etoa((unsigned char *)ifr. 144 ifr_hwaddr.sa_data, eabuf));143 ether_etoa((unsigned char *)ifr.ifr_hwaddr. 144 sa_data, eabuf)); 145 145 nvram_set("et0macaddr", macaddr); 146 146 // MAC_ADD( macaddr ); src/router/services/sysinit/sysinit-dir300.c
r12477 r13124 255 255 256 256 strcpy(macaddr, 257 ether_etoa((unsigned char *)ifr. 258 ifr_hwaddr.sa_data, eabuf));257 ether_etoa((unsigned char *)ifr.ifr_hwaddr. 258 sa_data, eabuf)); 259 259 nvram_set("et0macaddr", macaddr); 260 260 // MAC_ADD( macaddr ); … … 290 290 291 291 strcpy(macaddr, 292 ether_etoa((unsigned char *)ifr. 293 ifr_hwaddr.sa_data, eabuf));292 ether_etoa((unsigned char *)ifr.ifr_hwaddr. 293 sa_data, eabuf)); 294 294 nvram_set("et0macaddr", macaddr); 295 295 // MAC_ADD (macaddr); src/router/services/sysinit/sysinit-fonera.c
r12549 r13124 174 174 175 175 strcpy(macaddr, 176 ether_etoa((unsigned char *)ifr. 177 ifr_hwaddr.sa_data, eabuf));176 ether_etoa((unsigned char *)ifr.ifr_hwaddr. 177 sa_data, eabuf)); 178 178 nvram_set("et0macaddr", macaddr); 179 179 // MAC_ADD( macaddr ); src/router/services/sysinit/sysinit-gateworx.c
r13068 r13124 150 150 * /proc 151 151 */ 152 fprintf(stderr, "mount devices\n");152 fprintf(stderr, "mount devices\n"); 153 153 mount("proc", "/proc", "proc", MS_MGC_VAL, NULL); 154 154 // system2 ("/etc/convert"); … … 167 167 * eval("mount","/etc/usr.fs","/usr","-t","squashfs","-o","loop"); 168 168 */ 169 fprintf(stderr, "create folders\n");169 fprintf(stderr, "create folders\n"); 170 170 eval("mkdir", "/tmp/www"); 171 171 eval("mknod", "/dev/gpio", "c", "127", "0"); … … 198 198 mkdir("/var/tmp", 0777); 199 199 200 201 200 cprintf("sysinit() setup console\n"); 202 201 … … 205 204 */ 206 205 207 fprintf(stderr, "set console loglevel\n");206 fprintf(stderr, "set console loglevel\n"); 208 207 cprintf("sysinit() klogctl\n"); 209 208 klogctl(8, NULL, atoi(nvram_safe_get("console_loglevel"))); … … 215 214 uname(&name); 216 215 217 218 216 #ifndef HAVE_TONZE 219 217 #ifndef HAVE_NOP8670 … … 221 219 #endif 222 220 #endif 223 fprintf(stderr, "try modules for ethernet adapters\n");221 fprintf(stderr, "try modules for ethernet adapters\n"); 224 222 nvram_set("intel_eth", "0"); 225 223 if (detect("82541")) // Intel Gigabit … … 232 230 nvram_set("intel_eth", "1"); 233 231 insmod("8139too"); 234 } 235 else if (detect("8139")) // Realtek 8139 Adapter (various notebooks) 232 } else if (detect("8139")) // Realtek 8139 Adapter (various notebooks) 236 233 { 237 234 nvram_set("intel_eth", "1"); 238 235 insmod("8139too"); 239 } 240 else if (detect("DFE-690TXD")) // Realtek 8139 Adapter (various 236 } else if (detect("DFE-690TXD")) // Realtek 8139 Adapter (various 241 237 { 242 238 // notebooks) 243 239 nvram_set("intel_eth", "1"); 244 240 insmod("8139too"); 245 } 246 else if (detect("SMC2-1211TX")) // Realtek 8139 Adapter (various 247 { // notebooks) 241 } else if (detect("SMC2-1211TX")) // Realtek 8139 Adapter (various 242 { // notebooks) 248 243 nvram_set("intel_eth", "1"); 249 244 insmod("8139too"); 250 } 251 else if (detect("Robotics")) // Realtek 8139 Adapter (various 252 { // notebooks) 245 } else if (detect("Robotics")) // Realtek 8139 Adapter (various 246 { // notebooks) 253 247 nvram_set("intel_eth", "1"); 254 248 insmod("8139too"); 255 249 } 256 250 #ifndef HAVE_NOWIFI 257 fprintf(stderr, "load HAL Driver\n");251 fprintf(stderr, "load HAL Driver\n"); 258 252 insmod("ath_hal"); 259 fprintf(stderr, "load ATH Driver\n");253 fprintf(stderr, "load ATH Driver\n"); 260 254 if (nvram_get("rate_control") != NULL) { 261 255 char rate[64]; … … 272 266 273 267 #if 1 274 fprintf(stderr, "load IXP helper\n");268 fprintf(stderr, "load IXP helper\n"); 275 269 insmod("ixp400th"); 276 fprintf(stderr, "load IXP Core Driver\n");270 fprintf(stderr, "load IXP Core Driver\n"); 277 271 insmod("ixp400"); 278 // system2("cat /usr/lib/firmware/IxNpeMicrocode.dat > /dev/IxNpe");279 fprintf(stderr, "load IXP Ethernet Driver\n");272 // system2("cat /usr/lib/firmware/IxNpeMicrocode.dat > /dev/IxNpe"); 273 fprintf(stderr, "load IXP Ethernet Driver\n"); 280 274 insmod("ixp400_eth"); 281 fprintf(stderr, "initialize Ethernet\n");275 fprintf(stderr, "initialize Ethernet\n"); 282 276 eval("ifconfig", "ixp0", "0.0.0.0", "up"); 283 277 eval("ifconfig", "ixp1", "0.0.0.0", "up"); 284 278 #ifndef HAVE_WAVESAT 285 fprintf(stderr, "Load OCF Drivers\n");279 fprintf(stderr, "Load OCF Drivers\n"); 286 280 insmod("ocf"); 287 281 insmod("cryptodev"); … … 307 301 // insmod("ipv6"); 308 302 309 fprintf(stderr, "Load Sensor Driver\n");303 fprintf(stderr, "Load Sensor Driver\n"); 310 304 insmod("ad7418"); // temp / voltage sensor 311 305 /* … … 338 332 copy[2], copy[3], copy[4], copy[5]); 339 333 fprintf(stderr, "configure IXP0 to %s\n", mac); 340 nvram_set("et0macaddr_safe", mac);334 nvram_set("et0macaddr_safe", mac); 341 335 eval("ifconfig", "ixp0", "hw", "ether", mac); 342 336 fseek(file, 0x43b, SEEK_SET); … … 355 349 char *filename = "/sys/devices/platform/IXP4XX-I2C.0/i2c-adapter:i2c-0/0-0051/eeprom"; /* bank2=0x100 356 350 */ 357 fprintf(stderr, "Read MAC Addresses from EEPROM\n");351 fprintf(stderr, "Read MAC Addresses from EEPROM\n"); 358 352 FILE *file = fopen(filename, "r"); 359 353 … … 371 365 sprintf(mac, "%02X:%02X:%02X:%02X:%02X:%02X", copy[0], copy[1], 372 366 copy[2], copy[3], copy[4], copy[5]); 373 nvram_set("et0macaddr_safe", mac);367 nvram_set("et0macaddr_safe", mac); 374 368 eval("ifconfig", "ixp0", "hw", "ether", mac); 375 369 sprintf(mac, "%02X:%02X:%02X:%02X:%02X:%02X", copy[6], copy[7], … … 388 382 // switch 389 383 { 390 fprintf(stderr,"Load SPI Kendin Switch Driver\n");384 fprintf(stderr, "Load SPI Kendin Switch Driver\n"); 391 385 insmod("spi-algo-bit"); 392 386 if (nvram_match("DD_BOARD", "Avila GW2355")) … … 401 395 char filename2[64]; 402 396 403 fprintf(stderr, "Detect additional Device capabilities\n");397 fprintf(stderr, "Detect additional Device capabilities\n"); 404 398 sprintf(filename2, "/dev/mtdblock/%d", getMTD("RedBoot")); 405 399 file = fopen(filename2, "r"); … … 428 422 copy[1], copy[2], copy[3], copy[4], copy[5]); 429 423 fprintf(stderr, "configure IXP0 to %s\n", mac); 430 nvram_set("et0macaddr_safe", mac);424 nvram_set("et0macaddr_safe", mac); 431 425 eval("ifconfig", "ixp0", "hw", "ether", mac); 432 426 fseek(file, 0x1f818, SEEK_SET); … … 444 438 } 445 439 446 447 448 449 450 440 #ifdef HAVE_MAKSAT 451 441 if (nvram_match("DD_BOARD2", "ADI Engineering Pronghorn Metro")) … … 468 458 ioctl(s, SIOCGIFHWADDR, &ifr); 469 459 nvram_set("et0macaddr_safe", 470 ether_etoa((unsigned char *)ifr. 471 ifr_hwaddr.sa_data, eabuf));460 ether_etoa((unsigned char *)ifr.ifr_hwaddr. 461 sa_data, eabuf)); 472 462 close(s); 473 463 } … … 488 478 ioctl(s, SIOCGIFHWADDR, &ifr); 489 479 nvram_set("et0macaddr_safe", 490 ether_etoa((unsigned char *)ifr. 491 ifr_hwaddr.sa_data, eabuf));480 ether_etoa((unsigned char *)ifr.ifr_hwaddr. 481 sa_data, eabuf)); 492 482 close(s); 493 483 } … … 541 531 ioctl(s, SIOCGIFHWADDR, &ifr); 542 532 nvram_set("et0macaddr_safe", 543 ether_etoa((unsigned char *)ifr. 544 ifr_hwaddr.sa_data, eabuf));533 ether_etoa((unsigned char *)ifr.ifr_hwaddr. 534 sa_data, eabuf)); 545 535 close(s); 546 536 } … … 567 557 #endif 568 558 569 570 559 /* cf capability ? */ 571 560 char *modelname = nvram_safe_get("DD_BOARD"); 572 if (!strncmp(modelname,"Gateworks Avila GW2348",22) || !strcmp(modelname,"Gateworks Cambria GW2358-4")) { 573 fprintf(stderr,"Load CF Card Driver\n"); 574 insmod("pata_ixp4xx_cf"); 575 } 561 if (!strncmp(modelname, "Gateworks Avila GW2348", 22) 562 || !strcmp(modelname, "Gateworks Cambria GW2358-4")) { 563 fprintf(stderr, "Load CF Card Driver\n"); 564 insmod("pata_ixp4xx_cf"); 565 } 576 566 577 567 /* watchdog type */ 578 fprintf(stderr, "Load Hardware Watchdog\n");568 fprintf(stderr, "Load Hardware Watchdog\n"); 579 569 insmod("ixp4xx_wdt"); 580 fprintf(stderr, "blink led\n");570 fprintf(stderr, "blink led\n"); 581 571 eval("ledtool", "1", "1"); // blink the led 4 times 582 583 584 fprintf(stderr,"Enable Watchdog\n"); 572 573 fprintf(stderr, "Enable Watchdog\n"); 585 574 if (!nvram_match("disable_watchdog", "1")) 586 575 eval("watchdog"); // system watchdog 587 576 588 577 /* 589 578 * Set a sane date src/router/services/sysinit/sysinit-lsx.c
r13103 r13124 190 190 copy[1], copy[2], copy[3], copy[4], copy[5]); 191 191 fprintf(stderr, "configure ETH0 to %s\n", mac); 192 nvram_set("et0macaddr_safe", mac);192 nvram_set("et0macaddr_safe", mac); 193 193 eval("ifconfig", "eth0", "hw", "ether", mac); 194 194 fseek(fp, 0x1f818, SEEK_SET); … … 201 201 eval("ifconfig", "eth1", "hw", "ether", mac); 202 202 /* disable led's */ 203 eval("gpio","enable","3"); // 1 204 eval("gpio","enable","4"); // 2 205 eval("gpio","enable","5"); //wlan 206 eval("gpio","enable","6"); //conn 207 eval("gpio","enable","7"); //diag 208 203 eval("gpio", "enable", "3"); // 1 204 eval("gpio", "enable", "4"); // 2 205 eval("gpio", "enable", "5"); //wlan 206 eval("gpio", "enable", "6"); //conn 207 eval("gpio", "enable", "7"); //diag 209 208 210 209 } 211 210 fclose(fp); 212 211 } 213 214 215 216 212 217 213 //#endif src/router/services/sysinit/sysinit-rcaa01.c
r12477 r13124 158 158 159 159 strcpy(macaddr, 160 ether_etoa((unsigned char *)ifr. 161 ifr_hwaddr.sa_data, eabuf));160 ether_etoa((unsigned char *)ifr.ifr_hwaddr. 161 sa_data, eabuf)); 162 162 nvram_set("et0macaddr", macaddr); 163 163 // MAC_ADD( macaddr ); src/router/services/sysinit/sysinit-rt2880.c
r13075 r13124 87 87 eval("mknod", "-m", "0660", "/dev/mmc3", "b", "126", "4"); 88 88 89 90 89 eval("mknod", "/dev/gpio", "c", "252", "0"); 91 90 … … 127 126 insmod("rt2860v2_ap"); 128 127 #ifdef HAVE_DIR600 129 sysprintf("echo \"write 0 0 0x3300\" > /proc/rt3052/mii/ctrl"); 130 sysprintf("echo \"write 1 0 0x3300\" > /proc/rt3052/mii/ctrl"); 131 sysprintf("echo \"write 2 0 0x3300\" > /proc/rt3052/mii/ctrl"); 132 sysprintf("echo \"write 3 0 0x3300\" > /proc/rt3052/mii/ctrl"); 133 #endif 134 #if defined(HAVE_DIR600) || defined(HAVE_AR670W) || defined(HAVE_EAP9550) 135 FILE *in=fopen("/dev/mtdblock/1","rb"); 136 if (in!=NULL) 137 { 138 unsigned char *config=malloc(65536); 139 memset(config,0,65536); 140 fread(config,65536,1,in); 128 sysprintf("echo \"write 0 0 0x3300\" > /proc/rt3052/mii/ctrl"); 129 sysprintf("echo \"write 1 0 0x3300\" > /proc/rt3052/mii/ctrl"); 130 sysprintf("echo \"write 2 0 0x3300\" > /proc/rt3052/mii/ctrl"); 131 sysprintf("echo \"write 3 0 0x3300\" > /proc/rt3052/mii/ctrl"); 132 #endif 133 #if defined(HAVE_DIR600) || defined(HAVE_AR670W) || defined(HAVE_EAP9550) 134 FILE *in = fopen("/dev/mtdblock/1", "rb"); 135 if (in != NULL) { 136 unsigned char *config = malloc(65536); 137 memset(config, 0, 65536); 138 fread(config, 65536, 1, in); 141 139 #ifdef HAVE_AR670W 142 int len = sizeof("lanmac="); 143 #else 144 int len = sizeof("ethaddr="); 145 #endif 146 int i; 147 for (i=0;i<65535-18;i++) 148 { 140 int len = sizeof("lanmac="); 141 #else 142 int len = sizeof("ethaddr="); 143 #endif 144 int i; 145 for (i = 0; i < 65535 - 18; i++) { 149 146 #ifdef HAVE_AR670W 150 if (!strncmp(&config[i],"lanmac=",7))151 #else 152 if (!strncmp(&config[i],"ethaddr=",8))153 #endif 154 {147 if (!strncmp(&config[i], "lanmac=", 7)) 148 #else 149 if (!strncmp(&config[i], "ethaddr=", 8)) 150 #endif 151 { 155 152 #ifdef HAVE_AR670W 156 char *mac = &config[i+7]; 157 #else 158 char *mac = &config[i+8]; 159 #endif 160 if (mac[0]=='"') 161 mac++; 162 mac[17]=0; 163 eval("ifconfig","eth2","hw","ether",mac); 164 nvram_set("et0macaddr_safe",mac); 165 break; 166 } 153 char *mac = &config[i + 7]; 154 #else 155 char *mac = &config[i + 8]; 156 #endif 157 if (mac[0] == '"') 158 mac++; 159 mac[17] = 0; 160 eval("ifconfig", "eth2", "hw", "ether", mac); 161 nvram_set("et0macaddr_safe", mac); 162 break; 163 } 164 } 165 free(config); 166 fclose(in); 167 167 } 168 free(config); 169 fclose(in); 170 } 171 #endif 172 168 #endif 173 169 174 170 /* switch config */ … … 176 172 { 177 173 eval("ifconfig", "eth2", "up"); 178 #ifndef HAVE_EAP9550 174 #ifndef HAVE_EAP9550 179 175 eval("vconfig", "set_name_type", "VLAN_PLUS_VID_NO_PAD"); 180 176 eval("vconfig", "add", "eth2", "1"); //LAN … … 219 215 sysprintf("switch reg w 70 ffff417e"); 220 216 #elif HAVE_AR670W 221 sysprintf("mii_mgr -s -p 29 -r 23 -v 0x07c2"); 222 sysprintf("mii_mgr -s -p 29 -r 22 -v 0x8420"); 223 224 sysprintf("mii_mgr -s -p 29 -r 24 -v 0x1"); 225 sysprintf("mii_mgr -s -p 29 -r 25 -v 0x1"); 226 sysprintf("mii_mgr -s -p 29 -r 26 -v 0x1"); 227 sysprintf("mii_mgr -s -p 29 -r 27 -v 0x1"); 228 sysprintf("mii_mgr -s -p 29 -r 28 -v 0x2"); 229 sysprintf("mii_mgr -s -p 30 -r 9 -v 0x1089"); 230 sysprintf("mii_mgr -s -p 30 -r 1 -v 0x2f00"); 231 sysprintf("mii_mgr -s -p 30 -r 2 -v 0x0030"); 232 217 sysprintf("mii_mgr -s -p 29 -r 23 -v 0x07c2"); 218 sysprintf("mii_mgr -s -p 29 -r 22 -v 0x8420"); 219 220 sysprintf("mii_mgr -s -p 29 -r 24 -v 0x1"); 221 sysprintf("mii_mgr -s -p 29 -r 25 -v 0x1"); 222 sysprintf("mii_mgr -s -p 29 -r 26 -v 0x1"); 223 sysprintf("mii_mgr -s -p 29 -r 27 -v 0x1"); 224 sysprintf("mii_mgr -s -p 29 -r 28 -v 0x2"); 225 sysprintf("mii_mgr -s -p 30 -r 9 -v 0x1089"); 226 sysprintf("mii_mgr -s -p 30 -r 1 -v 0x2f00"); 227 sysprintf("mii_mgr -s -p 30 -r 2 -v 0x0030"); 233 228 234 229 #elif HAVE_EAP9550 235 sysprintf("switch reg w 14 5555");236 sysprintf("switch reg w 40 1001");237 sysprintf("switch reg w 44 1001");238 sysprintf("switch reg w 48 1001");239 sysprintf("switch reg w 4c 1");240 sysprintf("switch reg w 50 2001");241 sysprintf("switch reg w 70 ffffffff");242 sysprintf("switch reg w 98 7f7f");243 sysprintf("switch reg w e4 7f");230 sysprintf("switch reg w 14 5555"); 231 sysprintf("switch reg w 40 1001"); 232 sysprintf("switch reg w 44 1001"); 233 sysprintf("switch reg w 48 1001"); 234 sysprintf("switch reg w 4c 1"); 235 sysprintf("switch reg w 50 2001"); 236 sysprintf("switch reg w 70 ffffffff"); 237 sysprintf("switch reg w 98 7f7f"); 238 sysprintf("switch reg w e4 7f"); 244 239 #else 245 240 sysprintf("switch reg w 14 405555"); src/router/services/sysinit/sysinit.c
r13087 r13124 583 583 {0, 0, 0} 584 584 }; 585 585 586 586 struct nvram_tuple wrt320vlan[] = { 587 587 {"lan_ifname", "br0", 0}, … … 882 882 * some routers that can run micro only have 16MB memory 883 883 */ 884 FILE *fmem = fopen("/proc/meminfo", "r"); 885 char line[128]; 886 unsigned long msize = 0; 887 888 if (fmem != NULL) { 889 fgets(line, sizeof(line), fmem); //eat first line 890 fgets(line, sizeof(line), fmem); 891 if (sscanf(line, "%*s %lu", &msize) == 1) { 892 if (msize > (8 * 1024 * 1024) ) { 893 nvram_set ("ip_conntrack_max", "4096"); 894 nvram_set ("ip_conntrack_tcp_timeouts", "3600"); 884 FILE *fmem = fopen("/proc/meminfo", "r"); 885 char line[128]; 886 unsigned long msize = 0; 887 888 if (fmem != NULL) { 889 fgets(line, sizeof(line), fmem); //eat first line 890 fgets(line, sizeof(line), fmem); 891 if (sscanf(line, "%*s %lu", &msize) == 1) { 892 if (msize > (8 * 1024 * 1024)) { 893 nvram_set("ip_conntrack_max", "4096"); 894 nvram_set("ip_conntrack_tcp_timeouts", 895 "3600"); 896 } 895 897 } 896 } 897 fclose (fmem); 898 } 898 fclose(fmem); 899 } 899 900 #endif 900 901 /* … … 1288 1289 case ROUTER_WRT320N: 1289 1290 nvram_unset("vlan0hwname"); 1290 break; 1291 break; 1291 1292 case ROUTER_LINKSYS_WTR54GS: 1292 1293 nvram_set("vlan0ports", "0 5*"); … … 1333 1334 case ROUTER_WRT320N: 1334 1335 nvram_set("vlan2ports", "0 8"); 1335 break;1336 break; 1336 1337 case ROUTER_LINKSYS_WTR54GS: 1337 1338 nvram_set("vlan1ports", "1 5"); … … 1366 1367 1367 1368 } 1368 1369 if (restore_defaults) { //hack for VLAN page display for some routers: lan is on vlan1, wan is on vlan21369 1370 if (restore_defaults) { //hack for VLAN page display for some routers: lan is on vlan1, wan is on vlan2 1370 1371 if (strlen(nvram_safe_get("vlan1ports")) == 10) { 1371 nvram_set("port0vlans", "2");1372 nvram_set("port1vlans", "1");1373 nvram_set("port2vlans", "1");1374 nvram_set("port3vlans", "1");1375 nvram_set("port4vlans", "1");1376 nvram_set("port5vlans", "1 2 16");1377 } 1372 nvram_set("port0vlans", "2"); 1373 nvram_set("port1vlans", "1"); 1374 nvram_set("port2vlans", "1"); 1375 nvram_set("port3vlans", "1"); 1376 nvram_set("port4vlans", "1"); 1377 nvram_set("port5vlans", "1 2 16"); 1378 } 1378 1379 } 1379 1380 … … 1418 1419 1419 1420 if (nvram_get("overclocking") == NULL) { 1420 char *clk = nvram_safe_get("clkfreq"); 1421 char dup[64]; 1422 1423 strcpy(dup, clk); 1424 int j; 1425 for (j = 0; j < strlen(dup); j++) 1426 if (dup[j] == ',') 1427 dup[j] = 0; 1428 1429 nvram_set("overclocking", dup);1421 char *clk = nvram_safe_get("clkfreq"); 1422 char dup[64]; 1423 1424 strcpy(dup, clk); 1425 int j; 1426 for (j = 0; j < strlen(dup); j++) 1427 if (dup[j] == ',') 1428 dup[j] = 0; 1429 1430 nvram_set("overclocking", dup); 1430 1431 } 1431 1432 cprintf("start overclocking\n"); src/router/services/tools/mii_mgr.c
r12858 r13124 17 17 printf("mii_mgr -g -p [phy number] -r [register number]\n"); 18 18 printf(" Get: mii_mgr -g -p 3 -r 4\n\n"); 19 printf("mii_mgr -s -p [phy number] -r [register number] -v [0xvalue]\n"); 19 printf 20 ("mii_mgr -s -p [phy number] -r [register number] -v [0xvalue]\n"); 20 21 printf(" Set: mii_mgr -s -p 4 -r 1 -v 0xff11\n\n"); 21 22 #endif … … 46 47 while ((opt = getopt(argc, argv, options)) != -1) { 47 48 switch (opt) { 48 case 'g':49 method = RAETH_MII_READ;50 break;51 case 's':52 method = RAETH_MII_WRITE;53 break;54 case 'p':55 mii.phy_id = (__u16)atoi(optarg);56 break;57 case 'r':58 mii.reg_num = (__u16)atoi(optarg);59 break;60 case 'v':61 mii.val_in = (__u16)strtol(optarg, NULL, 16);62 break;63 case '?':64 show_usage();65 break;49 case 'g': 50 method = RAETH_MII_READ; 51 break; 52 case 's': 53 method = RAETH_MII_WRITE; 54 break; 55 case 'p': 56 mii.phy_id = (__u16)atoi(optarg); 57 break; 58 case 'r': 59 mii.reg_num = (__u16)atoi(optarg); 60 break; 61 case 'v': 62 mii.val_in = (__u16)strtol(optarg, NULL, 16); 63 break; 64 case '?': 65 show_usage(); 66 break; 66 67 } 67 68 } … … 70 71 if (ret < 0) { 71 72 printf("mii_mgr: ioctl error\n"); 72 } 73 else 74 switch (method) { 73 } else 74 switch (method) { 75 75 case RAETH_MII_READ: 76 76 printf("Get: phy[%d].reg[%d] = %04x\n", 77 mii.phy_id, mii.reg_num, mii.val_out);77 mii.phy_id, mii.reg_num, mii.val_out); 78 78 break; 79 79 case RAETH_MII_WRITE: 80 80 printf("Set: phy[%d].reg[%d] = %04x\n", 81 mii.phy_id, mii.reg_num, mii.val_in);81 mii.phy_id, mii.reg_num, mii.val_in); 82 82 break; 83 }83 } 84 84 85 85 close(sk); src/router/services/tools/overclock_atheros.c
r12348 r13124 168 168 fseek(in, 0x76b, SEEK_SET); 169 169 int dir300mul5 = getc(in); 170 171 170 172 171 fseek(in, 0x763, SEEK_SET); … … 500 499 fclose(in); 501 500 eval("mtd", "-f", "write", "/tmp/boot", "RedBoot"); 502 } else if (microvipermul == 0x9 || microvipermul == 0xa || microvipermul == 0xb 503 || microvipermul == 0xc || microvipermul == 0x17) { 501 } else if (microvipermul == 0x9 || microvipermul == 0xa 502 || microvipermul == 0xb || microvipermul == 0xc 503 || microvipermul == 0x17) { 504 504 505 505 fprintf(stderr, "viper microredboot(ar2313) found\n"); src/router/services/tools/reset_defaults.c
r12395 r13124 92 92 return 0; 93 93 } 94 94 95 extern void load_defaults(void); 95 96 extern void free_defaults(void); src/router/services/tools/site_survey_madwifi.c
r12253 r13124 137 137 } 138 138 139 140 139 static void fillenc(char *encinfo, unsigned char *vp, int ielen) 141 140 { src/router/services/tools/site_survey_ralink.c
r12991 r13124 137 137 skipline(scan); 138 138 skipline(scan); 139 // fscanf(scan, "%s %s", b1, b2);// skip first line140 // fscanf(scan, "%s %s %s %s %s %s %s", b1, b2, b3, b4, b5, b6, b7);//skip second line139 // fscanf(scan, "%s %s", b1, b2); // skip first line 140 // fscanf(scan, "%s %s %s %s %s %s %s", b1, b2, b3, b4, b5, b6, b7); //skip second line 141 141 i = 0; 142 142 do { 143 // fprintf(stderr,"read\n");143 // fprintf(stderr,"read\n"); 144 144 if (feof(scan)) 145 145 break; … … 151 151 b2[strlen(b2)] = 0; 152 152 int ret = fscanf(scan, "%s %s %s %s %s", b3, b4, b5, b6, b7); //skip second line 153 // fprintf(stderr,"%d\n",ret);153 // fprintf(stderr,"%d\n",ret); 154 154 if (ret < 5) 155 155 break; … … 159 159 site_survey_lists[i].phy_noise = -95; // no way 160 160 strcpy(site_survey_lists[i].ENCINFO, b4); 161 // strcat(site_survey_lists[i].ENCINFO, b4);161 // strcat(site_survey_lists[i].ENCINFO, b4); 162 162 site_survey_lists[i].RSSI = -atoi(b5); 163 163
