www.usr.com/support/gpl/USR9108_release1.5.tar.gz
authorDobrica Pavlinusic <dpavlin@mjesec.ffzg.hr>
Sun, 7 Oct 2007 14:06:07 +0000 (16:06 +0200)
committerDobrica Pavlinusic <dpavlin@mjesec.ffzg.hr>
Sun, 7 Oct 2007 14:06:07 +0000 (16:06 +0200)
USR910x_3.04L.01_consumer.tar.gz

BRCM_VERSION=3
BRCM_RELEASE=04
BRCM_EXTRAVERSION=01

135 files changed:
bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348GW.bin_save
bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348GWB.bin_save
bcmdrivers/broadcom/char/adsl/impl1/adsldd96348GW.o_save
bcmdrivers/broadcom/char/adsl/impl1/adsldd96348GWB.o_save
bcmdrivers/broadcom/include/bcm963xx/AdslMibDef.h
bcmdrivers/broadcom/include/bcm963xx/adsldrv.h
bcmdrivers/broadcom/include/bcm963xx/bcmadsl.h
bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348GW.o_save
bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348GWB.o_save
bcmdrivers/opensource/include/bcm963xx/bcmTag.h
hostTools/bcmImageBuilder
targets/96348GW/96348GW
targets/96348GWB/96348GWB
targets/fs.src/etc/rsa_host_key
userapps/broadcom/adslctl/adslctl_96348GWB_save
userapps/broadcom/adslctl/adslctl_96348GW_save
userapps/broadcom/cfm/cfm_96348GWB_save
userapps/broadcom/cfm/cfm_96348GW_save
userapps/broadcom/cfm/html/adslcfg.html
userapps/broadcom/cfm/html/adslcfgadv.html
userapps/broadcom/cfm/html/adslcfgc.html
userapps/broadcom/cfm/html/backupsettings.html
userapps/broadcom/cfm/html/certadd.html
userapps/broadcom/cfm/html/certcaimport.html
userapps/broadcom/cfm/html/certimport.html
userapps/broadcom/cfm/html/certloadsigned.html
userapps/broadcom/cfm/html/ddnsadd.html
userapps/broadcom/cfm/html/defaultsettings.html
userapps/broadcom/cfm/html/dhcpinfo.html
userapps/broadcom/cfm/html/diag.html
userapps/broadcom/cfm/html/diagbr.html
userapps/broadcom/cfm/html/diaglan.html
userapps/broadcom/cfm/html/diagmer.html
userapps/broadcom/cfm/html/diagpppoa.html
userapps/broadcom/cfm/html/diagpppoe.html
userapps/broadcom/cfm/html/dnscfg.html
userapps/broadcom/cfm/html/enblbridge.html
userapps/broadcom/cfm/html/enblservice.html
userapps/broadcom/cfm/html/hlpadslsync.html
userapps/broadcom/cfm/html/hlpatmetoe.html
userapps/broadcom/cfm/html/hlpatmseg.html
userapps/broadcom/cfm/html/hlpethconn.html
userapps/broadcom/cfm/html/hlppngdns.html
userapps/broadcom/cfm/html/hlppnggw.html
userapps/broadcom/cfm/html/hlppppoasess.html
userapps/broadcom/cfm/html/hlppppoeauth.html
userapps/broadcom/cfm/html/hlppppoeconn.html
userapps/broadcom/cfm/html/hlppppoeip.html
userapps/broadcom/cfm/html/hlptstdns.html
userapps/broadcom/cfm/html/hlpwlconn.html
userapps/broadcom/cfm/html/info.html
userapps/broadcom/cfm/html/ipoacfg.html
userapps/broadcom/cfm/html/ippcfg.html
userapps/broadcom/cfm/html/ipsconfig.html
userapps/broadcom/cfm/html/ipsec.html
userapps/broadcom/cfm/html/lancfg.html
userapps/broadcom/cfm/html/lancfg2.html
userapps/broadcom/cfm/html/lancfgbr.html
userapps/broadcom/cfm/html/logconfig.html
userapps/broadcom/cfm/html/natcfg2.html
userapps/broadcom/cfm/html/ntwkprtcl.html
userapps/broadcom/cfm/html/ntwksum2.html
userapps/broadcom/cfm/html/password.html
userapps/broadcom/cfm/html/portmapadd.html
userapps/broadcom/cfm/html/portmapedit.html
userapps/broadcom/cfm/html/pppautherr.html
userapps/broadcom/cfm/html/pppauthinfo.html
userapps/broadcom/cfm/html/pppoe.html
userapps/broadcom/cfm/html/pvccfg.html
userapps/broadcom/cfm/html/pvccfgerr.html
userapps/broadcom/cfm/html/pvcindex.html
userapps/broadcom/cfm/html/qoscls.html
userapps/broadcom/cfm/html/quicksetuperr.html
userapps/broadcom/cfm/html/resetrouter.html
userapps/broadcom/cfm/html/routeadd.html
userapps/broadcom/cfm/html/routeremove.html
userapps/broadcom/cfm/html/rtdefaultcfg.html
userapps/broadcom/cfm/html/rtdefaultcfgerr.html
userapps/broadcom/cfm/html/scacccntr.html
userapps/broadcom/cfm/html/scdmz.html
userapps/broadcom/cfm/html/scinflt.html
userapps/broadcom/cfm/html/scintro.html
userapps/broadcom/cfm/html/scmacflt.html
userapps/broadcom/cfm/html/scmacpolicy.html
userapps/broadcom/cfm/html/scoutflt.html
userapps/broadcom/cfm/html/scprttrg.html
userapps/broadcom/cfm/html/scvrtsrv.html
userapps/broadcom/cfm/html/snmpconfig.html
userapps/broadcom/cfm/html/sntpcfg.html
userapps/broadcom/cfm/html/statsadsl.html
userapps/broadcom/cfm/html/statsadslerr.html
userapps/broadcom/cfm/html/statsatm.html
userapps/broadcom/cfm/html/statsatmerr.html
userapps/broadcom/cfm/html/statsifc.html
userapps/broadcom/cfm/html/todadd.html
userapps/broadcom/cfm/html/updatesettings.html
userapps/broadcom/cfm/html/upload.html
userapps/broadcom/cfm/html/usr_common.js
userapps/broadcom/cfm/html/usr_main.css
userapps/broadcom/cfm/html/usr_menus_build.js
userapps/broadcom/cfm/html/wanadderr.html
userapps/broadcom/cfm/html/wancfg.html
userapps/broadcom/cfm/html/wlcfg.html
userapps/broadcom/cfm/html/wlcfgadv.html
userapps/broadcom/cfm/html/wlmacflt.html
userapps/broadcom/cfm/html/wlqos.html
userapps/broadcom/cfm/html/wlsecurity.html
userapps/broadcom/cfm/html/wlsetup.html
userapps/broadcom/cfm/inc/objectdefs.h
userapps/broadcom/cfm/inc/version.h
userapps/broadcom/cfm/util/psi/libpsi_96348GW.so
userapps/broadcom/cfm/util/psi/libpsi_96348GWB.so
userapps/broadcom/cfm/util/psi/libpsixml_96348GW.so
userapps/broadcom/cfm/util/psi/libpsixml_96348GWB.so
userapps/broadcom/cfm/util/system/syscall.c
userapps/broadcom/ddnsd/ddnsd_96348GWB_save
userapps/broadcom/ddnsd/ddnsd_96348GW_save
userapps/broadcom/sntp/sntp_96348GWB_save
userapps/broadcom/sntp/sntp_96348GW_save
userapps/opensource/busybox/include/config.h
userapps/opensource/ipsec-tools/config.log [deleted file]
userapps/opensource/ipsec-tools/src/racoon/handler.c
userapps/opensource/ipsec-tools/src/racoon/handler.h
userapps/opensource/ipsec-tools/src/racoon/isakmp.c
userapps/opensource/ipsec-tools/src/racoon/isakmp_agg.c
userapps/opensource/ipsec-tools/src/racoon/isakmp_base.c
userapps/opensource/ipsec-tools/src/racoon/isakmp_cfg.c
userapps/opensource/ipsec-tools/src/racoon/isakmp_ident.c
userapps/opensource/ipsec-tools/src/racoon/isakmp_inf.c
userapps/opensource/ipsec-tools/src/racoon/pfkey.c
userapps/opensource/ipsec-tools/src/racoon/session.c
userapps/opensource/libcreduction/uclibc/libpsi.so
userapps/opensource/ppp/pppoe/auth.c
userapps/opensource/ppp/pppoe/main.c
userapps/opensource/sshd/svr-authpasswd.c

index ae6413a..cc74781 100644 (file)
Binary files a/bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348GW.bin_save and b/bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348GW.bin_save differ
index fafad10..dfd446b 100644 (file)
Binary files a/bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348GWB.bin_save and b/bcmdrivers/broadcom/char/adsl/impl1/adsl_phy96348GWB.bin_save differ
index 64ee4c8..dcf859e 100644 (file)
Binary files a/bcmdrivers/broadcom/char/adsl/impl1/adsldd96348GW.o_save and b/bcmdrivers/broadcom/char/adsl/impl1/adsldd96348GW.o_save differ
index b8704f2..08e7d86 100644 (file)
Binary files a/bcmdrivers/broadcom/char/adsl/impl1/adsldd96348GWB.o_save and b/bcmdrivers/broadcom/char/adsl/impl1/adsldd96348GWB.o_save differ
index e6048f0..46c63b9 100755 (executable)
@@ -18,7 +18,7 @@
  * AdslMibOid.h 
  *
  * Description:
- *     SNMP object identifiers for ADSL MIB and other related MIBs
+ *  SNMP object identifiers for ADSL MIB and other related MIBs
  *
  * Copyright (c) 1993-1998 AltoCom, Inc. All rights reserved.
  * Authors: Ilya Stomakhin
@@ -93,8 +93,8 @@
  *
  *****************************************************************************/
 
