Changeset 13126
- Timestamp:
- 10/22/09 00:05:47 (1 month ago)
- Files:
-
- src/router/httpd/httpd.c (modified) (4 diffs)
- src/router/httpd/modules/broadcom.c (modified) (3 diffs)
- src/router/httpd/modules/callvalidate.c (modified) (1 diff)
- src/router/httpd/validate/validators.c (modified) (1 diff)
- src/router/httpd/visuals/dd-wrt.c (modified) (15 diffs)
- src/router/httpd/visuals/dhcp.c (modified) (1 diff)
- src/router/httpd/visuals/wireless.c (modified) (1 diff)
- src/router/httpd/visuals/wireless_broadcom.c (modified) (1 diff)
- src/router/httpd/visuals/wireless_generic.c (modified) (1 diff)
- src/router/httpd/visuals/wireless_madwifi.c (modified) (1 diff)
- src/router/httpd/visuals/wireless_ralink.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
src/router/httpd/httpd.c
r12533 r13126 770 770 return; 771 771 } 772 int nodetect =0;773 if (nvram_match("status_auth", "0") && endswith(file, "Info.htm"))774 nodetect =1;775 776 if (referer && host && nodetect ==0) {772 int nodetect = 0; 773 if (nvram_match("status_auth", "0") && endswith(file, "Info.htm")) 774 nodetect = 1; 775 776 if (referer && host && nodetect == 0) { 777 777 int i; 778 778 int hlen = strlen(host); … … 941 941 } else 942 942 #endif 943 {943 { 944 944 /* extract url args if present */ 945 945 query = strchr(file, '?'); … … 965 965 { 966 966 if (((nvram_match("http_username", DEFAULT_USER) 967 && nvram_match("http_passwd", DEFAULT_PASS)) 968 || nvram_match("http_username", "") 969 || nvram_match("http_passwd", "admin")) && !endswith(file, "register.asp")){ 967 && nvram_match("http_passwd", DEFAULT_PASS)) 968 || nvram_match("http_username", "") 969 || nvram_match("http_passwd", "admin")) 970 && !endswith(file, "register.asp")) { 970 971 changepassword = 1; 971 972 if (endswith(file, ".asp")) … … 1056 1057 if (handler->send_headers) 1057 1058 send_headers(200, "Ok", 1058 handler->extra_header, 1059 handler-> 1060 extra_header, 1059 1061 handler->mime_type, 1060 1062 0, NULL); src/router/httpd/modules/broadcom.c
r13064 r13126 2134 2134 if (sscanf(query, "%u-%u", &month, &year) != 2) 2135 2135 return; 2136 if (month <1 || month>12)2136 if (month < 1 || month > 12) 2137 2137 return; 2138 2138 … … 2151 2151 break; //skip monthly total 2152 2152 int ret = sscanf(var, "%lu:%lu", &rcvd[i], &sent[i]); 2153 if (ret !=2)2154 break;2153 if (ret != 2) 2154 break; 2155 2155 totin += rcvd[i]; 2156 2156 totout += sent[i]; … … 2175 2175 char incom[32]; 2176 2176 2177 snprintf(incom, 32, "%s", live_translate("status_inet.traffin"));2177 snprintf(incom, 32, "%s", live_translate("status_inet.traffin")); 2178 2178 char outcom[32]; 2179 2179 2180 snprintf(outcom, 32, "%s", live_translate("status_inet.traffout"));2180 snprintf(outcom, 32, "%s", live_translate("status_inet.traffout")); 2181 2181 char monthname[32]; 2182 2182 2183 snprintf(monthname, 32, "%s", live_translate(months[month - 1]));2183 snprintf(monthname, 32, "%s", live_translate(months[month - 1])); 2184 2184 2185 2185 websWrite(stream, src/router/httpd/modules/callvalidate.c
r13102 r13126 280 280 void *call_ej(char *name, void *handle, webs_t wp, int argc, char_t ** argv) 281 281 { 282 if (nvram_match("console_debug", "1")) 283 { 282 if (nvram_match("console_debug", "1")) { 284 283 fprintf(stderr, "call_ej %s\n", name); 285 int i =0;286 for (i =0;i<argc;i++)287 fprintf(stderr,"argument %s\n",argv[i]);288 }284 int i = 0; 285 for (i = 0; i < argc; i++) 286 fprintf(stderr, "argument %s\n", argv[i]); 287 } 289 288 char service[64]; 290 289 int nohandle = 0; src/router/httpd/validate/validators.c
r13058 r13126 810 810 if (!valid_ipaddr(wp, lan_ipaddr, v)) 811 811 return; 812 813 812 814 813 if (strcmp(nvram_safe_get("lan_ipaddr"), lan_ipaddr)) { src/router/httpd/visuals/dd-wrt.c
r13083 r13126 2509 2509 2510 2510 #ifdef HAVE_MADWIFI 2511 // memset(bufferif2, 0, 256);2512 // getIfList(bufferif2, "ath");2513 // foreach(word, bufferif2, next) {2514 // if (contains(word, '.'))2515 // sprintf(bufferif, "%s %s", bufferif, word);2516 // }2511 // memset(bufferif2, 0, 256); 2512 // getIfList(bufferif2, "ath"); 2513 // foreach(word, bufferif2, next) { 2514 // if (contains(word, '.')) 2515 // sprintf(bufferif, "%s %s", bufferif, word); 2516 // } 2517 2517 int c = getifcount("wifi"); 2518 2518 … … 2520 2520 char ath[32]; 2521 2521 2522 // sprintf(ath, "ath%d_bridged", i);2523 // if (nvram_default_match(ath, "1", "1"))2522 // sprintf(ath, "ath%d_bridged", i); 2523 // if (nvram_default_match(ath, "1", "1")) 2524 2524 { 2525 2525 sprintf(bufferif, "%s ath%d", bufferif, i); … … 2709 2709 sprintf(cn, "%d", chan[i].channel); 2710 2710 sprintf(fr, "%d", chan[i].freq); 2711 int freq = get_wififreq(prefix, chan[i].freq);2712 if (freq !=-1)2713 websWrite(wp,2714 "document.write(\"<option value=\\\"%s\\\" %s>%s - %d MHz</option>\");\n",2715 fr, nvram_match(wl_channel,2716 fr) ?2717 "selected=\\\"selected\\\"" : "", cn,2718 (freq));2711 int freq = get_wififreq(prefix, chan[i].freq); 2712 if (freq != -1) 2713 websWrite(wp, 2714 "document.write(\"<option value=\\\"%s\\\" %s>%s - %d MHz</option>\");\n", 2715 fr, nvram_match(wl_channel, 2716 fr) ? 2717 "selected=\\\"selected\\\"" : 2718 "", cn, (freq)); 2719 2719 // free (chan[i].freq); 2720 2720 i++; … … 4888 4888 websWrite(wp, "//]]>\n</script>\n"); 4889 4889 websWrite(wp, "</div>\n"); 4890 4890 4891 4891 websWrite(wp, "<div class=\"setting\">\n"); 4892 4892 websWrite(wp, … … 4904 4904 websWrite(wp, "//]]>\n</script>\n"); 4905 4905 websWrite(wp, "</div>\n"); 4906 4906 4907 4907 websWrite(wp, "</div>\n"); 4908 4908 … … 4953 4953 websWrite(wp, "//]]>\n</script>\n"); 4954 4954 websWrite(wp, "</div>\n"); 4955 4955 4956 4956 websWrite(wp, "<div class=\"setting\">\n"); 4957 4957 websWrite(wp, … … 4968 4968 prefix, prefix); 4969 4969 websWrite(wp, "//]]>\n</script>\n"); 4970 websWrite(wp, "</div>\n"); 4971 4970 websWrite(wp, "</div>\n"); 4971 4972 4972 websWrite(wp, "</div>\n"); 4973 4973 // leap authentication … … 5000 5000 "<input name=\"%s_leap8021xphase2\" size=\"20\" maxlength=\"79\" value=\"%s\" /></div>\n", 5001 5001 prefix, nvram_prefix_get("leap8021xphase2", prefix)); 5002 5002 5003 5003 websWrite(wp, "<div class=\"setting\">\n"); 5004 5004 websWrite(wp, … … 5096 5096 websWrite(wp, "//]]>\n</script>\n"); 5097 5097 websWrite(wp, "</div>\n"); 5098 5098 5099 5099 websWrite(wp, "<div class=\"setting\">\n"); 5100 5100 websWrite(wp, … … 5763 5763 5764 5764 if (channel > 0 && channel < 1000) { 5765 websWrite(wp, "%d (%d Mhz)", channel,get_wififreq(nvram_safe_get("wifi_display"),wifi_getfreq(nvram_safe_get("wifi_display")))); 5765 websWrite(wp, "%d (%d Mhz)", channel, 5766 get_wififreq(nvram_safe_get("wifi_display"), 5767 wifi_getfreq(nvram_safe_get 5768 ("wifi_display")))); 5766 5769 } else 5767 5770 // websWrite (wp, "unknown"); … … 5821 5824 5822 5825 #endif 5823 5824 5825 5826 5826 5827 5827 #define WDS_RSSI_TMP "/tmp/.rssi" … … 7415 7415 "<td><input name=\"%s\" size=\"8\" value=\"%s\" /></td>\n", 7416 7416 vlan_name, (db->users[i].user != NULL 7417 && db->users[i]. 7418 usersize) ? db->users[i]. 7419 user : ""); 7417 && db->users[i].usersize) ? db-> 7418 users[i].user : ""); 7420 7419 7421 7420 sprintf(vlan_name, "password%d", i); … … 7423 7422 "<td><input name=\"%s\" size=\"8\" value=\"%s\" /></td>\n", 7424 7423 vlan_name, (db->users[i].passwd != NULL 7425 && db-> 7426 users[i].passwordsize) ? db->7427 users[i].passwd : "");7424 && db->users[i]. 7425 passwordsize) ? db->users[i]. 7426 passwd : ""); 7428 7427 7429 7428 sprintf(vlan_name, "downstream%d", i); … … 7482 7481 "<td><input name=\"%s\" size=\"20\" value=\"%s\" /></td>\n", 7483 7482 vlan_name, (db->users[i].client != NULL 7484 && db->users[i]. 7485 clientsize) ? db->users[i]. 7486 client : ""); 7483 && db->users[i].clientsize) ? db-> 7484 users[i].client : ""); 7487 7485 7488 7486 sprintf(vlan_name, "shared%d", i); … … 7490 7488 "<td><input name=\"%s\" size=\"20\" value=\"%s\" /></td>\n", 7491 7489 vlan_name, (db->users[i].passwd != NULL 7492 && db-> 7493 users[i].passwordsize) ? db->7494 users[i].passwd : "");7490 && db->users[i]. 7491 passwordsize) ? db->users[i]. 7492 passwd : ""); 7495 7493 7496 7494 websWrite(wp, src/router/httpd/visuals/dhcp.c
r12846 r13126 274 274 "%c\"%s\",\"%s\",\"%s\",\"%s\",\"%d\"", 275 275 count ? ',' : ' ', 276 !*lease. 277 hostname ? " " : lease.hostname, 278 ipaddr, mac, expires_time, 276 !*lease.hostname ? " " : lease. 277 hostname, ipaddr, mac, expires_time, 279 278 get_single_ip(ipaddr, 3)); 280 279 cprintf("entry dumpleases:%d\n", __LINE__); src/router/httpd/visuals/wireless.c
r13119 r13126 771 771 #endif 772 772 else if (!strcmp(security_mode, "radius")) 773 show_radius(wp, prefix, 1, 0);773 show_radius(wp, prefix, 1, 0); 774 774 else if (!strcmp(security_mode, "wpa") 775 775 || !strcmp(security_mode, "wpa2") src/router/httpd/visuals/wireless_broadcom.c
r12998 r13126 148 148 } 149 149 } 150 src/router/httpd/visuals/wireless_generic.c
r12998 r13126 16 16 return str; 17 17 } 18 src/router/httpd/visuals/wireless_madwifi.c
r12998 r13126 27 27 28 28 #include "wireless_generic.c" 29 30 29 31 30 #include <sys/types.h> src/router/httpd/visuals/wireless_ralink.c
r12998 r13126 27 27 28 28 #include "wireless_generic.c" 29 30 31 29 32 30 #include <sys/types.h>
