Win32 Fixes and disable LQWinSize input
authorSven-Ola Tuecke <sven-ola@gmx.de>
Thu, 12 Jun 2008 06:35:11 +0000 (08:35 +0200)
committerSven-Ola Tuecke <sven-ola@gmx.de>
Thu, 12 Jun 2008 06:35:11 +0000 (08:35 +0200)
gui/win32/Inst/installer.nsi
gui/win32/Main/Frontend.rc
gui/win32/Main/MyDialog2.cpp
gui/win32/Main/MyDialog2.h
src/tc_set.c
src/win32/ifnet.c

index 6109ad7..2d08590 100644 (file)
@@ -54,7 +54,7 @@ UninstPage uninstConfirm
 UninstPage instfiles
 
 Function .onInit
-        MessageBox MB_YESNO "This will install olsr.org 0.5.4 on your computer. Continue?" IDYES NoAbort
+        MessageBox MB_YESNO "This will install olsr.org 0.5.6-rc5 on your computer. Continue?" IDYES NoAbort
         Abort
 NoAbort:
 FunctionEnd
index ec31e90..1726f7e 100644 (file)
-//Microsoft Developer Studio generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// Englisch (USA) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE MOVEABLE PURE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE MOVEABLE PURE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE MOVEABLE PURE 
-BEGIN
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "\r\n"
-    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"
-    "#ifdef _WIN32\r\n"
-    "LANGUAGE 9, 1\r\n"
-    "#pragma code_page(1252)\r\n"
-    "#endif //_WIN32\r\n"
-    "#include ""res\\Frontend.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "#include ""afxres.rc""         // Standard components\r\n"
-    "#endif\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_FRONTEND_DIALOG DIALOGEX 0, 0, 399, 289
-STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
-    WS_SYSMENU
-EXSTYLE WS_EX_APPWINDOW
-CAPTION "olsr.org Switch 0.5.0"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
-BEGIN
-    CONTROL         "Tab1",IDC_TAB1,"SysTabControl32",0x0,7,7,383,256
-    PUSHBUTTON      "Start",IDC_BUTTON1,228,268,50,14
-    PUSHBUTTON      "Stop",IDC_BUTTON2,284,268,50,14
-    PUSHBUTTON      "Exit",IDC_BUTTON3,340,268,50,14
-END
-
-IDD_DIALOG1 DIALOG DISCARDABLE  0, 0, 377, 240
-STYLE WS_CHILD | WS_VISIBLE
-FONT 8, "MS Sans Serif"
-BEGIN
-    EDITTEXT        IDC_EDIT1,7,25,363,208,ES_MULTILINE | ES_READONLY | 
-                    ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL
-    PUSHBUTTON      "Freeze",IDC_BUTTON3,152,7,50,14
-    PUSHBUTTON      "Continue",IDC_BUTTON2,208,7,50,14
-    PUSHBUTTON      "Save",IDC_BUTTON4,264,7,50,14
-    PUSHBUTTON      "Clear",IDC_BUTTON1,320,7,50,14
-END
-
-IDD_DIALOG2 DIALOGEX 0, 0, 377, 240
-STYLE WS_CHILD | WS_VISIBLE
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "List1",IDC_LIST1,"SysListView32",LVS_LIST | WS_BORDER | 
-                    WS_TABSTOP,7,19,103,76
-    CONTROL         "Slider2",IDC_SLIDER2,"msctls_trackbar32",TBS_AUTOTICKS | 
-                    TBS_BOTH | WS_TABSTOP,8,116,87,26
-    EDITTEXT        IDC_EDIT7,55,153,26,12,ES_RIGHT
-    CONTROL         "Enable IP version 6",IDC_CHECK3,"Button",
-                    BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,7,171,93,10
-    CONTROL         "Offer Internet connection",IDC_CHECK2,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,187,93,10
-    EDITTEXT        IDC_EDIT1,189,7,26,12,ES_RIGHT
-    EDITTEXT        IDC_EDIT2,305,7,26,12,ES_RIGHT
-    EDITTEXT        IDC_EDIT3,189,23,26,12,ES_RIGHT
-    EDITTEXT        IDC_EDIT9,305,23,26,12,ES_RIGHT
-    EDITTEXT        IDC_EDIT4,189,39,26,12,ES_RIGHT
-    EDITTEXT        IDC_EDIT10,305,39,26,12,ES_RIGHT
-    EDITTEXT        IDC_EDIT5,189,55,26,12,ES_RIGHT
-    EDITTEXT        IDC_EDIT6,305,55,26,12,ES_RIGHT
-    COMBOBOX        IDC_COMBO1,189,76,26,41,CBS_DROPDOWNLIST | CBS_SORT | 
-                    WS_VSCROLL | WS_TABSTOP
-    EDITTEXT        IDC_EDIT15,305,77,26,12,ES_RIGHT | ES_NUMBER
-    CONTROL         "Enable hysteresis",IDC_CHECK1,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,134,101,74,10
-    EDITTEXT        IDC_EDIT12,189,115,26,12,ES_RIGHT
-    EDITTEXT        IDC_EDIT13,305,115,26,12,ES_RIGHT
-    EDITTEXT        IDC_EDIT11,189,131,26,12,ES_RIGHT
-    CONTROL         "Enable ETX link quality",IDC_CHECK4,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,132,155,92,10
-    CONTROL         "for MPR selection only",IDC_RADIO1,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,132,171,87,10
-    CONTROL         "for MPR selection and routing",IDC_RADIO2,"Button",
-                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,132,187,109,
-                    10
-    EDITTEXT        IDC_EDIT14,305,169,26,12,ES_RIGHT | ES_NUMBER
-    PUSHBUTTON      "Open",IDC_BUTTON4,210,219,50,14
-    PUSHBUTTON      "Save",IDC_BUTTON5,265,219,50,14
-    PUSHBUTTON      "Reset",IDC_BUTTON1,320,219,50,14
-    LTEXT           "Interface list",IDC_STATIC,7,8,39,8
-    LTEXT           "Debug level",IDC_STATIC,7,105,39,8
-    RTEXT           "HELLO interval:",IDC_STATIC,132,9,51,8
-    RTEXT           "HELLO hold:",IDC_STATIC,247,9,42,8
-    RTEXT           "MID interval:",IDC_STATIC,132,25,41,8
-    RTEXT           "MID hold:",IDC_STATIC,247,25,32,8
-    RTEXT           "HNA interval:",IDC_STATIC,132,41,43,8
-    RTEXT           "HNA hold:",IDC_STATIC,247,41,34,8
-    RTEXT           "TC interval:",IDC_STATIC,132,57,37,8
-    RTEXT           "TC hold:",IDC_STATIC,247,57,28,8
-    RTEXT           "TC redundancy:",IDC_STATIC,132,79,52,8
-    RTEXT           "MPR coverage:",IDC_STATIC,247,79,51,8
-    LTEXT           "sec",IDC_STATIC,219,9,12,8
-    LTEXT           "sec",IDC_STATIC,335,9,12,8
-    LTEXT           "sec",IDC_STATIC,219,25,12,8
-    LTEXT           "sec",IDC_STATIC,335,25,12,8
-    LTEXT           "sec",IDC_STATIC,219,41,12,8
-    LTEXT           "sec",IDC_STATIC,335,41,12,8
-    LTEXT           "sec",IDC_STATIC,219,57,12,8
-    LTEXT           "sec",IDC_STATIC,335,57,12,8
-    RTEXT           "Poll interval:",IDC_STATIC,7,155,39,8
-    LTEXT           "sec",IDC_STATIC,85,155,12,8
-    CTEXT           "0",IDC_TEXT1,96,123,11,8
-    RTEXT           "Low mark:",IDC_STATIC,132,117,34,8
-    RTEXT           "Scaling:",IDC_STATIC,132,133,26,8
-    RTEXT           "High mark:",IDC_STATIC,247,117,35,8
-    RTEXT           "Window size:",IDC_STATIC,247,171,43,8
-    CONTROL         "Enable Fish Eye",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,249,187,92,10
-END
-
-IDD_DIALOG3 DIALOG DISCARDABLE  0, 0, 377, 240
-STYLE WS_CHILD | WS_VISIBLE
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "List1",IDC_LIST1,"SysListView32",LVS_REPORT | 
-                    LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,18,239,215
-    CONTROL         "List4",IDC_LIST4,"SysListView32",LVS_REPORT | 
-                    LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,255,18,115,66
-    CONTROL         "List4",IDC_LIST5,"SysListView32",LVS_REPORT | 
-                    LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,255,92,115,66
-    CONTROL         "List4",IDC_LIST6,"SysListView32",LVS_REPORT | 
-                    LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,255,167,115,66
-    LTEXT           "Node list",IDC_STATIC,7,7,32,8
-    LTEXT           "Node information",IDC_STATIC,257,7,59,8
-END
-
-IDD_DIALOG4 DIALOG DISCARDABLE  0, 0, 377, 240
-STYLE WS_CHILD | WS_VISIBLE
-FONT 8, "MS Sans Serif"
-BEGIN
-    CONTROL         "List1",IDC_LIST1,"SysListView32",LVS_REPORT | WS_BORDER | 
-                    WS_TABSTOP,7,18,363,215
-    LTEXT           "Routing table",IDC_STATIC,7,7,48,8
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO MOVEABLE PURE 
-BEGIN
-    IDD_FRONTEND_DIALOG, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 390
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 282
-    END
-
-    IDD_DIALOG1, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 370
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 233
-    END
-
-    IDD_DIALOG2, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 370
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 233
-    END
-
-    IDD_DIALOG3, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 370
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 233
-    END
-
-    IDD_DIALOG4, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 370
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 233
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON    DISCARDABLE     "res\\Frontend.ico"
-IDI_ICON3               ICON    DISCARDABLE     "res\\Tray2.ico"
-IDI_ICON2               ICON    DISCARDABLE     "res\\Tray1.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_TRAYMENU MENU DISCARDABLE 
-BEGIN
-    POPUP "IDR_TRAYMENU"
-    BEGIN
-        MENUITEM "Start",                       IDM_START
-        MENUITEM "Stop",                        IDM_STOP
-        POPUP "Show"
-        BEGIN
-            MENUITEM "Window",                      IDM_WINDOW
-            MENUITEM "Settings",                    IDM_SETTINGS
-            MENUITEM "Output",                      IDM_OUTPUT
-        END
-        MENUITEM "Exit",                        IDM_EXIT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog Info
-//
-
-IDD_DIALOG2 DLGINIT
-BEGIN
-    IDC_COMBO1, 0x403, 2, 0
-0x0030, 
-    IDC_COMBO1, 0x403, 2, 0
-0x0031, 
-    IDC_COMBO1, 0x403, 2, 0
-0x0032, 
-    0
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// 24
-//
-
-1                       24      DISCARDABLE     "trustInfo.manifest"
-#endif    // Englisch (USA) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
-LANGUAGE 9, 1
-#pragma code_page(1252)
-#endif //_WIN32
-#include "res\Frontend.rc2"  // non-Microsoft Visual C++ edited resources
-#include "afxres.rc"         // Standard components
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
+//Microsoft Developer Studio generated resource script.\r
+//\r
+#include "resource.h"\r
+\r
+#define APSTUDIO_READONLY_SYMBOLS\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 2 resource.\r
+//\r
+#include "afxres.h"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#undef APSTUDIO_READONLY_SYMBOLS\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+// Englisch (USA) resources\r
+\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
+#ifdef _WIN32\r
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US\r
+#pragma code_page(1252)\r
+#endif //_WIN32\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// TEXTINCLUDE\r
+//\r
+\r
+1 TEXTINCLUDE MOVEABLE PURE \r
+BEGIN\r
+    "resource.h\0"\r
+END\r
+\r
+2 TEXTINCLUDE MOVEABLE PURE \r
+BEGIN\r
+    "#include ""afxres.h""\r\n"\r
+    "\0"\r
+END\r
+\r
+3 TEXTINCLUDE MOVEABLE PURE \r
+BEGIN\r
+    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"\r
+    "#define _AFX_NO_OLE_RESOURCES\r\n"\r
+    "#define _AFX_NO_TRACKER_RESOURCES\r\n"\r
+    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"\r
+    "\r\n"\r
+    "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n"\r
+    "#ifdef _WIN32\r\n"\r
+    "LANGUAGE 9, 1\r\n"\r
+    "#pragma code_page(1252)\r\n"\r
+    "#endif //_WIN32\r\n"\r
+    "#include ""res\\Frontend.rc2""  // non-Microsoft Visual C++ edited resources\r\n"\r
+    "#include ""afxres.rc""         // Standard components\r\n"\r
+    "#endif\r\n"\r
+    "\0"\r
+END\r
+\r
+#endif    // APSTUDIO_INVOKED\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Dialog\r
+//\r
+\r
+IDD_FRONTEND_DIALOG DIALOGEX 0, 0, 399, 289\r
+STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | \r
+    WS_SYSMENU\r
+EXSTYLE WS_EX_APPWINDOW\r
+CAPTION "olsr.org Switch 0.5.6-rc5"\r
+FONT 8, "MS Sans Serif", 0, 0, 0x1\r
+BEGIN\r
+    CONTROL         "Tab1",IDC_TAB1,"SysTabControl32",0x0,7,7,383,256\r
+    PUSHBUTTON      "Start",IDC_BUTTON1,228,268,50,14\r
+    PUSHBUTTON      "Stop",IDC_BUTTON2,284,268,50,14\r
+    PUSHBUTTON      "Exit",IDC_BUTTON3,340,268,50,14\r
+END\r
+\r
+IDD_DIALOG1 DIALOG DISCARDABLE  0, 0, 377, 240\r
+STYLE WS_CHILD | WS_VISIBLE\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    EDITTEXT        IDC_EDIT1,7,25,363,208,ES_MULTILINE | ES_READONLY | \r
+                    ES_WANTRETURN | WS_VSCROLL | WS_HSCROLL\r
+    PUSHBUTTON      "Freeze",IDC_BUTTON3,152,7,50,14\r
+    PUSHBUTTON      "Continue",IDC_BUTTON2,208,7,50,14\r
+    PUSHBUTTON      "Save",IDC_BUTTON4,264,7,50,14\r
+    PUSHBUTTON      "Clear",IDC_BUTTON1,320,7,50,14\r
+END\r
+\r
+IDD_DIALOG2 DIALOG DISCARDABLE  0, 0, 377, 240\r
+STYLE WS_CHILD | WS_VISIBLE\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    CONTROL         "List1",IDC_LIST1,"SysListView32",LVS_LIST | WS_BORDER | \r
+                    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,171,93,10\r
+    CONTROL         "Offer Internet connection",IDC_CHECK2,"Button",\r
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,187,93,10\r
+    EDITTEXT        IDC_EDIT1,189,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,305,23,26,12,ES_RIGHT\r
+    EDITTEXT        IDC_EDIT4,189,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,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,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
+    CONTROL         "for MPR selection only",IDC_RADIO1,"Button",\r
+                    BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,132,171,87,10\r
+    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,305,169,26,12,ES_RIGHT | ES_NUMBER | \r
+                    WS_DISABLED\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,247,9,42,8\r
+    RTEXT           "MID interval:",IDC_STATIC,132,25,41,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,247,41,34,8\r
+    RTEXT           "TC interval:",IDC_STATIC,132,57,37,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,335,9,12,8\r
+    LTEXT           "sec",IDC_STATIC,219,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,335,41,12,8\r
+    LTEXT           "sec",IDC_STATIC,219,57,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           "Low mark:",IDC_STATIC,132,117,34,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
+    CONTROL         "Enable Fish Eye",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | \r
+                    WS_TABSTOP,249,187,92,10\r
+END\r
+\r
+IDD_DIALOG3 DIALOG DISCARDABLE  0, 0, 377, 240\r
+STYLE WS_CHILD | WS_VISIBLE\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    CONTROL         "List1",IDC_LIST1,"SysListView32",LVS_REPORT | \r
+                    LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,7,18,239,215\r
+    CONTROL         "List4",IDC_LIST4,"SysListView32",LVS_REPORT | \r
+                    LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,255,18,115,66\r
+    CONTROL         "List4",IDC_LIST5,"SysListView32",LVS_REPORT | \r
+                    LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,255,92,115,66\r
+    CONTROL         "List4",IDC_LIST6,"SysListView32",LVS_REPORT | \r
+                    LVS_SINGLESEL | WS_BORDER | WS_TABSTOP,255,167,115,66\r
+    LTEXT           "Node list",IDC_STATIC,7,7,32,8\r
+    LTEXT           "Node information",IDC_STATIC,257,7,59,8\r
+END\r
+\r
+IDD_DIALOG4 DIALOG DISCARDABLE  0, 0, 377, 240\r
+STYLE WS_CHILD | WS_VISIBLE\r
+FONT 8, "MS Sans Serif"\r
+BEGIN\r
+    CONTROL         "List1",IDC_LIST1,"SysListView32",LVS_REPORT | WS_BORDER | \r
+                    WS_TABSTOP,7,18,363,215\r
+    LTEXT           "Routing table",IDC_STATIC,7,7,48,8\r
+END\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// DESIGNINFO\r
+//\r
+\r
+#ifdef APSTUDIO_INVOKED\r
+GUIDELINES DESIGNINFO MOVEABLE PURE \r
+BEGIN\r
+    IDD_FRONTEND_DIALOG, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 390\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 282\r
+    END\r
+\r
+    IDD_DIALOG1, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 370\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 233\r
+    END\r
+\r
+    IDD_DIALOG2, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 370\r
+        TOPMARGIN, 6\r
+        BOTTOMMARGIN, 233\r
+    END\r
+\r
+    IDD_DIALOG3, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 370\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 233\r
+    END\r
+\r
+    IDD_DIALOG4, DIALOG\r
+    BEGIN\r
+        LEFTMARGIN, 7\r
+        RIGHTMARGIN, 370\r
+        TOPMARGIN, 7\r
+        BOTTOMMARGIN, 233\r
+    END\r
+END\r
+#endif    // APSTUDIO_INVOKED\r
+\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Icon\r
+//\r
+\r
+// Icon with lowest ID value placed first to ensure application icon\r
+// remains consistent on all systems.\r
+IDI_ICON1               ICON    DISCARDABLE     "res\\Frontend.ico"\r
+IDI_ICON3               ICON    DISCARDABLE     "res\\Tray2.ico"\r
+IDI_ICON2               ICON    DISCARDABLE     "res\\Tray1.ico"\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Menu\r
+//\r
+\r
+IDR_TRAYMENU MENU DISCARDABLE \r
+BEGIN\r
+    POPUP "IDR_TRAYMENU"\r
+    BEGIN\r
+        MENUITEM "Start",                       IDM_START\r
+        MENUITEM "Stop",                        IDM_STOP\r
+        POPUP "Show"\r
+        BEGIN\r
+            MENUITEM "Window",                      IDM_WINDOW\r
+            MENUITEM "Settings",                    IDM_SETTINGS\r
+            MENUITEM "Output",                      IDM_OUTPUT\r
+        END\r
+        MENUITEM "Exit",                        IDM_EXIT\r
+    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
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// 24\r
+//\r
+\r
+1                       24      DISCARDABLE     "trustInfo.manifest"\r
+#endif    // Englisch (USA) resources\r
+/////////////////////////////////////////////////////////////////////////////\r
+\r
+\r
+\r
+#ifndef APSTUDIO_INVOKED\r
+/////////////////////////////////////////////////////////////////////////////\r
+//\r
+// Generated from the TEXTINCLUDE 3 resource.\r
+//\r
+#define _AFX_NO_SPLITTER_RESOURCES\r
+#define _AFX_NO_OLE_RESOURCES\r
+#define _AFX_NO_TRACKER_RESOURCES\r
+#define _AFX_NO_PROPERTY_RESOURCES\r
+\r
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r
+#ifdef _WIN32\r
+LANGUAGE 9, 1\r
+#pragma code_page(1252)\r
+#endif //_WIN32\r
+#include "res\Frontend.rc2"  // non-Microsoft Visual C++ edited resources\r
+#include "afxres.rc"         // Standard components\r
+#endif\r
+\r
+/////////////////////////////////////////////////////////////////////////////\r
+#endif    // not APSTUDIO_INVOKED\r
+\r
index cdd0bad..8989fa9 100644 (file)
@@ -84,7 +84,7 @@ void MyDialog2::DoDataExchange(CDataExchange* pDX)
        DDX_Control(pDX, IDC_EDIT15, m_MprCov);
        DDX_Control(pDX, IDC_RADIO2, m_EtxRadio2);
        DDX_Control(pDX, IDC_RADIO1, m_EtxRadio1);
