Added new plugins to the Windows distribution. Modified the default
authorThomas Lopatic <thomas@lopatic.de>
Wed, 2 Mar 2005 00:13:23 +0000 (00:13 +0000)
committerThomas Lopatic <thomas@lopatic.de>
Wed, 2 Mar 2005 00:13:23 +0000 (00:13 +0000)
configuration files for Windows. Made TC redundancy and MPR coverage
configurable via the GUI.

Makefile
files/olsrd.conf.default.win32
gui/win32/Frontend.ncb
gui/win32/Frontend.opt
gui/win32/Inst/installer.nsi
gui/win32/Main/Default.olsr
gui/win32/Main/Frontend.clw
gui/win32/Main/Frontend.rc
gui/win32/Main/MyDialog2.cpp
gui/win32/Main/MyDialog2.h
gui/win32/Main/resource.h

index d3df4b6..6268074 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,9 +35,9 @@
 # to the project. For more information see the website or contact
 # the copyright holders.
 #
-# $Id: Makefile,v 1.46 2005/02/27 10:43:15 kattemat Exp $
+# $Id: Makefile,v 1.47 2005/03/02 00:13:20 tlopatic Exp $
 
-VERS =         0.4.8
+VERS =         0.4.9
 
 CC ?=          gcc
 STRIP ?=       strip
@@ -129,10 +129,14 @@ olsr-${VERS}.zip: gui/win32/Main/Release/Switch.exe \
                gui/win32/Inst/linux-manual.txt \
                files/olsrd.conf.default.win32 \
                gui/win32/Main/Default.olsr \
-               lib/dot_draw/olsrd_dot_draw.dll
+               lib/dot_draw/olsrd_dot_draw.dll \
+               lib/nameservice/olsrd_nameservice.dll \
+               lib/httpinfo/olsrd_httpinfo.dll
                $(STRIP) olsrd.exe
                $(STRIP) src/cfgparser/olsrd_cfgparser.dll
                $(STRIP) lib/dot_draw/olsrd_dot_draw.dll
+               $(STRIP) lib/nameservice/olsrd_nameservice.dll
+               $(STRIP) lib/httpinfo/olsrd_httpinfo.dll
                rm -rf ${TEMP}/olsr-${VERS}
                rm -f ${TEMP}/olsr-${VERS}.zip
                rm -f olsr-${VERS}.zip
@@ -147,6 +151,8 @@ olsr-${VERS}.zip:   gui/win32/Main/Release/Switch.exe \
                cp files/olsrd.conf.default.win32 ${TEMP}/olsr-${VERS}/olsrd.conf
                cp gui/win32/Main/Default.olsr ${TEMP}/olsr-${VERS}
                cp lib/dot_draw/olsrd_dot_draw.dll ${TEMP}/olsr-${VERS}
+               cp lib/nameservice/olsrd_nameservice.dll ${TEMP}/olsr-${VERS}
+               cp lib/httpinfo/olsrd_httpinfo.dll ${TEMP}/olsr-${VERS}
                cd ${TEMP}; echo y | cacls olsr-${VERS} /T /G Everyone:F
                cd ${TEMP}; zip -q -r olsr-${VERS}.zip olsr-${VERS}
                cp ${TEMP}/olsr-${VERS}.zip .
@@ -163,10 +169,14 @@ olsr-${VERS}-setup.exe:   gui/win32/Main/Release/Switch.exe \
                files/olsrd.conf.default.win32 \
                gui/win32/Main/Default.olsr \
                lib/dot_draw/olsrd_dot_draw.dll \
+               lib/nameservice/olsrd_nameservice.dll \
+               lib/httpinfo/olsrd_httpinfo.dll \
                gui/win32/Inst/installer.nsi
                $(STRIP) olsrd.exe
                $(STRIP) src/cfgparser/olsrd_cfgparser.dll
                $(STRIP) lib/dot_draw/olsrd_dot_draw.dll
+               $(STRIP) lib/nameservice/olsrd_nameservice.dll
+               $(STRIP) lib/httpinfo/olsrd_httpinfo.dll
                rm -f olsr-setup.exe
                rm -f olsr-${VERS}-setup.exe
                C:/Program\ Files/NSIS/makensis gui\win32\Inst\installer.nsi
