[Ewrt-devel] Greetings

Tom Goetz
Tue Jun 8 17:47:35 PDT 2004


Irving Popovetsky wrote:

>Hi Tom, glad to have you aboard.
>
>On Mon, 2004-06-07 at 05:45, Tom Goetz wrote:
>  
>
>>Here's what I'm modifying so far:
>>
>>1. Hide NoCat in the web interface if not built.
>>2. Make the build compile clean if telnetd is not built (there's a 
>>compile failure in rc/rc.c). Hide telnetd in the web interface if not built.
>>3. Add a config option for including the the web help. Don't add the 
>>help to the image if not configed. Hide links to help if not configed.
>>4. Hide pppd in the web interface if not confied and built.
>>5. Set the nvram variables for web components to 0 if they are not 
>>built. So that when moving from a firmware that included optional 
>>components to one that does not, the web support for the optional 
>>components turns off.
>>    
>>
>
>We would accept patches for all of these things, assuming we review the
>code and it looks good.   
>You've probably noticed that the build process is still a mess.  I
>cleaned it up a little in Ewrt, but try doing make a second time or do a
>"make clean" to see what I mean.   The build targets just need to be
>fixed, I haven't had a chance to do it yet.
>
>look forward to seeing your code,
>
>  
>
I understand that EWRT is geared towards a Wifi hot spot router and the 
default build reflects this. However my interest is in a VPN router and 
I would like to submit patches so that it could build as one with a 
simple reconfig. For my changes I attempted to follow the existing code 
base. If you intend to establish a new coding style going forward I can 
adapt the changes to it.

I've included two files. The first is a patch generated by cvs -q diff 
-c in the router directory, it should apply with a patch -p0 < 
router.patch in the same directory. The second is a .config I would like 
to submit for addition to the router/config directory as defconfig-VPN.

The patch includes the following:

1. Hide config for the following from the web pages if not built:
    www help
    telnetd
    pptp
    nocat
    routing

2. Allow PPTPD to be build if configed

3. Don't install files for the following if not configed:
    sshd
    splish

4. Add a config option CONFIG_WWW_HELP to control installing of help 
files. This also contols a nvram variable that hides links to help in 
remaining web pages when help is not installed.

5. Add web config for PPTP options ms_wins & ms_dns

6. Fix rc/services.c so that you can build without CONFIG_TELNETD

I read some interesting discussions in the sveasoft forums about a 
lighter weight web interface. This doesn't seem to be in the build yet. 
Newer builds are rumpred to have more stats pages. I'd be interested in 
picking up these changes and intergrating them.

Hope you like it,

Tom Goetz
tom at goetz-family.org
-------------- next part --------------
#
# Automatically generated make config: don't edit
#

#
# Base Features
#
CONFIG_RC=y
CONFIG_NVRAM=y
CONFIG_SHARED=y
CONFIG_BUSYBOX=y
CONFIG_BUSYBOX_CONFIG=router
CONFIG_WLCONF=y
CONFIG_BRIDGE=y
CONFIG_VLAN=y
CONFIG_HTTPD=y
CONFIG_WWW=y
#CONFIG_WWW_HELP=y
# CONFIG_EBTABLES is not set
CONFIG_PPTPD=y
CONFIG_NETCONF=y
# CONFIG_IPTABLES is not set
CONFIG_LIBIPT=y
# CONFIG_GLIBC is not set
CONFIG_UCLIBC=y
CONFIG_LIBOPT=y

#
# Options
#
CONFIG_VENDOR=broadcom
CONFIG_UDHCPD=y
CONFIG_PPP=y
CONFIG_UPNP=y
CONFIG_NAS=y
CONFIG_NTP=y
CONFIG_DNSMASQ=y
CONFIG_UTILS=y
# CONFIG_TELNETD is not set
CONFIG_DROPBEAR_SSHD=y
CONFIG_BOOT_WAIT_ON=y
CONFIG_IPROUTE2=y
# CONFIG_SPLISH=y
# CONFIG_ETC is not set

#
# Additional C libraries
#
CONFIG_LIBCRYPT=y
CONFIG_LIBDL=y
CONFIG_LIBM=y
CONFIG_LIBNSL=y
CONFIG_LIBPTHREAD=y
CONFIG_LIBRESOLV=y
CONFIG_LIBUTIL=y
CONFIG_GLIB=y

#
# Environment
#
PLATFORM=mipsel
LINUXDIR=$(SRCBASE)/linux/linux
LIBDIR=$(TOOLCHAIN)/lib
USRLIBDIR=$(TOOLCHAIN)/usr/lib

#
# Internal Options
#
-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/Makefile,v
retrieving revision 1.7
diff -c -r1.7 Makefile
*** Makefile    18 May 2004 20:55:29 -0000      1.7
--- Makefile    9 Jun 2004 00:05:48 -0000
***************
*** 101,107 ****
  obj-$(CONFIG_EBTABLES) += ebtables
  obj-$(CONFIG_GLIB) += glib
  obj-$(CONFIG_SPLISH) += splish
! # obj-$(CONFIG_PPTPD) += pptpd
  
  ##################################################################
  CONFIG_OTHERS=y
--- 101,107 ----
  obj-$(CONFIG_EBTABLES) += ebtables
  obj-$(CONFIG_GLIB) += glib
  obj-$(CONFIG_SPLISH) += splish