-       DDX_Control(pDX, IDC_EDIT14, m_EtxWindowSize);
+//     DDX_Control(pDX, IDC_EDIT14, m_EtxWindowSize);
        DDX_Control(pDX, IDC_CHECK5, m_FishEyeCheck);
        DDX_Control(pDX, IDC_CHECK4, m_EtxCheck);
        DDX_Control(pDX, IDC_CHECK3, m_Ipv6Check);
@@ -120,7 +120,7 @@ BEGIN_MESSAGE_MAP(MyDialog2, CDialog)
        ON_BN_CLICKED(IDC_RADIO2, OnEtxRadio2)
        ON_BN_CLICKED(IDOK, OnOK)
        ON_BN_CLICKED(IDCANCEL, OnCancel)
-       ON_EN_KILLFOCUS(IDC_EDIT14, OnKillfocusEtxWinSize)
+//     ON_EN_KILLFOCUS(IDC_EDIT14, OnKillfocusEtxWinSize)
        //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
@@ -215,7 +215,9 @@ void MyDialog2::OnEtxCheckWorker()
 {
        BOOL EnaDis = m_EtxCheck.GetCheck();
 
-       m_EtxWindowSize.EnableWindow(EnaDis);
+#if 0\r
+       m_EtxWindowSize.EnableWindow(EnaDis);\r
+#endif
        m_EtxRadio1.EnableWindow(EnaDis);
        m_EtxRadio2.EnableWindow(EnaDis);
        m_FishEyeCheck.EnableWindow(EnaDis);
@@ -324,8 +326,10 @@ int MyDialog2::OpenConfigFile(CString PathName)
 
        m_EtxCheck.SetCheck(Conf->lq_level > 0);
 
-       Conv.Format("%d", Conf->lq_wsize);
-       m_EtxWindowSize.SetWindowText(Conv);
+#if 0\r
+       Conv.Format("%d", Conf->lq_wsize);\r
+       m_EtxWindowSize.SetWindowText(Conv);\r
+#endif
 
        m_EtxRadio1.SetCheck(Conf->lq_level == 1);
        m_EtxRadio2.SetCheck(Conf->lq_level == 0 || Conf->lq_level == 2);
@@ -538,8 +542,10 @@ int MyDialog2::SaveConfigFile(CString PathName, int Real)
        else
                Conf->lq_fish = 1;
 
+#if 0\r
        m_EtxWindowSize.GetWindowText(Conv);
-       Conf->lq_wsize = atoi(Conv);
+       Conf->lq_wsize = atoi(Conv);\r
+#endif
 
        PrevHna = NULL;
 
@@ -688,6 +694,7 @@ void MyDialog2::OnEtxRadio2()
        m_EtxRadio1.SetCheck(FALSE);
 }
 