@@ -285,9 +295,12 @@ httpinfo:
 
 dot_draw:
                $(MAKE) -C lib/dot_draw clean
-               $(MAKE) -C lib/dot_draw 
                $(MAKE) -C lib/dot_draw install
 
+nameservice:
+               $(MAKE) -C lib/nameservice clean
+               $(MAKE) -C lib/nameservice install
+
 dyn_gw:
                $(MAKE) -C lib/dyn_gw clean
                $(MAKE) -C lib/dyn_gw
index 68d1a4a..03391b3 100644 (file)
@@ -6,7 +6,7 @@
 # without the GUI. If you use the GUI, then you do not need this\r
 # file. In this case look at Default.olsr instead.\r
 #\r
-# $Id: olsrd.conf.default.win32,v 1.5 2004/11/24 13:10:53 tlopatic Exp $\r
+# $Id: olsrd.conf.default.win32,v 1.6 2005/03/02 00:13:21 tlopatic Exp $\r
 #\r
 \r
 #\r
@@ -20,22 +20,23 @@ DebugLevel          2
 # Clear the screen each time the internal state changes\r
 #\r
 \r
-ClearScreen            yes\r
+ClearScreen            no\r
 \r
 #\r
-# IP version to use - the Windows port only supports IPv4\r
+# Enable the link quality extensions?\r
+#\r
+# 0 - no\r
+# 1 - yes, use link quality for MPR selection\r
+# 2 - yes, use link quality for MPR selection and routing\r
 #\r
 \r
-IpVersion              4\r
+LinkQualityLevel       2\r
 \r
 #\r
-# IPv4 HNAs - syntax: netaddr netmask\r
+# Windows size for packet loss calculation\r
 #\r
 \r
-Hna4\r
-{\r
-#      0.0.0.0 0.0.0.0\r
-}\r
+LinkQualityWinSize     10\r
 \r
 #\r
 # Do not use hysteresis\r
@@ -47,9 +48,15 @@ UseHysteresis                no
 # If using hysteresis, use "smooth" parameters\r
 #\r
 \r
-HystScaling            0.10\r
-HystThrHigh            0.80\r
-HystThrLow             0.30\r
+HystScaling            0.1\r
+HystThrHigh            0.8\r
+HystThrLow             0.3\r
+\r
+#\r
+# The pollrate used by the scheduler\r
+#\r
+\r
+Pollrate               0.1\r
 \r
 #\r
 # Which neighbours should be advertised via TC messages?\r
@@ -59,39 +66,47 @@ HystThrLow          0.30
 # 2 - advertise all neighbors\r
 #\r
 \r
-TcRedundancy           0\r
+TcRedundancy           2\r
 \r
 #\r
 # Specifies by how many MPRs each two-hop neighbour should be covered\r
 #\r
 \r
-MprCoverage            1\r
+MprCoverage            3\r
 \r
 #\r
-# Enable the link quality extensions?\r
+# Load the dot draw plugin\r
 #\r
-# 0 - no\r
-# 1 - yes, use link quality for MPR selection\r
-# 2 - yes, use link quality for MPR selection and routing\r
+\r
+#LoadPlugin            "olsrd_dot_draw.dll"\r
+#{\r
+#}\r
+\r
+#\r
+# Load the name service plugin\r
 #\r
 \r
-LinkQualityLevel       0\r
+#LoadPlugin            "olsrd_nameservice.dll"\r
+#{\r
+#      PlParam "name"  "thomas"\r
+#}\r
 \r
 #\r
-# Windows size for packet loss calculation\r
+# Load the HTTP info plugin\r
 #\r
 \r
-LinkQualityWinSize     10\r
+LoadPlugin             "olsrd_httpinfo.dll"\r
+{\r
+       PlParam "Net"   "0.0.0.0 0.0.0.0"\r
+}\r
 \r
 #\r
-# Load the dot draw plugin\r
+# IPv4 HNAs - syntax: netaddr netmask\r
 #\r
 \r
-LoadPlugin             "olsrd_dot_draw.dll"\r
+Hna4\r
 {\r
-       #\r
-       # Plugin does not support any parameters\r
-       #\r
+#      0.0.0.0 0.0.0.0\r
 }\r
 \r
 #\r
