Changeset 18808
- Timestamp:
- 03/22/12 18:52:29 (14 months ago)
- Location:
- src/router/services
- Files:
-
- 3 edited
-
networking/firewall.c (modified) (7 diffs)
-
networking/network.c (modified) (3 diffs)
-
sysinit/sysinit.c (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
src/router/services/networking/firewall.c
r18706 r18808 922 922 #ifndef HAVE_BCMMODERN 923 923 if (nvram_match("block_loopback", "0")) 924 writeproc("/proc/sys/net/ipv4/conf/br0/loop", "1");924 writeproc("/proc/sys/net/ipv4/conf/br0/loop", "1"); 925 925 #endif 926 926 #endif … … 1994 1994 //check if ovpn server is running 1995 1995 if (nvram_match("openvpn_enable", "1") 1996 1996 && nvram_match("openvpn_switch", "1")) { 1997 1997 save2file("-A INPUT -p %s --dport %s -j %s\n", 1998 1998 nvram_match("openvpn_proto", "udp") ? "udp" : "tcp", … … 2004 2004 save2file("-A FORWARD -o %s0 -j %s\n", 2005 2005 nvram_safe_get("openvpn_tuntap"), log_accept); 2006 } 2006 } 2007 2007 #endif 2008 2008 if (wanactive()) { … … 2252 2252 if (strcmp(get_wan_face(), var) 2253 2253 && strcmp(nvram_safe_get("lan_ifname"), var)) { 2254 if (nvram_nmatch("0", "%s_bridged", var) && nvram_nmatch("0","%s_nat",var)) { 2254 if (nvram_nmatch("0", "%s_bridged", var) 2255 && nvram_nmatch("0", "%s_nat", var)) { 2255 2256 save2file("-A FORWARD -i %s -j %s\n", var, 2256 2257 log_accept); … … 3191 3192 if (isregistered_real()) 3192 3193 #endif 3194 { 3193 3195 runStartup("/jffs/etc/config", ".prewall"); // if available 3194 runStartup("/mmc/etc/config", ".prewall"); // if available 3195 runStartup("/tmp/etc/config", ".prewall"); // if available 3196 create_rc_file(RC_FIREWALL); 3197 if (f_exists("/tmp/.rc_firewall")) { 3198 setenv("PATH", "/sbin:/bin:/usr/sbin:/usr/bin", 1); 3199 system("/tmp/.rc_firewall"); 3200 } 3201 runStartup("/etc/config", ".firewall"); 3196 runStartup("/mmc/etc/config", ".prewall"); // if available 3197 runStartup("/tmp/etc/config", ".prewall"); // if available 3198 create_rc_file(RC_FIREWALL); 3199 if (f_exists("/tmp/.rc_firewall")) { 3200 setenv("PATH", "/sbin:/bin:/usr/sbin:/usr/bin", 1); 3201 system("/tmp/.rc_firewall"); 3202 } 3203 runStartup("/etc/config", ".firewall"); 3204 } 3202 3205 3203 3206 cprintf("Ready\n"); … … 3219 3222 cprintf("done"); 3220 3223 #ifdef XBOX_SUPPORT 3221 writeproc("/proc/sys/net/ipv4/netfilter/ip_conntrack_udp_timeout","65"); 3222 writeproc("/proc/sys/net/ipv4/netfilter/ip_conntrack_udp_timeouts","65 180"); 3224 writeproc("/proc/sys/net/ipv4/netfilter/ip_conntrack_udp_timeout", 3225 "65"); 3226 writeproc("/proc/sys/net/ipv4/netfilter/ip_conntrack_udp_timeouts", 3227 "65 180"); 3223 3228 #endif 3224 3229 cprintf("Start firewall\n"); … … 3234 3239 cprintf("start ipv6\n"); 3235 3240 if (nvram_match("ipv6_enable", "1")) { 3236 writeproc("/proc/sys/net/ipv6/conf/all/forwarding", "1");3241 writeproc("/proc/sys/net/ipv6/conf/all/forwarding", "1"); 3237 3242 } 3238 3243 #ifdef HAVE_WIFIDOG -
src/router/services/networking/network.c
r18799 r18808 785 785 786 786 // don't let packages pass to iptables without ebtables loaded 787 writeproc("/proc/sys/net/bridge/bridge-nf-call-arptables", "0");788 writeproc("/proc/sys/net/bridge/bridge-nf-call-ip6tables", "0");789 writeproc("/proc/sys/net/bridge/bridge-nf-call-iptables", "0");787 writeproc("/proc/sys/net/bridge/bridge-nf-call-arptables", "0"); 788 writeproc("/proc/sys/net/bridge/bridge-nf-call-ip6tables", "0"); 789 writeproc("/proc/sys/net/bridge/bridge-nf-call-iptables", "0"); 790 790 strcpy(lan_ifname, nvram_safe_get("lan_ifname")); 791 791 strcpy(wan_ifname, nvram_safe_get("wan_ifname")); … … 2053 2053 wl_iovar_set(name, 2054 2054 "wet_host_mac", 2055 ifr. 2056 ifr_hwaddr.sa_data,2055 ifr.ifr_hwaddr. 2056 sa_data, 2057 2057 ETHER_ADDR_LEN); 2058 2058 } … … 4195 4195 cprintf("running custom DD-WRT ipup scripts\n"); 4196 4196 runStartup("/etc/config", ".ipup"); 4197 #ifdef HAVE_REGISTER 4198 if (isregistered_real()) 4199 #endif 4200 { 4197 4201 #ifdef HAVE_RB500 4198 runStartup("/usr/local/etc/config", ".ipup");4202 runStartup("/usr/local/etc/config", ".ipup"); 4199 4203 #else 4200 runStartup("/jffs/etc/config", ".ipup"); 4201 runStartup("/mmc/etc/config", ".ipup"); 4202 #endif 4204 runStartup("/jffs/etc/config", ".ipup"); 4205 runStartup("/mmc/etc/config", ".ipup"); 4206 #endif 4207 } 4203 4208 cprintf("trigger gpio"); 4204 4209 -
src/router/services/sysinit/sysinit.c
r18799 r18808 192 192 if (nvram_get("ath0_akm") == NULL || force) { 193 193 char *region = getUEnv("region"); 194 if (!region 195 || (strcmp(region, "AP") && strcmp(region, "TW") 196 && strcmp(region, "RU") 197 && strcmp(region, "KR") 198 && strcmp(region, "CH"))) { 194 if (!region || (strcmp(region, "AP") && strcmp(region, "TW") 195 && strcmp(region, "RU") 196 && strcmp(region, "KR") 197 && strcmp(region, "CH"))) { 199 198 { 200 199 char *mode_ex = … … 407 406 #endif 408 407 if (!strcmp(region, "AP") || !strcmp(region, "CH") 409 410 411 408 || !strcmp(region, "KR") 409 || !strcmp(region, "TW") 410 || !strcmp(region, "RU")) 412 411 nvram_set("wps_status", "0"); 413 412 else … … 426 425 runStartup("/etc/config", ".startup"); 427 426 427 #ifdef HAVE_REGISTER 428 if (isregistered_real()) { 429 #endif 428 430 #ifdef HAVE_RB500 429 runStartup("/usr/local/etc/config", ".startup"); // if available431 runStartup("/usr/local/etc/config", ".startup"); // if available 430 432 #elif HAVE_X86 431 runStartup("/usr/local/etc/config", ".startup"); // if available433 runStartup("/usr/local/etc/config", ".startup"); // if available 432 434 #else 433 runStartup("/jffs/etc/config", ".startup"); // if available 434 runStartup("/mmc/etc/config", ".startup"); // if available 435 runStartup("/jffs/etc/config", ".startup"); // if available 436 runStartup("/mmc/etc/config", ".startup"); // if available 437 #endif 438 #ifdef HAVE_REGISTER 439 } 435 440 #endif 436 441 return; … … 440 445 { 441 446 runStartup("/etc/config", ".wanup"); 447 #ifdef HAVE_REGISTER 448 if (isregistered_real()) 449 #endif 450 { 451 442 452 #ifdef HAVE_RB500 443 runStartup("/usr/local/etc/config", ".wanup"); // if available453 runStartup("/usr/local/etc/config", ".wanup"); // if available 444 454 #elif HAVE_X86 445 runStartup("/usr/local/etc/config", ".wanup"); // if available455 runStartup("/usr/local/etc/config", ".wanup"); // if available 446 456 #else 447 runStartup("/jffs/etc/config", ".wanup"); // if available 448 runStartup("/mmc/etc/config", ".wanup"); // if available 449 runStartup("/tmp/etc/config", ".wanup"); // if available 450 #endif 457 runStartup("/jffs/etc/config", ".wanup"); // if available 458 runStartup("/mmc/etc/config", ".wanup"); // if available 459 runStartup("/tmp/etc/config", ".wanup"); // if available 460 #endif 461 } 451 462 return; 452 463 } … … 2616 2627 #ifdef HAVE_AQOS 2617 2628 //filter hostapd shaping rules 2618 2629 2619 2630 char *qos_mac = nvram_safe_get("svqos_macs"); 2620 2631 2621 2632 if (strlen(qos_mac) > 0) { 2622 2633 char *newqos = malloc(strlen(qos_mac) + 254); 2623 memset(newqos, 0, strlen(qos_mac) +254);2634 memset(newqos, 0, strlen(qos_mac) + 254); 2624 2635 2625 2636 char level[32], level2[32], data[32], type[32], level3[32]; … … 2631 2642 break; 2632 2643 2633 if (!strcmp(level3, "|"))2644 if (!strcmp(level3, "|")) 2634 2645 strcpy(level3, "0"); 2635 2646 … … 2640 2651 type, level3); 2641 2652 else 2642 sprintf(newqos, "%s %s %s %s %s |", data, 2643 level, level2, type, level3); 2653 sprintf(newqos, "%s %s %s %s %s |", 2654 data, level, level2, type, 2655 level3); 2644 2656 2645 2657 } … … 2649 2661 free(newqos); 2650 2662 } 2651 2663 2652 2664 char *qos_ip = nvram_safe_get("svqos_ips"); 2653 2665 2654 2666 if (strlen(qos_ip) > 0) { 2655 2667 char *newip = malloc(strlen(qos_ip) + 254); 2656 memset(newip, 0, strlen(qos_ip) +254);2657 2668 memset(newip, 0, strlen(qos_ip) + 254); 2669 2658 2670 char data[32], level[32], level2[32], level3[32]; 2659 2671 2660 2672 do { 2661 if (sscanf(qos_ip, "%31s %31s %31s %31s |", data, level, level2, level3) < 4) 2673 if (sscanf 2674 (qos_ip, "%31s %31s %31s %31s |", data, level, 2675 level2, level3) < 4) 2662 2676 break; 2663 2677 2664 2678 if (!strcmp(level3, "|")) 2665 2679 strcpy(level3, "0"); 2666 2680 2667 2681 if (strlen(newip) > 0) 2668 sprintf(newip, "%s %s %s %s %s |", newip, data, level, level2, level3); 2682 sprintf(newip, "%s %s %s %s %s |", newip, data, 2683 level, level2, level3); 2669 2684 else 2670 sprintf(newip, "%s %s %s %s |", data, level, level2, level3); 2685 sprintf(newip, "%s %s %s %s |", data, level, 2686 level2, level3); 2671 2687 } 2672 2688 while ((qos_ip = strpbrk(++qos_ip, "|")) && qos_ip++); … … 2674 2690 free(newip); 2675 2691 } 2676 2677 2692 #endif 2678 2693 return;
Note: See TracChangeset
for help on using the changeset viewer.