+#if 0\r
 void MyDialog2::OnKillfocusEtxWinSize() 
 {
        CString Conv;
@@ -705,3 +712,4 @@ void MyDialog2::OnKillfocusEtxWinSize()
        Conv.Format("%d", WinSize);
        m_EtxWindowSize.SetWindowText(Conv);
 }
+#endif\r
index b8bdedb..6a5e961 100644 (file)
@@ -74,7 +74,7 @@ public:
        CEdit   m_MprCov;
        CButton m_EtxRadio2;
        CButton m_EtxRadio1;
-       CEdit   m_EtxWindowSize;
+       // CEdit        m_EtxWindowSize;
        CButton m_EtxCheck;
        CButton m_Ipv6Check;
        CButton m_InternetCheck;
index 61e041a..d914515 100644 (file)
@@ -750,12 +750,23 @@ olsr_calculate_tc_border(olsr_u8_t lower_border,
 
     lower_border--;
     for (i = 0; i < lower_border / 8; i++) {
-      lower_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - i - 1] = 0;
+#ifdef WIN32\r
+               lower_border_ip->v6.s6_addr[olsr_cnf->ipsize - i - 1] = 0;\r
+#else\r
+               lower_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - i - 1] = 0;
+#endif\r
     }
+#ifdef WIN32\r
+    lower_border_ip->v6.s6_addr[olsr_cnf->ipsize - lower_border / 8 -\r
+                                      1] &= (0xff << (lower_border & 7));\r
+    lower_border_ip->v6.s6_addr[olsr_cnf->ipsize - lower_border / 8 -\r
+                                      1] |= (1 << (lower_border & 7));\r
+#else\r
     lower_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - lower_border / 8 -
                                       1] &= (0xff << (lower_border & 7));
     lower_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - lower_border / 8 -
                                       1] |= (1 << (lower_border & 7));