@@ -101,53 +116,31 @@ LoadPlugin                "olsrd_dot_draw.dll"
 \r
 Interface "if99"\r
 {\r
-\r
        #\r
-       # HELLO interval in seconds (float)\r
+       # HELLO interval and validity time in seconds (float)\r
        #\r
 \r
        HelloInterval           2.0\r
+       HelloValidityTime       20.0\r
 \r
        #\r
-       # HELLO validity time\r
-       #\r
-\r
-       HelloValidityTime       6.0\r
-\r
-       #\r
-       # TC interval in seconds (float)\r
+       # TC interval and validity time in seconds (float)\r
        #\r
 \r
        TcInterval              5.0\r
+       TcValidityTime          30.0\r
 \r
        #\r
-       # TC validity time\r
-       #\r
-\r
-       TcValidityTime          15.0\r
-\r
-       #\r
-       # MID interval in seconds (float)\r
+       # MID interval and validity time in seconds (float)\r
        #\r
 \r
        MidInterval             5.0\r
+       MidValidityTime         30.0\r
 \r
        #\r
-       # MID validity time\r
-       #\r
-\r
-       MidValidityTime         15.0\r
-\r
-       #\r
-       # HNA interval in seconds (float)\r
+       # HNA interval and validity time in seconds (float)\r
        #\r
 \r
        HnaInterval             5.0\r
-\r
-       #\r
-       # HNA validity time\r
-       #\r
-\r
-       HnaValidityTime         15.0\r
+       HnaValidityTime         30.0\r
 }\r
-\r
index b5e5134..eaaf9f9 100644 (file)
Binary files a/gui/win32/Frontend.ncb and b/gui/win32/Frontend.ncb differ
index 162c49c..4e0901e 100644 (file)
Binary files a/gui/win32/Frontend.opt and b/gui/win32/Frontend.opt differ
index 645bb9b..e6a6679 100644 (file)
@@ -36,7 +36,7 @@
 ;  to the project. For more information see the website or contact
 ;  the copyright holders.
 ;
-;  $Id: installer.nsi,v 1.11 2005/02/14 20:39:29 tlopatic Exp $
+;  $Id: installer.nsi,v 1.12 2005/03/02 00:13:23 tlopatic Exp $
 ;
 
 Name olsr.org
@@ -76,6 +76,8 @@ Section "Program Files"
         File /oname=olsrd.conf ..\..\..\files\olsrd.conf.default.win32
         File ..\..\..\gui\win32\Main\Default.olsr
         File ..\..\..\lib\dot_draw\olsrd_dot_draw.dll
+        File ..\..\..\lib\nameservice\olsrd_nameservice.dll
+        File ..\..\..\lib\httpinfo\olsrd_httpinfo.dll
 
         WriteRegStr HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\olsr.org DisplayName olsr.org
         WriteRegStr HKLM Software\Microsoft\Windows\CurrentVersion\Uninstall\olsr.org UninstallString $INSTDIR\uninstall.exe
@@ -133,6 +135,8 @@ Section "Uninstall"
         Delete $INSTDIR\Default.olsr
        Delete $INSTDIR\olsrd.conf
         Delete $INSTDIR\olsrd_dot_draw.dll
+        Delete $INSTDIR\olsrd_nameservice.dll
+        Delete $INSTDIR\olsrd_httpinfo.dll
         Delete $INSTDIR\uninstall.exe
 
         RMDir $INSTDIR
index 9e7749e..7ed43bb 100755 (executable)
@@ -1,7 +1,7 @@
 #\r
 # Default configuration for the GUI\r
 #\r
-# $Id: Default.olsr,v 1.2 2004/11/24 13:10:56 tlopatic Exp $\r
+# $Id: Default.olsr,v 1.3 2005/03/02 00:13:23 tlopatic Exp $\r
 #\r
 \r
 #\r
@@ -9,7 +9,7 @@
 # route calculation\r
 #\r
 \r
-DebugLevel             2\r
+DebugLevel             0\r
 \r
 #\r
 # Enable the link quality extensions?\r
@@ -19,7 +19,7 @@ DebugLevel            2
 # 2 - yes, use link quality for MPR selection and routing\r
 #\r
 \r
-LinkQualityLevel       0\r
+LinkQualityLevel       2\r
 \r
 #\r
 # Windows size for packet loss calculation\r
@@ -45,7 +45,42 @@ HystThrLow           0.3
 # The pollrate used by the scheduler\r
 #\r
 \r