! obj-$(CONFIG_PPTPD) += pptpd
  
  ##################################################################
  CONFIG_OTHERS=y
***************
*** 110,118 ****
  CONFIG_OPENSSL=y
  
  
- #CONFIG_MDNS=y
- 
- 
  obj-$(CONFIG_TFTPD) += tftpd
  obj-$(CONFIG_CRON) += cron
  obj-$(CONFIG_PPTP) += pptp-client
--- 110,115 ----
***************
*** 412,423 ****
--- 409,425 ----
        $(MAKE) -C dropbear scp
  
  dropbear-install:
+ ifeq ($(CONFIG_DROPBEAR_SSHD),1)
        install -D dropbear/dropbearmulti $(INSTALLDIR)/dropbear/usr/sbin/dropbear
        $(STRIP) $(INSTALLDIR)/dropbear/usr/sbin/dropbear
        cd $(INSTALLDIR)/dropbear/usr/sbin && ln -sf dropbear dropbearconvert && ln -sf dropbear dropbearkey
        install -D dropbear/scp $(INSTALLDIR)/dropbear/usr/bin/scp
        $(STRIP) $(INSTALLDIR)/dropbear/usr/bin/scp
        #cd $(INSTALLDIR)/dropbear/usr/bin && ln -sf scp ssh
+ else
+       # So that generic rule does not take precedence
+       @true
+ endif
  
  glib:
        $(MAKE) -C glib install
***************
*** 426,431 ****
--- 428,434 ----
        $(MAKE) -C splish
  
  splish-install:
+ ifeq ($(CONFIG_SPLISH),1)
        install -D splish/src/splashd $(INSTALLDIR)/splish/usr/sbin/splashd
        $(STRIP) $(INSTALLDIR)/splish/usr/sbin/splashd
        mkdir -p ${INSTALLDIR}/splish/etc
***************
*** 438,443 ****
--- 441,450 ----
        install -D splish/libexec/iptables/throttle.fw $(INSTALLDIR)/splish/usr/libexec/nocat/throttle.fw
        mkdir -p $(INSTALLDIR)/splish/usr/share/nocat/
        cp -r splish/htdocs $(INSTALLDIR)/splish/usr/share/nocat/
+ else
+       # So that generic rule does not take precedence
+       @true
+ endif
  
  iproute2:
        $(MAKE) -C iproute2 all
Index: config/Config
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/config/Config,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Config
*** config/Config       24 Mar 2004 00:10:12 -0000      1.1.1.1
--- config/Config       9 Jun 2004 00:05:49 -0000
***************
*** 84,89 ****
--- 84,95 ----
         help
         Answer Y for additional web pages.
  
+ config CONFIG_WWW_HELP
+        bool "Help Web pages"
+        depends on CONFIG_WWW
+        help
+        Answer Y for help web pages.
+ 
  config CONFIG_EBTABLES
         bool "Ebtables"
         default n
Index: rc/Makefile
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/rc/Makefile,v
retrieving revision 1.2
diff -c -r1.2 Makefile
*** rc/Makefile 21 Apr 2004 20:28:15 -0000      1.2
--- rc/Makefile 9 Jun 2004 00:06:06 -0000
***************
*** 30,35 ****
--- 30,39 ----
  
  OBJS += heartbeat.o
  
+ ifeq ($(CONFIG_WWW_HELP),y)
+ CFLAGS += -DHAVE_WWW_HELP
+ endif
+ 
  ifeq ($(CONFIG_NETCONF),y)
  OBJS += firewall.o
  endif
***************
*** 43,48 ****
--- 47,56 ----
  CFLAGS += -DHAVE_TELNETD
  endif
  
+ ifeq ($(CONFIG_PPP),y)
+ CFLAGS += -DHAVE_PPPD
+ endif
+ 
  ifeq ($(CONFIG_BOOT_WAIT_ON),y)
  CFLAGS += -DBOOT_WAIT_ON
  endif
***************
*** 50,55 ****
--- 58,71 ----
  ifeq ($(CONFIG_DROPBEAR_SSHD),y)
  OBJS += sshd.o
  CFLAGS += -DHAVE_DROPBEAR
+ endif
+ 
+ ifeq ($(CONFIG_SPLISH),y)
+ CFLAGS += -DHAVE_NOCAT
+ endif
+ 
+ ifeq ($(CONFIG_ZEBRA),y)
+ CFLAGS += -DHAVE_ROUTING
  endif
  
  vpath %.c $(TOP)/shared $(SRCBASE)/rts/src
Index: rc/pptpd.c
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/rc/pptpd.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 pptpd.c
*** rc/pptpd.c  24 Mar 2004 00:10:41 -0000      1.1.1.1
--- rc/pptpd.c  9 Jun 2004 00:06:06 -0000
***************
*** 57,62 ****
--- 57,68 ----
              "chap-secrets /tmp/pptpd/chap-secrets\n"
              "ip-up-script /tmp/pptpd/ip-up\n"
              "ip-down-script /tmp/pptpd/ip-down\n");
+   lpTemp = nvram_safe_get("pptpd_wins");
+   if (inet_addr(lpTemp) != 0)
+       fprintf(fp, "ms-wins %s\n", lpTemp);
+   lpTemp = nvram_safe_get("pptpd_dns");
+   if (inet_addr(lpTemp) != 0)
+       fprintf(fp, "ms-dns %s\n", lpTemp);
    fclose(fp);  
  
  