+#endif\r
   }
 
   if (upper_border == 0xff) {
@@ -766,12 +777,23 @@ olsr_calculate_tc_border(olsr_u8_t lower_border,
     upper_border--;
 
     for (i = 0; i < upper_border / 8; i++) {
-      upper_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - i - 1] = 0;
+#ifdef WIN32\r
+               upper_border_ip->v6.s6_addr[olsr_cnf->ipsize - i - 1] = 0;\r
+#else\r
+               upper_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - i - 1] = 0;\r
+#endif
     }
+#ifdef WIN32\r
+    upper_border_ip->v6.s6_addr[olsr_cnf->ipsize - upper_border / 8 -\r
+                                      1] &= (0xff << (upper_border & 7));\r
+    upper_border_ip->v6.s6_addr[olsr_cnf->ipsize - upper_border / 8 -\r
+                                      1] |= (1 << (upper_border & 7));\r
+#else\r
     upper_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - upper_border / 8 -
                                       1] &= (0xff << (upper_border & 7));
     upper_border_ip->v6.in6_u.u6_addr8[olsr_cnf->ipsize - upper_border / 8 -
-                                      1] |= (1 << (upper_border & 7));
+                                      1] |= (1 << (upper_border & 7));\r
+#endif
   }
   return 1;
 }