-Pollrate               0.05\r
+Pollrate               0.1\r
+\r
+#\r
+# Which neighbours should be advertised via TC messages?\r
+#\r
+# 0 - only advertise our MPR selectors\r
+# 1 - advertise our MPR selectors and our MPRs\r
+# 2 - advertise all neighbors\r
+#\r
+\r
+TcRedundancy           2\r
+\r
+#\r
+# Specifies by how many MPRs each two-hop neighbour should be covered\r
+#\r
+\r
+MprCoverage            3\r
+\r
+#\r
+# Load the HTTP info plugin\r
+#\r
+\r
+LoadPlugin             "olsrd_httpinfo.dll"\r
+{\r
+       PlParam "Net"   "0.0.0.0 0.0.0.0"\r
+}\r
+\r
+#\r
+# This default gateway HNA will only be considered by the GUI if the\r
+# computer actually has a default route.\r
+#\r
+\r
+Hna4\r
+{\r
+       0.0.0.0 0.0.0.0\r
+}\r
 \r
 #\r
 # Pseudo interface used by the GUI. If we do not select any interface\r
@@ -63,36 +98,26 @@ Interface "GUI"
        #\r
 \r
        HelloInterval           2.0\r
-       HelloValidityTime       6.0\r
+       HelloValidityTime       20.0\r
 \r
        #\r
        # TC interval and validity time in seconds (float)\r
        #\r
 \r
        TcInterval              5.0\r
-       TcValidityTime          15.0\r
+       TcValidityTime          30.0\r
 \r
        #\r
        # MID interval and validity time in seconds (float)\r
        #\r
 \r
        MidInterval             5.0\r
-       MidValidityTime         15.0\r
+       MidValidityTime         30.0\r
 \r
        #\r
        # HNA interval and validity time in seconds (float)\r
        #\r
 \r
        HnaInterval             5.0\r
-       HnaValidityTime         15.0\r
-}\r
-\r
-#\r
-# This default gateway HNA will only be considered by the GUI if the\r
-# computer actually has a default route.\r
-#\r
-\r
-Hna4\r
-{\r
-       0.0.0.0 0.0.0.0\r
+       HnaValidityTime         30.0\r
 }\r
index 3214bcd..a001b3b 100644 (file)
@@ -19,11 +19,11 @@ Class7=MyEdit
 Class8=MyTabCtrl\r
 \r
 ResourceCount=6\r
-Resource1=IDD_DIALOG3\r
-Resource2=IDD_DIALOG4\r
-Resource3=IDD_FRONTEND_DIALOG\r
-Resource4=IDD_DIALOG2\r
-Resource5=IDD_DIALOG1\r
+Resource1=IDD_DIALOG2\r
+Resource2=IDD_DIALOG1\r
+Resource3=IDD_DIALOG4\r
+Resource4=IDD_DIALOG3\r
+Resource5=IDD_FRONTEND_DIALOG\r
 Resource6=IDR_TRAYMENU\r
 \r
 [CLS:CFrontendApp]\r
@@ -55,7 +55,7 @@ HeaderFile=MyDialog2.h
 ImplementationFile=MyDialog2.cpp\r
 Filter=D\r
 VirtualFilter=dWC\r
-LastObject=IDC_EDIT14\r
+LastObject=IDC_EDIT7\r
 \r
 [CLS:MyDialog3]\r
 Type=0\r
@@ -106,35 +106,35 @@ Control5=IDC_BUTTON1,button,1342242816
 [DLG:IDD_DIALOG2]\r
 Type=1\r
 Class=MyDialog2\r
-ControlCount=49\r
+ControlCount=53\r
 Control1=IDC_LIST1,SysListView32,1350631427\r
 Control2=IDC_SLIDER2,msctls_trackbar32,1342242825\r