-#ifndef        AdslMibDefHeader
-#define        AdslMibDefHeader
+#ifndef AdslMibDefHeader
+#define AdslMibDefHeader
 
 #if defined(__cplusplus)
 extern "C" {
@@ -102,81 +102,81 @@ extern "C" {
 
 /* 
 **
-**             ADSL configuration parameters 
+**      ADSL configuration parameters 
 **
 */
 
-#define kAdslCfgModMask                                                (0x00000007 | 0x0000F000)
-#define kAdslCfgModAny                                         0x00000000
+#define kAdslCfgModMask                     (0x00000007 | 0x0000F000)
+#define kAdslCfgModAny                      0x00000000
 
-#define kAdslCfgModGdmtOnly                                    0x00000001
-#define kAdslCfgModGliteOnly                           0x00000002
-#define kAdslCfgModT1413Only                           0x00000004
-#define kAdslCfgModAnnexIOnly                          0x00000004
-#define kAdslCfgModAdsl2Only                           0x00001000
-#define kAdslCfgModAdsl2pOnly                          0x00002000
+#define kAdslCfgModGdmtOnly                 0x00000001
+#define kAdslCfgModGliteOnly                0x00000002
+#define kAdslCfgModT1413Only                0x00000004
+#define kAdslCfgModAnnexIOnly               0x00000004
+#define kAdslCfgModAdsl2Only                0x00001000
+#define kAdslCfgModAdsl2pOnly               0x00002000
 
-#define kAdslCfgBitmapMask                                     0x00000018
-#define kAdslCfgDBM                                                    0x00000000
-#define kAdslCfgFBM                                                    0x00000008
-#define kAdslCfgFBMSoL                                         0x00000010
+#define kAdslCfgBitmapMask                  0x00000018
+#define kAdslCfgDBM                         0x00000000
+#define kAdslCfgFBM                         0x00000008
+#define kAdslCfgFBMSoL                      0x00000010
 
-#define kAdslCfgLinePairMask                           0x00000020
-#define kAdslCfgLineInnerPair                          0x00000000
-#define kAdslCfgLineOuterPair                          0x00000020
+#define kAdslCfgLinePairMask                0x00000020
+#define kAdslCfgLineInnerPair               0x00000000
+#define kAdslCfgLineOuterPair               0x00000020
 
-#define kAdslCfgCentilliumCRCWorkAroundMask                    0x00000040
-#define kAdslCfgCentilliumCRCWorkAroundDisabled                0x00000000
-#define kAdslCfgCentilliumCRCWorkAroundEnabled         0x00000040
+#define kAdslCfgCentilliumCRCWorkAroundMask         0x00000040
+#define kAdslCfgCentilliumCRCWorkAroundDisabled     0x00000000
+#define kAdslCfgCentilliumCRCWorkAroundEnabled      0x00000040
 
-#define kAdslCfgExtraData                                      0x00000080
-#define kAdslCfgTrellisMask                                    (0x00000100 | kAdslCfgExtraData)
-#define kAdslCfgTrellisOn                                      (0x00000100 | kAdslCfgExtraData)
-#define kAdslCfgTrellisOff                                     (0 | kAdslCfgExtraData)
-#define kAdslCfgExtraMask                                      0xFFFFFF80
+#define kAdslCfgExtraData                   0x00000080
+#define kAdslCfgTrellisMask                 (0x00000100 | kAdslCfgExtraData)
+#define kAdslCfgTrellisOn                   (0x00000100 | kAdslCfgExtraData)
+#define kAdslCfgTrellisOff                  (0 | kAdslCfgExtraData)
+#define kAdslCfgExtraMask                   0xFFFFFF80
 
-#define kAdslCfgLOSMonitoringMask                      0x00000200
-#define kAdslCfgLOSMonitoringOff                       0x00000200
-#define kAdslCfgLOSMonitoringOn                                0x00000000
+#define kAdslCfgLOSMonitoringMask           0x00000200
+#define kAdslCfgLOSMonitoringOff            0x00000200
+#define kAdslCfgLOSMonitoringOn             0x00000000
 
-#define kAdslCfgMarginMonitoringMask           0x00000400
-#define kAdslCfgMarginMonitoringOn                     0x00000400
-#define kAdslCfgMarginMonitoringOff                    0x00000000
+#define kAdslCfgMarginMonitoringMask        0x00000400
+#define kAdslCfgMarginMonitoringOn          0x00000400
+#define kAdslCfgMarginMonitoringOff         0x00000000
 
-#define kAdslCfgDemodCapMask                           0x00000800
-#define kAdslCfgDemodCapOn                                     0x00000800
-#define kAdslCfgDemodCapOff                                    0x00000000
+#define kAdslCfgDemodCapMask                0x00000800
+#define kAdslCfgDemodCapOn                  0x00000800
+#define kAdslCfgDemodCapOff                 0x00000000
 
 /* Flags 0x00001000 - 0x00008000 are reserved for modulation (see above) */
 
 /* Upstream mode flags 0x00010000 - 0x00030000 */
 
-#define kAdslCfgUpstreamModeMask                       0x00030000
-#define kAdslCfgUpstreamMax                                    0x00000000
-#define kAdslCfgUpstreamSingle                         0x00010000
-#define kAdslCfgUpstreamDouble                         0x00020000
-#define kAdslCfgUpstreamTriple                         0x00030000
+#define kAdslCfgUpstreamModeMask            0x00030000
+#define kAdslCfgUpstreamMax                 0x00000000
+#define kAdslCfgUpstreamSingle              0x00010000
+#define kAdslCfgUpstreamDouble              0x00020000
+#define kAdslCfgUpstreamTriple              0x00030000
 
-#define kAdslCfgNoSpectrumOverlap                      0x00040000
+#define kAdslCfgNoSpectrumOverlap           0x00040000
 
 /* Pwm sync clock configuration */
 
-#define kAdslCfgPwmSyncClockMask                       0x00080000
-#define kAdslCfgPwmSyncClockOn                         0x00080000
-#define kAdslCfgPwmSyncClockOff                                0x00000000
+#define kAdslCfgPwmSyncClockMask            0x00080000
+#define kAdslCfgPwmSyncClockOn              0x00080000
+#define kAdslCfgPwmSyncClockOff             0x00000000
 
-#define kAdslCfgDefaultTrainingMargin          -1
-#define kAdslCfgDefaultShowtimeMargin          -1
-#define kAdslCfgDefaultLOMTimeThld                     -1
+#define kAdslCfgDefaultTrainingMargin       -1
+#define kAdslCfgDefaultShowtimeMargin       -1
+#define kAdslCfgDefaultLOMTimeThld          -1
 
 /* ADSL2 parameters */
 
-#define kAdsl2CfgReachExOn                                     0x00000001
-#define kAdsl2CfgAnnexMEnabled                         0x00000002
+#define kAdsl2CfgReachExOn                  0x00000001
+#define kAdsl2CfgAnnexMEnabled              0x00000002
 
-#define kAdsl2CfgAnnexMPsdShift                                2
-#define kAdsl2CfgAnnexMPsdBits                         12
-#define kAdsl2CfgAnnexMPsdMask                         (0xFFF << kAdsl2CfgAnnexMPsdShift)
+#define kAdsl2CfgAnnexMPsdShift             2
+#define kAdsl2CfgAnnexMPsdBits              12
+#define kAdsl2CfgAnnexMPsdMask              (0xFFF << kAdsl2CfgAnnexMPsdShift)
 
 #if (((1 << kAdsl2CfgAnnexMPsdBits) - 1) != (kAdsl2CfgAnnexMPsdMask >> kAdsl2CfgAnnexMPsdShift))
 #error Inconsistent kAdsl2CfgAnnexM definitions
@@ -193,597 +193,603 @@ extern "C" {
 #define kAdsl2CfgAnnexMUp64                 (0x00000100 << kAdsl2CfgAnnexMPsdShift)
 #define kAdsl2CfgAnnexMCustomPsd            (0x00000200 << kAdsl2CfgAnnexMPsdShift)
 
-#define kAdsl2CfgAnnexLShift                           (2 + kAdsl2CfgAnnexMPsdBits)
-#define kAdsl2CfgAnnexLMask                                    (0x7 << kAdsl2CfgAnnexLShift)
+#define kAdsl2CfgAnnexLShift                (2 + kAdsl2CfgAnnexMPsdBits)
+#define kAdsl2CfgAnnexLMask                 (0x7 << kAdsl2CfgAnnexLShift)
 
 #define kAdsl2CfgAnnexLUpWide               (0x00000001 << kAdsl2CfgAnnexLShift)
 #define kAdsl2CfgAnnexLUpNarrow             (0x00000002 << kAdsl2CfgAnnexLShift)
-#define kAdsl2CfgAnnexLDnOvlap                         (0x00000004 << kAdsl2CfgAnnexLShift)
+#define kAdsl2CfgAnnexLDnOvlap              (0x00000004 << kAdsl2CfgAnnexLShift)
 
 typedef struct _adslCfgProfile {
-       long            adslAnnexCParam;
-       long            adslAnnexAParam;
-       long            adslTrainingMarginQ4;
-       long            adslShowtimeMarginQ4;
-       long            adslLOMTimeThldSec;
-       long            adslDemodCapMask;
-       long            adslDemodCapValue;
-       long            adsl2Param;
-       long            adslPwmSyncClockFreq;
-       long            adslHsModeSwitchTime;
+    long        adslAnnexCParam;
+    long        adslAnnexAParam;
+    long        adslTrainingMarginQ4;
+    long        adslShowtimeMarginQ4;
+    long        adslLOMTimeThldSec;
+    long        adslDemodCapMask;
+    long        adslDemodCapValue;
+    long        adsl2Param;
+    long        adslPwmSyncClockFreq;
+    long        adslHsModeSwitchTime;
 } adslCfgProfile;
 
 /* 
 **
-**             ADSL PHY configuration
+**      ADSL PHY configuration
 **
 */
 
 typedef struct _adslPhyCfg {
-       long            demodCapMask;
-       long            demodCap;
+    long        demodCapMask;
+    long        demodCap;
 } adslPhyCfg;
 
 /* 
 **
-**             ADSL version info parameters 
+**      ADSL version info parameters 
 **
 */
 
-#define        kAdslVersionStringSize                          32
+#define kAdslVersionStringSize              32
 
-#define        kAdslTypeUnknown                                        0
-#define        kAdslTypeAnnexA                                         1
-#define        kAdslTypeAnnexB                                         2
-#define        kAdslTypeAnnexC                                         3
-#define        kAdslTypeSADSL                                          4
+#define kAdslTypeUnknown                    0
+#define kAdslTypeAnnexA                     1
+#define kAdslTypeAnnexB                     2
+#define kAdslTypeAnnexC                     3
+#define kAdslTypeSADSL                      4
 
 typedef struct _adslVersionInfo {
-       unsigned short  phyType;
-       unsigned short  phyMjVerNum;
-       unsigned short  phyMnVerNum;
-       char                    phyVerStr[kAdslVersionStringSize];
-       unsigned short  drvMjVerNum;
-       unsigned short  drvMnVerNum;
-       char                    drvVerStr[kAdslVersionStringSize];
+    unsigned short  phyType;
+    unsigned short  phyMjVerNum;
+    unsigned short  phyMnVerNum;
+    char            phyVerStr[kAdslVersionStringSize];
+    unsigned short  drvMjVerNum;
+    unsigned short  drvMnVerNum;
+    char            drvVerStr[kAdslVersionStringSize];
 } adslVersionInfo;
 
 /* 
 **
-**             ADSL self-test parameters 
+**      ADSL self-test parameters 
 **
 */
 
-#define kAdslSelfTestLMEM                                      0x00000001
-#define kAdslSelfTestSDRAM                                     0x00000002
-#define kAdslSelfTestAFE                                       0x00000004
-#define kAdslSelfTestQproc                                     0x00000008
-#define kAdslSelfTestRS                                                0x00000010
-#define kAdslSelfTestHostDma                           0x00000020
+#define kAdslSelfTestLMEM                   0x00000001
+#define kAdslSelfTestSDRAM                  0x00000002
+#define kAdslSelfTestAFE                    0x00000004
+#define kAdslSelfTestQproc                  0x00000008
+#define kAdslSelfTestRS                     0x00000010
+#define kAdslSelfTestHostDma                0x00000020
 
-#define kAdslSelfTestAll                                       ((kAdslSelfTestHostDma - 1) | kAdslSelfTestHostDma)
+#define kAdslSelfTestAll                    ((kAdslSelfTestHostDma - 1) | kAdslSelfTestHostDma)
 
-#define kAdslSelfTestInProgress                                0x40000000
-#define kAdslSelfTestCompleted                         0x80000000
+#define kAdslSelfTestInProgress             0x40000000
+#define kAdslSelfTestCompleted              0x80000000
 
 /* MIB OID's for ADSL objects */
 
-#define kOidMaxObjLen                                          80
-
-#define kOidAdsl                                                       94
-#define kOidAdslInterleave                                     124
-#define kOidAdslFast                                           125
-#define kOidAtm                                                                37
-#define kOidAdslPrivate                                                255
-#define kOidAdslPrivatePartial                         254
-
-#define kAdslMibAnnexAToneNum                          256
-#define kAdslMibToneNum                                                kAdslMibAnnexAToneNum
-#define kAdslMibMaxToneNum                                     kAdslMibAnnexAToneNum*2*2
-
-#define kOidAdslPrivSNR                                                1
-#define kOidAdslPrivBitAlloc                           2
-#define kOidAdslPrivGain                                       3
-#define kOidAdslPrivShowtimeMargin                     4
-#define kOidAdslPrivChanCharLin                                5
-#define kOidAdslPrivChanCharLog                                6
-#define kOidAdslPrivQuietLineNoise                     7
-#define kOidAdslPrivExtraInfo                          255
-
-#define kOidAdslLine                                           1
-#define kOidAdslMibObjects                                     1
-
-#define kOidAdslLineTable                                      1
-#define kOidAdslLineEntry                                      1
-#define kOidAdslLineCoding                                     1
-#define kOidAdslLineType                                       2
-#define kOidAdslLineSpecific                       3
-#define kOidAdslLineConfProfile                                4
-#define kOidAdslLineAlarmConfProfile           5
-
-#define kOidAdslAtucPhysTable                          2
-#define kOidAdslAturPhysTable                          3
-#define kOidAdslPhysEntry                                      1
-#define kOidAdslPhysInvSerialNumber            1
+#define kOidMaxObjLen                       80
+
+#define kOidAdsl                            94
+#define kOidAdslInterleave                  124
+#define kOidAdslFast                        125
+#define kOidAtm                             37
+#define kOidAdslPrivate                     255
+#define kOidAdslPrivatePartial              254
+
+#define kAdslMibAnnexAToneNum               256
+#define kAdslMibToneNum                     kAdslMibAnnexAToneNum
+#define kAdslMibMaxToneNum                  kAdslMibAnnexAToneNum*2*2
+
+#define kOidAdslPrivSNR                     1
+#define kOidAdslPrivBitAlloc                2
+#define kOidAdslPrivGain                    3
+#define kOidAdslPrivShowtimeMargin          4
+#define kOidAdslPrivChanCharLin             5
+#define kOidAdslPrivChanCharLog             6
+#define kOidAdslPrivQuietLineNoise          7
+#define kOidAdslPrivExtraInfo               255
+
+#define kOidAdslLine                        1
+#define kOidAdslMibObjects                  1
+
+#define kOidAdslLineTable                   1
+#define kOidAdslLineEntry                   1
+#define kOidAdslLineCoding                  1
+#define kOidAdslLineType                    2
+#define kOidAdslLineSpecific                3
+#define kOidAdslLineConfProfile             4
+#define kOidAdslLineAlarmConfProfile        5
+
+#define kOidAdslAtucPhysTable               2
+#define kOidAdslAturPhysTable               3
+#define kOidAdslPhysEntry                   1
+#define kOidAdslPhysInvSerialNumber         1
 #define kOidAdslPhysInvVendorID             2
-#define kOidAdslPhysInvVersionNumber           3
-#define kOidAdslPhysCurrSnrMgn                 4
-#define kOidAdslPhysCurrAtn                    5
-#define kOidAdslPhysCurrStatus                 6
-#define kOidAdslPhysCurrOutputPwr              7
-#define kOidAdslPhysCurrAttainableRate         8
-
-#define kOidAdslAtucChanTable                          4
-#define kOidAdslAturChanTable                          5
-#define kOidAdslChanEntry                                      1
-#define kOidAdslChanInterleaveDelay                    1
-#define kOidAdslChanCurrTxRate                         2
-#define kOidAdslChanPrevTxRate                 3
-#define kOidAdslChanCrcBlockLength             4
-
-#define kOidAdslAtucPerfDataTable                      6
-#define kOidAdslAturPerfDataTable                      7
-#define kOidAdslPerfDataEntry                          1
-#define kOidAdslPerfLofs                       1
-#define kOidAdslPerfLoss                       2
-#define kOidAdslPerfLprs                       3
-#define kOidAdslPerfESs                        4
+#define kOidAdslPhysInvVersionNumber        3
+#define kOidAdslPhysCurrSnrMgn              4
+#define kOidAdslPhysCurrAtn                 5
+#define kOidAdslPhysCurrStatus              6
+#define kOidAdslPhysCurrOutputPwr           7
+#define kOidAdslPhysCurrAttainableRate      8
+
+#define kOidAdslAtucChanTable               4
+#define kOidAdslAturChanTable               5
+#define kOidAdslChanEntry                   1
+#define kOidAdslChanInterleaveDelay         1
+#define kOidAdslChanCurrTxRate              2
+#define kOidAdslChanPrevTxRate              3
+#define kOidAdslChanCrcBlockLength          4
+
+#define kOidAdslAtucPerfDataTable           6
+#define kOidAdslAturPerfDataTable           7
+#define kOidAdslPerfDataEntry               1
+#define kOidAdslPerfLofs                    1
+#define kOidAdslPerfLoss                    2
+#define kOidAdslPerfLprs                    3
+#define kOidAdslPerfESs                     4
 #define kOidAdslPerfValidIntervals          5
-#define kOidAdslPerfInvalidIntervals           6
-#define kOidAdslPerfCurr15MinTimeElapsed       7
-#define kOidAdslPerfCurr15MinLofs              8
-#define kOidAdslPerfCurr15MinLoss              9
-#define kOidAdslPerfCurr15MinLprs              10
-#define kOidAdslPerfCurr15MinESs               11
+#define kOidAdslPerfInvalidIntervals        6
+#define kOidAdslPerfCurr15MinTimeElapsed    7
+#define kOidAdslPerfCurr15MinLofs           8
+#define kOidAdslPerfCurr15MinLoss           9
+#define kOidAdslPerfCurr15MinLprs           10
+#define kOidAdslPerfCurr15MinESs            11
 #define kOidAdslPerfCurr1DayTimeElapsed     12
-#define kOidAdslPerfCurr1DayLofs               13
-#define kOidAdslPerfCurr1DayLoss               14
-#define kOidAdslPerfCurr1DayLprs               15
-#define kOidAdslPerfCurr1DayESs                16
-#define kOidAdslPerfPrev1DayMoniSecs           17
-#define kOidAdslPerfPrev1DayLofs               18
+#define kOidAdslPerfCurr1DayLofs            13
+#define kOidAdslPerfCurr1DayLoss            14
+#define kOidAdslPerfCurr1DayLprs            15
+#define kOidAdslPerfCurr1DayESs             16
+#define kOidAdslPerfPrev1DayMoniSecs        17
+#define kOidAdslPerfPrev1DayLofs            18
 #define kOidAdslPerfPrev1DayLoss            19
-#define kOidAdslPerfPrev1DayLprs               20
-#define kOidAdslPerfPrev1DayESs                21
-
-#define kOidAdslAtucPerfIntervalTable          8
-#define kOidAdslAturPerfIntervalTable          9
-#define kOidAdslPerfIntervalEntry                      1
-#define kOidAdslIntervalNumber                         1
-#define kOidAdslIntervalLofs                           2
-#define kOidAdslIntervalLoss                           3
-#define kOidAdslIntervalLprs                           4
-#define kOidAdslIntervalESs                                    5
-#define kOidAdslIntervalValidData                      6
-
-#define kOidAdslAtucChanPerfTable                                      10
-#define kOidAdslAturChanPerfTable                                      11
-#define kOidAdslChanPerfEntry                                          1
-#define kOidAdslChanReceivedBlks                       1
-#define kOidAdslChanTransmittedBlks                    2
-#define kOidAdslChanCorrectedBlks                      3
-#define kOidAdslChanUncorrectBlks                      4
-#define kOidAdslChanPerfValidIntervals                 5
-#define kOidAdslChanPerfInvalidIntervals               6
-#define kOidAdslChanPerfCurr15MinTimeElapsed           7
-#define kOidAdslChanPerfCurr15MinReceivedBlks          8
-#define kOidAdslChanPerfCurr15MinTransmittedBlks       9
-#define kOidAdslChanPerfCurr15MinCorrectedBlks         10
-#define kOidAdslChanPerfCurr15MinUncorrectBlks         11
-#define kOidAdslChanPerfCurr1DayTimeElapsed            12
-#define kOidAdslChanPerfCurr1DayReceivedBlks           13
-#define kOidAdslChanPerfCurr1DayTransmittedBlks        14
-#define kOidAdslChanPerfCurr1DayCorrectedBlks          15
-#define kOidAdslChanPerfCurr1DayUncorrectBlks          16
-#define kOidAdslChanPerfPrev1DayMoniSecs               17
-#define kOidAdslChanPerfPrev1DayReceivedBlks           18
-#define kOidAdslChanPerfPrev1DayTransmittedBlks        19
-#define kOidAdslChanPerfPrev1DayCorrectedBlks          20
-#define kOidAdslChanPerfPrev1DayUncorrectBlks          21
-
-#define kOidAdslAtucChanIntervalTable                          12
-#define kOidAdslAturChanIntervalTable                          13
-#define kOidAdslChanIntervalEntry                                      1
-#define kOidAdslChanIntervalNumber                                     1
-#define kOidAdslChanIntervalReceivedBlks               2
-#define kOidAdslChanIntervalTransmittedBlks            3
-#define kOidAdslChanIntervalCorrectedBlks              4
-#define kOidAdslChanIntervalUncorrectBlks              5
-#define kOidAdslChanIntervalValidData                  6
-
-#define kOidAtmMibObjects              1
-#define kOidAtmTcTable                 4
-#define kOidAtmTcEntry                 1
-#define kOidAtmOcdEvents               1
-#define kOidAtmAlarmState              2
+#define kOidAdslPerfPrev1DayLprs            20
+#define kOidAdslPerfPrev1DayESs             21
+
+#define kOidAdslAtucPerfIntervalTable       8
+#define kOidAdslAturPerfIntervalTable       9
+#define kOidAdslPerfIntervalEntry           1
+#define kOidAdslIntervalNumber              1
+#define kOidAdslIntervalLofs                2
+#define kOidAdslIntervalLoss                3
+#define kOidAdslIntervalLprs                4
+#define kOidAdslIntervalESs                 5
+#define kOidAdslIntervalValidData           6
+
+#define kOidAdslAtucChanPerfTable                   10
+#define kOidAdslAturChanPerfTable                   11
+#define kOidAdslChanPerfEntry                       1
+#define kOidAdslChanReceivedBlks                    1
+#define kOidAdslChanTransmittedBlks                 2
+#define kOidAdslChanCorrectedBlks                   3
+#define kOidAdslChanUncorrectBlks                   4
+#define kOidAdslChanPerfValidIntervals              5
+#define kOidAdslChanPerfInvalidIntervals            6
+#define kOidAdslChanPerfCurr15MinTimeElapsed        7
+#define kOidAdslChanPerfCurr15MinReceivedBlks       8
+#define kOidAdslChanPerfCurr15MinTransmittedBlks    9
+#define kOidAdslChanPerfCurr15MinCorrectedBlks      10
+#define kOidAdslChanPerfCurr15MinUncorrectBlks      11
+#define kOidAdslChanPerfCurr1DayTimeElapsed         12
+#define kOidAdslChanPerfCurr1DayReceivedBlks        13
+#define kOidAdslChanPerfCurr1DayTransmittedBlks     14
+#define kOidAdslChanPerfCurr1DayCorrectedBlks       15
+#define kOidAdslChanPerfCurr1DayUncorrectBlks       16
+#define kOidAdslChanPerfPrev1DayMoniSecs            17
+#define kOidAdslChanPerfPrev1DayReceivedBlks        18
+#define kOidAdslChanPerfPrev1DayTransmittedBlks     19
+#define kOidAdslChanPerfPrev1DayCorrectedBlks       20
+#define kOidAdslChanPerfPrev1DayUncorrectBlks       21
+
+#define kOidAdslAtucChanIntervalTable               12
+#define kOidAdslAturChanIntervalTable               13
+#define kOidAdslChanIntervalEntry                   1
+#define kOidAdslChanIntervalNumber                  1
+#define kOidAdslChanIntervalReceivedBlks            2
+#define kOidAdslChanIntervalTransmittedBlks         3
+#define kOidAdslChanIntervalCorrectedBlks           4
+#define kOidAdslChanIntervalUncorrectBlks           5
+#define kOidAdslChanIntervalValidData               6
+
+#define kOidAtmMibObjects       1
+#define kOidAtmTcTable          4
+#define kOidAtmTcEntry          1
+#define kOidAtmOcdEvents        1
+#define kOidAtmAlarmState       2
 
 /* Adsl Channel coding */
 
-#define        kAdslRcvDir                     0
-#define        kAdslXmtDir                     1
+#define kAdslRcvDir         0
+#define kAdslXmtDir         1
 
-#define        kAdslRcvActive          (1 << kAdslRcvDir)
-#define        kAdslXmtActive          (1 << kAdslXmtDir)
+#define kAdslRcvActive      (1 << kAdslRcvDir)
+#define kAdslXmtActive      (1 << kAdslXmtDir)
 
-#define        kAdslIntlChannel        0
-#define        kAdslFastChannel        1
+#define kAdslIntlChannel    0
+#define kAdslFastChannel    1
 
-#define        kAdslTrellisOff         0
-#define        kAdslTrellisOn          1
+#define kAdslTrellisOff     0
+#define kAdslTrellisOn      1
 
 /* AnnexC modulation and bitmap types for the field (adslConnection.modType) */
 
-#define kAdslModMask           0x7
+#define kAdslModMask        0x7
 
-#define        kAdslModGdmt            0
-#define        kAdslModT1413           1
-#define        kAdslModGlite           2
-#define kAdslModAnnexI         3
-#define kAdslModAdsl2          4
-#define kAdslModAdsl2p         5
-#define kAdslModReAdsl2                6
+#define kAdslModGdmt        0
+#define kAdslModT1413       1
+#define kAdslModGlite       2
+#define kAdslModAnnexI      3
+#define kAdslModAdsl2       4
+#define kAdslModAdsl2p      5
+#define kAdslModReAdsl2     6
 
-#define kAdslBitmapShift       3
-#define kAdslBitmapMask                kAdslCfgBitmapMask
-#define kAdslDBM                   (0 << kAdslBitmapShift)
-#define kAdslFBM                   (1 << kAdslBitmapShift)
-#define kAdslFBMSoL                    (2 << kAdslBitmapShift)
+#define kAdslBitmapShift    3
+#define kAdslBitmapMask     kAdslCfgBitmapMask
+#define kAdslDBM            (0 << kAdslBitmapShift)
+#define kAdslFBM            (1 << kAdslBitmapShift)
+#define kAdslFBMSoL         (2 << kAdslBitmapShift)
 
-#define kAdslUpstreamModeShift         5
-#define kAdslUpstreamModeMask          (3 << kAdslUpstreamModeShift)
-#define kAdslUpstreamModeSingle                (0 << kAdslUpstreamModeShift)
-#define kAdslUpstreamModeDouble                (1 << kAdslUpstreamModeShift)
-#define kAdslUpstreamModeTriple                (2 << kAdslUpstreamModeShift)
+#define kAdslUpstreamModeShift      5
+#define kAdslUpstreamModeMask       (3 << kAdslUpstreamModeShift)
+#define kAdslUpstreamModeSingle     (0 << kAdslUpstreamModeShift)
+#define kAdslUpstreamModeDouble     (1 << kAdslUpstreamModeShift)
+#define kAdslUpstreamModeTriple     (2 << kAdslUpstreamModeShift)
 
 /* AdslLineCodingType definitions */
 
-#define kAdslLineCodingOther           1
-#define kAdslLineCodingDMT                     2
-#define kAdslLineCodingCAP                     3
-#define kAdslLineCodingQAM                     4
+#define kAdslLineCodingOther        1
+#define kAdslLineCodingDMT          2
+#define kAdslLineCodingCAP          3
+#define kAdslLineCodingQAM          4
 
 /* AdslLineType definitions */
 
-#define kAdslLineTypeNoChannel         1
-#define kAdslLineTypeFastOnly          2
-#define kAdslLineTypeIntlOnly          3
-#define kAdslLineTypeFastOrIntl                4
-#define kAdslLineTypeFastAndIntl       5
+#define kAdslLineTypeNoChannel      1
+#define kAdslLineTypeFastOnly       2
+#define kAdslLineTypeIntlOnly       3
+#define kAdslLineTypeFastOrIntl     4
+#define kAdslLineTypeFastAndIntl    5
 
 typedef struct _adslLineEntry {
-       unsigned char   adslLineCoding;
-       unsigned char   adslLineType;
+    unsigned char   adslLineCoding;
+    unsigned char   adslLineType;
 } adslLineEntry;
 
 
 /* AdslPhys status definitions */
 
-#define kAdslPhysStatusNoDefect                (1 << 0)
-#define kAdslPhysStatusLOF                     (1 << 1)        /* lossOfFraming (not receiving valid frame) */
-#define kAdslPhysStatusLOS                     (1 << 2)        /* lossOfSignal (not receiving signal) */
-#define kAdslPhysStatusLPR                     (1 << 3)        /* lossOfPower */
-#define kAdslPhysStatusLOSQ                    (1 << 4)        /* lossOfSignalQuality */
-#define kAdslPhysStatusLOM                     (1 << 5)        /* lossOfMargin */
+#define kAdslPhysStatusNoDefect     (1 << 0)
+#define kAdslPhysStatusLOF          (1 << 1)    /* lossOfFraming (not receiving valid frame) */
+#define kAdslPhysStatusLOS          (1 << 2)    /* lossOfSignal (not receiving signal) */
+#define kAdslPhysStatusLPR          (1 << 3)    /* lossOfPower */
+#define kAdslPhysStatusLOSQ         (1 << 4)    /* lossOfSignalQuality */
+#define kAdslPhysStatusLOM          (1 << 5)    /* lossOfMargin */
+
+#define kAdslPhysVendorIdLen        8
+#define kAdslPhysSerialNumLen       32
+#define kAdslPhysVersionNumLen      32
 
 typedef struct _adslPhysEntry {
-       long            adslCurrSnrMgn;
-       long            adslCurrAtn;
-       long            adslCurrStatus;
-       long            adslCurrOutputPwr;
-       long            adslCurrAttainableRate;
-       long            adslSignalAttn;
-       long            adslHlinScaleFactor;
+    long        adslCurrSnrMgn;
+    long        adslCurrAtn;
+    long        adslCurrStatus;
+    long        adslCurrOutputPwr;
+    long        adslCurrAttainableRate;
+    long        adslSignalAttn;
+    long        adslHlinScaleFactor;
+    long        adslLDCompleted;
+    char        adslVendorID[kAdslPhysVendorIdLen];
 } adslPhysEntry;
 
-#define kAdslPhysVendorIdLen           8
-#define kAdslPhysSerialNumLen          32
-#define kAdslPhysVersionNumLen         32
-
 typedef struct _adslFullPhysEntry {
-       char            adslSerialNumber[kAdslPhysSerialNumLen];
-       char            adslVendorID[kAdslPhysVendorIdLen];
-       char            adslVersionNumber[kAdslPhysVersionNumLen];
-       long            adslCurrSnrMgn;
-       long            adslCurrAtn;
-       long            adslCurrStatus;
-       long            adslCurrOutputPwr;
-       long            adslCurrAttainableRate;
-       long            adslSignalAttn;
-       long            adslHlinScaleFactor;
+    char        adslSerialNumber[kAdslPhysSerialNumLen];
+    char        adslVendorID[kAdslPhysVendorIdLen];
+    char        adslVersionNumber[kAdslPhysVersionNumLen];
+    long        adslCurrSnrMgn;
+    long        adslCurrAtn;
+    long        adslCurrStatus;
+    long        adslCurrOutputPwr;
+    long        adslCurrAttainableRate;
+    long        adslSignalAttn;
+    long        adslHlinScaleFactor;
 } adslFullPhysEntry;
 
 /* Adsl channel entry definitions */
 
 typedef struct _adslChanEntry {
-    unsigned long              adslChanIntlDelay;
-       unsigned long           adslChanCurrTxRate;
-       unsigned long           adslChanPrevTxRate;
-       unsigned long           adslChanCrcBlockLength;
+    unsigned long       adslChanIntlDelay;
+    unsigned long       adslChanCurrTxRate;
+    unsigned long       adslChanPrevTxRate;
+    unsigned long       adslChanCrcBlockLength;
 } adslChanEntry;
 
 /* Adsl performance data definitions */
 
 typedef struct _adslPerfCounters {
-       unsigned long           adslLofs;
-       unsigned long           adslLoss;
-       unsigned long           adslLols;       /* Loss of Link failures (ATUC only) */
-       unsigned long           adslLprs;
-       unsigned long           adslESs;        /* Count of Errored Seconds */
-       unsigned long           adslInits;      /* Count of Line initialization attempts (ATUC only) */
-       unsigned long           adslUAS;        /* Count of Unavailable Seconds */
-       unsigned long           adslSES;        /* Count of Severely Errored Seconds */
-       unsigned long           adslLOSS;       /* Count of LOS seconds */
-       unsigned long           adslFECs;       /* Count of FEC seconds  */
-       unsigned long           adslLCDS;       /* Count of LCD Errored Seconds */
+    unsigned long       adslLofs;
+    unsigned long       adslLoss;
+    unsigned long       adslLols;   /* Loss of Link failures (ATUC only) */
+    unsigned long       adslLprs;
+    unsigned long       adslESs;    /* Count of Errored Seconds */
+    unsigned long       adslInits;  /* Count of Line initialization attempts (ATUC only) */
+    unsigned long       adslUAS;    /* Count of Unavailable Seconds */
+    unsigned long       adslSES;    /* Count of Severely Errored Seconds */
+    unsigned long       adslLOSS;   /* Count of LOS seconds */
+    unsigned long       adslFECs;   /* Count of FEC seconds  */
+    unsigned long       adslLCDS;   /* Count of LCD Errored Seconds */
 } adslPerfCounters;
 
 typedef struct _adslFailureCounters {
-       unsigned long           adslRetr;               /* Count of total retrains */
-       unsigned long           adslRetrLof;    /* Count of retrains due to LOF */
-       unsigned long           adslRetrLos;    /* Count of retrains due to LOS */
-       unsigned long           adslRetrLpr;    /* Count of retrains due to LPR */
-       unsigned long           adslRetrLom;    /* Count of retrains due to LOM */
-       unsigned long           adslInitErr;    /* Count of training failures */
-       unsigned long           adslInitTo;             /* Count of training timeouts */
-       unsigned long           adslLineSearch; /* Count of line search inits */
+    unsigned long       adslRetr;       /* Count of total retrains */
+    unsigned long       adslRetrLof;    /* Count of retrains due to LOF */
+    unsigned long       adslRetrLos;    /* Count of retrains due to LOS */
+    unsigned long       adslRetrLpr;    /* Count of retrains due to LPR */
+    unsigned long       adslRetrLom;    /* Count of retrains due to LOM */
+    unsigned long       adslInitErr;    /* Count of training failures */
+    unsigned long       adslInitTo;     /* Count of training timeouts */
+    unsigned long       adslLineSearch; /* Count of line search inits */
 } adslFailureCounters;
 
 typedef struct _adslPerfDataEntry {
-       adslPerfCounters        perfTotal;
-       unsigned long                           adslPerfValidIntervals;
-       unsigned long                           adslPerfInvalidIntervals;
-       adslPerfCounters        perfCurr15Min;
-       unsigned long                           adslPerfCurr15MinTimeElapsed;
-       adslPerfCounters        perfCurr1Day;
-       unsigned long                           adslPerfCurr1DayTimeElapsed;
-       adslPerfCounters        perfPrev1Day;
-       unsigned long                           adslAturPerfPrev1DayMoniSecs;
-       adslFailureCounters failTotal;
+    adslPerfCounters    perfTotal;
+    adslPerfCounters    perfSinceShowTime;
+    unsigned long               adslPerfValidIntervals;
+    unsigned long               adslPerfInvalidIntervals;
+    adslPerfCounters    perfCurr15Min;
+    unsigned long               adslPerfCurr15MinTimeElapsed;
+    adslPerfCounters    perfCurr1Day;
+    unsigned long               adslPerfCurr1DayTimeElapsed;
+    adslPerfCounters    perfPrev1Day;
+    unsigned long               adslAturPerfPrev1DayMoniSecs;
+    adslFailureCounters failTotal;
+    adslFailureCounters failSinceShowTime;
 } adslPerfDataEntry;
 
-#define kAdslMibPerfIntervals          4
+#define kAdslMibPerfIntervals       4
 
 /* Adsl channel performance data definitions */
 
 typedef struct _adslChanCounters {
-       unsigned long           adslChanReceivedBlks;
-       unsigned long           adslChanTransmittedBlks;
-       unsigned long           adslChanCorrectedBlks;
-       unsigned long           adslChanUncorrectBlks;
+    unsigned long       adslChanReceivedBlks;
+    unsigned long       adslChanTransmittedBlks;
+    unsigned long       adslChanCorrectedBlks;
+    unsigned long       adslChanUncorrectBlks;
 } adslChanCounters;
 
 typedef struct _adslChanPerfDataEntry {
-       adslChanCounters        perfTotal;
-       unsigned long                           adslChanPerfValidIntervals;
-       unsigned long                           adslChanPerfInvalidIntervals;
-       adslChanCounters        perfCurr15Min;
-       unsigned long                           adslPerfCurr15MinTimeElapsed;
-       adslChanCounters        perfCurr1Day;
-       unsigned long                           adslPerfCurr1DayTimeElapsed;
-       adslChanCounters        perfPrev1Day;
-       unsigned long                           adslAturPerfPrev1DayMoniSecs;
+    adslChanCounters    perfTotal;
+    unsigned long               adslChanPerfValidIntervals;
+    unsigned long               adslChanPerfInvalidIntervals;
+    adslChanCounters    perfCurr15Min;
+    unsigned long               adslPerfCurr15MinTimeElapsed;
+    adslChanCounters    perfCurr1Day;
+    unsigned long               adslPerfCurr1DayTimeElapsed;
+    adslChanCounters    perfPrev1Day;
+    unsigned long               adslAturPerfPrev1DayMoniSecs;
 } adslChanPerfDataEntry;
 
-#define kAdslMibChanPerfIntervals      4
+#define kAdslMibChanPerfIntervals   4
 
 /* Adsl trap threshold definitions */
 
-#define        kAdslEventLinkChange            0x001
-#define        kAdslEventRateChange            0x002
-#define        kAdslEventLofThresh                     0x004
-#define        kAdslEventLosThresh                     0x008
-#define        kAdslEventLprThresh                     0x010
-#define        kAdslEventESThresh                      0x020
-#define        kAdslEventFastUpThresh          0x040
-#define        kAdslEventIntlUpThresh          0x080
-#define        kAdslEventFastDownThresh        0x100
-#define        kAdslEventIntlDwonThresh        0x200
+#define kAdslEventLinkChange        0x001
+#define kAdslEventRateChange        0x002
+#define kAdslEventLofThresh         0x004
+#define kAdslEventLosThresh         0x008
+#define kAdslEventLprThresh         0x010
+#define kAdslEventESThresh          0x020
+#define kAdslEventFastUpThresh      0x040
+#define kAdslEventIntlUpThresh      0x080
+#define kAdslEventFastDownThresh    0x100
+#define kAdslEventIntlDwonThresh    0x200
 
 typedef struct _adslThreshCounters {
-       unsigned long           adslThreshLofs;
-       unsigned long           adslThreshLoss;
-       unsigned long           adslThreshLols; /* Loss of Link failures (ATUC only) */
-       unsigned long           adslThreshLprs;
-       unsigned long           adslThreshESs;
-       unsigned long           adslThreshFastRateUp;
-       unsigned long           adslThreshIntlRateUp;
-       unsigned long           adslThreshFastRateDown;
-       unsigned long           adslThreshIntlRateDown;
+    unsigned long       adslThreshLofs;
+    unsigned long       adslThreshLoss;
+    unsigned long       adslThreshLols; /* Loss of Link failures (ATUC only) */
+    unsigned long       adslThreshLprs;
+    unsigned long       adslThreshESs;
+    unsigned long       adslThreshFastRateUp;
+    unsigned long       adslThreshIntlRateUp;
+    unsigned long       adslThreshFastRateDown;
+    unsigned long       adslThreshIntlRateDown;
 } adslThreshCounters;
 
 
 /* Atm PHY performance data definitions */
 
-#define        kAtmPhyStateNoAlarm                     1
-#define        kAtmPhyStateLcdFailure          2
+#define kAtmPhyStateNoAlarm         1
+#define kAtmPhyStateLcdFailure      2
 
 typedef struct _atmPhyDataEntrty {
-       unsigned long           atmInterfaceOCDEvents;
-       unsigned long           atmInterfaceTCAlarmState;
+    unsigned long       atmInterfaceOCDEvents;
+    unsigned long       atmInterfaceTCAlarmState;
 } atmPhyDataEntrty;
 
 typedef struct _adslBertResults {
-       unsigned long           bertTotalBits;
-       unsigned long           bertErrBits;
+    unsigned long       bertTotalBits;
+    unsigned long       bertErrBits;
 } adslBertResults;
 
 typedef struct {
-       unsigned long           cntHi;
-       unsigned long           cntLo;
+    unsigned long       cntHi;
+    unsigned long       cntLo;
 } cnt64;
 
 typedef struct _adslBertStatusEx {
-       unsigned long           bertSecTotal;
-       unsigned long           bertSecElapsed;
-       unsigned long           bertSecCur;
-       cnt64                           bertTotalBits;
-       cnt64                           bertErrBits;
+    unsigned long       bertSecTotal;
+    unsigned long       bertSecElapsed;
+    unsigned long       bertSecCur;
+    cnt64               bertTotalBits;
+    cnt64               bertErrBits;
 } adslBertStatusEx;
 
 typedef struct _adslDataConnectionInfo {
-       unsigned short          K;
-       unsigned char           S, R, D;
+    unsigned short      K;
+    unsigned char       S, R, D;
 } adslDataConnectionInfo;
 
 typedef struct _adslConnectionInfo {
-       unsigned char                   chType;                         /* fast or interleaved */
-       unsigned char                   modType;                        /* modulation type: G.DMT or T1.413 */
-       unsigned char                   trellisCoding;          /* off(0) or on(1) */
-       adslDataConnectionInfo  rcvInfo;
-       adslDataConnectionInfo  xmtInfo;
+    unsigned char           chType;             /* fast or interleaved */
+    unsigned char           modType;            /* modulation type: G.DMT or T1.413 */
+    unsigned char           trellisCoding;      /* off(0) or on(1) */
+    adslDataConnectionInfo  rcvInfo;
+    adslDataConnectionInfo  xmtInfo;
 } adslConnectionInfo;
 
 typedef struct _adsl2DataConnectionInfo {
-       unsigned char           Nlp;
-       unsigned char           Nbc;
-       unsigned char           MSGlp;
-       unsigned short          MSGc;
-
-       unsigned long           L;
-       unsigned short          M;
-       unsigned short          T;
-       unsigned short          D;
-       unsigned short          R;
-       unsigned short          B;
+    unsigned char       Nlp;
+    unsigned char       Nbc;
+    unsigned char       MSGlp;
+    unsigned short      MSGc;
+
+    unsigned long       L;
+    unsigned short      M;
+    unsigned short      T;
+    unsigned short      D;
+    unsigned short      R;
+    unsigned short      B;
 } adsl2DataConnectionInfo;
 
 /* ADSL2 connection parameters */
 
-#define kAdsl2ModeAnnexMask                                    0xF
+#define kAdsl2ModeAnnexMask                 0xF
 
-#define kAdsl2ModeAnnexMUp32                           1
-#define kAdsl2ModeAnnexMUp36                           
-#define kAdsl2ModeAnnexMUp40                           
+#define kAdsl2ModeAnnexMUp32                1
+#define kAdsl2ModeAnnexMUp36                2 
+#define kAdsl2ModeAnnexMUp40                3 
 #define kAdsl2ModeAnnexMUp44                4
 #define kAdsl2ModeAnnexMUp48                5
-#define kAdsl2ModeAnnexMUp52                           6
+#define kAdsl2ModeAnnexMUp52                6
 #define kAdsl2ModeAnnexMUp56                7
 #define kAdsl2ModeAnnexMUp60                8
 #define kAdsl2ModeAnnexMUp64                9
 
-#define kAdsl2ModeAnnexLShift                          4
-#define kAdsl2ModeAnnexLMask                           (0x3 << kAdsl2ModeAnnexLShift)
+#define kAdsl2ModeAnnexLShift               4
+#define kAdsl2ModeAnnexLMask                (0x3 << kAdsl2ModeAnnexLShift)
 
-#define kAdsl2ModeAnnexLUpMask                         (0x00000001 << kAdsl2ModeAnnexLShift)
+#define kAdsl2ModeAnnexLUpMask              (0x00000001 << kAdsl2ModeAnnexLShift)
 #define kAdsl2ModeAnnexLUpWide              (0x00000000 << kAdsl2ModeAnnexLShift)
 #define kAdsl2ModeAnnexLUpNarrow            (0x00000001 << kAdsl2ModeAnnexLShift)
 
-#define kAdsl2ModeAnnexLDnMask                         (0x00000002 << kAdsl2ModeAnnexLShift)
-#define kAdsl2ModeAnnexLDnNonOvlap                     (0x00000000 << kAdsl2ModeAnnexLShift)
-#define kAdsl2ModeAnnexLDnOvlap                                (0x00000002 << kAdsl2ModeAnnexLShift)
+#define kAdsl2ModeAnnexLDnMask              (0x00000002 << kAdsl2ModeAnnexLShift)
+#define kAdsl2ModeAnnexLDnNonOvlap          (0x00000000 << kAdsl2ModeAnnexLShift)
+#define kAdsl2ModeAnnexLDnOvlap             (0x00000002 << kAdsl2ModeAnnexLShift)
 
 typedef struct _adsl2ConnectionInfo {
-       long                                    adsl2Mode;
-       long                                    rcvRate;
-       long                                    xmtRate;
-       unsigned char                   pwrState;                       /* Lx state: x = 0..3 */
-       adsl2DataConnectionInfo rcv2Info;
-       adsl2DataConnectionInfo xmt2Info;
+    long                    adsl2Mode;
+    long                    rcvRate;
+    long                    xmtRate;
+    unsigned char           pwrState;           /* Lx state: x = 0..3 */
+    adsl2DataConnectionInfo rcv2Info;
+    adsl2DataConnectionInfo xmt2Info;
 } adsl2ConnectionInfo;
 
 typedef struct _adslConnectionDataStat {
-       unsigned long                   cntRS;  
-       unsigned long                   cntRSCor;       
-       unsigned long                   cntRSUncor;     
-       unsigned long                   cntSF;  
-       unsigned long                   cntSFErr;       
+    unsigned long           cntRS;  
+    unsigned long           cntRSCor;   
+    unsigned long           cntRSUncor; 
+    unsigned long           cntSF;  
+    unsigned long           cntSFErr;   
 } adslConnectionDataStat;
 
 typedef struct _adslConnectionStat {
-       adslConnectionDataStat  rcvStat;
-       adslConnectionDataStat  xmtStat;
+    adslConnectionDataStat  rcvStat;
+    adslConnectionDataStat  xmtStat;
 } adslConnectionStat;
 
 typedef struct _atmConnectionDataStat {
-       unsigned long                   cntHEC;
-       unsigned long                   cntOCD;
-       unsigned long                   cntLCD;
-       unsigned long                   cntES;
-       unsigned long                   cntCellTotal;
-       unsigned long                   cntCellData;
-       unsigned long                   cntCellDrop;
-       unsigned long                   cntBitErrs;
+    unsigned long           cntHEC;
+    unsigned long           cntOCD;
+    unsigned long           cntLCD;
+    unsigned long           cntES;
+    unsigned long           cntCellTotal;
+    unsigned long           cntCellData;
+    unsigned long           cntCellDrop;
+    unsigned long           cntBitErrs;
 } atmConnectionDataStat;
 
 typedef struct _atmConnectionStat {
-       atmConnectionDataStat   rcvStat;
-       atmConnectionDataStat   xmtStat;
+    atmConnectionDataStat   rcvStat;
+    atmConnectionDataStat   xmtStat;
 } atmConnectionStat;
 
-#define        kAdslFramingModeMask                    0x0F
-#define        kAtmFramingModeMask                             0xF0
-#define        kAtmHeaderCompression                   0x80
+#define kAdslFramingModeMask            0x0F
+#define kAtmFramingModeMask             0xF0
+#define kAtmHeaderCompression           0x80
 
 /* ADSL2 data */
 
 typedef struct _adslDiagModeData {
-       long                                    loopAttn;
-       long                                    signalAttn;
-       long                                    snrMargin;
-       long                                    attnDataRate;
-       long                                    actXmtPower;
-       long                                    hlinScaleFactor;
+    long                    loopAttn;
+    long                    signalAttn;
+    long                    snrMargin;
+    long                    attnDataRate;
+    long                    actXmtPower;
+    long                    hlinScaleFactor;
 } adslDiagModeData;
 
 /* AdslMibGetObjectValue return codes */
 
-#define        kAdslMibStatusSuccess                   0
-#define        kAdslMibStatusFailure                   -1
-#define        kAdslMibStatusNoObject                  -2
-#define        kAdslMibStatusObjectInvalid             -3
-#define        kAdslMibStatusBufferTooSmall    -4
-#define        kAdslMibStatusLastError                 -4
+#define kAdslMibStatusSuccess           0
+#define kAdslMibStatusFailure           -1
+#define kAdslMibStatusNoObject          -2
+#define kAdslMibStatusObjectInvalid     -3
+#define kAdslMibStatusBufferTooSmall    -4
+#define kAdslMibStatusLastError         -4
 
 /* Adsl training codes */
 
-#define        kAdslTrainingIdle                               0
-#define        kAdslTrainingG994                               1
-#define        kAdslTrainingG992Started                2
-#define        kAdslTrainingG992ChanAnalysis   3
-#define        kAdslTrainingG992Exchange               4
-#define        kAdslTrainingConnected                  5
+#define kAdslTrainingIdle               0
+#define kAdslTrainingG994               1
+#define kAdslTrainingG992Started        2
+#define kAdslTrainingG992ChanAnalysis   3
+#define kAdslTrainingG992Exchange       4
+#define kAdslTrainingConnected          5
 
 /* Global info structure */
 
 typedef struct _adslMibInfo {
-       adslLineEntry                   adslLine;
-       adslPhysEntry                   adslPhys;
-       adslChanEntry                   adslChanIntl;
-       adslChanEntry                   adslChanFast;
-       adslPerfDataEntry               adslPerfData;
-       adslPerfCounters                adslPerfIntervals[kAdslMibPerfIntervals];
-       adslChanPerfDataEntry   adslChanIntlPerfData;
-       adslChanPerfDataEntry   adslChanFastPerfData;
-       adslChanCounters                adslChanIntlPerfIntervals[kAdslMibChanPerfIntervals];
-       adslChanCounters                adslChanFastPerfIntervals[kAdslMibChanPerfIntervals];
-
-       adslThreshCounters              adslAlarm;
-
-       atmPhyDataEntrty                adslChanIntlAtmPhyData;
-       atmPhyDataEntrty                adslChanFastAtmPhyData;
-
-       adslBertResults                 adslBertRes;
-
-       adslConnectionInfo              adslConnection;
-       adslConnectionStat              adslStat;
-       unsigned char                   adslTrainingState;
-       atmConnectionStat               atmStat;
-
-       adslFullPhysEntry               adslAtucPhys;
-       unsigned char                   adslRxNonStdFramingAdjustK;
-       unsigned char                   adslFramingMode;
-       adslBertStatusEx                adslBertStatus;
-       long                                    afeRxPgaGainQ1;
-
-       adslDiagModeData                adslDiag;
-       adsl2ConnectionInfo             adsl2Info;
-       adslPerfCounters                adslTxPerfTotal;
-       adslPerfCounters                adslTxPerfLast15Min;
-       adslPerfCounters                adslTxPerfLast1Day;
+    adslLineEntry           adslLine;
+    adslPhysEntry           adslPhys;
+    adslChanEntry           adslChanIntl;
+    adslChanEntry           adslChanFast;
+    adslPerfDataEntry       adslPerfData;
+    adslPerfCounters        adslPerfIntervals[kAdslMibPerfIntervals];
+    adslChanPerfDataEntry   adslChanIntlPerfData;
+    adslChanPerfDataEntry   adslChanFastPerfData;
+    adslChanCounters        adslChanIntlPerfIntervals[kAdslMibChanPerfIntervals];
+    adslChanCounters        adslChanFastPerfIntervals[kAdslMibChanPerfIntervals];
+
+    adslThreshCounters      adslAlarm;
+
+    atmPhyDataEntrty        adslChanIntlAtmPhyData;
+    atmPhyDataEntrty        adslChanFastAtmPhyData;
+
+    adslBertResults         adslBertRes;
+
+    adslConnectionInfo      adslConnection;
+    adslConnectionStat      adslStat;
+    adslConnectionStat      adslStatSincePowerOn;
+    unsigned char           adslTrainingState;
+    atmConnectionStat       atmStat;
+    atmConnectionStat       atmStatSincePowerOn;
+
+    adslFullPhysEntry       adslAtucPhys;
+    unsigned char           adslRxNonStdFramingAdjustK;
+    unsigned char           adslFramingMode;
+    adslBertStatusEx        adslBertStatus;
+    long                    afeRxPgaGainQ1;
+
+    adslDiagModeData        adslDiag;
+    adsl2ConnectionInfo     adsl2Info;
+    adslPerfCounters        adslTxPerfTotal;
+    adslPerfCounters        adslTxPerfLast15Min;
+    adslPerfCounters        adslTxPerfLast1Day;
 } adslMibInfo;
 
 #if defined(__cplusplus)
 }
 #endif
 
-#endif /* AdslMibDefHeader */
+#endif  /* AdslMibDefHeader */
index 66e8f8a..1ca515e 100755 (executable)
@@ -92,10 +92,10 @@ typedef struct
 
 typedef struct
 {
-    ADSL_FN_NOTIFY_CB  pFnNotifyCb;
-    UINT32                             ulParm;
-       adslCfgProfile          *pAdslCfg;
-    BCMADSL_STATUS             bvStatus;
+    ADSL_FN_NOTIFY_CB pFnNotifyCb;
+    UINT32 ulParm;
+    adslCfgProfile *pAdslCfg;
+    BCMADSL_STATUS bvStatus;
 } ADSLDRV_INITIALIZE, *PADSLDRV_INITIALIZE;
 
 typedef struct
@@ -106,8 +106,8 @@ typedef struct
 
 typedef struct
 {
-       UINT16 usAtmFastPortId;
-       UINT16 usAtmInterleavedPortId;
+    UINT16 usAtmFastPortId;
+    UINT16 usAtmInterleavedPortId;
     BCMADSL_STATUS bvStatus;
 } ADSLDRV_MAP_ATM_PORT, *PADSLDRV_MAP_ATM_PORT;
 
@@ -119,85 +119,103 @@ typedef struct
 
 typedef struct
 {
-    int                                diagCmd;
-    int                                diagMap;
-    int                                logTime;
-       int                             srvIpAddr;
-       int                             gwIpAddr;
-    BCMADSL_STATUS     bvStatus;
+    int diagCmd;
+    int diagMap;
+    int logTime;
+    int srvIpAddr;
+    int gwIpAddr;
+    BCMADSL_STATUS      bvStatus;
 } ADSLDRV_DIAG, *PADSLDRV_DIAG;
 
 typedef struct
 {
-       char                    *objId;
-       int                             objIdLen;
-       char                    *dataBuf;
-       long                    dataBufLen;
-    BCMADSL_STATUS     bvStatus;
+    char *objId;
+    int  objIdLen;
+    char *dataBuf;
+    long dataBufLen;
+    BCMADSL_STATUS bvStatus;
 } ADSLDRV_GET_OBJ, *PADSLDRV_GET_OBJ;
 
 typedef struct
 {
-       unsigned long   totalBits;
-    BCMADSL_STATUS     bvStatus;
+    unsigned long totalBits;
+    BCMADSL_STATUS bvStatus;
 } ADSLDRV_BERT, *PADSLDRV_BERT;
 
 typedef struct
 {
-       unsigned long   totalSec;
-    BCMADSL_STATUS     bvStatus;
+    unsigned long totalSec;
+    BCMADSL_STATUS bvStatus;
 } ADSLDRV_BERT_EX, *PADSLDRV_BERT_EX;
 
 typedef struct
 {
-       adslCfgProfile          *pAdslCfg;
-    BCMADSL_STATUS             bvStatus;
+    adslCfgProfile *pAdslCfg;
+    BCMADSL_STATUS bvStatus;
 } ADSLDRV_CONFIGURE, *PADSLDRV_CONFIGURE;
 
 typedef struct
 {
-       unsigned long   testCmd;
-       unsigned long   xmtStartTone;
-       unsigned long   xmtNumTones;
-       unsigned long   rcvStartTone;
-       unsigned long   rcvNumTones;
-    char                       *xmtToneMap;
-    char                       *rcvToneMap;
-    BCMADSL_STATUS     bvStatus;
+    unsigned long   testCmd;
+    unsigned long   xmtStartTone;
+    unsigned long   xmtNumTones;
+    unsigned long   rcvStartTone;
+    unsigned long   rcvNumTones;
+    char *xmtToneMap;
+    char *rcvToneMap;
+    BCMADSL_STATUS      bvStatus;
 } ADSLDRV_TEST, *PADSLDRV_TEST;
 
 typedef struct
 {
-       int                             toneId;
-       ADSL_CONSTELLATION_POINT        *pointBuf;
-       int                             numPoints;
-    BCMADSL_STATUS     bvStatus;
+    int toneId;
+    ADSL_CONSTELLATION_POINT *pointBuf;
+    int numPoints;
+    BCMADSL_STATUS bvStatus;
 } ADSLDRV_GET_CONSTEL_POINTS, *PADSLDRV_GET_CONSTEL_POINTS;
 
 typedef struct
 {
-       adslVersionInfo         *pAdslVer;
-    BCMADSL_STATUS             bvStatus;
+    adslVersionInfo *pAdslVer;
+    BCMADSL_STATUS  bvStatus;
 } ADSLDRV_GET_VERSION, *PADSLDRV_GET_VERSION;
 
 typedef struct
 {
-       unsigned long   sdramBaseAddr;
-    BCMADSL_STATUS     bvStatus;
+    unsigned long sdramBaseAddr;
+    BCMADSL_STATUS bvStatus;
 } ADSLDRV_SET_SDRAM_BASE, *PADSLDRV_SET_SDRAM_BASE;
 
 
 typedef struct
 {
-       int                             paramId;
-       void                    *buf;
-       int                             len;
-    BCMADSL_STATUS     bvStatus;
+    int paramId;
+    void *buf;
+    int len;
+    BCMADSL_STATUS bvStatus;
 } ADSLDRV_SET_OEM_PARAM, *PADSLDRV_SET_OEM_PARAM;
 
 #if defined(__cplusplus)
 }
 #endif
 
+
+/* declaration for read, write, poll operations */
+#define ADSL_EOC_FRAME_RCVD         (1 << BCM_ADSL_G997_FRAME_RECEIVED)
+#define ADSL_EOC_FRAME_SENT         (1 << BCM_ADSL_G997_FRAME_SENT)
+#define ADSL_LINK_DROPPED           (1 << BCM_ADSL_LINK_DOWN)
+#define ADSL_EOC_ANY_EVENT          (ADSL_EOC_FRAME_RCVD | ADSL_EOC_FRAME_SENT | ADSL_LINK_DROPPED)
+#define ADSL_EOC_RDWR_EVENT         (ADSL_EOC_FRAME_RCVD | ADSL_EOC_FRAME_SENT)
+
+#define ADSL_EOC_HDR                {0xff, 0x03, 0x81, 0x4c}
+#define ADSL_2P_HDR_OFFSET          2  /* 0x81, 4c */
+#define ADSL_HDR_OFFSET             0  /* 0xff, 0x3, 0x81, 4c */
+#define ADSL_EOC_HDR_LEN            4
+#define ADSL_2P_EOC_HDR_LEN         2
+#define ADSL_EOC_ENABLE             {0xff, 0x03, 0x00, 0x57}
+
+void AdslCheckLinkupMsg(void);
+void snmp_adsl_eoc_event(void);
+
 #endif // _ADSLDRV_H_
 
index 0fc84d2..0ebce15 100755 (executable)
@@ -191,6 +191,11 @@ void *BcmAdsl_G997FrameGetNext(int *pLen);
 void  BcmAdsl_G997FrameFinished(void);
 void BcmAdsl_DyingGaspHandler(void *context);
 
+void BcmAdsl_AtmClearVcTable(void);
+void BcmAdsl_AtmAddVc(int vpi, int vci);
+void BcmAdsl_AtmDeleteVc(int vpi, int vci);
+void BcmAdsl_AtmSetMaxSdu(unsigned short maxsdu);
+
 #if defined(__cplusplus)
 }
 #endif