Index: rc/rc.c
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/rc/rc.c,v
retrieving revision 1.4
diff -c -r1.4 rc.c
*** rc/rc.c     26 Apr 2004 23:37:27 -0000      1.4
--- rc/rc.c     9 Jun 2004 00:06:07 -0000
***************
*** 397,405 ****
--- 397,428 ----
  
        nvram_set("filter_port", "");       // The name have been disbaled from 1.41.3
  
+ #ifdef HAVE_WWW_HELP
+       if(!nvram_match("help_web", "0"))
+         nvram_set("help_web", "1");
+ #else
+       nvram_set("help_web", "0");
+ #endif
+ 
+ #ifdef HAVE_PPTPD
+       if(!nvram_match("pptpd_web", "0"))
+         nvram_set("pptpd_web", "1");
+ #else
+       nvram_set("pptpd_web", "0");
+ #endif
+ 
  #ifdef HAVE_TELNETD
        if(!nvram_match("telnetd_web", "0"))
          nvram_set("telnetd_web", "1");
+ #else
+       nvram_set("telnetd_web", "0");
+ #endif
+ 
+ #ifdef HAVE_PPPD
+       if(!nvram_match("pppd_web", "0"))
+         nvram_set("pppd_web", "1");
+ #else
+       nvram_set("pppd_web", "0");
  #endif
  
  #ifdef HAVE_SET_BOOT
***************
*** 410,415 ****
--- 433,454 ----
  #ifdef HAVE_SSHD
        if(!nvram_match("sshd_web", "0"))
          nvram_set("sshd_web", "1");