-Control3=IDC_CHECK3,button,1476460547\r
-Control4=IDC_CHECK2,button,1342242819\r
-Control5=IDC_EDIT1,edit,1350631426\r
-Control6=IDC_EDIT2,edit,1350631426\r
-Control7=IDC_EDIT3,edit,1350631426\r
-Control8=IDC_EDIT9,edit,1350631426\r
-Control9=IDC_EDIT4,edit,1350631426\r
-Control10=IDC_EDIT10,edit,1350631426\r
-Control11=IDC_EDIT5,edit,1350631426\r
-Control12=IDC_EDIT6,edit,1350631426\r
-Control13=IDC_EDIT7,edit,1350631426\r
-Control14=IDC_CHECK1,button,1342242819\r
-Control15=IDC_EDIT12,edit,1350631426\r
-Control16=IDC_EDIT13,edit,1350631426\r
-Control17=IDC_EDIT11,edit,1350631426\r
-Control18=IDC_CHECK4,button,1342242819\r
-Control19=IDC_RADIO1,button,1342373897\r
-Control20=IDC_RADIO2,button,1342373897\r
-Control21=IDC_EDIT14,edit,1350639618\r
-Control22=IDC_BUTTON4,button,1342242816\r
-Control23=IDC_BUTTON5,button,1342242816\r
-Control24=IDC_BUTTON1,button,1342242816\r
-Control25=IDC_STATIC,static,1342308352\r
-Control26=IDC_STATIC,static,1342308352\r
-Control27=IDC_STATIC,static,1342308354\r
-Control28=IDC_STATIC,static,1342308354\r
+Control3=IDC_EDIT7,edit,1350631426\r
+Control4=IDC_CHECK3,button,1476460547\r
+Control5=IDC_CHECK2,button,1342242819\r
+Control6=IDC_EDIT1,edit,1350631426\r
+Control7=IDC_EDIT2,edit,1350631426\r
+Control8=IDC_EDIT3,edit,1350631426\r
+Control9=IDC_EDIT9,edit,1350631426\r
+Control10=IDC_EDIT4,edit,1350631426\r
+Control11=IDC_EDIT10,edit,1350631426\r
+Control12=IDC_EDIT5,edit,1350631426\r
+Control13=IDC_EDIT6,edit,1350631426\r
+Control14=IDC_COMBO1,combobox,1344340227\r
+Control15=IDC_EDIT15,edit,1350639618\r
+Control16=IDC_CHECK1,button,1342242819\r
+Control17=IDC_EDIT12,edit,1350631426\r
+Control18=IDC_EDIT13,edit,1350631426\r
+Control19=IDC_EDIT11,edit,1350631426\r
+Control20=IDC_CHECK4,button,1342242819\r
+Control21=IDC_RADIO1,button,1342373897\r
+Control22=IDC_RADIO2,button,1342373897\r
+Control23=IDC_EDIT14,edit,1350639618\r
+Control24=IDC_BUTTON4,button,1342242816\r
+Control25=IDC_BUTTON5,button,1342242816\r
+Control26=IDC_BUTTON1,button,1342242816\r
+Control27=IDC_STATIC,static,1342308352\r
+Control28=IDC_STATIC,static,1342308352\r
 Control29=IDC_STATIC,static,1342308354\r
 Control30=IDC_STATIC,static,1342308354\r
 Control31=IDC_STATIC,static,1342308354\r
@@ -142,20 +142,24 @@ Control32=IDC_STATIC,static,1342308354
 Control33=IDC_STATIC,static,1342308354\r
 Control34=IDC_STATIC,static,1342308354\r
 Control35=IDC_STATIC,static,1342308354\r
-Control36=IDC_STATIC,static,1342308352\r
-Control37=IDC_STATIC,static,1342308352\r
-Control38=IDC_STATIC,static,1342308352\r
+Control36=IDC_STATIC,static,1342308354\r
+Control37=IDC_STATIC,static,1342308354\r
+Control38=IDC_STATIC,static,1342308354\r
 Control39=IDC_STATIC,static,1342308352\r
 Control40=IDC_STATIC,static,1342308352\r
 Control41=IDC_STATIC,static,1342308352\r
 Control42=IDC_STATIC,static,1342308352\r
 Control43=IDC_STATIC,static,1342308352\r
 Control44=IDC_STATIC,static,1342308352\r
-Control45=IDC_TEXT1,static,1342308353\r
-Control46=IDC_STATIC,static,1342308354\r
+Control45=IDC_STATIC,static,1342308352\r
+Control46=IDC_STATIC,static,1342308352\r
 Control47=IDC_STATIC,static,1342308354\r