index 99832e9..3212c51 100644 (file)
Binary files a/bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348GW.o_save and b/bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348GW.o_save differ
index 5b8ad5e..bf9fdbb 100644 (file)
Binary files a/bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348GWB.o_save and b/bcmdrivers/broadcom/net/enet/impl2/bcm_enet96348GWB.o_save differ
index c710c6e..f1ab6db 100755 (executable)
@@ -30,7 +30,7 @@
 
 
 #define BCM_SIG_1   "U.S. Robotics"
-#define BCM_SIG_2   "ver. 304L0107"          // was "firmware version 2.0" now it is split 6 char out for chip id.
+#define BCM_SIG_2   "ver. 304L0113"          // was "firmware version 2.0" now it is split 6 char out for chip id.
 
 #define BCM_TAG_VER         "6"
 #define BCM_TAG_VER_LAST    "26"
index eb46c5e..46dd16a 100755 (executable)
Binary files a/hostTools/bcmImageBuilder and b/hostTools/bcmImageBuilder differ
index e6adfe0..d8153f1 100755 (executable)
@@ -73,13 +73,13 @@ BRCM_KERNEL_NF_LOG=m
 #
 # Cryptographic selection
 #
-# BRCM_KERNEL_CRYPTO is not set
-# BRCM_KERNEL_CRYPTO_HMAC is not set
-# BRCM_KERNEL_CRYPTO_NULL is not set
-# BRCM_KERNEL_CRYPTO_MD5 is not set
-# BRCM_KERNEL_CRYPTO_SHA1 is not set
-# BRCM_KERNEL_CRYPTO_DES is not set
-# BRCM_KERNEL_CRYPTO_AES is not set
+BRCM_KERNEL_CRYPTO=y
+BRCM_KERNEL_CRYPTO_HMAC=y
+BRCM_KERNEL_CRYPTO_NULL=y
+BRCM_KERNEL_CRYPTO_MD5=y
+BRCM_KERNEL_CRYPTO_SHA1=y
+BRCM_KERNEL_CRYPTO_DES=y
+BRCM_KERNEL_CRYPTO_AES=y
 
 #
 # Root file system selection