+ #else
+       nvram_set("sshd_web", "0");
+ #endif
+ 
+ #ifdef HAVE-NOCAT
+       if(!nvram_match("nocat_web", "0")
+         nvram_set("nocat_web", "1");
+ #else
+       nvram_set("nocat_web", "0");
+ #endif
+ 
+ #ifdef HAVE_ROUTING
+       if(!nvram_match("routing_web", "0"))
+         nvram_set("routing_web", "1");
+ #else
+       nvram_set("routing_web", "1");
  #endif
  
        nvram_set("wl_country","Japan");    // The country always Japan (channels 1..14)
Index: rc/services.c
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/rc/services.c,v
retrieving revision 1.4
diff -c -r1.4 services.c
*** rc/services.c       26 Apr 2004 23:37:27 -0000      1.4
--- rc/services.c       9 Jun 2004 00:06:08 -0000
***************
*** 439,446 ****
--- 439,450 ----
  //    }
  
        stop_clientd();
+ #ifdef HAVE_DROPBEAR
        stop_sshd();
+ #endif
+ #ifdef HAVE_TELNETD
        stop_telnetd();
+ #endif
        stop_wshaper();
        stop_splashd();
  
Index: shared/broadcom.c
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/shared/broadcom.c,v
retrieving revision 1.4
diff -c -r1.4 broadcom.c
*** shared/broadcom.c   27 Apr 2004 03:03:13 -0000      1.4
--- shared/broadcom.c   9 Jun 2004 00:06:10 -0000
***************
*** 1435,1440 ****
--- 1435,1442 ----
        { "pptpd_enable", "PPTPD", validate_choice, ARGV("0", "1"), FALSE },
        { "pptpd_lip", "PPTPD", NULL, NULL, FALSE },
        { "pptpd_rip", "PPTPD", NULL, NULL, FALSE },
+       { "pptpd_wins", "PPTPD", NULL, NULL, FALSE },
+       { "pptpd_dns", "PPTPD", NULL, NULL, FALSE },
        { "pptpd_auth", "PPTPD", NULL, NULL, FALSE },
        { "resetbutton_enable", "Resetbuttond", validate_choice, ARGV("0", "1"), FALSE },
        { "telnetd_enable", "Telnetd", validate_choice, ARGV("0", "1"), FALSE },
Index: shared/defaults.c
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/shared/defaults.c,v
retrieving revision 1.4
diff -c -r1.4 defaults.c
*** shared/defaults.c   23 Apr 2004 04:50:55 -0000      1.4
--- shared/defaults.c   9 Jun 2004 00:06:11 -0000
***************
*** 419,424 ****
--- 419,426 ----
        { "pptpd_lip", "", 0},
        { "pptpd_rip", "", 0},
        { "pptpd_auth", "", 0},
+       { "pptpd_wins", "", 0},
+       { "pptpd_dns", "", 0},
        { "resetbutton_enable", "1", 0},
        { "telnetd_enable", "0", 0},
        { "tftpd_enable", "1", 0},
  
Index: www/cisco_wrt54g_en/DDNS.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/DDNS.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 DDNS.asp
*** www/cisco_wrt54g_en/DDNS.asp        24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/DDNS.asp        9 Jun 2004 00:06:15 -0000
***************
*** 410,416 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HDDNS.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
--- 410,419 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><% nvram_match("help_web","0","<!--"); %>
!               <a target="_blank" href="help/HDDNS.asp">More...</a>
!               <% nvram_match("help_web","0","-->"); %>
!         </span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
Index: www/cisco_wrt54g_en/DMZ.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/DMZ.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 DMZ.asp
*** www/cisco_wrt54g_en/DMZ.asp 24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/DMZ.asp 9 Jun 2004 00:06:16 -0000
***************
*** 257,263 ****
          <TR>
            <TD width=10 bgColor=#6666cc height=25>&#12288;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <a target="_blank" href="help/HDMZ.asp">More...</a></font></TD>
            <TD width=9 bgColor=#6666cc height=25>&#12288;</TD>
          </TR>
          </TBODY>
--- 257,265 ----
          <TR>
            <TD width=10 bgColor=#6666cc height=25>&#12288;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!       <% nvram_match("help_web","0","<!--"); %>
!           <a target="_blank" href="help/HDMZ.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %></font></TD>
            <TD width=9 bgColor=#6666cc height=25>&#12288;</TD>
          </TR>
          </TBODY>
Index: www/cisco_wrt54g_en/Diagnostics.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Diagnostics.asp,v
retrieving revision 1.2
diff -c -r1.2 Diagnostics.asp
*** www/cisco_wrt54g_en/Diagnostics.asp 27 Apr 2004 03:03:13 -0000      1.2
--- www/cisco_wrt54g_en/Diagnostics.asp 9 Jun 2004 00:06:16 -0000
***************
*** 134,142 ****
                        <TD width=25></TD>
                        <TD class=small width=65><A href="Management.asp">Management</a></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
!                       <TD width=15></TD>
                        <TD class=small width=40><A href="Nocat.asp">NoCat</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
                        <TD width=15></TD>
                        <TD class=small width=25><A href="Log.asp">Log</a></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
--- 134,144 ----
                        <TD width=25></TD>
                        <TD class=small width=65><A href="Management.asp">Management</a></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
!                       <% nvram_match("nocat_web","0", "<!--"); %>
!                       <TD width=15></TD>
                        <TD class=small width=40><A href="Nocat.asp">NoCat</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
+                       <% nvram_match("nocat_web","0", "-->"); %>
                        <TD width=15></TD>
                        <TD class=small width=25><A href="Log.asp">Log</a></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
Index: www/cisco_wrt54g_en/Factory_Defaults.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Factory_Defaults.asp,v
retrieving revision 1.2
diff -c -r1.2 Factory_Defaults.asp
*** www/cisco_wrt54g_en/Factory_Defaults.asp    27 Apr 2004 03:03:13 -0000      1.2
--- www/cisco_wrt54g_en/Factory_Defaults.asp    9 Jun 2004 00:06:17 -0000
***************
*** 107,115 ****
                        <TD width=25></TD>
                        <TD class=small width=65><A href="Management.asp">Management</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
!                       <TD width=15></TD>
                        <TD class=small width=40><A href="Nocat.asp">NoCat</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
                        <TD width=15></TD>
                        <TD class=small width=25><A href="Log.asp">Log</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
--- 107,117 ----
                        <TD width=25></TD>
                        <TD class=small width=65><A href="Management.asp">Management</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
!                       <% nvram_match("nocat_web","0", "<!--"); %>
!                       <TD width=15></TD>
                        <TD class=small width=40><A href="Nocat.asp">NoCat</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
+                       <% nvram_match("nocat_web","0", "-->"); %>
                        <TD width=15></TD>
                        <TD class=small width=25><A href="Log.asp">Log</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
***************
*** 196,202 ****
                  <TR>
                  <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
                  <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HDefault.asp">More...</a></span></font></TD>
                  <TD width=9 bgColor=#6666cc height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
         <TR>
           <TD width=809 colSpan=2>
--- 198,207 ----
                  <TR>
                  <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
                  <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><% nvram_match("help_web","0","<!--"); %>
!               <a target="_blank" href="help/HDefault.asp">More...</a>
!               <% nvram_match("help_web","0","-->"); %>
!               </span></font></TD>
                  <TD width=9 bgColor=#6666cc height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
         <TR>
           <TD width=809 colSpan=2>
Index: www/cisco_wrt54g_en/Filters.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Filters.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Filters.asp
*** www/cisco_wrt54g_en/Filters.asp     24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/Filters.asp     9 Jun 2004 00:06:18 -0000
***************
*** 848,854 ****
                  <td width="11" height="25" bgcolor="#6666CC">&nbsp;</td>
                  <td width="156" height="25" bgcolor="#6666CC">
                  <font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HFilters.asp">More...</a></span></font></td>
                  <td width="9" height="25" bgcolor="#6666CC">&nbsp;</td>
                </tr></table></td>
                
--- 848,858 ----
                  <td width="11" height="25" bgcolor="#6666CC">&nbsp;</td>
                  <td width="156" height="25" bgcolor="#6666CC">
                  <font color="#FFFFFF">
!           <span >
!               <% nvram_match("help_web","0","<!--"); %>
!               <a target="_blank" href="help/HFilters.asp">More...</a>
!               <% nvram_match("help_web","0","-->"); %>
!               </span></font></td>
                  <td width="9" height="25" bgcolor="#6666CC">&nbsp;</td>
                </tr></table></td>
                
Index: www/cisco_wrt54g_en/Firewall.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Firewall.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Firewall.asp
*** www/cisco_wrt54g_en/Firewall.asp    24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/Firewall.asp    9 Jun 2004 00:06:19 -0000
***************
*** 282,288 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HFirewall.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
--- 282,292 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HFirewall.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
Index: www/cisco_wrt54g_en/Forward.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Forward.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Forward.asp
*** www/cisco_wrt54g_en/Forward.asp     24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/Forward.asp     9 Jun 2004 00:06:20 -0000
***************
*** 381,387 ****
            <TD width=15
          background=image/UI_05.gif>&nbsp;</TD></TR></TBODY></TABLE></TD>
      <TD width=176 bgColor=#6666cc valign="top">
!     <p style="line-height: 200%"><font color="#FFFFFF"><span >&nbsp;&nbsp; <a target="_blank" href="help/HForward.asp">More...</a></span></font></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
        <TABLE cellSpacing=0 cellPadding=0 border=0>
--- 381,391 ----
            <TD width=15
          background=image/UI_05.gif>&nbsp;</TD></TR></TBODY></TABLE></TD>
      <TD width=176 bgColor=#6666cc valign="top">
!     <p style="line-height: 200%"><font color="#FFFFFF"><span >&nbsp;&nbsp; 
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HForward.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
        <TABLE cellSpacing=0 cellPadding=0 border=0>
Index: www/cisco_wrt54g_en/Log.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Log.asp,v
retrieving revision 1.2
diff -c -r1.2 Log.asp
*** www/cisco_wrt54g_en/Log.asp 27 Apr 2004 03:03:13 -0000      1.2
--- www/cisco_wrt54g_en/Log.asp 9 Jun 2004 00:06:21 -0000
***************
*** 183,191 ****
                        <TD width=25></TD>
                        <TD class=small width=65><A href="Management.asp">Management</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
!                       <TD width=15></TD>
                        <TD class=small width=40><A href="Nocat.asp">NoCat</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
                        <TD width=15></TD>
                        <TD  width=25><FONT style="COLOR: white">Log</FONT></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
--- 183,193 ----
                        <TD width=25></TD>
                        <TD class=small width=65><A href="Management.asp">Management</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
!                       <% nvram_match("nocat_web","0", "<!--"); %>
!                       <TD width=15></TD>
                        <TD class=small width=40><A href="Nocat.asp">NoCat</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
+                       <% nvram_match("nocat_web","0", "-->"); %>
                        <TD width=15></TD>
                        <TD  width=25><FONT style="COLOR: white">Log</FONT></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
***************
*** 302,308 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HLog.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
--- 304,314 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HLog.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
Index: www/cisco_wrt54g_en/Makefile
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Makefile,v
retrieving revision 1.2
diff -c -r1.2 Makefile
*** www/cisco_wrt54g_en/Makefile        21 Apr 2004 20:28:18 -0000      1.2
--- www/cisco_wrt54g_en/Makefile        9 Jun 2004 00:06:21 -0000
***************
*** 29,38 ****
        install -d $(INSTALLDIR)/www
        install -m 644 $(wildcard *.asp) $(wildcard *.jpg) $(wildcard *.gif) $(wildcard *.css) $(wildcard *.js) $(wildcard *.htm) $(wildcard *.xml) $(INSTALLDIR)/www
        cp -a image $(INSTALLDIR)/www
        cp -a help $(INSTALLDIR)/www
! 
  
        $(MAKE) -C $(SRCBASE)/router/www/common/ install
  
  webcomp:
        webcomp . list > webrom.c
--- 29,40 ----
        install -d $(INSTALLDIR)/www
        install -m 644 $(wildcard *.asp) $(wildcard *.jpg) $(wildcard *.gif) $(wildcard *.css) $(wildcard *.js) $(wildcard *.htm) $(wildcard *.xml) $(INSTALLDIR)/www
        cp -a image $(INSTALLDIR)/www
+ ifeq ($(CONFIG_WWW_help),y)
        cp -a help $(INSTALLDIR)/www
! endif
  
        $(MAKE) -C $(SRCBASE)/router/www/common/ install
+ 
  
  webcomp:
        webcomp . list > webrom.c
Index: www/cisco_wrt54g_en/Management.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Management.asp,v
retrieving revision 1.2
diff -c -r1.2 Management.asp
*** www/cisco_wrt54g_en/Management.asp  27 Apr 2004 03:03:13 -0000      1.2
--- www/cisco_wrt54g_en/Management.asp  9 Jun 2004 00:06:23 -0000
***************
*** 180,188 ****
                        <TD width=25></TD>
                        <TD width=65><FONT style="COLOR: white">Management</FONT></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
!                       <TD width=15></TD>
                        <TD class=small width=40><A href="Nocat.asp">NoCat</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
                        <TD width=15></TD>
                        <TD class=small width=25><A href="Log.asp">Log</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
--- 180,190 ----
                        <TD width=25></TD>
                        <TD width=65><FONT style="COLOR: white">Management</FONT></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
!                       <% nvram_match("nocat_web","0", "<!--"); %>
!                       <TD width=15></TD>
                        <TD class=small width=40><A href="Nocat.asp">NoCat</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
+                       <% nvram_match("nocat_web","0", "-->"); %>
                        <TD width=15></TD>
                        <TD class=small width=25><A href="Log.asp">Log</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
***************
*** 717,722 ****
--- 719,725 ----
  
          <!-- PPPD Configuration -->
  
+       <% nvram_match("pppd_web","0","<!--"); %>
          <TR>
            <TD width=156 bgColor=#000000 colSpan=3 height=25><P align=right><B><FONT style="FONT-SIZE: 9pt" color=#ffffff>PPP</FONT></B></P></TD>
            <TD width=5 bgColor=#000000 height=25>¡</TD>
***************
*** 742,752 ****
                  </TR></TBODY></TABLE></TD>
            <TD width=13 height=25>&nbsp;</TD>
            <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD></TR>
! 
        <!-- End PPP Configuration -->
  
          <!-- PPTP Configuration -->
! 
          <TR>
            <TD width=156 bgColor=#000000 colSpan=3 height=25><P align=right><B><FONT style="FONT-SIZE: 9pt" color=#ffffff>PPTP</FONT></B></P></TD>
            <TD width=5 bgColor=#000000 height=25>¡</TD>
--- 745,755 ----
                  </TR></TBODY></TABLE></TD>
            <TD width=13 height=25>&nbsp;</TD>
            <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD></TR>
!       <% nvram_match("pppd_web","0","-->"); %>
        <!-- End PPP Configuration -->
  
          <!-- PPTP Configuration -->
!       <% nvram_match("pptpd_web","0","<!--"); %>
          <TR>
            <TD width=156 bgColor=#000000 colSpan=3 height=25><P align=right><B><FONT style="FONT-SIZE: 9pt" color=#ffffff>PPTP</FONT></B></P></TD>
            <TD width=5 bgColor=#000000 height=25>¡</TD>
***************
*** 773,779 ****
            <TD width=13 height=25>&nbsp;</TD>
            <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD></TR>
  
! <% nvram_match("pptpd_enable","0","<!--"); %>
  
        <TR>
            <TD width=156 bgColor=#e7e7e7 colSpan=3 height=25>&nbsp;</TD>
--- 776,782 ----
            <TD width=13 height=25>&nbsp;</TD>
            <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD></TR>
  
!       <% nvram_match("pptpd_enable","0","<!--"); %>
  
        <TR>
            <TD width=156 bgColor=#e7e7e7 colSpan=3 height=25>&nbsp;</TD>
***************
*** 811,816 ****
--- 814,851 ----
            <TD width=156 bgColor=#e7e7e7 colSpan=3 height=25>&nbsp;</TD>
            <TD width=8 background=image/UI_04.gif height=25>&nbsp;</TD>
            <TD colSpan=3 height=25 width="42">&nbsp;</TD>
+           <TD width=101 height=25><SPAN lang=zh-tw style="FONT-SIZE: 8pt">MS WINS IP:</SPAN></TD>
+           <TD width=298 height=25>
+             <TABLE id=AutoNumber12 cellSpacing=0 cellPadding=0 width=242 border=0>
+               <TBODY>
+               <TR>
+                 <TD width=242 height=25><INPUT type=text size=20 name=pptpd_wins value=<% nvram_get("pptpd_wins"); %>></TD>
+                 </TR></TBODY></TABLE>
+           </TD>
+           <TD width=13 height=25>&nbsp;</TD>
+           <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD>
+         </TR>
+ 
+         <TR>
+           <TD width=156 bgColor=#e7e7e7 colSpan=3 height=25>&nbsp;</TD>
+           <TD width=8 background=image/UI_04.gif height=25>&nbsp;</TD>
+           <TD colSpan=3 height=25 width="42">&nbsp;</TD>
+           <TD width=101 height=25><SPAN lang=zh-tw style="FONT-SIZE: 8pt">MS DNS IP:</SPAN></TD>
+           <TD width=298 height=25>
+             <TABLE id=AutoNumber12 cellSpacing=0 cellPadding=0 width=242 border=0>
+               <TBODY>
+               <TR>
+                 <TD width=242 height=25><INPUT type=text size=20 name=pptpd_dns value=<% nvram_get("pptpd_dns"); %>></TD>
+                 </TR></TBODY></TABLE>
+           </TD>
+           <TD width=13 height=25>&nbsp;</TD>
+           <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD>
+         </TR>
+ 
+         <TR>
+           <TD width=156 bgColor=#e7e7e7 colSpan=3 height=25>&nbsp;</TD>
+           <TD width=8 background=image/UI_04.gif height=25>&nbsp;</TD>
+           <TD colSpan=3 height=25 width="42">&nbsp;</TD>
            <TD width=399 colspan=2>
              <p>
                <SPAN lang=zh-tw style="FONT-SIZE: 8pt">CHAP-Secrets</SPAN><br />
***************
*** 827,833 ****
            <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD>
          </TR>
  <% nvram_match("pptpd_enable","0","-->"); %>
! 
        <!-- End PPTP Configuration -->
  
        <!-- Resetbutton Configuration -->
--- 862,868 ----
            <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD>
          </TR>
  <% nvram_match("pptpd_enable","0","-->"); %>
!       <% nvram_match("pptpd_web","0","-->"); %>
        <!-- End PPTP Configuration -->
  
        <!-- Resetbutton Configuration -->
***************
*** 861,867 ****
        <!-- End Resetbuttond Configuration -->
  
          <!-- Zebra Configuration -->
! 
          <TR>
            <TD width=156 bgColor=#000000 colSpan=3 height=25><P align=right><B><FONT style="FONT-SIZE: 9pt" color=#ffffff>Routing</FONT></B></P></TD>
            <TD width=5 bgColor=#000000 height=25>¡</TD>
--- 896,902 ----
        <!-- End Resetbuttond Configuration -->
  
          <!-- Zebra Configuration -->
!       <% nvram_match("routing_web","0","<!--"); %>
          <TR>
            <TD width=156 bgColor=#000000 colSpan=3 height=25><P align=right><B><FONT style="FONT-SIZE: 9pt" color=#ffffff>Routing</FONT></B></P></TD>
            <TD width=5 bgColor=#000000 height=25>¡</TD>
***************
*** 887,897 ****
                  </TR></TBODY></TABLE></TD>
            <TD width=13 height=25>&nbsp;</TD>
            <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD></TR>
! 
        <!-- End Zebra Configuration -->
  
          <!-- Start SSHD Configuration -->
! <% nvram_match("sshd_web","0","<!--"); %>
          <TR>
            <TD width=156 bgColor=#000000 colSpan=3 height=25><P align=right><B><FONT style="FONT-SIZE: 9pt" color=#ffffff>SSHD</FONT></B></P></TD>
            <TD width=5 bgColor=#000000 height=25>¡</TD>
--- 922,932 ----
                  </TR></TBODY></TABLE></TD>
            <TD width=13 height=25>&nbsp;</TD>
            <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD></TR>
!       <% nvram_match("sshd_web","0","-->"); %>
        <!-- End Zebra Configuration -->
  
          <!-- Start SSHD Configuration -->
!       <% nvram_match("sshd_web","0","<!--"); %>
          <TR>
            <TD width=156 bgColor=#000000 colSpan=3 height=25><P align=right><B><FONT style="FONT-SIZE: 9pt" color=#ffffff>SSHD</FONT></B></P></TD>
            <TD width=5 bgColor=#000000 height=25>¡</TD>
***************
*** 920,926 ****
            <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD>
          </TR>
  
! <% nvram_match("sshd_enable","0","<!--"); %>
  
        <TR>
            <TD width=156 bgColor=#e7e7e7 colSpan=3 height=25>&nbsp;</TD>
--- 955,961 ----
            <TD width=15 background=image/UI_05.gif height=25>&nbsp;</TD>
          </TR>
  
!       <% nvram_match("sshd_enable","0","<!--"); %>
  
        <TR>
            <TD width=156 bgColor=#e7e7e7 colSpan=3 height=25>&nbsp;</TD>
***************
*** 1141,1147 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25></TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span lang="zh-tw"><a target="_blank" href="help/HManagement.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
--- 1176,1186 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25></TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span lang="zh-tw">
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HManagement.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
Index: www/cisco_wrt54g_en/Nocat.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Nocat.asp,v
retrieving revision 1.1
diff -c -r1.1 Nocat.asp
*** www/cisco_wrt54g_en/Nocat.asp       27 Apr 2004 05:30:36 -0000      1.1
--- www/cisco_wrt54g_en/Nocat.asp       9 Jun 2004 00:06:24 -0000
***************
*** 297,303 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25></TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span lang="zh-tw"><a target="_blank" href="help/HManagement.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
--- 297,307 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25></TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span lang="zh-tw">
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HManagement.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
Index: www/cisco_wrt54g_en/Routing.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Routing.asp,v
retrieving revision 1.2
diff -c -r1.2 Routing.asp
*** www/cisco_wrt54g_en/Routing.asp     21 Apr 2004 20:28:18 -0000      1.2
--- www/cisco_wrt54g_en/Routing.asp     9 Jun 2004 00:06:25 -0000
***************
*** 425,431 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HRouting.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
--- 425,435 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HRouting.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
Index: www/cisco_wrt54g_en/Status_Lan.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Status_Lan.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Status_Lan.asp
*** www/cisco_wrt54g_en/Status_Lan.asp  24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/Status_Lan.asp  9 Jun 2004 00:06:25 -0000
***************
*** 282,288 ****
          </TBODY></TABLE></FORM></TD>
      <TD vAlign=top width=176 bgColor=#6666cc>
      <p style="line-height: 200%"><span >&nbsp;&nbsp;&nbsp; </span><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HStatus.asp">More...</a></span></font></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
        <TABLE cellSpacing=0 cellPadding=0 border=0>
--- 282,292 ----
          </TBODY></TABLE></FORM></TD>
      <TD vAlign=top width=176 bgColor=#6666cc>
      <p style="line-height: 200%"><span >&nbsp;&nbsp;&nbsp; </span><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HStatus.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
        <TABLE cellSpacing=0 cellPadding=0 border=0>
Index: www/cisco_wrt54g_en/Status_Router.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Status_Router.asp,v
retrieving revision 1.2
diff -c -r1.2 Status_Router.asp
*** www/cisco_wrt54g_en/Status_Router.asp       21 Apr 2004 20:28:18 -0000      1.2
--- www/cisco_wrt54g_en/Status_Router.asp       9 Jun 2004 00:06:26 -0000
***************
*** 343,349 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HStatus.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
--- 343,353 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HStatus.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
Index: www/cisco_wrt54g_en/Status_Wireless.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Status_Wireless.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Status_Wireless.asp
*** www/cisco_wrt54g_en/Status_Wireless.asp     24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/Status_Wireless.asp     9 Jun 2004 00:06:26 -0000
***************
*** 244,250 ****
          </TBODY></TABLE></FORM></TD>
      <TD vAlign=top width=176 bgColor=#6666cc>
      <p style="line-height: 200%"><span >&nbsp;&nbsp;&nbsp; </span><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HStatus.asp">More...</a></span></font></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
        <TABLE cellSpacing=0 cellPadding=0 border=0>
--- 244,254 ----
          </TBODY></TABLE></FORM></TD>
      <TD vAlign=top width=176 bgColor=#6666cc>
      <p style="line-height: 200%"><span >&nbsp;&nbsp;&nbsp; </span><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HStatus.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
        <TABLE cellSpacing=0 cellPadding=0 border=0>
Index: www/cisco_wrt54g_en/Upgrade.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Upgrade.asp,v
retrieving revision 1.2
diff -c -r1.2 Upgrade.asp
*** www/cisco_wrt54g_en/Upgrade.asp     27 Apr 2004 03:03:13 -0000      1.2
--- www/cisco_wrt54g_en/Upgrade.asp     9 Jun 2004 00:06:27 -0000
***************
*** 191,199 ****
                        <TD width=25></TD>
                        <TD class=small width=65><A href="Management.asp">Management</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
!                       <TD width=15></TD>
                        <TD class=small width=40><A href="Nocat.asp">NoCat</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
                        <TD width=15></TD>
                        <TD class=small width=25><A href="Log.asp">Log</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
--- 191,201 ----
                        <TD width=25></TD>
                        <TD class=small width=65><A href="Management.asp">Management</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
!                       <% nvram_match("nocat_web","0", "<!--"); %>
!                       <TD width=15></TD>
                        <TD class=small width=40><A href="Nocat.asp">NoCat</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
+                       <% nvram_match("nocat_web","0", "-->"); %>
                        <TD width=15></TD>
                        <TD class=small width=25><A href="Log.asp">Log</A></TD>
                        <TD width=1><P class=bar><font color='white'><b>|</b></font></P></TD>
***************
*** 299,305 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HUpgrade.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
--- 301,311 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HUpgrade.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
Index: www/cisco_wrt54g_en/VPN.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/VPN.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 VPN.asp
*** www/cisco_wrt54g_en/VPN.asp 24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/VPN.asp 9 Jun 2004 00:06:28 -0000
***************
*** 268,274 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HVPN.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
--- 268,278 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HVPN.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
Index: www/cisco_wrt54g_en/WL_WPATable.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/WL_WPATable.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 WL_WPATable.asp
*** www/cisco_wrt54g_en/WL_WPATable.asp 24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/WL_WPATable.asp 9 Jun 2004 00:06:28 -0000
***************
*** 394,400 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HWPA.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
--- 394,404 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HWPA.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
Index: www/cisco_wrt54g_en/WanMAC.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/WanMAC.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 WanMAC.asp
*** www/cisco_wrt54g_en/WanMAC.asp      24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/WanMAC.asp      9 Jun 2004 00:06:29 -0000
***************
*** 286,292 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HMAC.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
--- 286,296 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HMAC.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
Index: www/cisco_wrt54g_en/Wireless_Advanced.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Wireless_Advanced.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Wireless_Advanced.asp
*** www/cisco_wrt54g_en/Wireless_Advanced.asp   24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/Wireless_Advanced.asp   9 Jun 2004 00:06:30 -0000
***************
*** 276,282 ****
          <TBODY>
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
!           <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF"><span ><a target="_blank" href="help/HWireless.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
--- 276,286 ----
          <TBODY>
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
!           <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF"><span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HWireless.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
      <TD width=809 colSpan=2>
Index: www/cisco_wrt54g_en/Wireless_Basic.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Wireless_Basic.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Wireless_Basic.asp
*** www/cisco_wrt54g_en/Wireless_Basic.asp      24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/Wireless_Basic.asp      9 Jun 2004 00:06:30 -0000
***************
*** 315,321 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HWireless.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
--- 315,325 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HWireless.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
Index: www/cisco_wrt54g_en/Wireless_MAC.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/Wireless_MAC.asp,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 Wireless_MAC.asp
*** www/cisco_wrt54g_en/Wireless_MAC.asp        24 Mar 2004 00:10:42 -0000      1.1.1.1
--- www/cisco_wrt54g_en/Wireless_MAC.asp        9 Jun 2004 00:06:31 -0000
***************
*** 275,281 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HWireless.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
--- 275,285 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HWireless.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
Index: www/cisco_wrt54g_en/index.asp
===================================================================
RCS file: /home/cvs/cvsroot/ewrt/src/router/www/cisco_wrt54g_en/index.asp,v
retrieving revision 1.3
diff -c -r1.3 index.asp
*** www/cisco_wrt54g_en/index.asp       23 Apr 2004 05:46:16 -0000      1.3
--- www/cisco_wrt54g_en/index.asp       9 Jun 2004 00:06:32 -0000
***************
*** 847,853 ****
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span ><a target="_blank" href="help/HSetup.asp">More...</a></span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>
--- 847,857 ----
          <TR>
            <TD width=11 bgColor=#6666cc height=25>&nbsp;</TD>
            <TD width=156 bgColor=#6666cc height=25><font color="#FFFFFF">
!           <span >
!       <% nvram_match("help_web","0","<!--"); %>
!       <a target="_blank" href="help/HSetup.asp">More...</a>
!       <% nvram_match("help_web","0","-->"); %>
!       </span></font></TD>
            <TD width=9 bgColor=#6666cc 
    height=25>&nbsp;</TD></TR></TBODY></TABLE></TD></TR>
    <TR>


More information about the Ewrt-devel mailing list