-Control48=IDC_STATIC,static,1342308354\r
-Control49=IDC_STATIC,static,1342308354\r
+Control48=IDC_STATIC,static,1342308352\r
+Control49=IDC_TEXT1,static,1342308353\r
+Control50=IDC_STATIC,static,1342308354\r
+Control51=IDC_STATIC,static,1342308354\r
+Control52=IDC_STATIC,static,1342308354\r
+Control53=IDC_STATIC,static,1342308354\r
 \r
 [DLG:IDD_DIALOG3]\r
 Type=1\r
index 4da688b..eacbe73 100644 (file)
@@ -97,23 +97,26 @@ BEGIN
                     WS_TABSTOP,7,19,103,76\r
     CONTROL         "Slider2",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | \r
                     TBS_BOTH | WS_TABSTOP,8,116,87,26\r
+    EDITTEXT        IDC_EDIT7,55,153,26,12,ES_RIGHT\r
     CONTROL         "Enable IP version 6",IDC_CHECK3,"Button",\r
-                    BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,155,93,10\r
+                    BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,171,93,10\r
     CONTROL         "Offer Internet connection",IDC_CHECK2,"Button",\r
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,171,93,10\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,187,93,10\r
     EDITTEXT        IDC_EDIT1,189,7,26,12,ES_RIGHT\r
-    EDITTEXT        IDC_EDIT2,299,7,26,12,ES_RIGHT\r
+    EDITTEXT        IDC_EDIT2,305,7,26,12,ES_RIGHT\r
     EDITTEXT        IDC_EDIT3,189,23,26,12,ES_RIGHT\r
-    EDITTEXT        IDC_EDIT9,299,23,26,12,ES_RIGHT\r
+    EDITTEXT        IDC_EDIT9,305,23,26,12,ES_RIGHT\r
     EDITTEXT        IDC_EDIT4,189,39,26,12,ES_RIGHT\r
-    EDITTEXT        IDC_EDIT10,299,39,26,12,ES_RIGHT\r
+    EDITTEXT        IDC_EDIT10,305,39,26,12,ES_RIGHT\r
     EDITTEXT        IDC_EDIT5,189,55,26,12,ES_RIGHT\r
-    EDITTEXT        IDC_EDIT6,299,55,26,12,ES_RIGHT\r
-    EDITTEXT        IDC_EDIT7,189,77,26,12,ES_RIGHT\r
+    EDITTEXT        IDC_EDIT6,305,55,26,12,ES_RIGHT\r
+    COMBOBOX        IDC_COMBO1,189,76,26,41,CBS_DROPDOWNLIST | CBS_SORT | \r
+                    WS_VSCROLL | WS_TABSTOP\r
+    EDITTEXT        IDC_EDIT15,305,77,26,12,ES_RIGHT | ES_NUMBER\r
     CONTROL         "Enable hysteresis",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | \r
                     WS_TABSTOP,134,101,74,10\r
     EDITTEXT        IDC_EDIT12,189,115,26,12,ES_RIGHT\r
-    EDITTEXT        IDC_EDIT13,299,115,26,12,ES_RIGHT\r
+    EDITTEXT        IDC_EDIT13,305,115,26,12,ES_RIGHT\r
     EDITTEXT        IDC_EDIT11,189,131,26,12,ES_RIGHT\r
     CONTROL         "Enable ETX link quality",IDC_CHECK4,"Button",\r
                     BS_AUTOCHECKBOX | WS_TABSTOP,132,155,92,10\r
@@ -122,35 +125,37 @@ BEGIN
     CONTROL         "for MPR selection and routing",IDC_RADIO2,"Button",\r
                     BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,132,187,109,\r
                     10\r
-    EDITTEXT        IDC_EDIT14,299,169,26,12,ES_RIGHT | ES_NUMBER\r
+    EDITTEXT        IDC_EDIT14,305,169,26,12,ES_RIGHT | ES_NUMBER\r
     PUSHBUTTON      "Open",IDC_BUTTON4,210,219,50,14\r
     PUSHBUTTON      "Save",IDC_BUTTON5,265,219,50,14\r
     PUSHBUTTON      "Reset",IDC_BUTTON1,320,219,50,14\r
     LTEXT           "Interface list",IDC_STATIC,7,8,39,8\r
     LTEXT           "Debug level",IDC_STATIC,7,105,39,8\r
     RTEXT           "HELLO interval:",IDC_STATIC,132,9,51,8\r