@@ -159,8 +159,8 @@ BUILD_IPPD=dynamic
 BUILD_BRCM_VLAN=dynamic
 # BUILD_DIAGAPP is not set
 BUILD_SIPROXD=dynamic
-# BUILD_IPSEC_TOOLS is not set
-# BUILD_CERT is not set
+BUILD_IPSEC_TOOLS=dynamic
+BUILD_CERT=dynamic
 
 #
 # Debug selection
index 15bf5c6..eab12b2 100644 (file)
@@ -73,13 +73,13 @@ BRCM_KERNEL_NF_LOG=m
 #
 # Cryptographic selection
 #
-# BRCM_KERNEL_CRYPTO is not set
-# BRCM_KERNEL_CRYPTO_HMAC is not set
-# BRCM_KERNEL_CRYPTO_NULL is not set
-# BRCM_KERNEL_CRYPTO_MD5 is not set
-# BRCM_KERNEL_CRYPTO_SHA1 is not set
-# BRCM_KERNEL_CRYPTO_DES is not set
-# BRCM_KERNEL_CRYPTO_AES is not set
+BRCM_KERNEL_CRYPTO=y
+BRCM_KERNEL_CRYPTO_HMAC=y
+BRCM_KERNEL_CRYPTO_NULL=y
+BRCM_KERNEL_CRYPTO_MD5=y
+BRCM_KERNEL_CRYPTO_SHA1=y
+BRCM_KERNEL_CRYPTO_DES=y
+BRCM_KERNEL_CRYPTO_AES=y
 
 #
 # Root file system selection
@@ -159,8 +159,8 @@ BUILD_IPPD=dynamic
 BUILD_BRCM_VLAN=dynamic
 # BUILD_DIAGAPP is not set
 BUILD_SIPROXD=dynamic
-# BUILD_IPSEC_TOOLS is not set
-# BUILD_CERT is not set
+BUILD_IPSEC_TOOLS=dynamic
+BUILD_CERT=dynamic
 
 #
 # Debug selection