index ca4288a..3a36deb 100644 (file)
@@ -237,7 +237,9 @@ static int FriendlyNameToMiniIndex(int *MiniIndex, char *String)
     return -1;
   }
 
-  *MiniIndex = WalkerAddr->IfIndex & 255;
+  *MiniIndex = WalkerAddr->IfIndex & 255;\r
+\r
+  return 0;
 }
 
 int GetIntInfo(struct InterfaceInfo *Info, char *Name)
@@ -1002,20 +1004,20 @@ int chk_if_up(struct olsr_if *IntConf, int DebugLevel __attribute__((unused)))
    * Register functions for periodic message generation 
    */
   New->hello_gen_timer =
-    olsr_start_timer(iface->cnf->hello_params.emission_interval * MSEC_PER_SEC,
+    olsr_start_timer(IntConf->cnf->hello_params.emission_interval * MSEC_PER_SEC,
                      HELLO_JITTER, OLSR_TIMER_PERIODIC,
                      olsr_cnf->lq_level == 0 ? &generate_hello : &olsr_output_lq_hello,
                      New, 0);
   New->tc_gen_timer =
-    olsr_start_timer(iface->cnf->tc_params.emission_interval * MSEC_PER_SEC,
+    olsr_start_timer(IntConf->cnf->tc_params.emission_interval * MSEC_PER_SEC,
                      TC_JITTER, OLSR_TIMER_PERIODIC,
                      olsr_cnf->lq_level == 0 ? &generate_tc : &olsr_output_lq_tc,
                      New, 0);
   New->mid_gen_timer =
-    olsr_start_timer(iface->cnf->mid_params.emission_interval * MSEC_PER_SEC,
+    olsr_start_timer(IntConf->cnf->mid_params.emission_interval * MSEC_PER_SEC,
                      MID_JITTER, OLSR_TIMER_PERIODIC, &generate_mid, New, 0);
   New->hna_gen_timer =
-    olsr_start_timer(iface->cnf->hna_params.emission_interval * MSEC_PER_SEC,
+    olsr_start_timer(IntConf->cnf->hna_params.emission_interval * MSEC_PER_SEC,
                      HNA_JITTER, OLSR_TIMER_PERIODIC, &generate_hna, New, 0);
 
   if(olsr_cnf->max_tc_vtime < IntConf->cnf->tc_params.emission_interval)