-    RTEXT           "HELLO hold:",IDC_STATIC,251,9,42,8\r
+    RTEXT           "HELLO hold:",IDC_STATIC,247,9,42,8\r
     RTEXT           "MID interval:",IDC_STATIC,132,25,41,8\r
-    RTEXT           "MID hold:",IDC_STATIC,251,25,32,8\r
+    RTEXT           "MID hold:",IDC_STATIC,247,25,32,8\r
     RTEXT           "HNA interval:",IDC_STATIC,132,41,43,8\r
-    RTEXT           "HNA hold:",IDC_STATIC,251,41,34,8\r
+    RTEXT           "HNA hold:",IDC_STATIC,247,41,34,8\r
     RTEXT           "TC interval:",IDC_STATIC,132,57,37,8\r
-    RTEXT           "TC hold:",IDC_STATIC,251,57,28,8\r
-    RTEXT           "Poll interval:",IDC_STATIC,132,79,39,8\r
+    RTEXT           "TC hold:",IDC_STATIC,247,57,28,8\r
+    RTEXT           "TC redundancy:",IDC_STATIC,132,79,52,8\r
+    RTEXT           "MPR coverage:",IDC_STATIC,247,79,51,8\r
     LTEXT           "sec",IDC_STATIC,219,9,12,8\r
-    LTEXT           "sec",IDC_STATIC,329,9,12,8\r
+    LTEXT           "sec",IDC_STATIC,335,9,12,8\r
     LTEXT           "sec",IDC_STATIC,219,25,12,8\r
-    LTEXT           "sec",IDC_STATIC,329,25,12,8\r
+    LTEXT           "sec",IDC_STATIC,335,25,12,8\r
     LTEXT           "sec",IDC_STATIC,219,41,12,8\r
-    LTEXT           "sec",IDC_STATIC,329,41,12,8\r
+    LTEXT           "sec",IDC_STATIC,335,41,12,8\r
     LTEXT           "sec",IDC_STATIC,219,57,12,8\r
-    LTEXT           "sec",IDC_STATIC,329,57,12,8\r
-    LTEXT           "sec",IDC_STATIC,219,79,12,8\r
+    LTEXT           "sec",IDC_STATIC,335,57,12,8\r
+    RTEXT           "Poll interval:",IDC_STATIC,7,155,39,8\r
+    LTEXT           "sec",IDC_STATIC,85,155,12,8\r
     CTEXT           "0",IDC_TEXT1,96,123,11,8\r
-    RTEXT           "Scaling:",IDC_STATIC,132,133,26,8\r
     RTEXT           "Low mark:",IDC_STATIC,132,117,34,8\r
-    RTEXT           "High mark:",IDC_STATIC,251,117,35,8\r
-    RTEXT           "Window size:",IDC_STATIC,251,171,43,8\r
+    RTEXT           "Scaling:",IDC_STATIC,132,133,26,8\r
+    RTEXT           "High mark:",IDC_STATIC,247,117,35,8\r
+    RTEXT           "Window size:",IDC_STATIC,247,171,43,8\r
 END\r
 \r
 IDD_DIALOG3 DIALOG DISCARDABLE  0, 0, 377, 240\r
@@ -269,6 +274,23 @@ BEGIN
     END\r
 END\r
 \r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Dialog Info\r
+//\r
+\r
+IDD_DIALOG2 DLGINIT\r
+BEGIN\r
+    IDC_COMBO1, 0x403, 2, 0\r
+0x0030, \r
+    IDC_COMBO1, 0x403, 2, 0\r
+0x0031, \r
+    IDC_COMBO1, 0x403, 2, 0\r
+0x0032, \r
+    0\r
+END\r
+\r
 #endif    // English (U.S.) resources\r
 /////////////////////////////////////////////////////////////////////////////\r
 \r
index e189c10..e13c3c5 100644 (file)
@@ -36,7 +36,7 @@
  * to the project. For more information see the website or contact\r
  * the copyright holders.\r
  *\r
- * $Id: MyDialog2.cpp,v 1.7 2004/11/21 02:06:56 tlopatic Exp $\r
+ * $Id: MyDialog2.cpp,v 1.8 2005/03/02 00:13:23 tlopatic Exp $\r
  */\r
 \r
 #include "stdafx.h"\r