index de49801..8595360 100755 (executable)
Binary files a/targets/fs.src/etc/rsa_host_key and b/targets/fs.src/etc/rsa_host_key differ
index 68feec8..d4a10bc 100755 (executable)
Binary files a/userapps/broadcom/adslctl/adslctl_96348GWB_save and b/userapps/broadcom/adslctl/adslctl_96348GWB_save differ
index 68feec8..d4a10bc 100755 (executable)
Binary files a/userapps/broadcom/adslctl/adslctl_96348GW_save and b/userapps/broadcom/adslctl/adslctl_96348GW_save differ
index ff17adf..b42deeb 100755 (executable)
Binary files a/userapps/broadcom/cfm/cfm_96348GWB_save and b/userapps/broadcom/cfm/cfm_96348GWB_save differ
index af01bb2..7699c3e 100755 (executable)
Binary files a/userapps/broadcom/cfm/cfm_96348GW_save and b/userapps/broadcom/cfm/cfm_96348GW_save differ
index 486d090..4caeafc 100755 (executable)
@@ -93,10 +93,10 @@ function applyClick() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("ADSL Settings", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Internet");
 </script>
 
-<h3>Modulation</h3>
+<h3>ADSL Settings</h3>
 
 <form>
 <p>Select the modulation:</p>
index 628bbfe..17186b0 100755 (executable)
@@ -43,7 +43,7 @@ function toneClick() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("ADSL Settings", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("ADSL Settings");
 </script>
 
 <h3>Advanced</h3>
index 22a137d..c7fbaa6 100755 (executable)
@@ -71,7 +71,7 @@ function applyClick() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("ADSL Settings", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("ADSL Settings");
 </script>
 
 <h3>Modulation</h3>
index 05c489f..ab0b574 100755 (executable)
@@ -28,7 +28,7 @@ function backupClick() {
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Device", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device");
 </script>
 
 <h3>Back Up Settings</h3>
index 790dc2b..9bdf7b2 100755 (executable)
@@ -1,10 +1,19 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+       (c) 2006 U.S. Robotics Corporation
+-->
 <html>
-  <head>
-    <meta HTTP-EQUIV='Pragma' CONTENT='no-cache'>
-    <link rel="stylesheet" href='stylemain.css' type='text/css'>
-      <link rel="stylesheet" href='colors.css' type='text/css'>
-        <script language="javascript" src="util.js"></script>
-        <script language="javascript">
+<head>
+       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+       <meta HTTP-EQUIV='Pragma' CONTENT='no-cache'>
+       <title>Add Certificate</title>
+       <link href="usr_menus.css" rel="stylesheet" type="text/css">
+       <script src="usr_menus.js" type="text/javascript"></script>
+       <script src="usr_menus_build.js" type="text/javascript"></script>
+       <link href="usr_main.css" rel="stylesheet" type="text/css">
+       <script src="usr_common.js" type="text/javascript"></script>
+        <script type="text/javascript" src="util.js"></script>
+        <script type="text/javascript">
 <!-- hide
 
 var category = '<%ejGetJS(certCategory)%>';
@@ -251,7 +260,7 @@ function loadCountryList() {
   document.forms[0].certCountry[234] = new Option("ZA (South Africa)","ZA");
   document.forms[0].certCountry[235] = new Option("ZM (Zambia)","ZM");
   document.forms[0].certCountry[236] = new Option("ZW (Zimbabwe)","ZW");
+
   for (var i=0; i< document.forms[0].certCountry.options.length; i++) {
     if (document.forms[0].certCountry.options[i].value == country) {
       document.forms[0].certCountry.options[i].selected = true;
@@ -274,16 +283,16 @@ function frmLoad() {
 
 function btnApply() {
   var loc, idx, type;
-  
+
   if (category != 'ca') {
      loc = 'certlocal.cmd?action=add';
   }
   else {
      loc = 'certca.cmd?action=add';
   }
-  
+
   with ( document.forms[0] ) {
-  
+
        if ( isValidNameWSpace(certName.value) == false ) {
                alert('Invalid Certificate Name "' + certName.value + '".');
                return;
@@ -294,17 +303,17 @@ function btnApply() {
       return;
     }
     if ( certOrg.value == '' ) {
-      alert('Organization Name should not be empty.');
+      alert('Please enter an organization name.');
       return;
     }
     if ( certState.value == '' ) {
-      alert('State/Province Name should not be empty.');
+      alert('Please enter a state/province name.');
       return;
     }
     loc += '&certCommonName=' + certCommonName.value;
     loc += '&certOrg=' + certOrg.value;
     loc += '&certState=' + certState.value;
-    
+
     idx = certCountry.selectedIndex;
     loc += '&certCountry=' + certCountry.options[idx].value;
   }
@@ -313,49 +322,52 @@ function btnApply() {
   eval(code);
 }
 // done hiding -->
-            </script>
-  </head>
-  <body onLoad='frmLoad()'>
-    <blockquote>
-      <form>
-        <b>Create new certificate request<br>
-        </b>
-        <br>
-        To generate a certificate signing request you need to include Common Name, 
-        Organization Name, State/Province Name, and the 2-letter Country Code for
-        the certificate.
-        <br>
-        <br>
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="180">Certificate Name:</td>
-            <td><input type='text' name='certName' size='20' maxlength="63"></td>
-          </tr>
-            <tr>
-              <td width="180">Common Name:</td>
-              <td><input type='text' name='certCommonName' size='20' maxlength="63"></td>
-            </tr>
-            <tr>
-              <td width="180">Organization Name:</td>
-              <td><input type='text' name='certOrg' size='20' maxlength="63"></td>
-            </tr>
-            <tr>
-              <td width="180">State/Province Name:</td>
-              <td><input type='text' name='certState' size='20' maxlength="32"></td>
-            </tr>
-            <tr>
-              <td width="180">Country/Region Name:</td>
-              <td><select name='certCountry' size="1">
-                </select></td>
-            </tr>
-          </table>
-        <br>
-        <br>
-        <br>
-        <center>
-          <input type='button' onClick='btnApply()' value='Apply'>
-        </center>
-      </form>
-    </blockquote>
-  </body>
+       </script>
+</head>
+
+<body onload="initMenu(); frmLoad();">
+
+<script type="text/javascript">
+       setPageTitle("<%ejGetWlJS(wlInterface)%>");
+       writeHeader("New Certificate");
+</script>
+
+<h3>New Certificate Request</h3>
+
+<form>
+<p>To generate a certificate signing request, you need to include Common Name,
+Organization Name, State/Province Name, and the two-letter Country Code for
+the certificate.</p>
+
+<table border="0">
+       <tr>
+               <td><label for="certName">Certificate name:</label></td>
+               <td><input type='text' name='certName' size='20' maxlength="63"></td>
+       </tr>
+       <tr>
+               <td><label for="certCommonName">Common name:</label></td>
+               <td><input type='text' name='certCommonName' size='20' maxlength="63"></td>
+       </tr>
+       <tr>
+               <td><label for=certOrg"">Organization name:</label></td>
+               <td><input type='text' name='certOrg' size='20' maxlength="63"></td>
+       </tr>
+       <tr>
+               <td><label for="certState">State/province name:</label></td>
+               <td><input type='text' name='certState' size='20' maxlength="32"></td>
+       </tr>
+       <tr>
+               <td><label>Country/region name:</label></td>
+               <td><select name='certCountry' size="1"></select></td>
+       </tr>
+</table>
+
+<p><input type='button' onClick='btnApply()' value='Apply'></p>
+</form>
+
+<script type="text/javascript">
+       writeFooter();
+</script>
+
+</body>
 </html>
index 28a4066..3c6258e 100755 (executable)
@@ -1,10 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+       (c) 2006 U.S. Robotics Corporation
+-->
 <html>
-  <head>
-    <meta HTTP-EQUIV='Pragma' CONTENT='no-cache'>
-    <link rel="stylesheet" href='stylemain.css' type='text/css'>
-      <link rel="stylesheet" href='colors.css' type='text/css'>
-        <script language="javascript" src="util.js"></script>
-        <script language="javascript">
+<head>
+       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+       <meta HTTP-EQUIV='Pragma' CONTENT='no-cache'>
+       <title>Import Certificate</title>
+       <link href="usr_menus.css" rel="stylesheet" type="text/css">
+       <script src="usr_menus.js" type="text/javascript"></script>
+       <script src="usr_menus_build.js" type="text/javascript"></script>
+       <link href="usr_main.css" rel="stylesheet" type="text/css">
+       <script src="usr_common.js" type="text/javascript"></script>
+
+  <script type="text/javascript" src="util.js"></script>
+  <script type="text/javascript">
 <!-- hide
 
 var certstart = '-----BEGIN CERTIFICATE-----';
@@ -20,53 +30,49 @@ function frmLoad() {
 
 function applyClick() {
   var idx;
+
   with ( document.forms[0] ) {
     if ( certName.value == '' ) {
-      alert('Certificate Name should not be empty.');
+      alert('Please enter a certificate name.');
       return;
     }
     if ( certPublic.value == '' ) {
-      alert('Certificate Public Key should not be empty.');
+      alert('Please enter a certificate public key.');
       return;
     }
   }
   document.importForm.submit();
 }
 // done hiding -->
+       </script>
+</head>
+
+<body onload="initMenu(); frmLoad();">
+
+<script type="text/javascript">
+       setPageTitle("<%ejGetWlJS(wlInterface)%>");
+       writeHeader("Import Certificate");
+</script>
+
+<h3>Import CA Certificate</h3>
+
+<form name="importForm" method="post">
+
+<p>Enter the certificate name and certificate content.</p>
+
+<p><label for="certName">Certificate name:</label>
+       <input type='text' name='certName' size='20' maxlength="63"></p>
+
+<p><label for="certPublic">Certificate:</label></p>
+<p><TEXTAREA name='certPublic' rows='20' cols='80'></TEXTAREA></td></p>
+
+<p><input type='button' value="Import" onclick="applyClick()"></p>
+
+</form>
+
+<script type="text/javascript">
+       writeFooter();
 </script>
-  </head>
-  <body onLoad='frmLoad()'>
-    <blockquote>
-      <form name="importForm" method="post">
-        <b>Import CA certificate<br>
-        </b>
-        <br>
-        Enter certificate name and paste certificate content.<br>
-        <br>
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="180">Certificate Name:</td>
-            <td><input type='text' name='certName' size='20' maxlength="63"></td>
-          </tr>
-            <tr>
-              <td width="180">Certificate:</td>
-              <td>
-                <P>
-                  <TEXTAREA name='certPublic' rows='20' cols='80'>
-              </TEXTAREA>
-                </P>
-              </td>
-            </tr>
-          </table>
-        </div>
-        <br>
-        <br>
-        <br>
-        <center>
-          <input type='button' value='Apply' onclick="applyClick()">
-        </center>
-      </form>
-    </blockquote>
-  </body>
+
+</body>
 </html>
index 1a580fb..2039276 100755 (executable)
@@ -1,10 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+       (c) 2006 U.S. Robotics Corporation
+-->
 <html>
-  <head>
-    <meta HTTP-EQUIV='Pragma' CONTENT='no-cache'>
-    <link rel="stylesheet" href='stylemain.css' type='text/css'>
-      <link rel="stylesheet" href='colors.css' type='text/css'>
-        <script language="javascript" src="util.js"></script>
-        <script language="javascript">
+<head>
+       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+       <meta HTTP-EQUIV='Pragma' CONTENT='no-cache'>
+       <title>Import Certificate</title>
+       <link href="usr_menus.css" rel="stylesheet" type="text/css">
+       <script src="usr_menus.js" type="text/javascript"></script>
+       <script src="usr_menus_build.js" type="text/javascript"></script>
+       <link href="usr_main.css" rel="stylesheet" type="text/css">
+       <script src="usr_common.js" type="text/javascript"></script>
+
+  <script type="text/javascript" src="util.js"></script>
+  <script type="text/javascript">
 <!-- hide
 
 var keystart = '-----BEGIN RSA PRIVATE KEY-----';
@@ -24,7 +34,7 @@ function frmLoad() {
 
 function applyClick() {
   var idx;
+
   with ( document.forms[0] ) {
     if ( certName.value == '' ) {
       alert('Certificate Name should not be empty.');
@@ -43,47 +53,34 @@ function applyClick() {
 }
 // done hiding -->
 </script>
-  </head>
-  <body onLoad='frmLoad()'>
-    <blockquote>
-      <form name="importForm" method="post">
-        <b>Import certificate<br>
-        </b>
-        <br>
-        Enter certificate name, paste certificate content and private key.<br>
-        <br>
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="180">Certificate Name:</td>
-            <td><input type='text' name='certName' size='20' maxlength="63"></td>
-          </tr>
-            <tr>
-              <td width="180">Certificate:</td>
-              <td>
-                <P>
-                  <TEXTAREA name='certPublic' rows='20' cols='80'>
-              </TEXTAREA>
-                </P>
-              </td>
-            </tr>
-            <tr>
-              <td width="180">Private Key:</td>
-              <td>
-                <P>
-                  <TEXTAREA name='certPrivate' rows='20' cols='80'>
-              </TEXTAREA>
-                </P>
-              </td>
-            </tr>
-          </table>
-        </div>
-        <br>
-        <br>
-        <br>
-        <center>
-          <input type='button' value='Apply' onclick="applyClick()">
-        </center>
-      </form>
-    </blockquote>
-  </body>
+</head>
+<body onLoad="initMenu(); frmLoad();">
+
+<script type="text/javascript">
+       setPageTitle("<%ejGetWlJS(wlInterface)%>");
+       writeHeader("Import Certificate");
+</script>
+
+<h3>Import Certificate</h3>
+
+<form name="importForm" method="post">
+<p>Please enter the certificate name and its content and private key.</p>
+
+<p><label for="certName">Certificate name:</label>
+       <input type='text' name='certName' size='20' maxlength="63"></p>
+
+<p><label for="certPublic">Certificate:</label></p>
+<p><TEXTAREA name='certPublic' rows='20' cols='80'></TEXTAREA></p>
+
+<p><label for="certPrivate">Private key:</label></p>
+<P><TEXTAREA name='certPrivate' rows='20' cols='80'></TEXTAREA></P>
+
+<p><input type='button' value='Apply' onclick="applyClick()"></p>
+</form>
+
+<script type="text/javascript">
+       writeFooter();
+</script>
+
+</body>
 </html>
index eeb21b5..7a5898c 100755 (executable)
@@ -1,10 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+       (c) 2006 U.S. Robotics Corporation
+-->
 <html>
-  <head>
-    <meta HTTP-EQUIV='Pragma' CONTENT='no-cache'>
-    <link rel="stylesheet" href='stylemain.css' type='text/css'>
-      <link rel="stylesheet" href='colors.css' type='text/css'>
-        <script language="javascript" src="util.js"></script>
-        <script language="javascript">
+<head>
+       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+       <meta HTTP-EQUIV='Pragma' CONTENT='no-cache'>
+       <title>Load Certificate</title>
+       <link href="usr_menus.css" rel="stylesheet" type="text/css">
+       <script src="usr_menus.js" type="text/javascript"></script>
+       <script src="usr_menus_build.js" type="text/javascript"></script>
+       <link href="usr_main.css" rel="stylesheet" type="text/css">
+       <script src="usr_common.js" type="text/javascript"></script>
+
+       <script type="text/javascript" src="util.js"></script>
+       <script type="text/javascript">
 <!-- hide
 var category = '<%ejGetJS(certCategory)%>';
 var certn = '<%ejGetJS(certName)%>';
@@ -30,47 +40,41 @@ function applyClick() {
 
   with ( document.forms[0] ) {
     if ( certPublic.value == '' ) {
-      alert('Certificate Public Key should not be empty.');
+      alert('Please enter a certificate public key.');
       return;
     }
   }
   document.loadForm.submit();
 }
 // done hiding -->
+       </script>
+</head>
+
+<body onLoad="initMenu(); frmLoad();">
+
+<script type="text/javascript">
+       setPageTitle("<%ejGetWlJS(wlInterface)%>");
+       writeHeader("Import Certificate");
+</script>
+
+<h3>Load Certificate</h3>
+
+<form name="loadForm" method="post">
+
+<p>Please enter a signed certificate.</p>
+
+<p><label for="certName">Certificate name:</label>
+       <input type='text' name='certName' disabled size='20' maxlength="63"></p>
+
+<p><label for="certPublic">Certificate:</label></p>
+<P><TEXTAREA name='certPublic' rows='20' cols='80'></TEXTAREA></P>
+
+<p><input type='button' onClick='applyClick()' value='Apply'></p>
+</form>
+
+<script type="text/javascript">
+       writeFooter();
 </script>
-  </head>
-  <body onLoad='frmLoad()'>
-    <blockquote>
-      <form name="loadForm" method="post">
-        <b>Load certificate<br>
-        </b>
-        <br>
-          Paste signed certificate.
-        <br>
-        <br>
-        <table border="0" cellpadding="0" cellspacing="0">
-          <tr>
-            <td width="180">Certificate Name:</td>
-            <td><input type='text' name='certName' disabled size='20' maxlength="63"></td>
-          </tr>
-            <tr>
-              <td width="180">Certificate:</td>
-              <td>
-                <P>
-                  <TEXTAREA name='certPublic' rows='20' cols='80'>
-                  </TEXTAREA>
-                </P>
-              </td>
-            </tr>
-          </table>
-        </div>
-        <br>
-        <br>
-        <br>
-        <center>
-          <input type='button' onClick='applyClick()' value='Apply'>
-        </center>
-      </form>
-    </blockquote>
-  </body>
+
+</body>
 </html>
index 355e4ce..cf30334 100755 (executable)
@@ -182,7 +182,7 @@ function btnApply(place) {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Dynamic DNS", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Dynamic DNS");
 </script>
 
 
index c9a5d07..fa4ea57 100755 (executable)
@@ -28,7 +28,7 @@ function restoreClick() {
    <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Device", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device");
 </script>
 
 
index 864d08e..1dafcc4 100755 (executable)
@@ -17,7 +17,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("LAN", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("LAN");
 </script>
 
 <h3>DHCP Clients</h3>
index 07693bb..66188fc 100755 (executable)
@@ -103,7 +103,7 @@ function frmLoad() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Device", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device");
 </script>
 
 <h3>Diagnostics</h3>
index 4a8e3a0..ca0f359 100755 (executable)
@@ -19,7 +19,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Device", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device");
 </script>
 
 <form>
index c9625d9..7dffc18 100755 (executable)
@@ -17,7 +17,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Device", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device");
 </script>
 
 
index f842239..531539e 100755 (executable)
@@ -19,7 +19,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Diagnostics", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Diagnostics");
 </script>
 
 <form>
index b7e2809..9419baf 100755 (executable)
@@ -17,7 +17,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Diagnostics", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Diagnostics");
 </script>
 
 <form>
index cc51c19..537a255 100755 (executable)
@@ -19,7 +19,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Diagnostics", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Diagnostics");
 </script>
 
 <form>
index 9684a30..2f3a51e 100755 (executable)
@@ -117,7 +117,7 @@ function btnReset() {
    <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Internet", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Internet");
 </script>
 
 
index 7e6bade..c12303e 100755 (executable)
@@ -71,7 +71,7 @@ function frmLoad() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Bridge Service", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Bridge Service");
 </script>
 
 <form>
index 1847893..a8b367f 100755 (executable)
@@ -118,6 +118,7 @@ function frmLoad() {
       else
          enblReaim.checked = false;
       serviceName.value = service;
+      setVisibility("idReaim", ("<%ejGetWlJS(wlInterface)%>"=="1"));
    }
 }
 
@@ -127,7 +128,7 @@ function frmLoad() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("IGMP and WAN Services", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("IGMP and WAN Services");
 </script>
 
 <form>
@@ -135,7 +136,7 @@ function frmLoad() {
        <p><input type='checkbox' name='enblService' id='enblService' checked> <label for="enblService">WAN service</label></p>
        <p><label for="serviceName">Service name:</label> <input type="text" name="serviceName" id="serviceName"></p>
 
-   <div id='openInPort'>
+   <div id='idReaim'>
                <p><input type='checkbox' name='enblReaim' id='enblReaim' checked> <label for="enblReaim">Allow "Reaim" proxy</label></p>
       <p>Clear <b>Allow "Reaim" proxy</b> to disable "Reaim" proxy support for AOL and MSN Instant Messenger.</p>
    </div>
index ecfe1a1..5f6728d 100755 (executable)
@@ -16,7 +16,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("ADSL Synchronization Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("ADSL Synchronization Test");
 </script>
 
 <form>
index efa8360..aaab8d2 100755 (executable)
@@ -15,7 +15,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("ATM OAM End-to-end Ping Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("ATM OAM End-to-end Ping Test");
 </script>
 
 <form>
index afc5aba..3bdc2a4 100755 (executable)
@@ -16,7 +16,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("ATM OAM Segment Ping Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("ATM OAM Segment Ping Test");
 </script>
 
 <form>
index 047ff67..eb09293 100755 (executable)
@@ -16,7 +16,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Ethernet Connection Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Ethernet Connection Test");
 </script>
 
 
index a52da71..f3c9b23 100755 (executable)
@@ -18,7 +18,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Ping Primary Domain Name System Server Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Ping Primary Domain Name System Server Test");
 </script>
 
   <form>
index 6dfbee2..866190a 100755 (executable)
@@ -16,7 +16,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Ping Default Gateway Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Ping Default Gateway Test");
 </script>
 
 <form>
index 6715de3..ffab48d 100755 (executable)
@@ -16,7 +16,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("PPP Server Session Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("PPP Server Session Test");
 </script>
 
   <form>
index 0e9133a..8de3d3e 100755 (executable)
@@ -16,7 +16,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Authentication With ISP Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Authentication With ISP Test");
 </script>
 
   <form>
index 1e0e9b0..7e624c1 100755 (executable)
@@ -16,7 +16,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("PPP Server Connection Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("PPP Server Connection Test");
 </script>
 
   <form>
index bc451a3..a782728 100755 (executable)
@@ -16,7 +16,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Assigned IP Address Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Assigned IP Address Test");
 </script>
 
   <form>
index b683e41..59d274c 100755 (executable)
@@ -16,7 +16,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Query DNS For ISP Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Query DNS For ISP Test");
 </script>
 
   <form>
index 630c538..f9cda1f 100755 (executable)
@@ -16,7 +16,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("Wireless Connection Test", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Wireless Connection Test");
 </script>
 
 <form>
index 7ad83f2..bb4389a 100755 (executable)
@@ -13,7 +13,6 @@
        <script src="usr_common.js" type="text/javascript"></script>
 
    <meta http-equiv="Pragma" content="no-cache">
-   <meta http-equiv="refresh" content="60">
 
 <script type="text/javascript">
 setPageTitle("<%ejGetWlJS(wlInterface)%>");
@@ -35,22 +34,53 @@ function getMACfilterWireless()
                        return "Deny some";
        }
 }
-
 </script>
 </head>
 <body onload="initMenu(); setVisibility('idWireless', '<%ejGetWlJS(wlInterface)%>' == '1'); initializePage();">
 
 <script type="text/javascript">
-       writeHeader("Status", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Status");
 </script>
 
-<p class="clsNote"><a href="http://www.usr.com/productreg/">Register the product</a></p>
+<noscript>
+       <p class="clsNotice">The U.S. Robotics Wireless <i>MAX</i>g VoIP Router
+       uses scripting to display its data correctly.
+       This browser either doesn&rsquo;t support scripting or has
+       scripting disabled. Please refer to your browser&rsquo;s documentation for instructions
+       on how to enable scripting.
+       </p>
+</noscript>
+
+
+<div id="idHelpOpen" style="display: none;" onclick="setVisibility('idHelpOpen', false); setVisibility('idPanelHelp', true);">?</div>
+<div id="idPanelHelp">
+
+   <div id="idHelpClose" onclick="setVisibility('idPanelHelp', false); setVisibility('idHelpOpen', true);">x</div>
+
+       <p class="clsNote">
+               <a href="javascript:print();">Print</a> this page
+               <br/>
+               <a href="http://www.usr.com/productreg/">Register</a> this product
+       </p>
 
 <script type="text/javascript">
        if ("<%ejGetWlJS(wlInterface)%>" == "1")
                document.write("<p class=\"clsNote\">Tutorial: How do I add a <a href=\"tutorial_addclient.html\">new wireless client<\/a> to my network?<\/p>");
 </script>
 
+       <h1>Updates</h1>
+       <p>Visit the <a href="http://www.usr.com/support/" target="_new">U.S.&nbsp;Robotics
+       Web site</a> to check for updated firmware.</p>
+
+       <h1>Refresh</h1>
+       <p>Press your browser&rsquo;s <b>Refresh</b> button to display the latest values.</p>
+
+       <h1>Features</h1>
+       <p><a href="purchase.html">Purchase</a> additional features.</p>
+       <p><a href="ipsunlock.cmd">Unlock</a> purchased features.</p>
+
+</div>
+
 
 <h3>Device</h3>
 
index 4c0e507..a82ea7f 100755 (executable)
@@ -213,7 +213,7 @@ function btnBack() {
    <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("WAN IP Settings", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("WAN IP Settings");
 </script>
 
 <form>
index ac25805..56868ff 100755 (executable)
@@ -108,7 +108,7 @@ function onChangeName()
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Device", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device");
 </script>
 
 <h3>Print Server</h3>
index 796ba05..feef0af 100755 (executable)
@@ -1,15 +1,20 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+       (c) 2006 U.S. Robotics Corporation
+-->
 <html>
-
 <head>
-  <link rel="stylesheet" href="stylemain.css" type="text/css">
-  <link rel="stylesheet" href="colors.css" type="text/css">
+       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
   <meta http-equiv="Pragma" content="no-cache">
-  <title> IPSec Settings</title>
+  <title>Internet &raquo; VPN IPSec Settings</title>
+       <link href="usr_menus.css" rel="stylesheet" type="text/css">
+       <script src="usr_menus.js" type="text/javascript"></script>
+       <script src="usr_menus_build.js" type="text/javascript"></script>
+       <link href="usr_main.css" rel="stylesheet" type="text/css">
+       <script src="usr_common.js" type="text/javascript"></script>
+   <script type="text/javascript" src="util.js"></script>
+   <script type="text/javascript">
 
-   <script language="javascript" src="util.js"></script>
-   <script language="javascript">
-   
 <!-- hide
 
 var ipsTableIndex = '<%ejGetJS(ipsTableIndex)%>';
@@ -17,13 +22,13 @@ var ipsConnName = '<%ejGetJS(ipsConnName)%>';
 var ipsRemoteGWAddr = '<%ejGetJS(ipsRemoteGWAddr)%>';
 var ipsLocalIPMode = '<%ejGetJS(ipsLocalIPMode)%>';
 var ipsLocalIP = '<%ejGetJS(ipsLocalIP)%>';
-var ipsLocalMask = '<%ejGetJS(ipsLocalMask)%>'; 
+var ipsLocalMask = '<%ejGetJS(ipsLocalMask)%>';
 var ipsLocalRangeLo = '<%ejGetJS(ipsLocalRangeLo)%>';
-var ipsLocalRangeHi = '<%ejGetJS(ipsLocalRangeHi)%>'; 
+var ipsLocalRangeHi = '<%ejGetJS(ipsLocalRangeHi)%>';
 var ipsRemoteIPMode = '<%ejGetJS(ipsRemoteIPMode)%>';
-var ipsRemoteIP = '<%ejGetJS(ipsRemoteIP)%>'; 
+var ipsRemoteIP = '<%ejGetJS(ipsRemoteIP)%>';
 var ipsRemoteMask = '<%ejGetJS(ipsRemoteMask)%>';
-var ipsRemoteRangeLo = '<%ejGetJS(ipsRemoteRangeLo)%>'; 
+var ipsRemoteRangeLo = '<%ejGetJS(ipsRemoteRangeLo)%>';
 var ipsRemoteRangeHi = '<%ejGetJS(ipsRemoteRangeHi)%>';
 var ipsKeyExM = '<%ejGetJS(ipsKeyExM)%>';
 var ipsAuthM = '<%ejGetJS(ipsAuthM)%>';
@@ -46,7 +51,7 @@ var ipsPh2DHGroup = '<%ejGetJS(ipsPh2DHGroup)%>';
 var ipsPh2KeyTime = '<%ejGetJS(ipsPh2KeyTime)%>';
 
 
-var showAdv = 0;
+var showAdv = false;
 
 
 function setSelect(item, value)
@@ -95,7 +100,7 @@ function localIPModeChange() {
       case "subnet":
         showhide("IP11", 1);
         showhide("IP12", 1);
-        break; 
+        break;
       case "single":
         showhide("IP11", 1);
         showhide("IP12", 0);
@@ -112,7 +117,7 @@ function remoteIPModeChange() {
       case "subnet":
         showhide("IP21", 1);
         showhide("IP22", 1);
-        break; 
+        break;
       case "single":
         showhide("IP21", 1);
         showhide("IP22", 0);
@@ -139,16 +144,16 @@ function keyauthChange() {
         case "certificate":
           showhide("PSK", 0);
           showhide("Certificate", 1);
-          break;        
-        default:       
+          break;
+        default:
         }
-        break; 
+        break;
       case "manual":
         showhide("AutoKeyEx", 0);
         showhide("ManualKey", 1);
         showhide("PSK", 0);
         showhide("Certificate", 0);
-               showAdv = 0;
+               showAdv = false;
                showhideAdv(showAdv);
         break;
       default:
@@ -156,24 +161,22 @@ function keyauthChange() {
   }
 }
 
-function switchAdv() {
-   with ( document.forms[0] ) {
-     showAdv = !showAdv;
-     showhideAdv(showAdv);
-   }
+function switchAdv()
+{
+       showhideAdv(!showAdv);
 }
 
-function showhideAdv(show) {
-   with ( document.forms[0] ) {
-     showhide("adv", show);
-     if (show) {
-        advSWButton.value = "Hide Advanced Settings";
-     }
-     else {
-        advSWButton.value = "Show Advanced Settings";
-     }
-     showAdv = show;
-   }
+function showhideAdv(show)
+{
+       with (document.forms[0])
+       {
+               showhide("adv", show);
+               if (show)
+                       advSWButton.value = "Hide Advanced IKE Settings";
+               else
+                       advSWButton.value = "Show Advanced IKE Settings";
+               showAdv = show;
+       }
 }
 
 //////////////////////////
@@ -185,7 +188,7 @@ function formLoad()
                connName.value = ipsConnName;
                remoteGWAddr.value = ipsRemoteGWAddr;
                setSelect(localIPMode, ipsLocalIPMode);
-               localIP.value = ipsLocalIP; 
+               localIP.value = ipsLocalIP;
                localMask.value = ipsLocalMask;
                setSelect(remoteIPMode, ipsRemoteIPMode);
                remoteIP.value = ipsRemoteIP;
@@ -210,18 +213,17 @@ function formLoad()
                setSelect(ph2DHGroup, ipsPh2DHGroup);
                ph2KeyTime.value = ipsPh2KeyTime;
        }
-       
+
     localIPModeChange();
     remoteIPModeChange();
     keyauthChange();
     showhideAdv(showAdv);
-    
 }
 
 function applyClick() {
        var loc = 'ipsec.cmd?action=editsubmit';
        with ( document.forms[0] ) {
-       
+
                if ( isValidNameWSpace(connName.value) == false ) {
                        alert('Invalid connection name "' + connName.value + '".');
                        return;
@@ -246,19 +248,19 @@ function applyClick() {
                if ( getSelect(keyExM) == "auto" ) {
                val = parseInt(ph1KeyTime.value);
                if (  isNaN(val) == true || val < 0 ) {
-                  alert('Phase 1 Key Life Time is invalid.');
-                  showhideAdv(1);
+                  alert('Phase 1 key lifetime is invalid.');
+                  showhideAdv(true);
                   return;
                }
                val = parseInt(ph2KeyTime.value);
                if (  isNaN(val) == true || val < 0 ) {
-                  alert('Phase 2 Key Life Time is invalid.');
-                  showhideAdv(1);
+                  alert('Phase 2 key lifetime is invalid.');
+                  showhideAdv(true);
                   return;
                }
                if ( getSelect(authM) == "certificate") {
                   if ( certificateName.options.length == 0) {
-                      alert('No certificate avaiable for authentication. Use Certificate menu to add certificates or choose another autentication method.');
+                      alert('No certificate avaiable for authentication. Use Certificate page to add certificates or choose another autentication method.');
                       return;
                   }
                }
@@ -275,7 +277,7 @@ function applyClick() {
                                ekeys = -1;
                        }
                        if ( ekeys != -1 && isValidHexKey(manualEncryptionKey.value, ekeys) == false) {
-                               alert('Invalid Manual Encryption Key.');
+                               alert('The manual encryption key is not a valid hexadecimal key.');
                                return;
                        }
                        var akeys;
@@ -289,12 +291,12 @@ function applyClick() {
                                akeys = -1;
                        }
                        if ( akeys != -1 && isValidHexKey(manualAuthKey.value, akeys) == false) {
-                               alert('Invalid Manual Authentication Key.');
+                               alert('The manual authentication key is not a valid hexadecimal key.');
                                return;
                        }
                }
-       
-               loc += '&ipsTableIndex=' + ipsTableIndex;   
+
+               loc += '&ipsTableIndex=' + ipsTableIndex;
                loc += '&ipsConnName=' + connName.value;
                loc += submitText(connName, 'ipsConnName');
                loc += submitText(remoteGWAddr, 'ipsRemoteGWAddr');
@@ -323,7 +325,7 @@ function applyClick() {
                loc += submitSelect(ph2IntegrityAlgo, 'ipsPh2IntegrityAlgo');
                loc += submitSelect(ph2DHGroup, 'ipsPh2DHGroup');
                loc += submitText(ph2KeyTime, 'ipsPh2KeyTime');
-               
+
        }
        var code = 'location = "' + loc + '"';
        eval(code);
@@ -331,267 +333,253 @@ function applyClick() {
 
 // done hiding -->
 </script>
-  
+
 </head>
 
-<body onLoad="formLoad()">
-<blockquote>
+<body onload="initMenu(); formLoad();">
+
+<script type="text/javascript">
+        setPageTitle("<%ejGetWlJS(wlInterface)%>");
+       writeHeader("Internet");
+</script>
+
+<h3>VPN IPSec Settings</h3>
+
 <form>
-  <b>IPSec Settings</b> 
-  <br><br>
-  <table border="0" cellpadding="0" cellspacing="2" width="100%">
-    <tr>
-      <td width="40%"> IPSec Connection Name </td>
-      <td> <input name="connName" size="20" maxlength="60" value="testconnection" type="text"> </td>
-    </tr>
-    <tr>
-        <td width="40%">Remote IPSec Gateway Address (IP or Domain Name)</td>
-        <td><input name="remoteGWAddr" size="20" maxlength="255" value="" type="text"></td>
-    </tr>
-  </table></div>
-  <table border="0" cellpadding="0" cellspacing="2" width="100%">
-   <tr><td>&nbsp;</td></tr>
-    <tr>
-      <td width="40%"> Tunnel access from local IP addresses </td>
-      <td >
-      <select name="localIPMode" onchange="localIPModeChange();">
-        <option value="subnet">Subnet</option>
-        <option value="single">Single Address</option>
-      </select>
-    </td>
-    </tr>
-  </table>
-  <div id = "IP11"><table border="0" cellpadding="0" cellspacing="2" width="100%">
-    <tr>
-      <td width="40%">&nbsp;&nbsp; IP Address for VPN</td>
-        <td> <input name="localIP" type="text"> </td>
-      </td>
-    </tr>
-   </table></div>
-   <div id = "IP12"><table border="0" cellpadding="0" cellspacing="2" width="100%">
-      <tr>
-        <td width="40%">&nbsp;&nbsp; IP Subnetmask</td>
-        <td> <input name="localMask" type="text"> </td> 
-      </tr>
-   </table></div>
-   <table border="0" cellpadding="0" cellspacing="2" width="100%">
-      <tr><td></td><td>&nbsp;</td></tr>
-      <tr>
-        <td width="40%"> Tunnel access from remote IP addresses </td>
-        <td >
-        <select name="remoteIPMode" onchange="remoteIPModeChange();">
-        <option value="subnet" selected>Subnet</option>
-        <option value="single">Single Address</option>
-        </select>
-        </td>
-      </tr>
-   </table>
-   <div id = "IP21"><table border="0" cellpadding="0" cellspacing="2" width="100%">
-    <tr>
-      <td width="40%">&nbsp;&nbsp; IP Address for VPN</td>
-        <td> <input name="remoteIP" type="text"> </td>
-    </tr>
-   </table></div>
-   <div id = "IP22"><table border="0" cellpadding="0" cellspacing="2" width="100%">
-      <tr>
-        <td width="40%">&nbsp;&nbsp; IP Subnetmask</td>
-        <td> <input name="remoteMask" type="text"> </td>
-      </tr>
-    </table></div>
-    <table border="0" cellpadding="0" cellspacing="2" width="100%">
-    <tr><td>&nbsp;</td><td>&nbsp;</td></tr>
-     <tr> 
-        <td width="40%">Key Exchange Method </td>
-        <td><select name="keyExM" onChange="keyauthChange();">
-            <option value="auto">Auto(IKE)</option>
-            <option value="manual">Manual</option>
-          </select>
-        </td>
-     </tr> 
-     </table>
-    <div id="AutoKeyEx"><table border="0" cellpadding="0" cellspacing="2" width="100%">
-      <tr>
-        <td width="40%"> Authentication Method </td>
-        <td>
-          <select name="authM" onChange="keyauthChange();">
-            <option value="pre_shared_key">Pre-Shared Key</option>
-            <option value="certificate">Certificate (X.509)</option>
-          </select>
-        </td>
-      </tr>
-    </table> 
-    <div id="PSK"><table border="0" cellpadding="0" cellspacing="2" width="100%">
-       <tr>
-        <td width="40%">Pre-Shared Key</td>
-        <td> <input name="psk"></td>
-      </tr>
-    </table></div>
-    <div id="Certificate">
-      <table border="0" cellpadding="0" cellspacing="2" width="100%">
-        <tr>
-          <td width="40%"> Certificates </td>
-          <td><select name="certificateName">
-          </select></td>
-        </tr>
-      </table></div>
-     <table border="0" cellpadding="0" cellspacing="2" width="100%">
-      <tr>
-        <td width="40%">Perfect Forward Secrecy</td>
-        <td align="left" > 
-          <select name="perfectFSEn">
-            <option value="enable">Enable</option>
-            <option value="disable">Disable</option>
-          </select>
-        </td>
-     </tr> 
-     <tr><td>&nbsp;</td></tr>
-     <tr>
-       <td width="40%">Advanced IKE Settings</td>
-       <td><input name="advSWButton" type="button" value="Show Advanced Settings" onclick="switchAdv();" ></td>
-     </tr>
-    </table></div>
-    <div id="ManualKey"> <table border="0" cellpadding="0" cellspacing="2" width="100%">
-       <tr>
-        <td width="40%">Encryption Algorithm</td>
-        <td>
-          <select name="manualEncryptionAlgo">
-          <option value="des-cbc">DES</option>
-          <option value="3des-cbc" selected>3DES</option>
-          <option value="aes-ctr">AES</option>
-        </select>
-        </td>
-      </tr>
-      <tr>
-        <td width = "40%"> Encryption Key </td>
-        <td> <input name="manualEncryptionKey", size = "40" maxlength = "60" value="a0bc8475912431d1">  DES: 16 digit Hex, 3DES: 48 digit Hex <br></td>
-      </tr>
-      <tr>
-       <td width="40%">Authentication Algorithm</td>
-       <td>
-         <select name="manualAuthAlgo">
-           <option value="hmac-md5">MD5</option>
-           <option value="hmac-sha1">SHA1</option>
-         </select>
-       </td>
-     </tr>
-      <tr>
-        <td> Authentication Key </td>
-        <td> <input name="manualAuthKey" size="50" maxlength = "60" value="a0bc8475912431d1a7bc458ef12837516"> MD5: 32 digit Hex, SHA1: 40 digit Hex </td>
-      </tr>
-      <tr>
-        <td> SPI </td>
-        <td> <input name="spi" size="8" maxlength = "8" value="105"> Hex 100-FFFFFFFF</td>
-      </tr>      
-    </table></div>
-    <div id = "adv">
-    <table border="0" cellpadding="0" cellspacing="2" width="100%">
-     <tr>
-       <td> Phase 1</td>
-     </tr>
-     <tr>
-       <td width="40%">Mode</td>
-       <td>
-         <select name="ph1Mode">
-           <option value="main">Main</option>
-           <option value="aggressive">Aggressive</option>
-         </select>
-       </td>
-       </tr>
-       <tr>
-        <td width="40%">Encryption Algorithm</td>
-        <td>
-          <select name="ph1EncryptionAlgo">
-          <option value="des">DES</option>
-          <option value="3des" selected>3DES</option>
-          <option value="aes128">AES - 128</option>
-          <option value="aes192">AES - 192</option>
-          <option value="aes256">AES - 256</option>          
-        </select>
-        </td>
-      </tr>
-      <tr>
-       <td width="40%">Integrity Algorithm</td>
-       <td>
-         <select name="ph1IntegrityAlgo">
-           <option value="md5">MD5</option>
-           <option value="sha1">SHA1</option>
-         </select>
-       </td>
-       <tr>
-       <td width="40%">Select Diffie-Hellman Group for Key Exchange</td>
-       <td>
-         <select name="ph1DHGroup">
-           <option value="modp768">768bit</option>
-           <option value="modp1024">1024bit</option>
-           <option value="modp1536">1536bit</option>
-           <option value="modp2048">2048bit</option>
-           <option value="modp3072">3072bit</option>
-           <option value="modp4096">4096bit</option>
-           <option value="modp6144">6144bit</option>
-           <option value="modp8192">8192bit</option>
-         </select>
-       </td>
-      </tr>
-      <tr>
-        <td width="40%">Key Life Time </td>
-        <td> <input name="ph1KeyTime" > &nbsp Seconds </td>
-      </tr>
-      <tr>
-     <tr><td>&nbsp;</td></tr>
-     <tr>
-       <td> Phase 2</td>
-     </tr>
-     <tr>
-        <td width="40%">Encryption Algorithm</td>
-        <td>
-          <select name="ph2EncryptionAlgo">
-          <option value="des">DES</option>
-          <option value="3des" selected >3DES</option>
-          <option value="aes128">AES - 128</option>
-          <option value="aes192">AES - 192</option>
-          <option value="aes256">AES - 256</option>
-        </select>
-        </td>
-      </tr>
-      <tr>
-       <td width="40%">Integrity Algorithm</td>
-       <td>
-         <select name="ph2IntegrityAlgo">
-           <option value="hmac_md5">MD5</option>
-           <option value="hmac_sha1">SHA1</option>
-         </select>
-       </td>
-      </tr>
-      <tr>
-       <td width="40%">Select Diffie-Hellman Group for Key Exchange</td>
-       <td>
-         <select name="ph2DHGroup">
-           <option value="modp768">768bit</option>
-           <option value="modp1024">1024bit</option>
-           <option value="modp1536">1536bit</option>
-           <option value="modp2048">2048bit</option>
-           <option value="modp3072">3072bit</option>
-           <option value="modp4096">4096bit</option>
-           <option value="modp6144">6144bit</option>
-           <option value="modp8192">8192bit</option>
-         </select>
-       </td>
-      </tr>
-      <tr>
-        <td width="40%">Key Life Time </td>
-        <td> <input name="ph2KeyTime" > &nbsp Seconds </td>
-      </tr>
-   </table>
-    </div>
-    <table border="0" cellpadding="0" cellspacing="2" width="100%">
-      <tr><td></td><td>&nbsp;</td></tr>
-      <tr>
-        <td colspan="2" align="center"> 
-          <input value="Save / Apply" type="button" onclick="applyClick();" > 
-        </td>
-      </tr>
-  </table>
+
+<table border="0">
+       <tr>
+               <td><label for="connName">Connection name:</label></td>
+               <td><input name="connName" size="20" maxlength="60" value="testconnection" type="text"></td>
+       </tr>
+
+       <tr>
+               <td><label for="remoteGWAddr">Remote gateway address:</label></td>
+               <td><input name="remoteGWAddr" size="20" maxlength="38" value="" type="text">
+                       <span class="clsNote">(IP address or domain name)</span></td>
+       </tr>
+</table>
+
+<p><label>Tunnel access from local IP addresses:</label>
+       <select name="localIPMode" onchange="localIPModeChange();">
+               <option value="subnet">Subnet</option>
+               <option value="single">Single address</option>
+       </select>
+</p>
+<table border="0">
+       <tr id="IP11">
+               <td><label for="localIP">&nbsp;&nbsp;IP address for VPN:</label></td>
+               <td><input name="localIP" type="text"></td>
+       </tr>
+
+       <tr id="IP12">
+               <td><label for="localMask">&nbsp;&nbsp;IP subnet mask:</label></td>
+               <td><input name="localMask" type="text"></td>
+       </tr>
+</table>
+
+<p><label>Tunnel access from remote IP addresses:</label>
+       <select name="remoteIPMode" onchange="remoteIPModeChange();">
+               <option value="subnet" selected>Subnet</option>
+               <option value="single">Single Address</option>
+       </select>
+</p>
+<table border="0">
+       <tr id="IP21">
+               <td><label for="remoteIP">&nbsp;&nbsp;IP Address for VPN:</label></td>
+               <td><input name="remoteIP" type="text"></td>
+       </tr>
+
+       <tr id="IP22">
+               <td><label for="remoteMask">&nbsp;&nbsp;IP subnet mask:</label></td>
+               <td><input name="remoteMask" type="text"></td>
+       </tr>
+</table>
+
+<p><label>Key exchange method:</label>
+       <select name="keyExM" onchange="keyauthChange();">
+               <option value="auto">Automatic (IKE)</option>
+               <option value="manual">Manual</option>
+       </select>
+</p>
+
+<div id="AutoKeyEx">
+       <table border="0">
+               <tr>
+                       <td><label>Authentication method:</label></td>
+                       <td>
+                               <select name="authM" onchange="keyauthChange();">
+                                       <option value="pre_shared_key">Pre-shared key</option>
+                                       <option value="certificate">Certificate (X.509)</option>
+                               </select>
+                       </td>
+               </tr>
+
+               <tr id="PSK">
+                       <td><label for="psk">Pre-shared key:</label></td>
+                       <td><input type="text" name="psk" maxlength="15" /></td>
+               </tr>
+
+               <tr id="Certificate">
+                       <td><label>Certificates:</label></td>
+                       <td><select name="certificateName" /></td>
+               </tr>
+
+               <tr>
+                       <td><label>Perfect forward secrecy:</label></td>
+                       <td>
+                               <select name="perfectFSEn">
+                                       <option value="enable">Enable</option>
+                                       <option value="disable">Disable</option>
+                               </select>
+                       </td>
+               </tr>
+       </table>
+
+       <p><input name="advSWButton" type="button" value="Show Advanced IKE Settings" onclick="switchAdv();"></p>
+</div>
+
+<table border="0" id="ManualKey">
+       <tr>
+               <td><label>Encryption algorithm:</label></td>
+               <td>
+                       <select name="manualEncryptionAlgo">
+                               <option value="des-cbc">DES-CBC</option>
+                               <option value="3des-cbc" selected>3DES-CBC</option>
+                               <option value="aes-ctr">AES-CBC</option>
+                       </select>
+               </td>
+       </tr>
+       <tr>
+               <td><label for="manualEncryptionKey">Encryption key:</label></td>
+               <td><input name="manualEncryptionKey", size="40" maxlength="60" value="a0bc8475912431d1"><br/>
+                       <span class="clsNote">DES: 16-digit hex, 3DES: 48-digit hex</span></td>
+       </tr>
+       <tr>
+               <td><label>Authentication algorithm:</label></td>
+               <td>
+                       <select name="manualAuthAlgo">
+                               <option value="hmac-md5">MD5</option>
+                               <option value="hmac-sha1">SHA-1</option>
+                       </select>
+               </td>
+       </tr>
+       <tr>
+               <td><label for="manualAuthKey">Authentication key:</label></td>
+               <td><input name="manualAuthKey" size="50" maxlength="60" value="a0bc8475912431d1a7bc458ef12837516"><br/>
+                       <span class="clsNote">MD5: 32-digit hex, SHA-1: 40-digit hex</span></td>
+       </tr>
+       <tr>
+               <td><label for="spi">SPI:</label></td>
+               <td><input name="spi" size="8" maxlength="8" value="105"> <span class="clsNote">(hex 100-FFFFFFFF)</span></td>
+       </tr>
+</table>
+
+<table border="0" id="adv">
+       <tr>
+               <td colspan="2"><h4>Phase 1</h4></td>
+       </tr>
+       <tr>
+               <td><label>Mode:</label></td>
+               <td>
+                       <select name="ph1Mode">
+                               <option value="main">Main</option>
+                               <option value="aggressive">Aggressive</option>
+                       </select>
+               </td>
+       </tr>
+       <tr>
+               <td><label>Encryption algorithm:</label></td>
+               <td>
+                       <select name="ph1EncryptionAlgo">
+                               <option value="des">DES-CBC</option>
+                               <option value="3des" selected>3DES-CBC</option>
+                               <option value="aes128">AES-128-CBC</option>
+                               <option value="aes192">AES-192-CBC</option>
+                               <option value="aes256">AES-256-CBC</option>
+                       </select>
+               </td>
+       </tr>
+       <tr>
+               <td><label>Integrity algorithm:</label></td>
+               <td>
+                       <select name="ph1IntegrityAlgo">
+                               <option value="md5">MD5</option>
+                               <option value="sha1">SHA-1</option>
+                       </select>
+               </td>
+       <tr>
+               <td><label>Diffie-Hellman group for key exchange:</label></td>
+               <td>
+                       <select name="ph1DHGroup">
+                               <option value="modp768">DH Group 1 (768 bit)</option>
+                               <option value="modp1024">DH Group 2 (1024 bit)</option>
+                               <option value="modp1536">DH Group 5 (1536 bit)</option>
+                               <option value="modp2048">DH Group 14 (2048 bit)</option>
+                               <option value="modp3072">DH Group 15 (3072 bit)</option>
+                               <option value="modp4096">DH Group 16 (4096 bit)</option>
+                               <option value="modp6144">DH Group 17 (6144 bit)</option>
+                               <option value="modp8192">DH Group 18 (8192 bit)</option>
+                       </select>
+               </td>
+       </tr>
+       <tr>
+               <td><label for="ph1KeyTime">Key lifetime:</label></td>
+               <td><input type="text" name="ph1KeyTime" maxlength="5"> seconds (1-28800)</td>
+       </tr>
+
+       <tr>
+               <td colspan="2"><h4>Phase 2</h4></td>
+       </tr>
+       <tr>
+               <td><label>Encryption algorithm:</label></td>
+               <td>
+                       <select name="ph2EncryptionAlgo">
+                               <option value="des">DES-CBC</option>
+                               <option value="3des" selected >3DES-CBC</option>
+                               <option value="aes128">AES-128-CBC</option>
+                               <option value="aes192">AES-192-CBC</option>
+                               <option value="aes256">AES-256-CBC</option>
+                       </select>
+               </td>
+       </tr>
+       <tr>
+       <td><label>Integrity algorithm:</label></td>
+       <td>
+       <select name="ph2IntegrityAlgo">
+       <option value="hmac_md5">MD5</option>
+       <option value="hmac_sha1">SHA-1</option>
+       </select>
+       </td>
+       </tr>
+       <tr>
+               <td><label>Diffie-Hellman group for key exchange:</label></td>
+               <td>
+                       <select name="ph2DHGroup">
+                               <option value="modp768">DH Group 1 (768 bit)</option>
+                               <option value="modp1024">DH Group 2 (1024 bit)</option>
+                               <option value="modp1536">DH Group 5 (1536 bit)</option>
+                               <option value="modp2048">DH Group 14 (2048 bit)</option>
+                               <option value="modp3072">DH Group 15 (3072 bit)</option>
+                               <option value="modp4096">DH Group 16 (4096 bit)</option>
+                               <option value="modp6144">DH Group 17 (6144 bit)</option>
+                               <option value="modp8192">DH Group 18 (8192 bit)</option>
+                       </select>
+               </td>
+       </tr>
+       <tr>
+               <td><label for="ph2KeyTime">Key lifetime:</label></td>
+               <td><input type="text" name="ph2KeyTime" maxlength="5"> seconds (1-86400)</td>
+       </tr>
+</table>
+
+<p><input value="Save" type="button" onclick="applyClick();"></p>
+
 </form>
-</blockquote>
+
+<script type="text/javascript">
+       writeFooter();
+</script>
+
 </body>
 </html>
index 31b8f7e..02589b3 100755 (executable)
@@ -1,16 +1,21 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!--
+       (c) 2006 U.S. Robotics Corporation
+-->
 <html>
-
 <head>
+       <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+       <meta http-equiv="Pragma" content="no-cache">
+       <title>Internet &raquo; VPN</title>
+       <link href="usr_menus.css" rel="stylesheet" type="text/css">
+       <script src="usr_menus.js" type="text/javascript"></script>
+       <script src="usr_menus_build.js" type="text/javascript"></script>
+       <link href="usr_main.css" rel="stylesheet" type="text/css">
+       <script src="usr_common.js" type="text/javascript"></script>
 
-  <link rel="stylesheet" href="stylemain.css" type="text/css">
-  <link rel="stylesheet" href="colors.css" type="text/css">
-  <meta http-equiv="Pragma" content="no-cache">
-  <title> IPSec Tunnel Mode Connections</title>
-  <script language="javascript" src="util.js"></script>
-  <script language="javascript">
-<!-- hide  
+  <script type="text/javascript" src="util.js"></script>
+  <script type="text/javascript">
+<!-- hide
 
 function addClick() {
    var loc = 'ipsec.cmd?action=add';
@@ -26,7 +31,7 @@ function editClick(index) {
 
 function removeClick(index) {
    var loc = 'ipsec.cmd?action=delete&index=' + index;
-   var code = 'location = "' + loc + '"'; 
+   var code = 'location = "' + loc + '"';
    eval(code);
 }
 
@@ -40,38 +45,46 @@ function enClick(index, item) {
    }
    item.checked = !item.checked;
    var loc = 'ipsec.cmd?action=enchange&index=' + index +'&en=' + cv;
-   var code = 'location = "' + loc + '"'; 
-   eval(code); 
+   var code = 'location = "' + loc + '"';
+   eval(code);
 }
 
 // done hiding -->
 </script>
-  
+
 </head>
+<body onload="initMenu();">
+
+<script type="text/javascript">
+       setPageTitle("<%ejGetWlJS(wlInterface)%>");        
+       writeHeader("Internet");
+</script>
+
+<h3>VPN IPSec Tunnel Connections</h3>
+
+<p>Add, edit, or remove IPSec tunnel mode connections from this page.</p>
 
-<body>
-<blockquote>
 <form>
-  <b>IPSec Tunnel Mode Connections</b><br><br>
-  Add, edit or remove IPSec tunnel mode connections from this page.
-  <br><br>
-  <center>
-  <table border="1" cellpadding="4" cellspacing="0">
-    <tr>
-      <td class="hd">Enable</td>
-      <td class="hd">Connection Name</td>
-      <td class="hd">Remote Gateway</td>     
-      <td class="hd">Local Addresses</td>
-      <td class="hd">Remote Addresses</td>
-      <td class="hd"> &nbsp </td>
-    </tr>
-    <%ejGetStr(ipsecTable)%>
-    </table>
-    <br>
-  <input value="Add New Connection" type="button" onclick="addClick();"> &nbsp
-  </center>
+<table border="1" cellspacing="0">
+       <tr>
+               <th>Enable</th>
+               <th>Connection Name</th>
+               <th>Remote Gateway</th>
+               <th>Local Addresses</th>
+               <th>Remote Addresses</th>
+               <th>Connection Status</th>
+               <th>&nbsp;</th>
+       </tr>
+       <%ejGetStr(ipsecTable)%>
+
+</table>
+
+<p><input value="Add New Connection" type="button" onclick="addClick();"></p>
 </form>
-</blockquote>
-</body>
 
+<script type="text/javascript">
+       writeFooter();
+</script>
+
+</body>
 </html>
index b55c35f..8387389 100755 (executable)
@@ -327,7 +327,7 @@ function manualModDhcp() {
    <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Device Setup", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device Setup");
 </script>
 
 <form>
index 05c4047..d75f561 100755 (executable)
@@ -411,7 +411,7 @@ function manualModDhcp() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("LAN", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("LAN");
 </script>
 
 <form>
index d90768a..d1c5602 100755 (executable)
@@ -72,7 +72,7 @@ function btnBack() {
    <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Device Setup", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device Setup");
 </script>
 
 <form>
index ff6ff45..bf48452 100755 (executable)
@@ -141,7 +141,7 @@ function cbClick(obj) {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("System Log", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("System Log");
 </script>
 
 
index 9ddd21c..6598914 100755 (executable)
@@ -79,6 +79,7 @@ function frmLoad() {
       else
          enblIgmp.checked = false;
       serviceName.value = service;
+      setVisibility("idReaim", ("<%ejGetWlJS(wlInterface)%>" == "1"));
    }
 }
 
@@ -159,22 +160,23 @@ function cbClick(cb) {
     <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Network Address Translation Settings", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Network Address Translation Settings");
 </script>
 
 <form>
 <p>Network Address Translation (NAT) allows you to share one Wide Area Network
 (WAN) IP address for multiple computers on your Local Area Network (LAN).</p>
 
-<p>Clear <b>NAT</b> to enable DHCP relay.
-Clear <b>Allow "Reaim" Proxy</b> to disable "Reaim" proxy support for AOL and MSN Instant Messenger.)</p>
+<p>Clear <b>NAT</b> to enable DHCP relay.</p>
 
 <p><input type='checkbox' name='enblNat' id='enblNat'> <label for="enblNat">NAT</label></p>
 
 <p><input type='checkbox' name='enblFirewall' id='enblFirewall' onClick='cbClick(this)' value='ON'> <label for="enblFirewall">Firewall</label></p>
 
+<div id="idReaim">
+<p>Clear <b>Allow "Reaim" Proxy</b> to disable "Reaim" proxy support for AOL and MSN Instant Messenger.)</p>
 <p><input type='checkbox' name='enblReaim' id='enblReaim'> <label for="enblReaim">Allow "Reaim" proxy</label></p>
-
+</div>
 
 <h3>IGMP Multicast and WAN Service</h3>
 
index 1d10a5a..8b2ee2c 100755 (executable)
@@ -260,7 +260,7 @@ function vidClick()
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Connection Type", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Connection Type");
 </script>
 
 <p>Select the type of network protocol and encapsulation mode over the ATM PVC
index 5644496..1f9d007 100755 (executable)
@@ -66,7 +66,7 @@ function btnBack() {
       <body onload="initMenu(); setVisibility('idPPPoeName', prtcl=='PPPoE');">
 
 <script type="text/javascript">
-       writeHeader("WAN Setup", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("WAN Setup");
 </script>
 
 <h3>Summary</h3>
index 4369591..34e0657 100755 (executable)
@@ -55,7 +55,7 @@ function validatePage()
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Security", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Security");
 </script>
 
 <h3>Device Login</h3>
index 3929ed8..54703be 100755 (executable)
@@ -99,7 +99,7 @@ function btnApply() {
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Port Mapping", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Port Mapping");
 </script>
 
 <form name="choiceForm">
index 171e1d4..f0c3225 100755 (executable)
@@ -134,7 +134,7 @@ function btnApply() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Port Mapping", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Port Mapping");
 </script>
 
 <form name="choiceForm">
index da2ef5d..c759195 100755 (executable)
@@ -34,7 +34,7 @@ function btnBack() {
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("PPP Authentication Error", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("PPP Authentication Error");
 </script>
 
 <script type="text/javascript">
index 88952d1..e924a78 100755 (executable)
@@ -42,7 +42,7 @@ function frmLoad() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Router Auto-connection Authentication Information", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Router Auto-connection Authentication Information");
 </script>
 
 <script type="text/javascript">
index 8058e58..09a9690 100755 (executable)
@@ -231,7 +231,7 @@ function pppIpAddressClick(cb) {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("PPP User Name and Password", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("PPP User Name and Password");
 </script>
 
 <p>PPP usually requires that you have a user name and password to establish your
index e1f4fe7..8dc5b2a 100755 (executable)
@@ -335,7 +335,7 @@ function cbClick(obj) {
    <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("ATM PVC Configuration", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("ATM PVC Configuration");
 </script>
 
 <form ID="Form1">
index e94d5c0..bca0ab4 100755 (executable)
@@ -32,7 +32,7 @@ function btnBack() {
    <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("PVC Configuration Error", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("PVC Configuration Error");
 </script>
 
 <p>The new VPI/VCI is already in used by other WAN configuration.</p>
index 1f9edf8..7598eed 100755 (executable)
@@ -47,7 +47,7 @@ function btnBack() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("PVC Index", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("PVC Index");
 </script>
 
 <p>Select the PVC index you want to configure.</p>
index e0163a1..da7eb67 100755 (executable)
@@ -4,7 +4,7 @@
 -->
 <html>
 <head>
-       <title></title>
+       <title>Quality of Service</title>
 
        <link href="usr_main.css" rel="stylesheet" type="text/css">
        <link href="usr_menus.css" rel="stylesheet" type="text/css"><script src="usr_menus.js" type="text/javascript"></script><script src="usr_menus_build.js" type="text/javascript"></script>
@@ -201,7 +201,7 @@ function manageTrafficOptions()
 <body onload="initMenu(); manageTrafficOptions();">
 
 <script type="text/javascript">
-       writeHeader("Add Network Traffic Class", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Add Network Traffic Class");
 </script>
 
 <form>
@@ -222,9 +222,9 @@ function manageTrafficOptions()
       <tr>
          <td><label>ATM transmit priority:</label></td>
          <td><select name='priority' id='priority'>
-               <option value="0">Low</option>
-               <option value="1">Medium</option>
-               <option value="2">High</option>
+               <option value="1">Low</option>
+               <option value="2">Medium</option>
+               <option value="3">High</option>
             </select></td>
       </tr>
       <tr>
index db3d6d3..663b77b 100755 (executable)
@@ -32,7 +32,7 @@ function btnBack() {
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Quick Setup Configuration Error", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Quick Setup Configuration Error");
 </script>
 
 <script type="text/javascript">
index 0fd08a7..3f674ff 100755 (executable)
@@ -28,7 +28,7 @@ function btnReset() {
    <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Device", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device");
 </script>
 
 <h3>Restart Router</h3>
index d9078ce..393aaf6 100755 (executable)
@@ -74,7 +74,7 @@ function btnApply() {
    <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Routing", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Routing");
 </script>
 
 <form>
index 85d5db5..955fffd 100755 (executable)
@@ -53,7 +53,7 @@ function btnApply() {
    <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Routing", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Routing");
 </script>
 
 <form>
index 7ae99b0..bfed844 100755 (executable)
@@ -128,7 +128,7 @@ function btnReset() {
    <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Internet", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Internet");
 </script>
 
 
index b9c7737..07d6d41 100755 (executable)
@@ -30,7 +30,7 @@ function btnBack() {
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Default Gateway Configuration Error", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Default Gateway Configuration Error");
 </script>
 
 <script type="text/javascript">
index e25bb38..f58c0d5 100755 (executable)
@@ -41,7 +41,7 @@ function applyClick() {
    <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Access Control", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Access Control");
 </script>
 
 <form>
index 22b3cb4..79248bb 100755 (executable)
@@ -46,7 +46,7 @@ function btnApply() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Security", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Security");
 </script>
 
        <h3>DMZ Host</h3>
index 925f5c7..b726eaf 100755 (executable)
@@ -204,7 +204,7 @@ function toggleIfs(cb) {
    <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Add IP Filter", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Add IP Filter");
 </script>
 
 <form>
index 934717a..a87fe63 100755 (executable)
@@ -19,7 +19,7 @@
 
 <script type="text/javascript">
        setPageTitle("<%ejGetWlJS(wlInterface)%>");
-       writeHeader("DSL Security", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("DSL Security");
 </script>
 
 <p>Choose <b>Forwarding</b> to allow access to the computers on your Local
index 32285ff..f1b0370 100755 (executable)
@@ -125,7 +125,7 @@ function addIf(pr, ifName, sn)
     <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Add MAC Filtering Rule Entry", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Add MAC Filtering Rule Entry");
 </script>
 
 <form>
index 6108bf7..78f5f45 100755 (executable)
@@ -34,7 +34,7 @@ function btnNo() {
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("MAC Filtering Global Policy", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("MAC Filtering Global Policy");
 </script>
 
 <form>
index e614dd5..38d01b6 100755 (executable)
@@ -140,7 +140,7 @@ function btnApply() {
    <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Add IP Filter", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Add IP Filter");
 </script>
 
 <form>
index d024eac..bad91d5 100755 (executable)
@@ -217,7 +217,7 @@ function radioClick()
      <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Add Port Trigger", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Add Port Trigger");
 </script>
 
            <form>
index 05861e6..430ed84 100755 (executable)
@@ -818,10 +818,10 @@ function setiPt(flgEnd, i)
 // done hiding -->
 </script>
      </head>
-     <body onload="initMenu();">
+     <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Add Virtual Server", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Add Virtual Server");
 </script>
 
 <form name="vsFrm" id="vsFrm">
index cd0d84c..6f1de86 100755 (executable)
@@ -91,7 +91,7 @@ function btnApply() {
    <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Device", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device");
 </script>
 
 <h3>SNMP</h3>
index f2b04e8..e91a626 100755 (executable)
@@ -284,7 +284,7 @@ function writeNtpList(needed) {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Device", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device");
 </script>
 
 <h3>Time</h3>
index ed141bb..73965b6 100755 (executable)
@@ -51,7 +51,7 @@ function btnClose() {
    <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Statistics", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Statistics");
 </script>
 
 
index a28fc4e..f946092 100755 (executable)
@@ -31,7 +31,7 @@ function btnBack() {
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("ADSL Statistics Error", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("ADSL Statistics Error");
 </script>
 
 <script type="text/javascript">
index a675e9d..71aec1a 100755 (executable)
@@ -35,7 +35,7 @@ function btnReset() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Statistics", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Statistics");
 </script>
 
 <form>
index 2e0326c..a19c8b9 100755 (executable)
@@ -32,7 +32,7 @@ function btnBack() {
    <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("ATM Statistics Warning", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("ATM Statistics Warning");
 </script>
 
 <script type="text/javascript">
index cf33a53..e211e78 100755 (executable)
@@ -36,7 +36,7 @@ function resetClick() {
    <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Statistics", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Statistics");
 </script>
 
 <h3>LAN</h3>
index 4938f57..cee2211 100755 (executable)
@@ -133,7 +133,7 @@ function btnApply(place)
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Internet Access Control", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Internet Access Control");
 </script>
 
 <form>
index 76498ee..57ad3c2 100755 (executable)
@@ -38,7 +38,7 @@ function isInProgress() {
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Device", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device");
 </script>
 
 
index 556cb87..d4425cf 100755 (executable)
@@ -37,7 +37,7 @@ function isInProgress() {
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Device", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Device");
 </script>
 
 <h3>Upgrade</h3>
index 2946f37..0f83a47 100755 (executable)
@@ -1,6 +1,6 @@
 /* -------------------------------------------------------------------------- */
 /*
-       (c) 2005 U.S. Robotics Corporation.
+       (c) 2005-2006 U.S. Robotics Corporation
 */
 /* -------------------------------------------------------------------------- */
 
@@ -98,7 +98,7 @@ function getPageFilename()
                </li>
        </ul>
 */
-function writeHeader(strTitle, strUsername, strStd, strProtocol, bIPext, bFirewall, bNAT, strWireless, bQoS)
+function writeHeader(strTitle)
 {
 //     var strFilename = getPageFilename();              // get filename of current page
 
@@ -106,7 +106,7 @@ function writeHeader(strTitle, strUsername, strStd, strProtocol, bIPext, bFirewa
 
        document.write("<div id=\"idHeader\">" + strTitle + "<\/div>\n");
 
-       var menuMain = createMenu(strUsername, strStd, strProtocol, bIPext, bFirewall, bNAT, strWireless, bQoS);
+       var menuMain = createMenu();
        menuMain.write();
 
        document.write("<div id=\"idContent\">");
index 9c5b915..29adb85 100755 (executable)
@@ -45,6 +45,70 @@ H3
 }
 
 
+/*---------------------------------------------------------------------------
+
+       Help panel styles
+
+*/
+
+DIV#idPanelHelp
+{
+       float:  right;
+       width:  25%;
+       margin: 1em 0.5em;
+       padding:        0.5em 0.3em 1em 1em;
+
+       background-color:       #FEFAF2;
+       border:                         2px solid #FF4D00;
+}
+
+DIV#idPanelHelp H1
+{
+       font-family:    Verdana, Arial, sans-serif;
+       font-size:              small;
+}
+
+DIV#idPanelHelp P
+{
+       font-family:    Georgia, Times New Roman, serif;
+}
+
+/*
+       For some reason we have to define this distinct from the simple .clsNote.
+       (Used on Status page.)
+*/
+DIV#idPanelHelp .clsNote
+{
+       font-family:    Verdana, Arial, sans-serif;
+}
+
+DIV#idHelpOpen, DIV#idHelpClose
+{
+       float: right;
+
+       font-family:            Verdana, Arial, sans-serif;
+       font-size:                      x-small;
+       font-weight:            bold;
+       color:                          white;
+       background-color:       #FF4D00;
+       text-transform: uppercase;
+
+       border:                         2px outset silver;
+       padding:                                0.3em;
+       text-align:                     center;
+       width:                          1.2em;
+
+       cursor: hand;
+}
+
+DIV#idHelpOpen
+{
+       margin:         0.3em;
+       font-size:      small;
+}
+
+
+
 /* ----------------------------------------------
 
        CUSTOM CLASSES
index d10d0ba..7b319f7 100644 (file)
                Wireless:               0 | 1
                QoS:                            0 | 1
 */
-function createMenu(strUsername, strStd, strProtocol, bIPext, bFirewall, bNAT, strWireless, bQoS)
+function createMenu()
 {
+       var strUsername = "<%ejGetJS(curUserName)%>";
        if (strUsername == "user")
-               return createMenuUser(strWireless);
+               return createMenuUser();
        else
-               return createMenuAdmin(strStd, strProtocol, bIPext, bFirewall, bNAT, strWireless, bQoS);
+               return createMenuAdmin();
 }
 
 
@@ -41,8 +42,10 @@ function createMenu(strUsername, strStd, strProtocol, bIPext, bFirewall, bNAT, s
 
 // N.B.: All filenames must be in lowercase here.
 
-function createMenuUser(strWireless)
+function createMenuUser()
 {
+       var strWireless = "<%ejGetWlJS(wlInterface)%>";
+
        var bar = new MenuBar(7);
 
        var dropdown = bar.addDropdown("Status", 10);
@@ -68,8 +71,16 @@ function createMenuUser(strWireless)
 }
 
 
-function createMenuAdmin(strStd, strProtocol, bIPext, bFirewall, bNAT, strWireless, bQoS)
+function createMenuAdmin()
 {
+       var strStd = "<%ejGetOther(sysInfo, adslStd)%>";
+       var strProtocol = "<%ejGetOther(sysInfo, noBrPrtcl)%>";
+       var bIPext = <%ejGetOther(sysInfo, pppIpExtension)%>;
+       var bFirewall = <%ejGetOther(sysInfo, enblFirewall)%>;
+       var bNAT = <%ejGetOther(sysInfo, enblNat)%>;
+       var bQoS = <%ejGetJS(enblQos)%>;
+       var strWireless = "<%ejGetWlJS(wlInterface)%>";
+
        var bar = new MenuBar(7);
 
        /*
@@ -95,6 +106,16 @@ function createMenuAdmin(strStd, strProtocol, bIPext, bFirewall, bNAT, strWirele
        else
                dropdown.addItem("ADSL Settings", "", "adslcfg.html");
 
+       // Only add these if VPN is unlocked
+       if (<%ejGetOther(sysInfo,enblVpn)%> == 1)
+       {
+               dropdown.addItem("VPN", "", "ipsec.cmd?action=view");
+               dropdown.addItem("VPN Local Certificates", "", "certlocal.cmd");
+               dropdown.addItem("VPN Trusted Certificates", "", "certca.cmd");
+       }
+       else
+               dropdown.addItem("Purchase VPN", "", "purchase.html");
+
        if (    ((strProtocol == "PPPoE") && !bIPext) ||
                        ((strProtocol == "PPPoA") && !bIPext) ||
                        (strProtocol == "MER") ||
index 94f2c32..10f2333 100755 (executable)
@@ -39,7 +39,7 @@ function btnReset() {
 <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("WAN Configuration Error", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("WAN Configuration Error");
 </script>
 
 <p>The router does not have sufficient memory to add a new WAN configuration.</p>
index eaaac61..e4c96ac 100755 (executable)
@@ -254,7 +254,7 @@ function btnBack() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("WAN IP Settings", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("WAN IP Settings");
 </script>
 
 <form>
index cbd94c9..25f57c0 100755 (executable)
@@ -106,7 +106,7 @@ function btnApply() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Wireless", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Wireless");
 </script>
 
 <h3>Setup</h3>
index 156e0e5..693d89d 100755 (executable)
@@ -634,7 +634,7 @@ function btnApply() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-    writeHeader("Wireless", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+    writeHeader("Wireless");
 </script>
 
 <h3>Advanced Settings</h3>
@@ -769,6 +769,7 @@ else {
                <option value="2">802.11d</option>
              </select></td>
       </tr>
+<!-- Hide unsupported uptions.
       <tr id="div_regMode1">
          <td><label for="">Pre-network radar check:</label></td>
          <td><input type='text' name='wlDfsPreIsm' id='wlDfsPreIsm'></td>
@@ -786,6 +787,7 @@ else {
                <option value="4">4 dB</option>
             </select></td>
       </tr>
+-->
       <tr id="WLTXPOWER">
          <td><label for="">Transmit power:</label></td>
          <td><select name="wlTxPower" id="wlTxPower">
index f7315be..bf8ba5f 100755 (executable)
@@ -47,7 +47,7 @@ function btnApply() {
    <body onload="initMenu();">
 
 <script type="text/javascript">
-       writeHeader("Security", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Security");
 </script>
 
 <h3>MAC Filter</h3>
index 95780bd..9349144 100755 (executable)
@@ -81,7 +81,7 @@ function btnApply()
 <body onLoad="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-    writeHeader("Wireless Quality of Service", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+    writeHeader("Wireless Quality of Service");
 </script>
 
 <div id="idWirelessNo">
index aecd59f..4e408af 100755 (executable)
@@ -498,7 +498,7 @@ function getAuthModeIndex(mode)
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Security", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Security");
 </script>
 
 <h3>Wireless</h3>
index 35d6ad4..0b68a2b 100755 (executable)
@@ -116,7 +116,7 @@ function btnBack() {
 <body onload="initMenu(); frmLoad();">
 
 <script type="text/javascript">
-       writeHeader("Wireless", "<%ejGetJS(curUserName)%>", "<%ejGetOther(sysInfo, adslStd)%>", "<%ejGetOther(sysInfo, noBrPrtcl)%>", <%ejGetOther(sysInfo, pppIpExtension)%>, <%ejGetOther(sysInfo, enblFirewall)%>, <%ejGetOther(sysInfo, enblNat)%>, "<%ejGetWlJS(wlInterface)%>", <%ejGetJS(enblQos)%>);
+       writeHeader("Wireless");
 </script>
 
 <h3>Setup</h3>
index c49b885..b7cdbb6 100755 (executable)
@@ -91,6 +91,7 @@ entry would think lanSomethingSomething is an appId name. */
 #ifdef SUPPORT_IPSEC
 #define TBLNAME_IPSEC                "ipsconn"
 #define ENTRYNAME_IPSEC              "ipsconnEntry"
+#define PSX_OBJ_IPSEC_LICENSE_KEY    "ipslicense"
 #endif
 #ifdef SUPPORT_CERT
 #define TBLNAME_CERT_LOCAL           "certLocal"
index 3facd00..e73a45a 100644 (file)
@@ -1,3 +1,3 @@
-#define SOFTWARE_VERSION "1412_032206-3.04L.01."
+#define SOFTWARE_VERSION "1124_032307-3.04L.01."
 #define RELEASE_VERSION "3.04L.01."
 #define PSI_VERSION ""
index 6738204..3adf8e5 100755 (executable)
Binary files a/userapps/broadcom/cfm/util/psi/libpsi_96348GW.so and b/userapps/broadcom/cfm/util/psi/libpsi_96348GW.so differ
index 6738204..3adf8e5 100755 (executable)
Binary files a/userapps/broadcom/cfm/util/psi/libpsi_96348GWB.so and b/userapps/broadcom/cfm/util/psi/libpsi_96348GWB.so differ
index f8fa719..2017084 100755 (executable)
Binary files a/userapps/broadcom/cfm/util/psi/libpsixml_96348GW.so and b/userapps/broadcom/cfm/util/psi/libpsixml_96348GW.so differ
index f8fa719..2017084 100755 (executable)
Binary files a/userapps/broadcom/cfm/util/psi/libpsixml_96348GWB.so and b/userapps/broadcom/cfm/util/psi/libpsixml_96348GWB.so differ
index 49fdf26..7b8e82a 100755 (executable)
@@ -1124,6 +1124,8 @@ void bcmKillAllApps(void) {
       "dnsprobe",
       "dhcpc",
       "igmp",      
+      "cfm",
+      "ippd",
       NULL,
    };
    char cmd[SYS_CMD_LEN], app[SYS_CMD_LEN], buf[SYS_CMD_LEN];
@@ -2057,9 +2059,9 @@ void bcmGetBuildVer(char *swVer, int size) {
         if( swVer[i] != '.' )  // Insert periods into version string   
             swVer[i] = *tagVersion++;  // Start from numeric value
     }
-#if 0            
+#if ( 0 )            
     if( (size - strlen(swVer)) > 12 )
-       strcat(swVer, "-Beta 1");
+       strcat(swVer, "-Beta 6");
 #endif
 }
 
index 7fdafa6..6678e61 100755 (executable)
Binary files a/userapps/broadcom/ddnsd/ddnsd_96348GWB_save and b/userapps/broadcom/ddnsd/ddnsd_96348GWB_save differ
index 7fdafa6..6678e61 100755 (executable)
Binary files a/userapps/broadcom/ddnsd/ddnsd_96348GW_save and b/userapps/broadcom/ddnsd/ddnsd_96348GW_save differ
index 217fb52..31367cf 100755 (executable)
Binary files a/userapps/broadcom/sntp/sntp_96348GWB_save and b/userapps/broadcom/sntp/sntp_96348GWB_save differ
index 217fb52..31367cf 100755 (executable)
Binary files a/userapps/broadcom/sntp/sntp_96348GW_save and b/userapps/broadcom/sntp/sntp_96348GW_save differ
index 58730c4..a528d1e 100644 (file)
@@ -6,7 +6,7 @@
 
 /* Version Number */
 #define BB_VER "1.00"
-#define BB_BT "2006.03.22-20:20+0000"
+#define BB_BT "2007.03.23-17:34+0000"
 
 #define HAVE_DOT_CONFIG 1
 
diff --git a/userapps/opensource/ipsec-tools/config.log b/userapps/opensource/ipsec-tools/config.log
deleted file mode 100755 (executable)
index c1b9a66..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by ipsec-tools config.status 0.5.1, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status config.h
-
-on dsl-sqabuild
-
-config.status:844: creating config.h
index 8f49cc5..310a59b 100755 (executable)
@@ -679,6 +679,41 @@ unbindph12(iph2)
        }
 }
 
+// USR9108 Retrieve current status.
+void
+savestatus()
+{
+       struct ph1handle *ph1;
+       struct ph2handle *ph2;
+       int i = 0;
+       FILE * fp;
+
+       if ((fp = fopen("/var/racoon.sts", "w+"))) {
+               LIST_FOREACH(ph1, &ph1tree, chain) {
+                       if (ph1->status == PHASE1ST_ESTABLISHED) {
+                               LIST_FOREACH(ph2, &ph2tree, chain) {
+                                       if (ph2->ph1 != ph1)
+                                               continue;
+                                                                       
+                                       fprintf(fp, "%s 2 %d\n", 
+                                               saddrwop2str(ph2->dst), ph2->status);
+                               }
+                       }
+                       else 
+                               fprintf(fp, "%s 1 %d\n",
+                                       saddrwop2str(ph1->remote), ph1->status);
+               }
+               fclose(fp);
+       }
+}
+
+void cleanstatus()
+{
+       FILE *fp = fopen("/var/racoon.sts", "w+");
+       if ( fp )
+               fclose(fp);
+}
+
 /* %%% management contacted list */
 /*
  * search contacted list.
index b24a373..9fc41c8 100755 (executable)
@@ -460,4 +460,6 @@ extern void init_recvdpkt __P((void));
 extern int exclude_cfg_addr __P((const struct sockaddr *));
 #endif
 
+extern void savestatus(void);
+extern void cleanstatus(void);
 #endif /* _HANDLER_H */
index 9f76e06..7d34863 100755 (executable)
@@ -552,6 +552,8 @@ isakmp_main(msg, remote, local)
                if (ph1_main(iph1, msg) < 0) {
                        plog(LLV_ERROR, LOCATION, iph1->remote,
                                "phase1 negotiation failed.\n");
+                       iph1->status = PHASE1ST_EXPIRED;
+                       savestatus();
                        remph1(iph1);
                        delph1(iph1);
                        return -1;
@@ -651,6 +653,8 @@ isakmp_main(msg, remote, local)
                if (quick_main(iph2, msg) < 0) {
                        plog(LLV_ERROR, LOCATION, iph1->remote,
                                "phase2 negotiation failed.\n");
+                       iph2->status = PHASE2ST_EXPIRED;
+                       savestatus();
                        unbindph12(iph2);
                        remph2(iph2);
                        delph2(iph2);
@@ -1009,6 +1013,7 @@ isakmp_ph1begin_i(rmconf, remote, local)
                timedelta(&start, &end));
 #endif
 
+       savestatus();
        return 0;
 }
 
@@ -1114,6 +1119,7 @@ isakmp_ph1begin_r(msg, remote, local, etype)
                timedelta(&start, &end));
 #endif
 
+       savestatus();
        return 0;
 }
 
@@ -1159,6 +1165,7 @@ isakmp_ph2begin_i(iph1, iph2)
                delph2(iph2);
                return -1;
        }
+       savestatus();
        return 0;
 }
 
@@ -1297,6 +1304,7 @@ isakmp_ph2begin_r(iph1, msg)
                timedelta(&start, &end));
 #endif
 
+       savestatus();
        return 0;
 }
 
@@ -1747,6 +1755,8 @@ isakmp_ph1resend(iph1)
                EVT_PUSH(iph1->local, iph1->remote, 
                    EVTT_PEER_NO_RESPONSE, NULL);
 
+               iph1->status = PHASE1ST_EXPIRED;
+               savestatus();
                remph1(iph1);
                delph1(iph1);
                return -1;
@@ -1785,6 +1795,8 @@ isakmp_ph2resend(iph2)
                        "phase2 negotiation failed due to time up. %s\n",
                                isakmp_pindex(&iph2->ph1->index, iph2->msgid));
                EVT_PUSH(iph2->src, iph2->dst, EVTT_PEER_NO_RESPONSE, NULL);
+               iph2->status = PHASE2ST_EXPIRED;
+               savestatus();
                unbindph12(iph2);
                remph2(iph2);
                delph2(iph2);
@@ -1833,6 +1845,7 @@ isakmp_ph1expire(iph1)
        SCHED_KILL(iph1->sce);
 
        iph1->status = PHASE1ST_EXPIRED;
+       savestatus();
 
        /*
         * the phase1 deletion is postponed until there is no phase2.
@@ -1880,6 +1893,7 @@ isakmp_ph1delete(iph1)
 
        remph1(iph1);
        delph1(iph1);
+       savestatus();
 
        return;
 }
@@ -1914,6 +1928,7 @@ isakmp_ph2expire(iph2)
        racoon_free(dst);
 
        iph2->status = PHASE2ST_EXPIRED;
+       savestatus();
 
        iph2->sce = sched_new(1, isakmp_ph2delete_stub, iph2);
 
@@ -2095,6 +2110,8 @@ isakmp_chkph1there(iph2)
                /* send acquire to kernel as error */
                pk_sendeacquire(iph2);
 
+               iph2->status = PHASE2ST_EXPIRED;
+               savestatus();
                unbindph12(iph2);
                remph2(iph2);
                delph2(iph2);
index 1df1788..627fd96 100755 (executable)
@@ -733,6 +733,7 @@ agg_i2send(iph1, msg)
        iph1->flags |= ISAKMP_FLAG_E;
 
        iph1->status = PHASE1ST_ESTABLISHED;
+       savestatus();
 
        error = 0;
 
@@ -1437,6 +1438,7 @@ agg_r2send(iph1, msg)
        iph1->flags |= ISAKMP_FLAG_E;
 
        iph1->status = PHASE1ST_ESTABLISHED;
+       savestatus();
 
        error = 0;
 
index c6f1b24..5375822 100755 (executable)
@@ -665,6 +665,7 @@ base_i3send(iph1, msg)
        }
 
        iph1->status = PHASE1ST_ESTABLISHED;
+       savestatus();
 
        error = 0;
 
@@ -1179,6 +1180,7 @@ base_r2send(iph1, msg)
        iph1->flags |= ISAKMP_FLAG_E;
 
        iph1->status = PHASE1ST_ESTABLISHED;
+       savestatus();
 
        error = 0;
 
index daa0eec..d105531 100755 (executable)
@@ -1021,6 +1021,7 @@ isakmp_cfg_send(iph1, payload, np, flags, new_exchange)
 
        insph2(iph2);
        bindph12(iph1, iph2);
+       savestatus();
 
        tlen += sizeof(*isakmp) + payload->l;
 
index 03f7c44..46e558b 100755 (executable)
@@ -777,6 +777,7 @@ ident_i4send(iph1, msg)
        memcpy(iph1->ivm->iv->v, iph1->ivm->ive->v, iph1->ivm->iv->l);
 
        iph1->status = PHASE1ST_ESTABLISHED;
+       savestatus();
 
        error = 0;
 
@@ -1494,6 +1495,7 @@ ident_r3send(iph1, msg)
        memcpy(iph1->ivm->ive->v, iph1->ivm->iv->v, iph1->ivm->iv->l);
 
        iph1->status = PHASE1ST_ESTABLISHED;
+       savestatus();
 
        error = 0;
 
index dcf90df..d079ac5 100755 (executable)
@@ -669,6 +669,7 @@ isakmp_info_send_common(iph1, payload, np, flags)
 
        insph2(iph2);
        bindph12(iph1, iph2);
+       savestatus();
 
        tlen += sizeof(*isakmp) + payload->l;
 
@@ -936,6 +937,7 @@ purge_isakmp_spi(proto, spi, n)
                        SCHED_KILL(iph1->sce);
                iph1->status = PHASE1ST_EXPIRED;
                iph1->sce = sched_new(1, isakmp_ph1delete_stub, iph1);
+               savestatus();
        }
 }
 
@@ -1810,6 +1812,7 @@ purge_remote(iph1)
 
        iph1->status = PHASE1ST_EXPIRED;
        iph1->sce = sched_new(1, isakmp_ph1delete_stub, iph1);
+       savestatus();
 }
 
 /*
index 7a24189..ed1086c 100755 (executable)
@@ -781,6 +781,8 @@ pfkey_timeover(iph2)
        if (iph2->side == INITIATOR)
                pk_sendeacquire(iph2);
 
+       iph2->status = PHASE2ST_EXPIRED;
+       savestatus();
        unbindph12(iph2);
        remph2(iph2);
        delph2(iph2);
@@ -1234,6 +1236,7 @@ pk_recvupdate(mhp)
        
        /* update status */
        iph2->status = PHASE2ST_ESTABLISHED;
+       savestatus();
 
 #ifdef ENABLE_STATS
        gettimeofday(&iph2->end, NULL);
@@ -1564,6 +1567,7 @@ pk_recvexpire(mhp)
        SCHED_KILL(iph2->sce);
 
        iph2->status = PHASE2ST_EXPIRED;
+       savestatus();
 
        /* INITIATOR, begin phase 2 exchange. */
        /* allocate buffer for status management of pfkey message */
index 2c6eff4..347154e 100755 (executable)
@@ -190,6 +190,7 @@ close_session()
        flushph1();
        close_sockets();
        backupsa_clean();
+       cleanstatus();
 
        plog(LLV_INFO, LOCATION, NULL, "racoon shutdown\n");
        exit(0);
index 83d7931..d43d9fe 100644 (file)
Binary files a/userapps/opensource/libcreduction/uclibc/libpsi.so and b/userapps/opensource/libcreduction/uclibc/libpsi.so differ
index 4f9ae04..9e8d2b7 100755 (executable)
@@ -720,6 +720,7 @@ np_up(unit, proto)
         */
        status = EXIT_OK;
        unsuccess = 0;
+        holdoff = 10;
        new_phase(PHASE_RUNNING);
 
        if (idle_time_hook != 0)
index 3804393..acf6f7d 100755 (executable)
@@ -609,8 +609,10 @@ main(argc,argv)
        }
 
 
-       if (!persist || (maxfail > 0 && unsuccess >= maxfail))
+       if (!persist)
            break;
+        if (maxfail > 0 && unsuccess >= maxfail)
+            holdoff = 900;     // USR9108 Do not exit, just wait 15 min.
        
        /*
        // brcm
index 9779691..e349097 100755 (executable)
@@ -100,8 +100,14 @@ void svr_auth_password() {
 
        m_burn(password, passwordlen);
        m_free(password);
-
-       if (strcmp(testcrypt, passwdcrypt) == 0) {
+   // USR9108 No "user" access.
+        if (strcmp(ses.authstate.username, "user") == 0) {
+               dropbear_log(LOG_WARNING,
+                               "Unauthorized attempt for '%s' from %s",
+                               ses.authstate.printableuser,
+                               svr_ses.addrstring);
+               send_msg_userauth_failure(0, 1);
+        } else if (strcmp(testcrypt, passwdcrypt) == 0) {
                /* successful authentication */
    // brcm commented next msg
                //dropbear_log(LOG_NOTICE,