@@ -81,6 +81,8 @@ void MyDialog2::DoDataExchange(CDataExchange* pDX)
 {\r
        CDialog::DoDataExchange(pDX);\r
        //{{AFX_DATA_MAP(MyDialog2)\r
+       DDX_Control(pDX, IDC_COMBO1, m_TcRed);\r
+       DDX_Control(pDX, IDC_EDIT15, m_MprCov);\r
        DDX_Control(pDX, IDC_RADIO2, m_EtxRadio2);\r
        DDX_Control(pDX, IDC_RADIO1, m_EtxRadio1);\r
        DDX_Control(pDX, IDC_EDIT14, m_EtxWindowSize);\r
@@ -193,6 +195,8 @@ BOOL MyDialog2::OnInitDialog()
        if (::GetBestRoute(0, 0, &IpFwdRow) != NO_ERROR)\r
                m_InternetCheck.EnableWindow(FALSE);\r
 \r
+       m_MprCov.LimitText(1);\r
+\r
        Reset();\r
 \r
        return TRUE;\r
@@ -297,6 +301,11 @@ int MyDialog2::OpenConfigFile(CString PathName)
        Conv.Format("%.2f", Conf->pollrate);\r
        m_PollInt.SetWindowText(Conv);\r
 \r
+       Conv.Format("%d", Conf->mpr_coverage);\r
+       m_MprCov.SetWindowText(Conv);\r
+\r
+       m_TcRed.SetCurSel(Conf->tc_redundancy);\r
+\r
        m_HystCheck.SetCheck(Conf->use_hysteresis);\r
 \r
        Conv.Format("%.2f", Conf->hysteresis_param.scaling);\r
@@ -496,6 +505,11 @@ int MyDialog2::SaveConfigFile(CString PathName, int Real)
        m_PollInt.GetWindowText(Conv);\r
        Conf->pollrate = (float)atof(Conv);\r
 \r
+       Conf->tc_redundancy = (unsigned char)m_TcRed.GetCurSel();\r
+\r
+       m_MprCov.GetWindowText(Conv);\r
+       Conf->mpr_coverage = (unsigned char)atoi(Conv);\r
+\r
        Conf->use_hysteresis = m_HystCheck.GetCheck() ? OLSR_TRUE : OLSR_FALSE;\r
 \r
        m_HystScaling.GetWindowText(Conv);\r
index 340c4cf..0c196b0 100644 (file)
@@ -36,7 +36,7 @@
  * to the project. For more information see the website or contact\r
  * the copyright holders.\r
  *\r
- * $Id: MyDialog2.h,v 1.7 2005/02/28 18:12:16 tlopatic Exp $\r
+ * $Id: MyDialog2.h,v 1.8 2005/03/02 00:13:23 tlopatic Exp $\r
  */\r
 \r
 #if !defined(AFX_MYDIALOG2_H__1A381668_A36B_4C51_9B79_643BC2A59D88__INCLUDED_)\r
@@ -70,6 +70,8 @@ public:
 \r
        //{{AFX_DATA(MyDialog2)\r
        enum { IDD = IDD_DIALOG2 };\r
+       CComboBox       m_TcRed;\r
+       CEdit   m_MprCov;\r
        CButton m_EtxRadio2;\r
        CButton m_EtxRadio1;\r
        CEdit   m_EtxWindowSize;\r
index 6729fa2..8d52199 100644 (file)
 #define IDC_LIST4                       1025\r
 #define IDC_EDIT14                      1025\r
 #define IDC_LIST5                       1026\r
+#define IDC_EDIT15                      1026\r
 #define IDC_LIST6                       1027\r
 #define IDC_RADIO1                      1029\r
 #define IDC_RADIO2                      1030\r
+#define IDC_COMBO1                      1031\r
 #define IDM_START                       32773\r
 #define IDM_STOP                        32774\r
 #define IDM_WINDOW                      32775\r
@@ -59,7 +61,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS\r
 #define _APS_NEXT_RESOURCE_VALUE        142\r
 #define _APS_NEXT_COMMAND_VALUE         32779\r
-#define _APS_NEXT_CONTROL_VALUE         1030\r
+#define _APS_NEXT_CONTROL_VALUE         1032\r
 #define _APS_NEXT_SYMED_VALUE           101\r
 #endif\r
 #endif\r