ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
81390 discussions
Start a n
N
ew thread
[reactos] 01/06: [RTL] actctx.c: rename RefCount back to ref_count like in wine
by Timo Kreuzer
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=20b5a26a3c7e7f435bbca…
commit 20b5a26a3c7e7f435bbca1997bf5158de68ab032 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 5 08:40:38 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Nov 5 10:54:21 2024 +0200 [RTL] actctx.c: rename RefCount back to ref_count like in wine There is no point in changing the name of this field. --- sdk/lib/rtl/actctx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/lib/rtl/actctx.c b/sdk/lib/rtl/actctx.c index 540d5ff511f..6a0bf6bd5fe 100644 --- a/sdk/lib/rtl/actctx.c +++ b/sdk/lib/rtl/actctx.c @@ -570,7 +570,7 @@ typedef struct _ASSEMBLY_STORAGE_MAP typedef struct _ACTIVATION_CONTEXT { #ifdef __REACTOS__ - LONG RefCount; + LONG ref_count; ULONG Flags; LIST_ENTRY Links; PACTIVATION_CONTEXT_DATA ActivationContextData; @@ -600,7 +600,7 @@ typedef struct _ACTIVATION_CONTEXT struct guidsection_header *comserver_section; struct guidsection_header *ifaceps_section; struct guidsection_header *clrsurrogate_section; -} ACTIVATION_CONTEXT, *PIACTIVATION_CONTEXT; +} ACTIVATION_CONTEXT; struct actctx_loader { @@ -1280,14 +1280,14 @@ static ACTIVATION_CONTEXT *check_actctx( HANDLE h ) static inline void actctx_addref( ACTIVATION_CONTEXT *actctx ) { - InterlockedExchangeAdd( &actctx->RefCount, 1 ); + InterlockedIncrement( &actctx->ref_count ); } static void actctx_release( ACTIVATION_CONTEXT *actctx ) { PACTIVATION_CONTEXT_WRAPPED pActual; - if (InterlockedExchangeAdd(&actctx->RefCount, -1) == 1) + if (!InterlockedDecrement( &actctx->ref_count )) { unsigned int i, j; @@ -5232,7 +5232,7 @@ RtlCreateActivationContext(IN ULONG Flags, ActualActCtx->MagicMarker = ACTCTX_MAGIC_MARKER; actctx = &ActualActCtx->ActivationContext; - actctx->RefCount = 1; + actctx->ref_count = 1; actctx->config.type = ACTIVATION_CONTEXT_PATH_TYPE_NONE; actctx->config.info = NULL; actctx->appdir.type = ACTIVATION_CONTEXT_PATH_TYPE_WIN32_FILE;
7Â months, 3Â weeks
1
0
0
0
[reactos] 03/03: [SDK] Add some missing definitions
by Timo Kreuzer
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=db5fa3bffc1681efa6b58…
commit db5fa3bffc1681efa6b5824bd729b599b597cdd4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Nov 2 10:10:16 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Nov 4 08:42:34 2024 +0200 [SDK] Add some missing definitions --- sdk/include/psdk/winnls.h | 65 ++++++++++++++++++++++++++++++++++++++-- sdk/include/xdk/ntbasedef.h | 8 +++++ sdk/include/xdk/rtlfuncs.h | 5 +++- sdk/include/xdk/winnt.template.h | 1 + sdk/include/xdk/winnt_old.h | 29 ++++++++++++++++++ 5 files changed, 105 insertions(+), 3 deletions(-) diff --git a/sdk/include/psdk/winnls.h b/sdk/include/psdk/winnls.h index 195652d0621..15e291cf12b 100644 --- a/sdk/include/psdk/winnls.h +++ b/sdk/include/psdk/winnls.h @@ -25,11 +25,13 @@ extern "C" { #define LOCALE_ILANGUAGE 1 #define LOCALE_SLANGUAGE 2 #define LOCALE_SENGLANGUAGE 0x1001 +#define LOCALE_SENGLISHLANGUAGENAME 0x1001 #define LOCALE_SABBREVLANGNAME 3 #define LOCALE_SNATIVELANGNAME 4 #define LOCALE_ICOUNTRY 5 #define LOCALE_SCOUNTRY 6 #define LOCALE_SENGCOUNTRY 0x1002 +#define LOCALE_SENGLISHCOUNTRYNAME 0x1002 #define LOCALE_SABBREVCTRYNAME 7 #define LOCALE_SNATIVECTRYNAME 8 #define LOCALE_IDEFAULTLANGUAGE 9 @@ -710,6 +712,18 @@ BOOL WINAPI EnumSystemCodePagesW(_In_ CODEPAGE_ENUMPROCW, _In_ DWORD); BOOL WINAPI EnumSystemGeoID(_In_ GEOCLASS, _In_ GEOID, _In_ GEO_ENUMPROC); BOOL WINAPI EnumSystemLocalesA(_In_ LOCALE_ENUMPROCA, _In_ DWORD); BOOL WINAPI EnumSystemLocalesW(_In_ LOCALE_ENUMPROCW, _In_ DWORD); + +typedef BOOL (CALLBACK* LOCALE_ENUMPROCEX)(LPWSTR, DWORD, LPARAM); + +WINBASEAPI +BOOL +WINAPI +EnumSystemLocalesEx( + _In_ LOCALE_ENUMPROCEX lpLocaleEnumProcEx, + _In_ DWORD dwFlags, + _In_ LPARAM lParam, + _In_opt_ LPVOID lpReserved); + BOOL WINAPI EnumTimeFormatsA(_In_ TIMEFMT_ENUMPROCA, _In_ LCID, _In_ DWORD); BOOL WINAPI EnumTimeFormatsW(_In_ TIMEFMT_ENUMPROCW, _In_ LCID, _In_ DWORD); @@ -888,6 +902,14 @@ int WINAPI GetTimeFormatA(LCID,DWORD,const SYSTEMTIME*,LPCSTR,LPSTR,int); int WINAPI GetTimeFormatW(LCID,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int); int WINAPI GetTimeFormatEx(LPCWSTR,DWORD,const SYSTEMTIME*,LPCWSTR,LPWSTR,int); LANGID WINAPI GetUserDefaultLangID(void); + +WINBASEAPI +int +WINAPI +GetUserDefaultLocaleName( + _Out_writes_(cchLocaleName) LPWSTR lpLocaleName, + _In_ int cchLocaleName); + LCID WINAPI GetUserDefaultLCID(void); GEOID WINAPI GetUserGeoID(_In_ GEOCLASS); @@ -1006,7 +1028,11 @@ GetLocaleInfoEx( _Out_writes_opt_(cchData) LPWSTR lpLCData, _In_ int cchData); -BOOL WINAPI IsValidLocaleName(_In_ LPCWSTR lpLocaleName); +WINBASEAPI +BOOL +WINAPI +IsValidLocaleName( + _In_ LPCWSTR lpLocaleName); BOOL WINAPI @@ -1106,11 +1132,41 @@ GetStringScripts( BOOL WINAPI SetProcessPreferredUILanguages(_In_ DWORD, _In_opt_ PCZZWSTR, _Out_opt_ PULONG); BOOL WINAPI SetThreadPreferredUILanguages(_In_ DWORD, _In_opt_ PCZZWSTR, _Out_opt_ PULONG); BOOL WINAPI VerifyScripts(_In_ DWORD, _In_ LPCWSTR, _In_ int, _In_ LPCWSTR, _In_ int); -INT WINAPI LCMapStringEx(_In_ LPCWSTR, _In_ DWORD, _In_ LPCWSTR, _In_ INT, _Out_opt_ LPWSTR, _In_ INT, _In_ LPNLSVERSIONINFO, _In_ LPVOID, _In_ LPARAM); + +#if (WINVER >= _WIN32_WINNT_WIN8) +_When_((dwMapFlags & (LCMAP_SORTKEY | LCMAP_BYTEREV | LCMAP_HASH | LCMAP_SORTHANDLE)) != 0, _At_((LPBYTE) lpDestStr, _Out_writes_bytes_opt_(cchDest))) +#else +_When_((dwMapFlags & (LCMAP_SORTKEY | LCMAP_BYTEREV)) != 0, _At_((LPBYTE) lpDestStr, _Out_writes_bytes_opt_(cchDest))) +#endif +_When_(cchSrc != -1, _At_((WCHAR *) lpSrcStr, _Out_writes_opt_(cchSrc))) +_When_(cchDest != -1, _At_((WCHAR *) lpDestStr, _Out_writes_opt_(cchDest))) +WINBASEAPI +int +WINAPI +LCMapStringEx( + _In_opt_ LPCWSTR lpLocaleName, + _In_ DWORD dwMapFlags, + _In_reads_(cchSrc) LPCWSTR lpSrcStr, + _In_ int cchSrc, + _Out_writes_opt_(cchDest) LPWSTR lpDestStr, + _In_ int cchDest, + _In_opt_ LPNLSVERSIONINFO lpVersionInformation, + _In_opt_ LPVOID lpReserved, + _In_opt_ LPARAM sortHandle); + LCID WINAPI LocaleNameToLCID(_In_ LPCWSTR, _In_ DWORD); #endif /* (WINVER >= 0x0600) */ +WINBASEAPI +int +WINAPI +LCIDToLocaleName( + _In_ LCID Locale, + _Out_writes_opt_(cchName) LPWSTR lpName, + _In_ int cchName, + _In_ DWORD dwFlags); + #ifdef UNICODE #define CALINFO_ENUMPROC CALINFO_ENUMPROCW #define CALINFO_ENUMPROCEX CALINFO_ENUMPROCEXW @@ -1207,4 +1263,9 @@ typedef LPNUMBERFMTA LPNUMBERFMT; #ifdef __cplusplus } #endif + +#ifndef NOAPISET +#include <stringapiset.h> +#endif + #endif diff --git a/sdk/include/xdk/ntbasedef.h b/sdk/include/xdk/ntbasedef.h index 2cb40d0ee17..a662f2bdfb2 100644 --- a/sdk/include/xdk/ntbasedef.h +++ b/sdk/include/xdk/ntbasedef.h @@ -226,6 +226,14 @@ #endif #endif /* DECLSPEC_NOINLINE */ +#ifndef DECLSPEC_GUARD_SUPPRESS + #if (_MSC_FULL_VER >= 181040116) || defined(_D1VERSIONLKG171_) + #define DECLSPEC_GUARD_SUPPRESS __declspec(guard(suppress)) + #else + #define DECLSPEC_GUARD_SUPPRESS + #endif +#endif + #if !defined(_M_CEE_PURE) #define NTAPI_INLINE NTAPI #else diff --git a/sdk/include/xdk/rtlfuncs.h b/sdk/include/xdk/rtlfuncs.h index 8f5ed2854ba..6aeca552d6e 100644 --- a/sdk/include/xdk/rtlfuncs.h +++ b/sdk/include/xdk/rtlfuncs.h @@ -2,7 +2,7 @@ * Runtime Library Functions * ******************************************************************************/ -$if (_WDMDDK_) +$if (_WDMDDK_ || _WINNT_) #define FAST_FAIL_LEGACY_GS_VIOLATION 0 #define FAST_FAIL_VTGUARD_CHECK_FAILURE 1 #define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 @@ -31,6 +31,9 @@ RtlFailFast( __fastfail(Code); } +$endif(_WDMDDK_ || _WINNT_) +$if (_WDMDDK_) + #if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && (defined(_M_CEE_PURE) || defined(_M_CEE_SAFE)) #define NO_KERNEL_LIST_ENTRY_CHECKS #endif diff --git a/sdk/include/xdk/winnt.template.h b/sdk/include/xdk/winnt.template.h index 216290cc980..050e87d472d 100644 --- a/sdk/include/xdk/winnt.template.h +++ b/sdk/include/xdk/winnt.template.h @@ -75,6 +75,7 @@ $include(interlocked.h) $include(ketypes.h) $include(extypes.h) $include(rtltypes.h) +$include(rtlfuncs.h) $include(winnt_old.h) #ifdef __cplusplus diff --git a/sdk/include/xdk/winnt_old.h b/sdk/include/xdk/winnt_old.h index f8c375d104f..157c3724e80 100644 --- a/sdk/include/xdk/winnt_old.h +++ b/sdk/include/xdk/winnt_old.h @@ -130,14 +130,30 @@ #define STATUS_USER_APC ((DWORD)0x000000C0) #define STATUS_TIMEOUT ((DWORD)0x00000102) #define STATUS_PENDING ((DWORD)0x00000103) +#define DBG_EXCEPTION_HANDLED ((DWORD)0x00010001) +#define DBG_CONTINUE ((DWORD)0x00010002) #define STATUS_SEGMENT_NOTIFICATION ((DWORD)0x40000005) +#define STATUS_FATAL_APP_EXIT ((DWORD)0x40000015) +#define DBG_REPLY_LATER ((DWORD)0x40010001) +#define DBG_TERMINATE_THREAD ((DWORD)0x40010003) +#define DBG_TERMINATE_PROCESS ((DWORD)0x40010004) +#define DBG_CONTROL_C ((DWORD)0x40010005) +#define DBG_PRINTEXCEPTION_C ((DWORD)0x40010006) +#define DBG_RIPEXCEPTION ((DWORD)0x40010007) +#define DBG_CONTROL_BREAK ((DWORD)0x40010008) +#define DBG_COMMAND_EXCEPTION ((DWORD)0x40010009) +#define DBG_PRINTEXCEPTION_WIDE_C ((DWORD)0x4001000A) #define STATUS_GUARD_PAGE_VIOLATION ((DWORD)0x80000001) #define STATUS_DATATYPE_MISALIGNMENT ((DWORD)0x80000002) #define STATUS_BREAKPOINT ((DWORD)0x80000003) #define STATUS_SINGLE_STEP ((DWORD)0x80000004) +#define STATUS_LONGJUMP ((DWORD)0x80000026) +#define STATUS_UNWIND_CONSOLIDATE ((DWORD)0x80000029) +#define DBG_EXCEPTION_NOT_HANDLED ((DWORD)0x80010001) #define STATUS_ACCESS_VIOLATION ((DWORD)0xC0000005) #define STATUS_IN_PAGE_ERROR ((DWORD)0xC0000006) #define STATUS_INVALID_HANDLE ((DWORD)0xC0000008) +#define STATUS_INVALID_PARAMETER ((DWORD)0xC000000D) #define STATUS_NO_MEMORY ((DWORD)0xC0000017) #define STATUS_ILLEGAL_INSTRUCTION ((DWORD)0xC000001D) #define STATUS_NONCONTINUABLE_EXCEPTION ((DWORD)0xC0000025) @@ -154,10 +170,23 @@ #define STATUS_INTEGER_OVERFLOW ((DWORD)0xC0000095) #define STATUS_PRIVILEGED_INSTRUCTION ((DWORD)0xC0000096) #define STATUS_STACK_OVERFLOW ((DWORD)0xC00000FD) +#define STATUS_DLL_NOT_FOUND ((DWORD)0xC0000135) +#define STATUS_ORDINAL_NOT_FOUND ((DWORD)0xC0000138) +#define STATUS_ENTRYPOINT_NOT_FOUND ((DWORD)0xC0000139) #define STATUS_CONTROL_C_EXIT ((DWORD)0xC000013A) +#define STATUS_DLL_INIT_FAILED ((DWORD)0xC0000142) +#define STATUS_CONTROL_STACK_VIOLATION ((DWORD)0xC00001B2) #define STATUS_FLOAT_MULTIPLE_FAULTS ((DWORD)0xC00002B4) #define STATUS_FLOAT_MULTIPLE_TRAPS ((DWORD)0xC00002B5) #define STATUS_REG_NAT_CONSUMPTION ((DWORD)0xC00002C9) +#define STATUS_HEAP_CORRUPTION ((DWORD)0xC0000374) +#define STATUS_STACK_BUFFER_OVERRUN ((DWORD)0xC0000409) +#define STATUS_INVALID_CRUNTIME_PARAMETER ((DWORD)0xC0000417) +#define STATUS_ASSERTION_FAILURE ((DWORD)0xC0000420) +#define STATUS_ENCLAVE_VIOLATION ((DWORD)0xC00004A2) +#define STATUS_INTERRUPTED ((DWORD)0xC0000515) +#define STATUS_THREAD_NOT_RUNNING ((DWORD)0xC0000516) +#define STATUS_ALREADY_REGISTERED ((DWORD)0xC0000718) #define STATUS_SXS_EARLY_DEACTIVATION ((DWORD)0xC015000F) #define STATUS_SXS_INVALID_DEACTIVATION ((DWORD)0xC0150010)
7Â months, 4Â weeks
1
0
0
0
[reactos] 02/03: [SDK] Add some missing headers
by Timo Kreuzer
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc0433f02af34ad3aec0b…
commit dc0433f02af34ad3aec0bda7ad5cda2a643bca66 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun May 26 15:26:23 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Nov 4 08:42:34 2024 +0200 [SDK] Add some missing headers --- CMakeLists.txt | 1 + sdk/include/psdk/appmodel.h | 78 +++++++++++++++++++++++++++ sdk/include/psdk/processthreadsapi.h | 30 +++++++++++ sdk/include/psdk/stringapiset.h | 32 +++++++++++ sdk/include/psdk/synchapi.h | 24 +++++++++ sdk/include/psdk/sysinfoapi.h | 22 ++++++++ sdk/include/psdk/winbase.h | 5 ++ sdk/include/winrt/roapi.h | 43 +++++++++++++++ sdk/include/winrt/wrl/wrappers/corewrappers.h | 23 ++++++++ 9 files changed, 258 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 063ea4d060d..787f8e920ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,6 +312,7 @@ Enable this if the module uses typeid or dynamic_cast. You will probably need to sdk/include sdk/include/psdk sdk/include/dxsdk + sdk/include/winrt ${REACTOS_BINARY_DIR}/sdk/include ${REACTOS_BINARY_DIR}/sdk/include/psdk ${REACTOS_BINARY_DIR}/sdk/include/dxsdk diff --git a/sdk/include/psdk/appmodel.h b/sdk/include/psdk/appmodel.h new file mode 100644 index 00000000000..67bb5936192 --- /dev/null +++ b/sdk/include/psdk/appmodel.h @@ -0,0 +1,78 @@ +/* + * PROJECT: ReactOS SDK + * LICENSE: MIT (
https://spdx.org/licenses/MIT
) + * PURPOSE: Windows AppModel definitions + * COPYRIGHT: Copyright 2024 Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum AppPolicyProcessTerminationMethod +{ + AppPolicyProcessTerminationMethod_ExitProcess = 0, + AppPolicyProcessTerminationMethod_TerminateProcess = 1, +} AppPolicyProcessTerminationMethod; + +typedef enum AppPolicyThreadInitializationType +{ + AppPolicyThreadInitializationType_None = 0, + AppPolicyThreadInitializationType_InitializeWinRT = 1, +} AppPolicyThreadInitializationType; + +typedef enum AppPolicyShowDeveloperDiagnostic +{ + AppPolicyShowDeveloperDiagnostic_None = 0, + AppPolicyShowDeveloperDiagnostic_ShowUI = 1, +} AppPolicyShowDeveloperDiagnostic; + +typedef enum AppPolicyWindowingModel +{ + AppPolicyWindowingModel_None = 0, + AppPolicyWindowingModel_Universal = 1, + AppPolicyWindowingModel_ClassicDesktop = 2, + AppPolicyWindowingModel_ClassicPhone = 3 +} AppPolicyWindowingModel; + +WINBASEAPI +_Check_return_ +_Success_(return == ERROR_SUCCESS) +LONG +WINAPI +AppPolicyGetProcessTerminationMethod( + _In_ HANDLE processToken, + _Out_ AppPolicyProcessTerminationMethod* policy); + +WINBASEAPI +_Check_return_ +_Success_(return == ERROR_SUCCESS) +LONG +WINAPI +AppPolicyGetThreadInitializationType( + _In_ HANDLE processToken, + _Out_ AppPolicyThreadInitializationType* policy); + +WINBASEAPI +_Check_return_ +_Success_(return == ERROR_SUCCESS) +LONG +WINAPI +AppPolicyGetShowDeveloperDiagnostic( + _In_ HANDLE processToken, + _Out_ AppPolicyShowDeveloperDiagnostic* policy); + +WINBASEAPI +_Check_return_ +_Success_(return == ERROR_SUCCESS) +LONG +WINAPI +AppPolicyGetWindowingModel( + _In_ HANDLE processToken, + _Out_ AppPolicyWindowingModel* policy); + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/sdk/include/psdk/processthreadsapi.h b/sdk/include/psdk/processthreadsapi.h new file mode 100644 index 00000000000..913cc445c7f --- /dev/null +++ b/sdk/include/psdk/processthreadsapi.h @@ -0,0 +1,30 @@ +/* + * PROJECT: ReactOS SDK + * LICENSE: MIT (
https://spdx.org/licenses/MIT
) + * PURPOSE: API definitions for api-ms-win-core-processthreads-l1 + * COPYRIGHT: Copyright 2024 Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +WINBASEAPI +BOOL +WINAPI +SetThreadStackGuarantee( + _Inout_ PULONG StackSizeInBytes); + +FORCEINLINE +HANDLE +GetCurrentThreadEffectiveToken( + VOID) +{ + return (HANDLE)(LONG_PTR)-6; +} + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/sdk/include/psdk/stringapiset.h b/sdk/include/psdk/stringapiset.h new file mode 100644 index 00000000000..21a6f624124 --- /dev/null +++ b/sdk/include/psdk/stringapiset.h @@ -0,0 +1,32 @@ +/* + * PROJECT: ReactOS SDK + * LICENSE: MIT (
https://spdx.org/licenses/MIT
) + * PURPOSE: API definitions for api-ms-win-core-string-l1 + * COPYRIGHT: Copyright 2024 Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#pragma once + +#include <winnls.h> + +#ifdef __cplusplus +extern "C" { +#endif + +WINBASEAPI +int +WINAPI +CompareStringEx( + _In_opt_ LPCWSTR lpLocaleName, + _In_ DWORD dwCmpFlags, + _In_NLS_string_(cchCount1) LPCWCH lpString1, + _In_ int cchCount1, + _In_NLS_string_(cchCount2) LPCWCH lpString2, + _In_ int cchCount2, + _Reserved_ LPNLSVERSIONINFO lpVersionInformation, + _Reserved_ LPVOID lpReserved, + _Reserved_ LPARAM lParam); + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/sdk/include/psdk/synchapi.h b/sdk/include/psdk/synchapi.h new file mode 100644 index 00000000000..e9443294c10 --- /dev/null +++ b/sdk/include/psdk/synchapi.h @@ -0,0 +1,24 @@ +/* + * PROJECT: ReactOS SDK + * LICENSE: MIT (
https://spdx.org/licenses/MIT
) + * PURPOSE: API definitions for api-ms-win-core-synch-l1 + * COPYRIGHT: Copyright 2024 Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +WINBASEAPI +BOOL +WINAPI +InitializeCriticalSectionEx( + _Out_ LPCRITICAL_SECTION lpCriticalSection, + _In_ DWORD dwSpinCount, + _In_ DWORD Flags); + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/sdk/include/psdk/sysinfoapi.h b/sdk/include/psdk/sysinfoapi.h new file mode 100644 index 00000000000..2542e6391d1 --- /dev/null +++ b/sdk/include/psdk/sysinfoapi.h @@ -0,0 +1,22 @@ +/* + * PROJECT: ReactOS SDK + * LICENSE: MIT (
https://spdx.org/licenses/MIT
) + * PURPOSE: API definitions for api-ms-win-core-sysinfo-l1 + * COPYRIGHT: Copyright 2024 Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +WINBASEAPI +VOID +WINAPI +GetSystemTimePreciseAsFileTime( + _Out_ LPFILETIME lpSystemTimeAsFileTime); + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/sdk/include/psdk/winbase.h b/sdk/include/psdk/winbase.h index 918d3e68a21..f5eed964654 100644 --- a/sdk/include/psdk/winbase.h +++ b/sdk/include/psdk/winbase.h @@ -12,6 +12,7 @@ extern "C" { #endif #include <libloaderapi.h> +#include <sysinfoapi.h> #ifdef _MSC_VER #pragma warning(push) @@ -4170,4 +4171,8 @@ WCHAR * CDECL wine_get_dos_file_name(LPCSTR str); #ifdef __cplusplus } #endif + +#include <synchapi.h> +#include <processthreadsapi.h> + #endif /* _WINBASE_H */ diff --git a/sdk/include/winrt/roapi.h b/sdk/include/winrt/roapi.h new file mode 100644 index 00000000000..228ea890e55 --- /dev/null +++ b/sdk/include/winrt/roapi.h @@ -0,0 +1,43 @@ +/* + * PROJECT: ReactOS SDK + * LICENSE: MIT (
https://spdx.org/licenses/MIT
) + * PURPOSE: WinRT Runtime Object API + * COPYRIGHT: Copyright 2024 Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#pragma once +#define __ROAPI_H_ + +#include <sal.h> + +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef _ROAPI_ + #define ROAPI +#else + #define ROAPI DECLSPEC_IMPORT +#endif + +typedef enum RO_INIT_TYPE +{ + RO_INIT_SINGLETHREADED = 0, + RO_INIT_MULTITHREADED = 1, +} RO_INIT_TYPE; + +ROAPI +_Check_return_ +HRESULT +WINAPI +RoInitialize( + _In_ RO_INIT_TYPE initType); + +ROAPI +void +WINAPI +RoUninitialize(void); + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/sdk/include/winrt/wrl/wrappers/corewrappers.h b/sdk/include/winrt/wrl/wrappers/corewrappers.h new file mode 100644 index 00000000000..875becab6bf --- /dev/null +++ b/sdk/include/winrt/wrl/wrappers/corewrappers.h @@ -0,0 +1,23 @@ +/* + * PROJECT: ReactOS SDK + * LICENSE: MIT (
https://spdx.org/licenses/MIT
) + * PURPOSE: WinRT core wrappers + * COPYRIGHT: Copyright 2024 Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +#pragma once +#define _WRL_COREWRAPPERS_H_ + +#include <windows.h> +#include <intsafe.h> +#include <roapi.h> + +#ifdef __cplusplus +extern "C" { +#endif + +// TBD + +#ifdef __cplusplus +} // extern "C" +#endif
7Â months, 4Â weeks
1
0
0
0
[reactos] 01/03: [MSHTML] Improve a reactos hack
by Timo Kreuzer
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c5ddc893a686148585d1…
commit 1c5ddc893a686148585d1e82c6bfd15f64418361 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 17 17:42:27 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Nov 4 08:42:34 2024 +0200 [MSHTML] Improve a reactos hack Don't define a dll-import function. --- dll/win32/mshtml/omnavigator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dll/win32/mshtml/omnavigator.c b/dll/win32/mshtml/omnavigator.c index 2d34901d06e..c2a256b8b43 100644 --- a/dll/win32/mshtml/omnavigator.c +++ b/dll/win32/mshtml/omnavigator.c @@ -20,12 +20,13 @@ #ifdef __REACTOS__ /* HACK This is a Vista+ API */ -static INT WINAPI LCIDToLocaleName( LCID lcid, LPWSTR name, INT count, DWORD flags ) +static INT WINAPI LCIDToLocaleName_( LCID lcid, LPWSTR name, INT count, DWORD flags ) { if (flags) FIXME( "unsupported flags %x\n", flags ); return GetLocaleInfoW( lcid, LOCALE_SNAME | LOCALE_NOUSEROVERRIDE, name, count ); } +#define LCIDToLocaleName LCIDToLocaleName_ #endif typedef struct HTMLPluginsCollection HTMLPluginsCollection;
7Â months, 4Â weeks
1
0
0
0
[reactos] 03/03: [TCPIP] Synchronize LWIP code to 2.2.0
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d6eebaa47a90f7a4c182b…
commit d6eebaa47a90f7a4c182beb5a53f7d903cb9ea62 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Apr 20 20:26:04 2024 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Nov 3 22:49:45 2024 +0100 [TCPIP] Synchronize LWIP code to 2.2.0 - take code from STABLE-2_2_0_RELEASE commit on
https://git.savannah.gnu.org/git/lwip.git
- remove lwip/contrib directory - do required changes due to upgrade in * CMakeLists.txt * include/lwip/arch/cc.h * include/lwip/arch/sys_arch.h * include/lwip/lwipopts.h * include/tcpip.h * ip/CMakeLists.txt * ip/lwip_glue/lwip_glue.h * ip/lwip_glue/tcp.c * ip/transport/tcp/if.c * tcpip/icmp.c CORE-13098 --- drivers/network/tcpip/CMakeLists.txt | 3 +- drivers/network/tcpip/include/lwip/arch/cc.h | 17 - drivers/network/tcpip/include/lwip/arch/sys_arch.h | 3 + drivers/network/tcpip/include/lwip/lwipopts.h | 1 + drivers/network/tcpip/include/tcpip.h | 1 + drivers/network/tcpip/ip/CMakeLists.txt | 1 + drivers/network/tcpip/ip/lwip_glue/lwip_glue.h | 1 - drivers/network/tcpip/ip/lwip_glue/tcp.c | 6 +- drivers/network/tcpip/ip/transport/tcp/if.c | 2 +- drivers/network/tcpip/lwip/.gitattributes | 10 + drivers/network/tcpip/lwip/.gitignore | 60 + drivers/network/tcpip/lwip/BUILDING | 119 + drivers/network/tcpip/lwip/CHANGELOG | 1620 ++++++- drivers/network/tcpip/lwip/CMakeLists.txt | 79 +- drivers/network/tcpip/lwip/COPYING | 54 +- drivers/network/tcpip/lwip/FEATURES | 11 + drivers/network/tcpip/lwip/FILES | 2 + drivers/network/tcpip/lwip/README | 100 +- drivers/network/tcpip/lwip/UPGRADING | 146 +- .../network/tcpip/lwip/codespell_changed_files.sh | 26 + drivers/network/tcpip/lwip/codespell_check.sh | 57 + drivers/network/tcpip/lwip/doc/FILES | 8 +- drivers/network/tcpip/lwip/doc/NO_SYS_SampleCode.c | 121 + drivers/network/tcpip/lwip/doc/ZeroCopyRx.c | 45 + drivers/network/tcpip/lwip/doc/contrib.txt | 17 +- .../network/tcpip/lwip/doc/doxygen/generate.bat | 1 + drivers/network/tcpip/lwip/doc/doxygen/generate.sh | 3 + .../network/tcpip/lwip/doc/doxygen/lwip.Doxyfile | 2516 ++++++++++ .../tcpip/lwip/doc/doxygen/lwip.Doxyfile.cmake.in | 2516 ++++++++++ drivers/network/tcpip/lwip/doc/doxygen/main_page.h | 417 ++ .../tcpip/lwip/doc/doxygen/output/index.html | 10 + drivers/network/tcpip/lwip/doc/mdns.txt | 111 + drivers/network/tcpip/lwip/doc/mqtt_client.txt | 164 + drivers/network/tcpip/lwip/doc/ppp.txt | 529 +++ drivers/network/tcpip/lwip/doc/rawapi.txt | 511 --- drivers/network/tcpip/lwip/doc/savannah.txt | 135 +- drivers/network/tcpip/lwip/doc/snmp_agent.txt | 181 - drivers/network/tcpip/lwip/doc/sys_arch.txt | 267 -- drivers/network/tcpip/lwip/src/FILES | 6 +- drivers/network/tcpip/lwip/src/Filelists.cmake | 293 ++ drivers/network/tcpip/lwip/src/Filelists.mk | 208 + drivers/network/tcpip/lwip/src/api/api_lib.c | 1067 ++++- drivers/network/tcpip/lwip/src/api/api_msg.c | 1672 ++++--- drivers/network/tcpip/lwip/src/api/err.c | 102 +- drivers/network/tcpip/lwip/src/api/if_api.c | 102 + drivers/network/tcpip/lwip/src/api/netbuf.c | 83 +- drivers/network/tcpip/lwip/src/api/netdb.c | 199 +- drivers/network/tcpip/lwip/src/api/netifapi.c | 358 +- drivers/network/tcpip/lwip/src/api/sockets.c | 4793 ++++++++++++++------ drivers/network/tcpip/lwip/src/api/tcpip.c | 588 ++- .../lwip/src/apps/altcp_tls/altcp_tls_mbedtls.c | 1367 ++++++ .../src/apps/altcp_tls/altcp_tls_mbedtls_mem.c | 210 + .../altcp_tls/altcp_tls_mbedtls_mem.h} | 56 +- .../altcp_tls/altcp_tls_mbedtls_structs.h} | 67 +- .../tcpip/lwip/src/apps/http/altcp_proxyconnect.c | 584 +++ drivers/network/tcpip/lwip/src/apps/http/fs.c | 161 + .../network/tcpip/lwip/src/apps/http/fs/404.html | 21 + .../tcpip/lwip/src/apps/http/fs/img/sics.gif | Bin 0 -> 724 bytes .../network/tcpip/lwip/src/apps/http/fs/index.html | 47 + drivers/network/tcpip/lwip/src/apps/http/fsdata.c | 336 ++ .../src/{core/ipv4/inet.c => apps/http/fsdata.h} | 17 +- .../network/tcpip/lwip/src/apps/http/http_client.c | 911 ++++ drivers/network/tcpip/lwip/src/apps/http/httpd.c | 2770 +++++++++++ .../tcpip/lwip/src/apps/http/httpd_structs.h | 123 + .../tcpip/lwip/src/apps/http/makefsdata/makefsdata | 97 + .../lwip/src/apps/http/makefsdata/makefsdata.c | 1307 ++++++ .../tcpip/lwip/src/apps/http/makefsdata/readme.txt | 23 + .../tcpip/lwip/src/apps/http/makefsdata/tinydir.h | 831 ++++ .../network/tcpip/lwip/src/apps/lwiperf/lwiperf.c | 847 ++++ drivers/network/tcpip/lwip/src/apps/mdns/mdns.c | 2855 ++++++++++++ .../network/tcpip/lwip/src/apps/mdns/mdns_domain.c | 635 +++ .../network/tcpip/lwip/src/apps/mdns/mdns_out.c | 1163 +++++ drivers/network/tcpip/lwip/src/apps/mqtt/mqtt.c | 1480 ++++++ .../tcpip/lwip/src/apps/netbiosns/netbiosns.c | 533 +++ drivers/network/tcpip/lwip/src/apps/smtp/smtp.c | 1554 +++++++ .../network/tcpip/lwip/src/apps/snmp/snmp_asn1.c | 704 +++ .../network/tcpip/lwip/src/apps/snmp/snmp_asn1.h | 113 + .../network/tcpip/lwip/src/apps/snmp/snmp_core.c | 1356 ++++++ .../tcpip/lwip/src/apps/snmp/snmp_core_priv.h | 91 + .../network/tcpip/lwip/src/apps/snmp/snmp_mib2.c | 116 + .../tcpip/lwip/src/apps/snmp/snmp_mib2_icmp.c | 182 + .../lwip/src/apps/snmp/snmp_mib2_interfaces.c | 368 ++ .../tcpip/lwip/src/apps/snmp/snmp_mib2_ip.c | 731 +++ .../tcpip/lwip/src/apps/snmp/snmp_mib2_snmp.c | 227 + .../tcpip/lwip/src/apps/snmp/snmp_mib2_system.c | 376 ++ .../tcpip/lwip/src/apps/snmp/snmp_mib2_tcp.c | 607 +++ .../tcpip/lwip/src/apps/snmp/snmp_mib2_udp.c | 372 ++ .../network/tcpip/lwip/src/apps/snmp/snmp_msg.c | 1981 ++++++++ .../network/tcpip/lwip/src/apps/snmp/snmp_msg.h | 185 + .../tcpip/lwip/src/apps/snmp/snmp_netconn.c | 122 + .../tcpip/lwip/src/apps/snmp/snmp_pbuf_stream.c | 156 + .../{core/sys.c => apps/snmp/snmp_pbuf_stream.h} | 58 +- .../network/tcpip/lwip/src/apps/snmp/snmp_raw.c | 103 + .../network/tcpip/lwip/src/apps/snmp/snmp_scalar.c | 232 + .../lwip/src/apps/snmp/snmp_snmpv2_framework.c | 90 + .../tcpip/lwip/src/apps/snmp/snmp_snmpv2_usm.c | 410 ++ .../network/tcpip/lwip/src/apps/snmp/snmp_table.c | 342 ++ .../tcpip/lwip/src/apps/snmp/snmp_threadsync.c | 231 + .../network/tcpip/lwip/src/apps/snmp/snmp_traps.c | 900 ++++ drivers/network/tcpip/lwip/src/apps/snmp/snmpv3.c | 136 + .../tcpip/lwip/src/apps/snmp/snmpv3_mbedtls.c | 342 ++ .../src/{core/sys.c => apps/snmp/snmpv3_priv.h} | 65 +- drivers/network/tcpip/lwip/src/apps/sntp/sntp.c | 948 ++++ drivers/network/tcpip/lwip/src/apps/tftp/tftp.c | 548 +++ drivers/network/tcpip/lwip/src/core/altcp.c | 717 +++ .../tcpip/lwip/src/core/{sys.c => altcp_alloc.c} | 67 +- drivers/network/tcpip/lwip/src/core/altcp_tcp.c | 578 +++ drivers/network/tcpip/lwip/src/core/def.c | 231 +- drivers/network/tcpip/lwip/src/core/dhcp.c | 1770 -------- drivers/network/tcpip/lwip/src/core/dns.c | 1449 ++++-- .../tcpip/lwip/src/core/{ipv4 => }/inet_chksum.c | 366 +- drivers/network/tcpip/lwip/src/core/init.c | 306 +- drivers/network/tcpip/lwip/src/core/ip.c | 167 + drivers/network/tcpip/lwip/src/core/ipv4/acd.c | 557 +++ drivers/network/tcpip/lwip/src/core/ipv4/autoip.c | 543 +-- drivers/network/tcpip/lwip/src/core/ipv4/dhcp.c | 1999 ++++++++ .../tcpip/lwip/src/{netif => core/ipv4}/etharp.c | 998 ++-- drivers/network/tcpip/lwip/src/core/ipv4/icmp.c | 384 +- drivers/network/tcpip/lwip/src/core/ipv4/igmp.c | 772 ++-- drivers/network/tcpip/lwip/src/core/ipv4/ip.c | 924 ---- drivers/network/tcpip/lwip/src/core/ipv4/ip4.c | 1166 +++++ .../lwip/src/core/ipv4/{ip_addr.c => ip4_addr.c} | 197 +- .../lwip/src/core/ipv4/{ip_frag.c => ip4_frag.c} | 497 +- drivers/network/tcpip/lwip/src/core/ipv6/README | 1 - drivers/network/tcpip/lwip/src/core/ipv6/dhcp6.c | 821 ++++ drivers/network/tcpip/lwip/src/core/ipv6/ethip6.c | 123 + drivers/network/tcpip/lwip/src/core/ipv6/icmp6.c | 442 +- drivers/network/tcpip/lwip/src/core/ipv6/inet6.c | 162 +- drivers/network/tcpip/lwip/src/core/ipv6/ip6.c | 1591 ++++++- .../network/tcpip/lwip/src/core/ipv6/ip6_addr.c | 371 +- .../network/tcpip/lwip/src/core/ipv6/ip6_frag.c | 862 ++++ drivers/network/tcpip/lwip/src/core/ipv6/mld6.c | 626 +++ drivers/network/tcpip/lwip/src/core/ipv6/nd6.c | 2474 ++++++++++ drivers/network/tcpip/lwip/src/core/mem.c | 582 ++- drivers/network/tcpip/lwip/src/core/memp.c | 611 ++- drivers/network/tcpip/lwip/src/core/netif.c | 1845 ++++++-- drivers/network/tcpip/lwip/src/core/pbuf.c | 1128 +++-- drivers/network/tcpip/lwip/src/core/raw.c | 489 +- .../network/tcpip/lwip/src/core/snmp/asn1_dec.c | 657 --- .../network/tcpip/lwip/src/core/snmp/asn1_enc.c | 611 --- drivers/network/tcpip/lwip/src/core/snmp/mib2.c | 4146 ----------------- .../network/tcpip/lwip/src/core/snmp/mib_structs.c | 1174 ----- drivers/network/tcpip/lwip/src/core/snmp/msg_in.c | 1453 ------ drivers/network/tcpip/lwip/src/core/snmp/msg_out.c | 674 --- drivers/network/tcpip/lwip/src/core/stats.c | 144 +- drivers/network/tcpip/lwip/src/core/sys.c | 80 + drivers/network/tcpip/lwip/src/core/tcp.c | 1902 ++++++-- drivers/network/tcpip/lwip/src/core/tcp_in.c | 1709 ++++--- drivers/network/tcpip/lwip/src/core/tcp_out.c | 1712 +++++-- drivers/network/tcpip/lwip/src/core/timeouts.c | 451 ++ drivers/network/tcpip/lwip/src/core/timers.c | 487 -- drivers/network/tcpip/lwip/src/core/udp.c | 1076 +++-- .../sys/socket.h => compat/posix/arpa/inet.h} | 22 +- .../ipv4/inet.c => include/compat/posix/net/if.h} | 12 +- .../lwip/src/include/{ => compat}/posix/netdb.h | 22 +- .../src/include/{ => compat}/posix/sys/socket.h | 22 +- .../ipv4/inet.c => include/compat/stdc/errno.h} | 13 +- .../tcpip/lwip/src/include/ipv4/lwip/autoip.h | 118 - .../tcpip/lwip/src/include/ipv4/lwip/inet.h | 107 - .../network/tcpip/lwip/src/include/ipv4/lwip/ip.h | 223 - .../tcpip/lwip/src/include/ipv6/lwip/icmp.h | 100 - .../network/tcpip/lwip/src/include/ipv6/lwip/ip.h | 130 - drivers/network/tcpip/lwip/src/include/lwip/acd.h | 109 + .../network/tcpip/lwip/src/include/lwip/altcp.h | 207 + .../src/{core/sys.c => include/lwip/altcp_tcp.h} | 56 +- .../tcpip/lwip/src/include/lwip/altcp_tls.h | 196 + drivers/network/tcpip/lwip/src/include/lwip/api.h | 325 +- .../network/tcpip/lwip/src/include/lwip/api_msg.h | 177 - .../network/tcpip/lwip/src/include/lwip/apps/FILES | 2 + .../lwip/apps/altcp_proxyconnect.h} | 63 +- .../src/include/lwip/apps/altcp_tls_mbedtls_opts.h | 111 + .../network/tcpip/lwip/src/include/lwip/apps/fs.h | 139 + .../tcpip/lwip/src/include/lwip/apps/http_client.h | 160 + .../tcpip/lwip/src/include/lwip/apps/httpd.h | 256 ++ .../tcpip/lwip/src/include/lwip/apps/httpd_opts.h | 416 ++ .../tcpip/lwip/src/include/lwip/apps/lwiperf.h | 109 + .../tcpip/lwip/src/include/lwip/apps/mdns.h | 154 + .../tcpip/lwip/src/include/lwip/apps/mdns_domain.h | 80 + .../tcpip/lwip/src/include/lwip/apps/mdns_opts.h | 121 + .../tcpip/lwip/src/include/lwip/apps/mdns_out.h | 138 + .../tcpip/lwip/src/include/lwip/apps/mdns_priv.h | 237 + .../tcpip/lwip/src/include/lwip/apps/mqtt.h | 205 + .../{core/sys.c => include/lwip/apps/mqtt_opts.h} | 85 +- .../tcpip/lwip/src/include/lwip/apps/mqtt_priv.h | 104 + .../ipv4/inet.c => include/lwip/apps/netbiosns.h} | 27 +- .../sys.c => include/lwip/apps/netbiosns_opts.h} | 56 +- .../tcpip/lwip/src/include/lwip/apps/smtp.h | 128 + .../tcpip/lwip/src/include/lwip/apps/smtp_opts.h | 80 + .../tcpip/lwip/src/include/lwip/apps/snmp.h | 145 + .../tcpip/lwip/src/include/lwip/apps/snmp_core.h | 377 ++ .../{core/sys.c => include/lwip/apps/snmp_mib2.h} | 64 +- .../tcpip/lwip/src/include/lwip/apps/snmp_opts.h | 297 ++ .../tcpip/lwip/src/include/lwip/apps/snmp_scalar.h | 113 + .../src/include/lwip/apps/snmp_snmpv2_framework.h | 32 + .../lwip/src/include/lwip/apps/snmp_snmpv2_usm.h | 24 + .../tcpip/lwip/src/include/lwip/apps/snmp_table.h | 134 + .../lwip/src/include/lwip/apps/snmp_threadsync.h | 114 + .../tcpip/lwip/src/include/lwip/apps/snmpv3.h | 114 + .../src/{core/sys.c => include/lwip/apps/sntp.h} | 69 +- .../tcpip/lwip/src/include/lwip/apps/sntp_opts.h | 215 + .../tcpip/lwip/src/include/lwip/apps/tftp_client.h | 50 + .../tcpip/lwip/src/include/lwip/apps/tftp_common.h | 108 + .../tcpip/lwip/src/include/lwip/apps/tftp_opts.h | 106 + .../inet.c => include/lwip/apps/tftp_server.h} | 38 +- drivers/network/tcpip/lwip/src/include/lwip/arch.h | 511 ++- .../network/tcpip/lwip/src/include/lwip/autoip.h | 90 + .../network/tcpip/lwip/src/include/lwip/debug.h | 140 +- drivers/network/tcpip/lwip/src/include/lwip/def.h | 179 +- drivers/network/tcpip/lwip/src/include/lwip/dhcp.h | 293 +- .../network/tcpip/lwip/src/include/lwip/dhcp6.h | 104 + drivers/network/tcpip/lwip/src/include/lwip/dns.h | 97 +- drivers/network/tcpip/lwip/src/include/lwip/err.h | 114 +- .../network/tcpip/lwip/src/include/lwip/errno.h | 198 + .../network/tcpip/lwip/src/include/lwip/etharp.h | 110 + .../lwip/src/{core/sys.c => include/lwip/ethip6.h} | 52 +- drivers/network/tcpip/lwip/src/include/lwip/icmp.h | 110 + .../lwip/src/{core/sys.c => include/lwip/icmp6.h} | 56 +- .../lwip/src/{core/sys.c => include/lwip/if_api.h} | 56 +- .../tcpip/lwip/src/include/{ipv4 => }/lwip/igmp.h | 91 +- drivers/network/tcpip/lwip/src/include/lwip/inet.h | 188 + .../lwip/src/include/{ipv4 => }/lwip/inet_chksum.h | 94 +- drivers/network/tcpip/lwip/src/include/lwip/init.h | 82 +- .../src/include/lwip/{init.h => init.h.cmake.in} | 82 +- drivers/network/tcpip/lwip/src/include/lwip/ip.h | 339 ++ drivers/network/tcpip/lwip/src/include/lwip/ip4.h | 109 + .../{ipv4/lwip/ip_addr.h => lwip/ip4_addr.h} | 187 +- .../{ipv4/lwip/ip_frag.h => lwip/ip4_frag.h} | 56 +- drivers/network/tcpip/lwip/src/include/lwip/ip6.h | 93 + .../network/tcpip/lwip/src/include/lwip/ip6_addr.h | 372 ++ .../network/tcpip/lwip/src/include/lwip/ip6_frag.h | 144 + .../network/tcpip/lwip/src/include/lwip/ip6_zone.h | 306 ++ .../network/tcpip/lwip/src/include/lwip/ip_addr.h | 468 ++ drivers/network/tcpip/lwip/src/include/lwip/mem.h | 101 +- drivers/network/tcpip/lwip/src/include/lwip/memp.h | 155 +- drivers/network/tcpip/lwip/src/include/lwip/mld6.h | 99 + drivers/network/tcpip/lwip/src/include/lwip/nd6.h | 90 + .../network/tcpip/lwip/src/include/lwip/netbuf.h | 61 +- .../network/tcpip/lwip/src/include/lwip/netdb.h | 68 +- .../network/tcpip/lwip/src/include/lwip/netif.h | 588 ++- .../network/tcpip/lwip/src/include/lwip/netifapi.h | 187 +- drivers/network/tcpip/lwip/src/include/lwip/opt.h | 2712 ++++++++--- drivers/network/tcpip/lwip/src/include/lwip/pbuf.h | 240 +- .../tcpip/lwip/src/include/lwip/priv/altcp_priv.h | 159 + .../tcpip/lwip/src/include/lwip/priv/api_msg.h | 272 ++ .../tcpip/lwip/src/include/lwip/priv/mem_priv.h | 84 + .../tcpip/lwip/src/include/lwip/priv/memp_priv.h | 161 + .../lwip/src/include/lwip/{ => priv}/memp_std.h | 79 +- .../tcpip/lwip/src/include/lwip/priv/nd6_priv.h | 143 + .../{core/sys.c => include/lwip/priv/raw_priv.h} | 49 +- .../lwip/src/include/lwip/priv/sockets_priv.h | 175 + .../include/lwip/{tcp_impl.h => priv/tcp_priv.h} | 261 +- .../tcpip/lwip/src/include/lwip/priv/tcpip_priv.h | 176 + .../network/tcpip/lwip/src/include/lwip/prot/acd.h | 91 + .../ipv4/inet.c => include/lwip/prot/autoip.h} | 37 +- .../tcpip/lwip/src/include/lwip/prot/dhcp.h | 178 + .../tcpip/lwip/src/include/lwip/prot/dhcp6.h | 138 + .../tcpip/lwip/src/include/lwip/{ => prot}/dns.h | 136 +- .../{ipv6/lwip/ip_addr.h => lwip/prot/etharp.h} | 111 +- .../tcpip/lwip/src/include/lwip/prot/ethernet.h | 127 + .../src/{core/sys.c => include/lwip/prot/iana.h} | 81 +- .../src/include/{ipv4/lwip => lwip/prot}/icmp.h | 102 +- .../tcpip/lwip/src/include/lwip/prot/icmp6.h | 172 + .../src/{core/sys.c => include/lwip/prot/ieee.h} | 77 +- .../src/{core/sys.c => include/lwip/prot/igmp.h} | 70 +- .../{core/ipv4/inet.c => include/lwip/prot/ip.h} | 25 +- .../network/tcpip/lwip/src/include/lwip/prot/ip4.h | 131 + .../network/tcpip/lwip/src/include/lwip/prot/ip6.h | 235 + .../src/{core/sys.c => include/lwip/prot/mld6.h} | 57 +- .../network/tcpip/lwip/src/include/lwip/prot/nd6.h | 274 ++ .../network/tcpip/lwip/src/include/lwip/prot/tcp.h | 100 + .../include/{ipv6/lwip/inet.h => lwip/prot/udp.h} | 78 +- drivers/network/tcpip/lwip/src/include/lwip/raw.h | 67 +- drivers/network/tcpip/lwip/src/include/lwip/sio.h | 57 +- drivers/network/tcpip/lwip/src/include/lwip/snmp.h | 402 +- .../tcpip/lwip/src/include/lwip/snmp_asn1.h | 101 - .../network/tcpip/lwip/src/include/lwip/snmp_msg.h | 315 -- .../tcpip/lwip/src/include/lwip/snmp_structs.h | 268 -- .../network/tcpip/lwip/src/include/lwip/sockets.h | 528 ++- .../network/tcpip/lwip/src/include/lwip/stats.h | 279 +- drivers/network/tcpip/lwip/src/include/lwip/sys.h | 386 +- drivers/network/tcpip/lwip/src/include/lwip/tcp.h | 327 +- .../src/{core/sys.c => include/lwip/tcpbase.h} | 70 +- .../network/tcpip/lwip/src/include/lwip/tcpip.h | 161 +- .../lwip/src/include/lwip/{timers.h => timeouts.h} | 86 +- drivers/network/tcpip/lwip/src/include/lwip/udp.h | 132 +- .../tcpip/lwip/src/include/netif/bridgeif.h | 127 + .../tcpip/lwip/src/include/netif/bridgeif_opts.h | 90 + .../network/tcpip/lwip/src/include/netif/etharp.h | 225 +- .../src/{core/sys.c => include/netif/ethernet.h} | 59 +- .../tcpip/lwip/src/include/netif/ieee802154.h | 112 + .../src/{core/sys.c => include/netif/lowpan6.h} | 73 +- .../tcpip/lwip/src/include/netif/lowpan6_ble.h | 78 + .../tcpip/lwip/src/include/netif/lowpan6_common.h | 82 + .../tcpip/lwip/src/include/netif/lowpan6_opts.h | 122 + .../network/tcpip/lwip/src/include/netif/ppp/ccp.h | 164 + .../tcpip/lwip/src/include/netif/ppp/chap-md5.h | 36 + .../tcpip/lwip/src/include/netif/ppp/chap-new.h | 200 + .../tcpip/lwip/src/include/netif/ppp/chap_ms.h | 44 + .../network/tcpip/lwip/src/include/netif/ppp/eap.h | 169 + .../network/tcpip/lwip/src/include/netif/ppp/ecp.h | 62 + .../tcpip/lwip/src/include/netif/ppp/eui64.h | 102 + .../network/tcpip/lwip/src/include/netif/ppp/fsm.h | 182 + .../tcpip/lwip/src/include/netif/ppp/ipcp.h | 134 + .../tcpip/lwip/src/include/netif/ppp/ipv6cp.h | 191 + .../network/tcpip/lwip/src/include/netif/ppp/lcp.h | 179 + .../tcpip/lwip/src/include/netif/ppp/magic.h | 130 + .../tcpip/lwip/src/include/netif/ppp/mppe.h | 181 + .../lwip/src/include/netif/ppp/polarssl/arc4.h | 81 + .../lwip/src/include/netif/ppp/polarssl/des.h | 92 + .../lwip/src/include/netif/ppp/polarssl/md4.h | 97 + .../lwip/src/include/netif/ppp/polarssl/md5.h | 96 + .../lwip/src/include/netif/ppp/polarssl/sha1.h | 96 + .../network/tcpip/lwip/src/include/netif/ppp/ppp.h | 698 +++ .../tcpip/lwip/src/include/netif/ppp/ppp_impl.h | 736 +++ .../tcpip/lwip/src/include/netif/ppp/ppp_opts.h | 610 +++ .../tcpip/lwip/src/include/netif/ppp/pppapi.h | 137 + .../tcpip/lwip/src/include/netif/ppp/pppcrypt.h | 144 + .../lwip/src/{ => include}/netif/ppp/pppdebug.h | 45 +- .../src/include/netif/{ppp_oe.h => ppp/pppoe.h} | 71 +- .../tcpip/lwip/src/include/netif/ppp/pppol2tp.h | 209 + .../tcpip/lwip/src/include/netif/ppp/pppos.h | 125 + .../tcpip/lwip/src/include/netif/ppp/upap.h | 131 + .../tcpip/lwip/src/{ => include}/netif/ppp/vj.h | 53 +- .../network/tcpip/lwip/src/include/netif/slipif.h | 63 +- .../lwip/src/{core/sys.c => include/netif/zepif.h} | 65 +- drivers/network/tcpip/lwip/src/netif/FILES | 28 +- drivers/network/tcpip/lwip/src/netif/bridgeif.c | 563 +++ .../network/tcpip/lwip/src/netif/bridgeif_fdb.c | 212 + drivers/network/tcpip/lwip/src/netif/ethernet.c | 329 ++ drivers/network/tcpip/lwip/src/netif/ethernetif.c | 317 -- drivers/network/tcpip/lwip/src/netif/lowpan6.c | 921 ++++ drivers/network/tcpip/lwip/src/netif/lowpan6_ble.c | 447 ++ .../network/tcpip/lwip/src/netif/lowpan6_common.c | 841 ++++ .../network/tcpip/lwip/src/netif/ppp/PPPD_FOLLOWUP | 473 ++ drivers/network/tcpip/lwip/src/netif/ppp/auth.c | 2989 ++++++++---- drivers/network/tcpip/lwip/src/netif/ppp/auth.h | 111 - drivers/network/tcpip/lwip/src/netif/ppp/ccp.c | 1740 +++++++ .../network/tcpip/lwip/src/netif/ppp/chap-md5.c | 126 + .../network/tcpip/lwip/src/netif/ppp/chap-new.c | 677 +++ drivers/network/tcpip/lwip/src/netif/ppp/chap.c | 908 ---- drivers/network/tcpip/lwip/src/netif/ppp/chap.h | 150 - drivers/network/tcpip/lwip/src/netif/ppp/chap_ms.c | 962 ++++ drivers/network/tcpip/lwip/src/netif/ppp/chpms.c | 396 -- drivers/network/tcpip/lwip/src/netif/ppp/chpms.h | 64 - drivers/network/tcpip/lwip/src/netif/ppp/demand.c | 465 ++ drivers/network/tcpip/lwip/src/netif/ppp/eap.c | 2441 ++++++++++ drivers/network/tcpip/lwip/src/netif/ppp/ecp.c | 191 + drivers/network/tcpip/lwip/src/netif/ppp/eui64.c | 56 + drivers/network/tcpip/lwip/src/netif/ppp/fsm.c | 1373 +++--- drivers/network/tcpip/lwip/src/netif/ppp/fsm.h | 157 - drivers/network/tcpip/lwip/src/netif/ppp/ipcp.c | 3365 +++++++++----- drivers/network/tcpip/lwip/src/netif/ppp/ipcp.h | 106 - drivers/network/tcpip/lwip/src/netif/ppp/ipv6cp.c | 1533 +++++++ drivers/network/tcpip/lwip/src/netif/ppp/lcp.c | 4200 ++++++++++------- drivers/network/tcpip/lwip/src/netif/ppp/lcp.h | 151 - drivers/network/tcpip/lwip/src/netif/ppp/magic.c | 278 +- drivers/network/tcpip/lwip/src/netif/ppp/magic.h | 63 - drivers/network/tcpip/lwip/src/netif/ppp/md5.c | 320 -- drivers/network/tcpip/lwip/src/netif/ppp/md5.h | 55 - drivers/network/tcpip/lwip/src/netif/ppp/mppe.c | 412 ++ .../network/tcpip/lwip/src/netif/ppp/multilink.c | 609 +++ drivers/network/tcpip/lwip/src/netif/ppp/pap.c | 628 --- drivers/network/tcpip/lwip/src/netif/ppp/pap.h | 118 - .../tcpip/lwip/src/netif/ppp/polarssl/README | 22 + .../tcpip/lwip/src/netif/ppp/polarssl/arc4.c | 101 + .../tcpip/lwip/src/netif/ppp/polarssl/des.c | 422 ++ .../tcpip/lwip/src/netif/ppp/polarssl/md4.c | 281 ++ .../tcpip/lwip/src/netif/ppp/polarssl/md5.c | 300 ++ .../tcpip/lwip/src/netif/ppp/polarssl/sha1.c | 335 ++ drivers/network/tcpip/lwip/src/netif/ppp/ppp.c | 2912 +++++------- drivers/network/tcpip/lwip/src/netif/ppp/ppp.h | 201 - .../network/tcpip/lwip/src/netif/ppp/ppp_impl.h | 363 -- drivers/network/tcpip/lwip/src/netif/ppp/pppapi.c | 427 ++ .../network/tcpip/lwip/src/netif/ppp/pppcrypt.c | 66 + .../tcpip/lwip/src/netif/ppp/{ppp_oe.c => pppoe.c} | 711 +-- .../network/tcpip/lwip/src/netif/ppp/pppol2tp.c | 1171 +++++ drivers/network/tcpip/lwip/src/netif/ppp/pppos.c | 940 ++++ drivers/network/tcpip/lwip/src/netif/ppp/randm.c | 249 - drivers/network/tcpip/lwip/src/netif/ppp/randm.h | 81 - drivers/network/tcpip/lwip/src/netif/ppp/upap.c | 679 +++ drivers/network/tcpip/lwip/src/netif/ppp/utils.c | 957 ++++ drivers/network/tcpip/lwip/src/netif/ppp/vj.c | 353 +- drivers/network/tcpip/lwip/src/netif/slipif.c | 278 +- drivers/network/tcpip/lwip/src/netif/zepif.c | 300 ++ drivers/network/tcpip/lwip/test/fuzz/Makefile | 73 + drivers/network/tcpip/lwip/test/fuzz/README | 34 + drivers/network/tcpip/lwip/test/fuzz/config.h | 0 .../tcpip/lwip/{COPYING => test/fuzz/fuzz.c} | 10 +- .../tcpip/lwip/{COPYING => test/fuzz/fuzz2.c} | 10 +- .../{src/core/ipv4/inet.c => test/fuzz/fuzz3.c} | 20 +- drivers/network/tcpip/lwip/test/fuzz/fuzz_common.c | 702 +++ .../{src/core/sys.c => test/fuzz/fuzz_common.h} | 54 +- .../tcpip/lwip/test/fuzz/inputs/arp/arp_req.bin | Bin 0 -> 42 bytes .../tcpip/lwip/test/fuzz/inputs/icmp/icmp_ping.bin | Bin 0 -> 98 bytes .../fuzz/inputs/ipv6/neighbor_solicitation.bin | Bin 0 -> 86 bytes .../lwip/test/fuzz/inputs/ipv6/router_adv.bin | Bin 0 -> 118 bytes .../tcpip/lwip/test/fuzz/inputs/tcp/tcp_syn.bin | Bin 0 -> 74 bytes .../lwip/test/fuzz/inputs/udp/udp_port_5000.bin | Bin 0 -> 50 bytes .../tcpip/lwip/test/{unit => fuzz}/lwipopts.h | 68 +- .../network/tcpip/lwip/test/fuzz/output_to_pcap.sh | 31 + .../tcpip/lwip/test/sockets/sockets_stresstest.c | 726 +++ .../{COPYING => test/sockets/sockets_stresstest.h} | 13 +- .../network/tcpip/lwip/test/unit/Filelists.cmake | 38 + drivers/network/tcpip/lwip/test/unit/Filelists.mk | 54 + drivers/network/tcpip/lwip/test/unit/Makefile | 11 + .../tcpip/lwip/test/unit/api/test_sockets.c | 852 ++++ .../tcpip/lwip/test/unit/api/test_sockets.h | 8 + .../network/tcpip/lwip/test/unit/arch/sys_arch.c | 387 ++ .../network/tcpip/lwip/test/unit/arch/sys_arch.h | 79 + .../network/tcpip/lwip/test/unit/core/test_def.c | 84 + .../network/tcpip/lwip/test/unit/core/test_def.h | 8 + .../network/tcpip/lwip/test/unit/core/test_dns.c | 52 + .../network/tcpip/lwip/test/unit/core/test_dns.h | 8 + .../network/tcpip/lwip/test/unit/core/test_mem.c | 168 +- .../network/tcpip/lwip/test/unit/core/test_mem.h | 4 +- .../network/tcpip/lwip/test/unit/core/test_netif.c | 285 ++ .../network/tcpip/lwip/test/unit/core/test_netif.h | 8 + .../network/tcpip/lwip/test/unit/core/test_pbuf.c | 359 ++ .../network/tcpip/lwip/test/unit/core/test_pbuf.h | 8 + .../tcpip/lwip/test/unit/core/test_timers.c | 233 + .../tcpip/lwip/test/unit/core/test_timers.h | 8 + .../network/tcpip/lwip/test/unit/dhcp/test_dhcp.c | 1103 +++++ .../network/tcpip/lwip/test/unit/dhcp/test_dhcp.h | 8 + .../tcpip/lwip/test/unit/etharp/test_etharp.c | 53 +- .../tcpip/lwip/test/unit/etharp/test_etharp.h | 4 +- .../network/tcpip/lwip/test/unit/ip4/test_ip4.c | 342 ++ .../network/tcpip/lwip/test/unit/ip4/test_ip4.h | 8 + .../network/tcpip/lwip/test/unit/ip6/test_ip6.c | 469 ++ .../network/tcpip/lwip/test/unit/ip6/test_ip6.h | 8 + drivers/network/tcpip/lwip/test/unit/lwip_check.h | 55 +- .../network/tcpip/lwip/test/unit/lwip_unittests.c | 84 +- drivers/network/tcpip/lwip/test/unit/lwipopts.h | 58 +- .../network/tcpip/lwip/test/unit/mdns/test_mdns.c | 916 ++++ .../network/tcpip/lwip/test/unit/mdns/test_mdns.h | 8 + .../network/tcpip/lwip/test/unit/mqtt/test_mqtt.c | 115 + .../network/tcpip/lwip/test/unit/mqtt/test_mqtt.h | 8 + .../network/tcpip/lwip/test/unit/ppp/test_pppos.c | 67 + .../network/tcpip/lwip/test/unit/ppp/test_pppos.h | 13 + .../network/tcpip/lwip/test/unit/tcp/tcp_helper.c | 131 +- .../network/tcpip/lwip/test/unit/tcp/tcp_helper.h | 16 +- .../network/tcpip/lwip/test/unit/tcp/test_tcp.c | 1211 ++++- .../network/tcpip/lwip/test/unit/tcp/test_tcp.h | 4 +- .../tcpip/lwip/test/unit/tcp/test_tcp_oos.c | 242 +- .../tcpip/lwip/test/unit/tcp/test_tcp_oos.h | 4 +- .../tcpip/lwip/test/unit/tcp/test_tcp_state.c | 665 +++ .../tcpip/lwip/test/unit/tcp/test_tcp_state.h | 8 + .../network/tcpip/lwip/test/unit/udp/test_udp.c | 418 +- .../network/tcpip/lwip/test/unit/udp/test_udp.h | 4 +- drivers/network/tcpip/tcpip/icmp.c | 3 - media/doc/3rd Party Files.txt | 2 +- 450 files changed, 131213 insertions(+), 39435 deletions(-) diff --git a/drivers/network/tcpip/CMakeLists.txt b/drivers/network/tcpip/CMakeLists.txt index caa7217dda9..ce3712ddb0e 100644 --- a/drivers/network/tcpip/CMakeLists.txt +++ b/drivers/network/tcpip/CMakeLists.txt @@ -4,7 +4,8 @@ set(LWIP_INCLUDE_DIRS ${LWIP_DIR}/src/include ${CMAKE_CURRENT_SOURCE_DIR}/include/lwip ) -add_subdirectory(lwip) +include(${LWIP_DIR}/src/Filelists.cmake) +add_dependencies(lwipcore xdk) add_subdirectory(ip) add_definitions( diff --git a/drivers/network/tcpip/include/lwip/arch/cc.h b/drivers/network/tcpip/include/lwip/arch/cc.h index 8a6d20066d1..0b0bd175011 100644 --- a/drivers/network/tcpip/include/lwip/arch/cc.h +++ b/drivers/network/tcpip/include/lwip/arch/cc.h @@ -15,23 +15,6 @@ free(void *mem); void * realloc(void *mem, size_t size); -/* mem_trim() must trim the buffer without relocating it. - * Since we can't do that, we just return the buffer passed in unchanged */ -#define mem_trim(_m_, _s_) (_m_) - -/* Unsigned int types */ -typedef unsigned char u8_t; -typedef unsigned short u16_t; -typedef unsigned long u32_t; - -/* Signed int types */ -typedef signed char s8_t; -typedef signed short s16_t; -typedef signed long s32_t; - -/* Memory pointer */ -typedef ULONG_PTR mem_ptr_t; - /* Printf/DPRINT formatters */ #define U16_F "hu" #define S16_F "hd" diff --git a/drivers/network/tcpip/include/lwip/arch/sys_arch.h b/drivers/network/tcpip/include/lwip/arch/sys_arch.h index 03746199062..5844b37b8ec 100644 --- a/drivers/network/tcpip/include/lwip/arch/sys_arch.h +++ b/drivers/network/tcpip/include/lwip/arch/sys_arch.h @@ -27,6 +27,9 @@ typedef struct _LWIP_MESSAGE_CONTAINER #define sys_jiffies() sys_now() +/* There is no such thing as "from ISR" for us */ +#define sys_mbox_trypost_fromisr sys_mbox_trypost + /* NULL definitions */ #define SYS_MBOX_NULL NULL #define SYS_SEM_NULL NULL diff --git a/drivers/network/tcpip/include/lwip/lwipopts.h b/drivers/network/tcpip/include/lwip/lwipopts.h index d6109f4b178..e579c58ac7a 100644 --- a/drivers/network/tcpip/include/lwip/lwipopts.h +++ b/drivers/network/tcpip/include/lwip/lwipopts.h @@ -11,6 +11,7 @@ /* Define LWIP_COMPAT_MUTEX if the port has no mutexes and binary semaphores should be used instead */ #define LWIP_COMPAT_MUTEX 1 +#define LWIP_COMPAT_MUTEX_ALLOWED 1 #define MEM_ALIGNMENT 4 diff --git a/drivers/network/tcpip/include/tcpip.h b/drivers/network/tcpip/include/tcpip.h index 88c7e063cb9..861d34472c0 100644 --- a/drivers/network/tcpip/include/tcpip.h +++ b/drivers/network/tcpip/include/tcpip.h @@ -151,6 +151,7 @@ typedef struct { #ifndef htons #define htons(x) WH2N(x) +#define LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS #endif /* Global variable */ diff --git a/drivers/network/tcpip/ip/CMakeLists.txt b/drivers/network/tcpip/ip/CMakeLists.txt index e69ca46f2cd..c070b68494d 100644 --- a/drivers/network/tcpip/ip/CMakeLists.txt +++ b/drivers/network/tcpip/ip/CMakeLists.txt @@ -32,6 +32,7 @@ list(APPEND SOURCE add_library(ip OBJECT ${SOURCE} ${ip_asm}) target_link_libraries(ip lwipcore) +add_importlibs(lwipcore ntoskrnl) target_include_directories(ip BEFORE PRIVATE ${LWIP_INCLUDE_DIRS} diff --git a/drivers/network/tcpip/ip/lwip_glue/lwip_glue.h b/drivers/network/tcpip/ip/lwip_glue/lwip_glue.h index ac7ab13e01f..2463340f029 100644 --- a/drivers/network/tcpip/ip/lwip_glue/lwip_glue.h +++ b/drivers/network/tcpip/ip/lwip_glue/lwip_glue.h @@ -13,7 +13,6 @@ #endif typedef struct tcp_pcb* PTCP_PCB; -typedef struct ip_addr ip4_addr_t; typedef struct _QUEUE_ENTRY { diff --git a/drivers/network/tcpip/ip/lwip_glue/tcp.c b/drivers/network/tcpip/ip/lwip_glue/tcp.c index 4ac40594d06..96d8853f1c0 100644 --- a/drivers/network/tcpip/ip/lwip_glue/tcp.c +++ b/drivers/network/tcpip/ip/lwip_glue/tcp.c @@ -36,7 +36,7 @@ void LibTCPDumpPcb(PVOID SocketContext) { struct tcp_pcb *pcb = (struct tcp_pcb*)SocketContext; - unsigned int addr = ntohl(pcb->remote_ip.addr); + unsigned int addr = lwip_ntohl(pcb->remote_ip.addr); DbgPrint("\tState: %s\n", tcp_state_str[pcb->state]); DbgPrint("\tRemote: (%d.%d.%d.%d, %d)\n", @@ -405,7 +405,7 @@ LibTCPBindCallback(void *arg) msg->Output.Bind.Error = tcp_bind(pcb, msg->Input.Bind.IpAddress, - ntohs(msg->Input.Bind.Port)); + lwip_ntohs(msg->Input.Bind.Port)); done: KeSetEvent(&msg->Event, IO_NO_INCREMENT, FALSE); @@ -609,7 +609,7 @@ LibTCPConnectCallback(void *arg) tcp_sent((PTCP_PCB)msg->Input.Connect.Connection->SocketContext, InternalSendEventHandler); Error = tcp_connect((PTCP_PCB)msg->Input.Connect.Connection->SocketContext, - msg->Input.Connect.IpAddress, ntohs(msg->Input.Connect.Port), + msg->Input.Connect.IpAddress, lwip_ntohs(msg->Input.Connect.Port), InternalConnectEventHandler); msg->Output.Connect.Error = Error == ERR_OK ? ERR_INPROGRESS : Error; diff --git a/drivers/network/tcpip/ip/transport/tcp/if.c b/drivers/network/tcpip/ip/transport/tcp/if.c index 2e57532ca53..3107cda70bd 100644 --- a/drivers/network/tcpip/ip/transport/tcp/if.c +++ b/drivers/network/tcpip/ip/transport/tcp/if.c @@ -9,7 +9,7 @@ #include <ipifcons.h> err_t -TCPSendDataCallback(struct netif *netif, struct pbuf *p, ip4_addr_t *dest) +TCPSendDataCallback(struct netif *netif, struct pbuf *p, const ip4_addr_t *dest) { NDIS_STATUS NdisStatus; PNEIGHBOR_CACHE_ENTRY NCE; diff --git a/drivers/network/tcpip/lwip/.gitattributes b/drivers/network/tcpip/lwip/.gitattributes new file mode 100644 index 00000000000..dd82723fe67 --- /dev/null +++ b/drivers/network/tcpip/lwip/.gitattributes @@ -0,0 +1,10 @@ +# These files are text and should be normalized +*.txt text +*.c text +*.h text + +# For git archive +.gitignore export-ignore +.gitattributes export-ignore +.github export-ignore +.vscode export-ignore diff --git a/drivers/network/tcpip/lwip/.gitignore b/drivers/network/tcpip/lwip/.gitignore new file mode 100644 index 00000000000..2fbaca4f5b2 --- /dev/null +++ b/drivers/network/tcpip/lwip/.gitignore @@ -0,0 +1,60 @@ +*.o +*.so +*.a +*.exe +*lwip_unittests.xml +*.suo +*.log +.depend* + +/.vscode/ipch + +/doc/doxygen/output/html + +/test/fuzz/output +/test/fuzz/lwip_fuzz +/test/fuzz/lwip_fuzz2 +/test/fuzz/lwip_fuzz3 +/test/fuzz/.depend + +/build + +/contrib/examples/example_app/lwipcfg.h +/contrib/examples/example_app/lwipopts_test.h + +/contrib/ports/unix/example_app/build +/contrib/ports/unix/example_app/example_app +/contrib/ports/unix/example_app/makefsdata + +/contrib/ports/unix/check/build +/contrib/ports/unix/lib/build +/contrib/ports/unix/check/lwip_unittests + +/contrib/ports/win32/example_app/build +/contrib/ports/win32/lwipcfg_msvc.h + +/contrib/ports/win32/msvc/Debug +/contrib/ports/win32/msvc/Debug unittests +/contrib/ports/win32/msvc/Release +/contrib/ports/win32/msvc/Release unittests +/contrib/ports/win32/msvc/*.user +/contrib/ports/win32/msvc/*.ncb +/contrib/ports/win32/msvc/*.cache +/contrib/ports/win32/msvc/*.suo +/contrib/ports/win32/msvc/ipch +/contrib/ports/win32/msvc/*.opensdf +/contrib/ports/win32/msvc/*.sdf +/contrib/ports/win32/mingw/*.map +/contrib/ports/win32/mingw/cov-int +/contrib/ports/win32/msvc/.vs +/contrib/apps/LwipMibCompiler/.vs +/contrib/apps/LwipMibCompiler/CCodeGeneration/bin +/contrib/apps/LwipMibCompiler/CCodeGeneration/obj +/contrib/apps/LwipMibCompiler/LwipMibCompiler/bin +/contrib/apps/LwipMibCompiler/LwipMibCompiler/obj +/contrib/apps/LwipMibCompiler/LwipSnmpCodeGeneration/bin +/contrib/apps/LwipMibCompiler/LwipSnmpCodeGeneration/obj +/contrib/apps/LwipMibCompiler/MibViewer/bin +/contrib/apps/LwipMibCompiler/MibViewer/obj +/contrib/apps/LwipMibCompiler/SharpSnmpLib/bin +/contrib/apps/LwipMibCompiler/SharpSnmpLib/obj diff --git a/drivers/network/tcpip/lwip/BUILDING b/drivers/network/tcpip/lwip/BUILDING new file mode 100644 index 00000000000..a2adc626b61 --- /dev/null +++ b/drivers/network/tcpip/lwip/BUILDING @@ -0,0 +1,119 @@ +Building lwIP +============= + +lwIP uses a CMake based build system. + +The CMake files in this project are designed to +be included into your own CMake files. They are +mainly variable definitions containing a list of +source files and predefined static libraries to +be linked against application code. + +1) lwIP sources: + src/Filelists.cmake provides file lists containing + the lwIP core library. + The file also contains two static libraries, lwipcore + and lwipallapps, where you can link your app against. + This is the file that is useful to all lwIP users. + +2) Example applications: + contrib/Filelists.cmake provides several file lists + containing the example applications. + The file also contains several static libraries + for these example apps. + This file is only useful for you, if you can use one + of the examples in your application, which is normally + not the case. + +3) OS/platform port: + Usually the OS port needs to be provided by the user. + If a port to Linux, Windows or MacOS is useful for + you, you can use + contrib/ports/{win32, unix}/Filelists.cmake + that contains file lists and libraries for + these operating systems. + +VARIABLES +========= +In all cases, you need to provide two variables. + +"LWIP_DIR" pointing to the lwIP directory +Example: +set(LWIP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/externals/lwip) + +"LWIP_INCLUDE_DIRS" that contains the include base paths +- for lwIP itself (${LWIP_DIR}/src/include) +- for lwIP contrib if you use it (${LWIP_DIR}/contrib) +- to a directory containing an OS port +- to a directory containing lwipopts.h + +Example: +set (LWIP_INCLUDE_DIRS + "${LWIP_DIR}/src/include" + "${LWIP_DIR}/contrib" + "${LWIP_DIR}/contrib/ports/unix/port/include" + "${LWIP_DIR}/contrib/examples/example_app" +) + +Putting it all together +======================= +To get a working application, your CMake system +needs to provide the variables described above, e.g. +set (LWIP_DIR <path to lwip sources>) +set (LWIP_INCLUDE_DIRS + "${LWIP_DIR}/src/include" + "${LWIP_DIR}/contrib" + "<path to my port>/include" + "<path to lwipopts.h>" +) + +You may add some defines: +set (LWIP_DEFINITIONS LWIP_DEBUG=1) + +Then include the filelists you need: +include(${LWIP_DIR}/src/Filelists.cmake) +include(${LWIP_DIR}/contrib/Filelists.cmake) + +Then, declare you executable: +add_executable(my_app <my source files> <my lwip port files>) + +Add lwIP include dirs to your app: +target_include_directories(my_app PRIVATE ${LWIP_INCLUDE_DIRS}) + +Link your app against the lwIP libs from the filelists you need: +target_link_libraries(my_app lwipcontribapps lwipallapps lwipcore) + +Working example +=============== +Working build examples can be found in the +contrib/ports/{win32, unix}/example_app +subdirectory. +To use them, create a build directory and call cmake with +the lwIP root dir: + +- mkdir build +- cd build +- cmake .. +- cmake --build . + +The CMakeLists.txt will autoselect the correct port +for your system (supported: Linux, Windows, Darwin). + +To configure the example app to your needs, you need to copy the file + contrib/examples/example_app/lwipcfg.h.example +to + contrib/examples/example_app/lwipcfg.h +and edit to your needs. + +Makefile based build system +=========================== +lwIP also maintains file lists for Makefile-based +build systems. Look for Filelists.mk files +in the source tree. We try to maintain them, +but lwIP's mainly focused build system is CMake. + +MS Visual Studio +================ +lwIP also provides basic support for MSVS in the win32 port +folder under 'msvc'. We try to maintain these files, +but lwIP's mainly focused build system is CMake. diff --git a/drivers/network/tcpip/lwip/CHANGELOG b/drivers/network/tcpip/lwip/CHANGELOG index c502b0039cd..5d5f81ad31c 100644 --- a/drivers/network/tcpip/lwip/CHANGELOG +++ b/drivers/network/tcpip/lwip/CHANGELOG @@ -1,15 +1,1311 @@ HISTORY + * These are only the most important changes. For a full list, use git log: +
http://git.savannah.nongnu.org/cgit/lwip.git
-(CVS HEAD) +(git master) * [Enter new changes just after this line - do not remove this line] - ++ New features: +(STABLE-2.2.0): + + 2018-10-02: Dirk Ziegelmeier + * Integrate contrib repository into main lwIP repository + + ++ New features: + + 2022-04-05: David Cermak + * contrib/addons: Add example of using DHCP extra options hooks + + 2023-05-11: David Cermak + * dhcp: Add macro for appending extra client's request options + + 2023-05-11: xueyunfei + * dhcp: Enable custom config for timeouts, thresholds, backoff time + + 2021-04-26 + * test/unit: added more unit tests + + 2020-03-27: Simon Goldschmidt + * test/fuzz: improve fuzz test + + 2019-12-11: Simon Goldschmidt + * ip6addr_aton: support scoped address strings (via '%') + + 2019-08-28: Joan Lledó + * Contrib: Add kFreeBSD to the Unix port + + 2019-07-14: Joan Lledó + * Unix port: improve support for the Hurd + + ++ Bugfixes: + + 2019-12-11: David Girault + * altcp_tls: support for saving/restoring session information + + 2018-11-16: Craig McQUeen + * dns: allow a DNS look-up with a trailing dot in the name + + 2018-10-19: Timmy Brolin + * Add outgoing VLAN PCP support for Ethernet level QoS + + 2018-10-08: Ben Wijen + * apps/tftp: added TFTP client + + 2018-10-04: Jasper Verschueren + * Implement IPv4 ACD (Address Conflict Detection) + + 2023-05-10 + * altcp_tls_mbedtls: note which version of mbedtls we are compatible to + * altcp_tls_mbedtls: multiple compatibility fixes + + 2023-04-26: Jan Breuer, Harrold Spier, Ognjen Bjelica, Dirk Ziegelmeier, Simon Goldschmidt + * apps/snmp: multiple fixes and improvements to snmp + + 2022-01-12: Simon Goldschmidt + * httpd: clean up custom file handling + + 2021-11-25: quanjia + * ping: fix sockaddr len in ping_send() for PING_USE_SOCKETS==1 + + 2021-11-12: Bas Prins + * http_client: reset timeout when receiving data + + 2020-07-07: Erik Ekman + * Rename IP and Ethernet equality checkers from _cmp to _eq + + 2020-03-05: Simon Goldschmidt + * tcp: tighten up checks for received SYN + + 2020-01-30: Simon Goldschmidt, David Girault, David J. Fiddes, Tom Ferrin + * apps/sntp: multiple fixes and improvements for sntp + + 2020-01-30: Simon Goldschmidt + * ip_forward: fix IPv4 forwarding with multiple netifs/offloading + + 2019-06-11: David Girault, Giuseppe Modugno + * apps/mqtt: multiple fixes for mqtt + + 2019-05-19: Joan Lledó + * New function tcpip_callback_wait() + Call a function inside the tcpip thread and block the calling thread until + the callback finishes + + 2018-08-15: Jasper Verschueren, David Girault, Our Air Quality + * apps/mdns: greatly improved the mdns client + +(STABLE-2.1.2): + + ++ Bugfixes: + + 2018-11-21: Jens Nielsen + * netbiosns.c: fix expecting too large packet (bug #55069) + + 2018-11-19: Dirk Ziegelmeier + * smtp.c: fix compiling with strict C compatibility because of strnlen (bug #55034) + + 2018-11-12: Simon Goldschmidt + * tcp.c: fix overflow check in tcp_recved triggering invalid assertion (bug #55015) + + 2018-11-12: Simon Goldschmidt + * tcp.c: fix a bug in sending RST segments (sent from port 0) + +(STABLE-2.1.1): + + ++ Bugfixes: + + 2018-11-01: Joan Lledó + * sockets.c: fix bad assertion in lwip_poll_dec_sockets_used() (bug #54933) + + 2018-11-01: Dirk Ziegelmeier + * ip4.c: don't send 127.* to default netif (bug #54670) + + 2018-10-23: David Girault + * altcp_tls_mbedtls.c: fix use-after free (bug #54774) + + 2018-10-23: Ognjen Bjelica, Dirk Ziegelmeier + * snmp_scalar.c: Avoid NULL pointer dereference (bug #54886) + + 2018-10-23: Simon Goldschmidt + * Fix missing standard includes in multiple files + + 2018-10-17: Ivan Warren + * def.h: fix casting htonX and ntohX to u16_t (bug #54850) + + 2018-10-12: Simon Goldschmidt + * Revert "tcp_abandon: no need to buffer pcb->local_port" (fix that source port was 0 for RST + called when aborting a connection) + + 2018-10-11: Jonas Rabenstein + * tcp.c: tcp_recved: check for overflow and warn about too big values (patch #9699) + + 2018-10-06: Joan Lledó + * sockets.c: alloc_socket(): Check for LWIP_SOCKET_POLL when setting select- + related variables (patch #9696) + + 2018-10-04: Spencer + * tcp.c: Update prev pointer when skipping entries in tcp_slowtmr (patch #9694) + + 2018-09-27: Martine Lenders + * lowpan6.c: Fix IEEE 802.15.4 address setting (bug #54749) + +(STABLE-2.1.0): + + ++ New features: + + 2018-06-17: Simon Goldschmidt + * lwiperf: implemented iPerf client mode + + 2018-04-23: Dirk Ziegelmeier + * added cmake build files + + 2018-03-04: Ray Abram + * netbios responder: respond to '*' queries + + 2018-02-23: Benjamin Aigner + * 6lowpan: add 6lowpan-over-BLE netif (based on existing 6lowpan netif) + + 2018-02-22: Simon Goldschmidt + * ipv6: add support for stateless DHCPv6 (to get DNS servers in SLAAC nets) + + 2018-02-16: Simon Goldschmidt + * add raw API http(s) client (with proxy support) + + 2018-02-01: Simon Goldschmidt + * tcp: add hooks to implement additional socket options + + 2018-02-01: Simon Goldschmidt + * tcp: add hooks to implement tcp md5 signatures or similar (see contrib/addons for an example) + + 2018-01-05: Simon Goldschmidt + * Added sys_mbox_trypost_fromisr() and tcpip_callbackmsg_trycallback_fromisr() + These can be used to post preallocated messages from an ISR to the tcpip thread + (e.g. when using FreeRTOS) + + 2018-01-02: Dirk Ziegelmeier + * task #14780: Add debug helper asserts to ensure threading/locking requirements are met + + 2017-11-21: Simon Goldschmidt + * task #14600: tcp_alloc(): kill TF_CLOSEPEND connections before other ESTABLISHED + + 2017-11-21: Simon Goldschmidt + * makefsdata: added option "-ssi:<filename>" to control SSI tag checking/insertion + through a list of filenames, not by checking the file extension at runtime + + 2017-11-20: Joel Cunningham + * netconn: add LWIP_HOOK_NETCONN_EXTERNAL_RESOLVE to use external DNS resolver (patch #9427) + + 2017-11-14: Joel Cunningham + * netifapi: Add thread safe ARP cache APIs (task #14724) + + 2017-11-06: Axel Lin + * TCP: kill existing connections with a LOWER priority than the one currently being opened. + Previous implementations also kill existing connections of the SAME priority. + + 2017-09-21: Kalle Olavi Niemitalo + * sockets: add poll() implementation (patch #9450) + + 2017-09-10: Joel Cunningham + * sockets: add readv() implementation (task #14610) + + 2017-08-04: Simon Goldschmidt + * Clean up DHCP a bit: no need keep msg_out and msg_in as members in struct + dhcp - they are used in a call stack only (p_out and options_out_len as well) + + 2017-08-04: Simon Goldschmidt + * pbuf: split pbuf_header(s16_t) into pbuf_add_header(size_t) and + pbuf_remove_header(size_t) + + 2017-07-20: Douglas + * sys: deprecate sys_arch_sem_wait and sys_arch_mbox_fetch returning the + time waited rather they are now defined to return != SYS_ARCH_TIMEOUT + on success. + + 2017-07-03: Jakub Schmidtke + * tcp: added support for sending TCP SACKs + + 2017-06-20: Joel Cunningham + * netconn/netdb: added core locking support to netconn_gethostbyname (task #14523) + + 2017-04-25: Simon Goldschmidt + * dhcp: added two hooks for adding and parsing user defined DHCP options + + 2017-04-25: Joel Cunningham + * sockets: added recvmsg for UDP (together with CMSG and IP_PKTINFO) (task #14247) + + 2017-04-20: Joel Cunningham + * tcp: added Appropriate Byte Counting support (task #14128) + + 2017-04-11: Simon Goldschmidt + * netconn/sockets: remove fatal error handling, fix asynchronous error handling, + ensure data before RST can be received + + 2017-03-30: Simon Goldschmidt + * added "application layered TCP" connection API (altcp) for seamless integration + of TLS or proxy connections + + 2017-03-09: Simon Goldschmidt + * sockets: add recvmsg for TCP + + 2017-03-02: Joel Cunningham + * netconn/sockets: vectorize netconn_write for TCP, treating a vectored I/O write + atomically in regards to TCP segmentation (patch #8882) + + 2017-03-02: Simon Goldschmidt + * netconn: added nonblocking accept/recv to netconn API (task #14396) + + 2017-02-28: Simon Goldschmidt + * Added LWIP_SINGLE_NETIF for small targets with only one netif + + 2017-02-10: David van Moolenbroek + * Implement UDP and RAW multicast support for IPv6 (core API, not netconn/sockets) + + 2017-02-04: David van Moolenbroek + * IPv6 scopes support + + 2017-01-20: Joel Cunningham + * sockets: add interface name/index APIs (task #14314) + + 2017-01-08: David van Moolenbroek + * Extensions to RAW API (patch #9208) + - Connected RAW PCBs + - Add raw_sendto_if_src() + - Support IP_HDRINCL socket option + + ++ Bugfixes: + + 2018-06-19: Simon Goldschmidt + * tcp: fix RTO timer not working if link is down + + 2018-06-15: Sylvain Rochet + * ppp: multiple smaller bugfixes + + 2018-05-17: Simon Goldschmidt + * etharp: arp table can now be bigger than 127 entries + + 2018-04-25: Jens Nielsen + * tftp server: correctly handle retransmissions + + 2018-04-18: Simon Goldschmidt + sockets: fix race conditions when closing full-duplex sockets + + 2018-03-09: Simon Goldschmidt + * 6lowpan: fix to work against contiki; added ZigBee encapsulation netif for tests + + 2018-02-04: Simon Goldschmidt + * sockets: fix inconsistencies on close (inconsistent error codes, double FIN) + + 2018-01-05: Dirk Ziegelmeier + * Fix bug #52748: the bug in timeouts.c by reimplementing timer logic to use + absolute instead of relative timeout values + + 2017-12-31: Dirk Ziegelmeier + * Fix bug #52704: DHCP and bad OFFER: Stop timeout only if offer is accepted + + 2017-11-08: Joel Cunningham + * netif: ensure link and admin states are up in issue reports (bug #52353) + + 2017-09-12: David Lockyer + * select: allocate select_cb from memp for LWIP_MPU_COMPATIBLE = 1 (bug #51990) + + 2017-09-11: Simon Goldschmidt + * tcp_in.c: fix bug #51937 (leaking tcp_pcbs on passive close with unacked data) + + 2017-08-11: Joel Cunningham + * lwip_itoa: fix converting the number 0 (previously converted to '\0') (bug #51729) + + 2017-08-08: Dirk Ziegelmeier + * ip4_route_src: parameter order is reversed: ip4_route_src(dest, src) -> ip4_route_src(src, dest) + to make parameter order consistent with other ip*_route*() functions + Same also applies to LWIP_HOOK_IP4_ROUTE_SRC() parameter order. + + 2017-08-04: Joel Cunningham + * tcp: re-work persist timer to fully close window (details in bug #50837) + + 2017-07-26: Simon Goldschmidt + * snmp_msg.c: fix bug #51578 (SNMP failed to decode some values on non 32bit platforms) + + 2017-07-20: Simon Goldschmidt + * compatibility headers: moved from 'src/include/posix' to 'src/include/compat/posix', + 'src/include/compat/stdc' etc. + + 2017-05-09: Joel Cunningham + * tcp: add zero-window probe timeout (bug #50837) + + 2017-04-11: Simon Goldschmidt + * sockets.c: task #14420 (Remove sys_sem_signal from inside SYS_ARCH_PROTECT + crit section) done for LWIP_TCPIP_CORE_LOCKING==1 + + 2017-02-24: Simon Goldschmidt + * sockets.c: fixed close race conditions in lwip_select (for LWIP_NETCONN_FULLDUPLEX) + + 2017-02-24: Simon Goldschmidt + * sockets.c: fixed that select ignored invalid/not open sockets in the fd_sets (bug #50392) + + 2017-01-11: David van Moolenbroek + * Lots of IPv6 related fixes and improvements + +(STABLE-2.0.3) + + ++ Bugfixes: + + 2017-09-11: Simon Goldschmidt + * tcp_in.c: fix bug #51937 (leaking tcp_pcbs on passive close with unacked data) + + 2017-08-02: Abroz Bizjak/Simon Goldschmidt + * multiple fixes in IPv4 reassembly (leading to corrupted datagrams received) + + 2017-03-30: Simon Goldschmidt + * dhcp.c: return ERR_VAL instead of asserting on offset-out-of-pbuf + + 2017-03-23: Dirk Ziegelmeier + * dhcp.h: fix bug #50618 (dhcp_remove_struct() macro does not work) + +(STABLE-2.0.2) + + ++ New features: + + 2017-02-10: Dirk Ziegelmeier + * Implement task #14367: Hooks need a better place to be defined: + We now have a #define for a header file name that is #included in every .c + file that provides hooks. + + 2017-02-10: Simon Goldschmidt + * tcp_close does not fail on memory error (instead, FIN is sent from tcp_tmr) + + ++ Bugfixes: + + 2017-03-08 + * tcp: do not keep sending SYNs when getting ACKs + + 2017-03-08: Joel Cunningham + * tcp: Initialize ssthresh to TCP_SND_BUF (bug #50476) + + 2017-03-01: Simon Goldschmidt + * httpd: LWIP_HTTPD_POST_MANUAL_WND: fixed double-free when httpd_post_data_recved + is called nested from httpd_post_receive_data() (bug #50424) + + 2017-02-28: David van Moolenbroek/Simon Goldschmidt + * tcp: fixed bug #50418: LWIP_EVENT_API: fix invalid calbacks for SYN_RCVD pcb + + 2017-02-17: Simon Goldschmidt + * dns: Improved DNS_LOCAL_HOSTLIST interface (bug #50325) + + 2017-02-16: Simon Goldschmidt + * LWIP_NETCONN_FULLDUPLEX: fixed shutdown during write (bug #50274) + + 2017-02-13: Simon Goldschmidt/Dirk Ziegelmeier + * For tiny targtes, LWIP_RAND is optional (fix compile time checks) + + 2017-02-10: Simon Goldschmidt + * tcp: Fixed bug #47485 (tcp_close() should not fail on memory error) by retrying + to send FIN from tcp_fasttmr + + 2017-02-09: Simon Goldschmidt + * sockets: Fixed bug #44032 (LWIP_NETCONN_FULLDUPLEX: select might work on + invalid/reused socket) by not allowing to reallocate a socket that has + "select_waiting != 0" + + 2017-02-09: Simon Goldschmidt + * httpd: Fixed bug #50059 (httpd LWIP_HTTPD_SUPPORT_11_KEEPALIVE vs. + LWIP_HTTPD_KILL_OLD_ON_CONNECTIONS_EXCEEDED) + + 2017-02-08: Dirk Ziegelmeier + * Rename "IPv6 mapped IPv4 addresses" to their correct name from RFC4191: + "IPv4-mapped IPv6 address" + + 2017-02-08: Luc Revardel + * mld6.c: Fix bug #50220 (mld6_leavegroup does not send ICMP6_TYPE_MLD, even + if last reporter) + + 2017-02-08: David van Moolenbroek + * ip6.c: Patch #9250: fix source substitution in ip6_output_if() + + 2017-02-08: Simon Goldschmidt + * tcp_out.c: Fixed bug #50090 (last_unsent->oversize_left can become wrong value + in tcp_write error path) + + 2017-02-02: Dirk Ziegelmeier + * Fix bug #50206: UDP Netconn bind to IP6_ADDR_ANY fails + + 2017-01-18: Dirk Ziegelmeier + * Fix zero-copy RX, see bug bug #50064. PBUF_REFs were not supported as ARP requests. + + 2017-01-15: Axel Lin, Dirk Ziegelmeier + * minor bug fixes in mqtt + + 2017-01-11: Knut Andre Tidemann + * sockets/netconn: fix broken default ICMPv6 handling of checksums + +(STABLE-2.0.1) + + ++ New features: + + 2016-12-31: Simon Goldschmidt + * tcp.h/.c: added function tcp_listen_with_backlog_and_err() to get the error + reason when listening fails (bug #49861) + + 2016-12-20: Erik Andersen + * Add MQTT client + + 2016-12-14: Jan Breuer: + * opt.h, ndc.h/.c: add support for RDNSS option (as per RFC 6106) + + 2016-12-14: David van Moolenbroek + * opt.h, nd6.c: Added LWIP_HOOK_ND6_GET_GW() + + 2016-12-09: Dirk Ziegelmeier + * ip6_frag.c: Implemented support for LWIP_NETIF_TX_SINGLE_PBUF + + 2016-12-09: Simon Goldschmidt + * dns.c: added one-shot multicast DNS queries + + 2016-11-24: Ambroz Bizjak, David van Moolenbroek + * tcp_out.c: Optimize passing contiguous nocopy buffers to tcp_write (bug #46290) + + 2016-11-16: Dirk Ziegelmeier + * sockets.c: added support for IPv6 mapped IPv4 addresses + + ++ Bugfixes: + + 2016-12-16: Thomas Mueller + * api_lib.c: fixed race condition in return value of netconn_gethostbyname() + (and thus also lwip_gethostbyname/_r() and lwip_getaddrinfo()) + + 2016-12-15: David van Moolenbroek + * opt.h, tcp: added LWIP_HOOK_TCP_ISN() to implement less predictable initial + sequence numbers (see contrib/addons/tcp_isn for an example implementation) + + 2016-12-05: Dirk Ziegelmeier + * fixed compiling with IPv4 disabled (IPv6 only case) + + 2016-11-28: Simon Goldschmidt + * api_lib.c: fixed bug #49725 (send-timeout: netconn_write() can return + ERR_OK without all bytes being written) + + 2016-11-28: Ambroz Bizjak + * tcpi_in.c: fixed bug #49717 (window size in received SYN and SYN-ACK + assumed scaled) + + 2016-11-25: Simon Goldschmidt + * dhcp.c: fixed bug #49676 (Possible endless loop when parsing dhcp options) + + 2016-11-23: Dirk Ziegelmeier + * udp.c: fixed bug #49662: multicast traffic is now only received on a UDP PCB + (and therefore on a UDP socket/netconn) when the PCB is bound to IP_ADDR_ANY + + 2016-11-16: Dirk Ziegelmeier + * *: Fixed dual-stack behaviour, IPv6 mapped IPv4 support in socket API + + 2016-11-14: Joel Cunningham + * tcp_out.c: fixed bug #49533 (start persist timer when unsent seg can't fit + in window) + + 2016-11-16: Roberto Barbieri Carrera + * autoip.c: fixed bug #49610 (sometimes AutoIP fails to reuse the same address) + + 2016-11-11: Dirk Ziegelmeier + * sockets.c: fixed bug #49578 (dropping multicast membership does not work + with LWIP_SOCKET_OFFSET) + +(STABLE-2.0.0) + + ++ New features: + + 2016-07-27: Simon Goldschmidt + * opt.h, timeouts.h/.c: added LWIP_TIMERS_CUSTOM to override the default + implementation of timeouts + + 2016-07-xx: Dirk Ziegelmeier + * Large overhaul of doxygen documentation + + 2016-04-05: Simon Goldschmidt + * timers.h/.c: prepare for overriding current timeout implementation: all + stack-internal caclic timers are avaliable in the lwip_cyclic_timers array + + 2016-03-23: Simon Goldschmidt + * tcp: call accept-callback with ERR_MEM when allocating a pcb fails on + passive open to inform the application about this error + ATTENTION: applications have to handle NULL pcb in accept callback! + + 2016-02-22: Ivan Delamer + * Initial 6LoWPAN support + + 2016-02-XX to 2016-03-XX: Dirk Ziegelmeier + * Cleanup TCPIP thread sync methods in a way that it is possibe to use them + in arbitrary code that needs things to be done in TCPIP thread. Used to + decouple netconn, netif, ppp and 6LoWPAN from LWIP core. + + 2016-02-XX: Dirk Ziegelmeier + * Implement dual-stack support in RAW, UDP and TCP. Add new IP address + type IPADDR_ANY_TYPE for this. Netconn/Socket API: Dual-stack is + automatically supported when an IPv6 netconn/socket is created. + + 2015-12-26: Martin Hentschel and Dirk Ziegelmeier + * Rewrite SNMP agent. SNMPv2c + MIB compiler. + + 2015-11-12: Dirk Ziegelmeier + * Decouple SNMP stack from lwIP core and move stack to apps/ directory. + Breaking change: Users have to call snmp_init() now! + + 2015-11-12: Dirk Ziegelmeier + * Implement possibility to declare private memory pools. This is useful to + decouple some apps from the core (SNMP stack) or make contrib app usage + simpler (httpserver_raw) + + 2015-10-09: Simon Goldschmidt + * started to move "private" header files containing implementation details to + "lwip/priv/" include directory to seperate the API from the implementation. + + 2015-10-07: Simon Goldschmidt + * added sntp client as first "supported" application layer protocol implementation + added 'apps' folder + + 2015-09-30: Dirk Ziegelmeier + * snmp_structs.h, mib_structs.c, mib2.c: snmp: fixed ugly inheritance + implementation by aggregating the "base class" (struct mib_node) in all + derived node classes to get more type-safe code + + 2015-09-23: Simon Goldschmidt + * netif.h/.c, nd6.c: task #13729: Convert netif addresses (IPv4 & IPv6) to + ip_addr_t (so they can be used without conversion/temporary storage) + + 2015-09-08: Dirk Ziegelmeier + * snmp: Separate mib2 counter/table callbacks from snmp agent. This both cleans + up the code and should allow integration of a 3rd party agent/mib2. Simple + counters are kept in MIB2_STATS, tree/table change function prototypes moved to + snmp_mib2.h. + + 2015-09-03: Simon Goldschmidt + * opt.h, dns.h/.c: DNS/IPv6: added support for AAAA records + + 2015-09-01: Simon Goldschmidt + * task #12178: hardware checksum capabilities can be configured per netif + (use NETIF_SET_CHECKSUM_CTRL() in your netif's init function) + + 2015-08-30: Simon Goldschmidt + * PBUF_REF with "custom" pbufs is now supported for RX pbufs (see pcapif in + contrib for an example, LWIP_SUPPORT_CUSTOM_PBUF is required) + + 2015-08-30: Simon Goldschmidt + * support IPv4 source based routing: define LWIP_HOOK_IP4_ROUTE_SRC to point + to a routing function + + 2015-08-05: Simon Goldschmidt + * many files: allow multicast socket options IP_MULTICAST_TTL, IP_MULTICAST_IF + and IP_MULTICAST_LOOP to be used without IGMP + + 2015-04-24: Simon Goldschmidt + * dhcp.h/c, autoip.h/.c: added functions dhcp/autoip_supplied_address() to + check for the source of address assignment (replacement for NETIF_FLAG_DHCP) + + 2015-04-10: Simon Goldschmidt + * many files: task #13480: added LWIP_IPV4 define - IPv4 can be disabled, + leaving an IPv6-only stack + + 2015-04-09: Simon Goldschmidt + * nearly all files: task #12722 (improve IPv4/v6 address handling): renamed + ip_addr_t to ip4_addr_t, renamed ipX_addr_t to ip_addr_t and added IP + version; ip_addr_t is used for all generic IP addresses for the API, + ip(4/6)_addr_t are only used internally or when initializing netifs or when + calling version-related functions + + 2015-03-24: Simon Goldschmidt + * opt.h, ip4_addr.h, ip4.c, ip6.c: loopif is not required for loopback traffic + any more but passed through any netif (ENABLE_LOOPBACK has to be enabled) + + 2015-03-23: Simon Goldschmidt + * opt.h, etharp.c: with ETHARP_TABLE_MATCH_NETIF== 1, duplicate (Auto)-IP + addresses on multiple netifs should now be working correctly (if correctly + addressed by routing, that is) + + 2015-03-23: Simon Goldschmidt + * etharp.c: Stable etharp entries that are about to expire are now refreshed + using unicast to prevent unnecessary broadcast. Only if no answer is received + after 15 seconds, broadcast is used. + + 2015-03-06: Philip Gladstone + * netif.h/.c: patch #8359 (Provide utility function to add an IPv6 address to + an interface) + + 2015-03-05: Simon Goldschmidt + * netif.c, ip4.c, dhcp.c, autoip.c: fixed bug #37068 (netif up/down handling + is unclear): correclty separated administrative status of a netif (up/down) + from 'valid address' status + ATTENTION: netif_set_up() now always has to be called, even when dhcp/autoip + is used! + + 2015-02-26: patch by TabascoEye + * netif.c, udp.h/.c: fixed bug #40753 (re-bind UDP pcbs on change of IP address) + + 2015-02-22: chrysn, Simon Goldschmidt + * *.*: Changed nearly all functions taking 'ip(X)_addr_t' pointer to take + const pointers (changed user callbacks: raw_recv_fn, udp_recv_fn; changed + port callbacks: netif_output_fn, netif_igmp_mac_filter_fn) + + 2015-02-19: Ivan Delamer + * netif.h, dhcp.c: Removed unused netif flag for DHCP. The preferred way to evaluate + if DHCP is active is through netif->dhcp field. + + 2015-02-19: Ivan Delamer + * netif.h, slipif.c, ppp.c: Removed unused netif flag for point to point connections + + 2015-02-18: Simon Goldschmidt + * api_lib.c: fixed bug #37958 "netconn API doesn't handle correctly + connections half-closed by peer" + + 2015-02-18: Simon Goldschmidt + * tcp.c: tcp_alloc() prefers killing CLOSING/LAST_ACK over active connections + (see bug #39565) + + 2015-02-16: Claudius Zingerli, Sergio Caprile + * opt.h, dhcp.h/.c: patch #8361 "Add support for NTP option in DHCP" + + 2015-02-14: Simon Goldschmidt + * opt.h, snmp*: added support for write-access community and dedicated + community for sending traps + + 2015-02-13: Simon Goldschmidt + * opt.h, memp.c: added hook LWIP_HOOK_MEMP_AVAILABLE() to get informed when + a memp pool was empty and an item is now available + + 2015-02-13: Simon Goldschmidt + * opt.h, pbuf.h/.c, etharp.c: Added the option PBUF_LINK_ENCAPSULATION_HLEN to + allocate additional header space for TX on netifs requiring additional headers + + 2015-02-12: chrysn + * timers.h/.c: introduce sys_timeouts_sleeptime (returns the time left before + the next timeout is due, for NO_SYS==1) + + 2015-02-11: Nick van Ijzendoorn + * opt.h, sockets.h/c: patch #7702 "Include ability to increase the socket number + with defined offset" + + 2015-02-11: Frederick Baksik + * opt.h, def.h, others: patch #8423 "arch/perf.h" should be made an optional item + + 2015-02-11: Simon Goldschmidt + * api_msg.c, opt.h: started to implement fullduplex sockets/netconns + (note that this is highly unstable yet!) + + 2015-01-17: Simon Goldschmidt + * api: allow enabling socket API without (public) netconn API - netconn API is + still used by sockets, but keeping it private (static) should allow better + compiler optimizations + + 2015-01-16: Simon Goldschmidt + * tcp_in.c: fixed bug #20506 "Initial congestion window is very small" again + by implementing the calculation formula from RFC3390 + + 2014-12-10: Simon Goldschmidt + * api: added option LWIP_NETCONN_SEM_PER_THREAD to use a semaphore per thread + instead of using one per netconn and per select call + + 2014-12-08: Simon Goldschmidt + * ip6.h: fixed bug #43778: IPv6 header version not set on 16-bit platform + (macro IP6H_VTCFL_SET()) + + 2014-12-08: Simon Goldschmidt + * icmp.c, ip4.c, pbuf.c, udp.c, pbuf.h: task #11472 Support PBUF_REF for RX + (IPv6 and IPv4/v6 reassembly might not work yet) + + 2014-11-06: Simon Goldschmidt + * sockets.c/.h, init.c: lwip_socket_init() is not needed any more + -> compatibility define + + 2014-09-16: Simon Goldschmidt + * dns.c, opt.h: reduced ram usage by parsing DNS responses in place + + 2014-09-16: Simon Goldschmidt + * pbuf.h/.c: added pbuf_take_at() and pbuf_put_at() + + 2014-09-15: Simon Goldschmidt + * dns.c: added source port randomization to make the DNS client more robust + (see bug #43144) + + 2013-09-02: Simon Goldschmidt + * arch.h and many other files: added optional macros PACK_STRUCT_FLD_8() and + PACK_STRUCT_FLD_S() to prevent gcc 4 from warning about struct members that + do not need packing + + 2013-08-19: Simon Goldschmidt + * netif.h: bug #42998: made NETIF_MAX_HWADDR_LEN overridable for some special + networks + + 2013-03-17: Simon Goldschmidt (patch by Ghobad Emadi) + * opt.h, etharp.c: Added LWIP_HOOK_ETHARP_GET_GW to implement IPv4 routing with + multiple gateways + + 2013-04-20: Fatih Asici + * opt.h, etharp.h/.c: patch #7993: Added support for transmitting packets + with VLAN headers via hook function LWIP_HOOK_VLAN_SET and to check them + via hook function LWIP_HOOK_VLAN_CHECK + + 2014-02-20: Simon Goldschmidt (based on patch by Artem Pisarenko) + * patch #7885: modification of api modules to support FreeRTOS-MPU + (don't pass stack-pointers to other threads) + + 2014-02-05: Simon Goldschmidt (patch by "xtian" and "alex_ab") + * patch #6537/#7858: TCP window scaling support + + 2014-01-17: Jiri Engelthaler + * icmp, icmp6, opt.h: patch #8027: Completed HW checksuming for IPv4 and + IPv6 ICMP's + + 2012-08-22: Sylvain Rochet + * New PPP stack for lwIP, developed in ppp-new branch. + Based from pppd 2.4.5, released 2009-11-17, with huge changes to match + code size and memory requirements for embedded devices, including: + - Gluing together the previous low-level PPP code in lwIP to pppd 2.4.5, which + is more or less what pppd sys-* files are, so that we get something working + using the unix port. + - Merged some patchs from lwIP Git repository which add interesting features + or fix bugs. + - Merged some patchs from Debian pppd package which add interesting features + or fix bugs. + - Ported PPP timeout handling to the lwIP timers system + - Disabled all the PPP code using filesystem access, replaced in necessary cases + to configuration variables. + - Disabled all the PPP code forking processes. + - Removed IPX support, lwIP does not support IPX. + - Ported and improved random module from the previous PPP port. + - Removed samba TDB (file-driven database) usage, because it needs a filesystem. + - MS-CHAP required a DES implementation, we added the latest PolarSSL DES + implementation which is under a BSD-ish license. + - Also switched to PolarSSL MD4,MD5,SHA1 implementations, which are meant to be + used in embedded devices with reduced memory footprint. + - Removed PPP configuration file parsing support. + - Added macro definition EAP_SUPPORT to make EAP support optional. + - Added macro definition CHAP_SUPPORT to make CHAP support optional. + - Added macro definition MSCHAP_SUPPORT to make MSCHAP support optional. + - Added macro definition PAP_SUPPORT to make PAP support optional. + - Cleared all Linux syscall calls. + - Disabled demand support using a macro, so that it can be ported later. + - Disabled ECP support using a macro, so that it can be ported later. + - Disabled CCP support using a macro, so that it can be ported later. + - Disabled CBCP support using a macro, so that it can be ported later. + - Disabled LQR support using a macro, so that it can be ported later. + - Print packet debug feature optional, through PRINTPKT_SUPPORT + - Removed POSIX signal usage. + - Fully ported PPPoS code from the previous port. + - Fully ported PPPoE code from the previous port. + - Fully ported VJ compression protocol code from the previous port. + - Removed all malloc()/free() use from PPP, replaced by stack usage or PBUF. + - Disabled PPP server support using a macro, so that it can be ported later. + - Switched all PPP debug to lwIP debug system. + - Created PPP Control Block (PPP PCB), removed PPP unit integer everywhere, + removed all global variables everywhere, did everything necessary for + the PPP stack to support more than one PPP session (pppd only support + one session per process). + - Removed the statically allocated output buffer, now using PBUF. + - Improved structure size of all PPP modules, deep analyze of code to reduce + variables size to the bare minimum. Switched all boolean type (char type in + most architecture) to compiler generated bitfields. + - Added PPP IPv6 support, glued lwIP IPv6 support to PPP. + - Now using a persistent netif interface which can then be used in lwIP + functions requiring a netif. + - Now initializing PPP in lwip_init() function. + - Reworked completely the PPP state machine, so that we don't end up in + anymore in inconsistent state, especially with PPPoE. + - Improved the way we handle PPP reconnection after disconnect, cleaning + everything required so that we start the PPP connection again from a + clean state. + - Added PPP holdoff support, allow the lwIP user to wait a little bit before + reconnecting, prevents connection flood, especially when using PPPoL2TP. + - Added PPPoL2TP LAC support (a.k.a. UDP tunnels), adding a VPN client + feature to lwIP, L2TP being a widely used tunnel protocol. + - Switched all used PPP types to lwIP types (u8t, u16t, u32t, ...) + - Added PPP API "sequential" thread-safe API, based from NETIFAPI. + + 2011-07-21: Simon Goldschmidt + * sockets.c, opt.h: (bug #30185): added LWIP_FIONREAD_LINUXMODE that makes + ioctl/FIONREAD return the size of the next pending datagram. + + 2011-05-25: Simon Goldschmidt + * again nearly the whole stack, renamed ip.c to ip4.c, ip_addr.c to ip4_addr.c, + combined ipv4/ipv6 inet_chksum.c, added ip.h, ip_addr.h: Combined IPv4 + and IPv6 code where possible, added defines to access IPv4/IPv6 in non-IP + code so that the code is more readable. + + 2011-05-17: Patch by Ivan Delamer (only checked in by Simon Goldschmidt) + * nearly the whole stack: Finally, we got decent IPv6 support, big thanks to + Ivan! (this is work in progress: we're just post release anyway :-) + + + ++ Bugfixes: + + 2016-08-23: Simon Goldschmidt + * etharp: removed ETHARP_TRUST_IP_MAC since it is insecure and we don't need + it any more after implementing unicast ARP renewal towards arp entry timeout + + 2016-07-20: Simon Goldschmidt + * memp.h/.c: fixed bug #48442 (memp stats don't work for MEMP_MEM_MALLOC) + + 2016-07-21: Simon Goldschmidt (patch by Ambroz Bizjak) + * tcp_in.c, tcp_out.c: fixed bug #48543 (TCP sent callback may prematurely + report sent data when only part of a segment is acked) and don't include + SYN/FIN in snd_buf counter + + 2016-07-19: Simon Goldschmidt + * etharp.c: fixed bug #48477 (ARP input packet might update static entry) + + 2016-07-11: Simon Goldschmidt + * tcp_in.c: fixed bug #48476 (TCP sent callback called wrongly due to picking + up old pcb->acked + + 2016-06-30: Simon Goldschmidt (original patch by Fabian Koch) + * tcp_in.c: fixed bug #48170 (Vulnerable to TCP RST spoofing) + + 2016-05-20: Dirk Ziegelmeier + * sntp.h/.c: Fix return value of sntp_getserver() call to return a pointer + + 2016-04-05: Simon Goldschmidt (patch by Philip Gladstone) + * udp.c: patch #8358: allow more combinations of listening PCB for IPv6 + + 2016-04-05: Simon Goldschmidt + * netconn/socket API: fixed bug# 43739 (Accept not reporting errors about + aborted connections): netconn_accept() returns ERR_ABRT (sockets: ECONNABORTED) + for aborted connections, ERR_CLSD (sockets: EINVAL) if the listening netconn + is closed, which better seems to follow the standard. + + 2016-03-23: Florent Matignon + * dhcp.c: fixed bug #38203: DHCP options are not recorded in all DHCP ack messages + + 2016-03-22: Simon Goldschmidt + * tcp: changed accept handling to be done internally: the application does not + have to call tcp_accepted() any more. Instead, when delaying accept (e.g. sockets + do), call tcp_backlog_delayed()/tcp_backlog_accepted() (fixes bug #46696) + + 2016-03-22: Simon Goldschmidt + * dns.c: ignore dns response parsing errors, only abort resolving for correct + responses or error responses from correct server (bug #47459) + + 2016-03-17: Simon Goldschmidt + * api_msg.c: fixed bug #47448 (netconn/socket leak if RST is received during close) + + 2016-03-17: Joel Cunningham + * api_msg.c: don't fail closing a socket/netconn when failing to allocate the + FIN segment; blocking the calling thread for a while is better than risking + leaking a netconn/socket (see bug #46701) + + 2016-03-16: Joel Cunningham + * tcp_out.c: reset rto timer on fast retransmission + + 2016-03-16: Deomid Ryabkov + * tcp_out.c: fixed bug #46384 Segment size calculation bug with MSS != TCP_MSS + + 2016-03-05: Simon Goldschmidt + * err.h/.c, sockets.c: ERR_IF is not necessarily a fatal error + + 2015-11-19: fix by Kerem Hadimli + * sockets.c: fixed bug #46471: lwip_accept() leaks socket descriptors if new + netconn was already closed because of peer behavior + + 2015-11-12: fix by Valery Ushakov + * tcp_in.c: fixed bug #46365 tcp_accept_null() should call tcp_abort() + + 2015-10-02: Dirk Ziegelmeier/Simon Goldschmidt + * snmp: cleaned up snmp structs API (fixed race conditions from bug #46089, + reduce ram/rom usage of tables): incompatible change for private MIBs + + 2015-09-30: Simon Goldschmidt + * ip4_addr.c: fixed bug #46072: ip4addr_aton() does not check the number range + of all address parts + + 2015-08-28: Simon Goldschmidt + * tcp.c, tcp_in.c: fixed bug #44023: TCP ssthresh value is unclear: ssthresh + is set to the full send window for active open, too, and is updated once + after SYN to ensure the correct send window is used + + 2015-08-28: Simon Goldschmidt + * tcp: fixed bug #45559: Window scaling casts u32_t to u16_t without checks + + 2015-08-26: Simon Goldschmidt + * ip6_frag.h/.c: fixed bug bug #41009: IPv6 reassembly broken on 64-bit platforms: + define IPV6_FRAG_COPYHEADER==1 on these platforms to copy the IPv6 header + instead of referencing it, which gives more room for struct ip6_reass_helper + + 2015-08-25: Simon Goldschmidt + * sockets.c: fixed bug #45827: recvfrom: TCP window is updated with MSG_PEEK + + 2015-08-20: Manoj Kumar + * snmp_msg.h, msg_in.c: fixed bug #43790: Sending octet string of Length >255 + from SNMP agent + + 2015-08-19: Jens Nielsen + * icmp.c, ip4.c, tcp_in.c, udp.c, raw.c: fixed bug #45120: Broadcast & multiple + interfaces handling + + 2015-08-19: Simon Goldschmidt (patch by "Sandra") + * dns.c: fixed bug #45004: dns response without answer might be discarded + + 2015-08-18: Chrysn + * timers.c: patch #8704 fix sys_timeouts_sleeptime function + + 2015-07-01: Erik Ekman + * puf.c: fixed bug #45454 (pbuf_take_at() skips write and returns OK if offset + is at start of pbuf in chain) + + 2015-05-19: Simon Goldschmidt + * dhcp.h/.c: fixed bugs #45140 and #45141 (dhcp was not stopped correctly after + fixing bug #38204) + + 2015-03-21: Simon Goldschmidt (patch by Homyak) + * tcp_in.c: fixed bug #44766 (LWIP_WND_SCALE: tcphdr->wnd was not scaled in + two places) + + 2015-03-21: Simon Goldschmidt + * tcp_impl.h, tcp.c, tcp_in.c: fixed bug #41318 (Bad memory ref in tcp_input() + after tcp_close()) + + 2015-03-21: Simon Goldschmidt + * tcp_in.c: fixed bug #38468 (tcp_sent() not called on half-open connection for + data ACKed with the same ack as FIN) + + 2015-03-21: Simon Goldschmidt (patch by Christoffer Lind) + * dhcp.h/.c: fixed bug #38204 (DHCP lease time not handled correctly) + + 2015-03-20: Simon Goldschmidt + * dhcp.c: fixed bug #38714 (Missing option and client address in DHCPRELEASE message) + + 2015-03-19: Simon Goldschmidt + * api.h, tcpip.h, api_lib.c, api_msg.c: fixed race conditions in assigning + netconn->last_err (fixed bugs #38121 and #37676) + + 2015-03-09: Simon Goldschmidt + * ip4.c: fixed the IPv4 part of bug #43904 (ip_route() must detect linkup status) + + 2015-03-04: Simon Goldschmidt + * nd6.c: fixed bug #43784 (a host should send at least one Router Solicitation) + + 2015-03-04: Valery Ushakov + * ip6.c: fixed bug #41094 (Byte-order bug in IPv6 fragmentation header test) + + 2015-03-04: Zach Smith + * nd6.c: fixed bug #38153 (nd6_input() byte order issues) + + 2015-02-26: Simon Goldschmidt + * netif.c, tcp.h/.c: fixed bug #44378 (TCP connections are not aborted on netif + remove) + + 2015-02-25: Simon Goldschmidt + * ip4.c, etharp.c: fixed bug #40177 (System hangs when dealing with corrupted + packets), implemented task #12357 (Ensure that malicious packets don't + assert-fail): improved some pbuf_header calls to not assert-fail. + + 2015-02-25: patch by Joel Cunningham + * udp.h/.c, sockets.c: fixed bug #43028 (IP_MULTICAST_TTL affects unicast + datagrams) + + 2015-02-25: patch by Greg Renda + * ip4_frag.c: fixed bug #38210 (ip reassembly while remove oldest datagram) + + 2015-02-25: Simon Goldschmidt + * sockets.c: fixed bug #38165 (socket with mulicast): ensure igmp membership + are dropped when socket (not netconn!) is closed. + + 2015-02-25: Simon Goldschmidt + * ip4.h/.c, udp.c: fixed bug #38061 (wrong multicast routing in IPv4) by + adding an optional default netif for multicast routing + + 2015-02-25: Simon Goldschmidt + * netconn API: fixed that netconn_connect still used message passing for + LWIP_TCPIP_CORE_LOCKING==1 + + 2015-02-22: patch by Jens Nielsen + * icmp.c: fixed bug #38803 (Source address in broadcast ping reply) + + 2015-02-22: Simon Goldschmidt + * udp.h, sockets.c: added proper accessor functions for pcb->multicast_ip + (previously used by get/setsockopt only) + + 2015-02-18: Simon Goldschmidt + * sockets.c: Fixed select not reporting received FIN as 'readable' in certain + rare cases (bug #43779: select(), close(), and TCP retransmission error) + + 2015-02-17: Simon Goldschmidt + * err.h, sockets.c, api_msg.c: fixed bug #38853 "connect() use a wrong errno": + return ERR_ALREADY/EALRADY during connect, ERR_ISCONN/EISCONN when already + connected + + 2015-02-17: Simon Goldschmidt + * tcp_impl.h, tcp_out.c, tcp.c, api_msg.c: fixed bug #37614 "Errors from + ipX_output are not processed". Now tcp_output(_segment) checks for the return + value of ipX_output and does not try to send more on error. A netif driver + can call tcp_txnow() (from tcpip_thread!) to try to send again if TX buffers + are available again. + + 2015-02-14: patches by Freddie Chopin + * snmp*: made community writable, fixed some const pointers + + 2015-02-13: Simon Goldschmidt + * msg_in.c: fixed bug #22070 "MIB_OBJECT_WRITE_ONLY not implemented in SNMP" + + 2015-02-12: Simon Goldschmidt + * ip.h, ip4.c, ip6.c: fixed bug #36403 "ip4_input() and ip6_input() always pass + inp to higher layers": now the accepting netif is passed up, but the input + netif is available through ip_current_input_netif() if required. + + 2015-02-11: patch by hichard + * tcpip.c: fixed bug #43094 "The function tcpip_input() forget to handle IPv6" + + 2015-02-10: Simon Goldschmidt + * netconn API: fixed that netconn_close/netconn_delete still used message passing + for LWIP_TCPIP_CORE_LOCKING==1 + + 2015-02-10: Simon Goldschmidt + * netconn/socket api: fixed bug #44225 "closing TCP socket should time out + eventually", implemented task #6930 "Implement SO_LINGER": closing TCP sockets + times out after 20 seconds or after the configured SND_TIMEOUT or depending + on the linger settings. + + 2015-01-27: Simon Goldschmidt + * api_msg.c: fixed that SHUT_RD followed by SHUT_WR was different to SHUT_RDWR, + fixed return value of lwip_netconn_do_close on unconnected netconns + + 2015-01-17: Simon Goldschmidt + * sockets.c: fixed bug #43361 select() crashes with stale FDs + + 2015-01-17: Simon Goldschmidt + * sockets.c/.h, memp_std.h: fixed bug #40788 "lwip_setsockopt_internal() crashes" + by rewriting set/getsockopt functions to combine checks with the actual code + and add more NULL checks; this also fixes that CORE_LOCKING used message + passing for set/getsockopt. + + 2014-12-19: Simon Goldschmidt + * opt.h, dhcp.h/.c: prevent dhcp from starting when netif link is down (only + when LWIP_DHCP_CHECK_LINK_UP==1, which is disabled by default for + compatibility reasons) + + 2014-12-17: Simon Goldschmidt + * tcp_out.c: fixed bug #43840 Checksum error for TCP_CHECKSUM_ON_COPY==1 for + no-copy data with odd length + + 2014-12-10: Simon Goldschmidt + * sockets.c, tcp.c, others: fixed bug #43797 set/getsockopt: SO_SNDTIMEO/SO_RCVTIMEO + take int as option but should take timeval (LWIP_SO_SNDRCVTIMEO_STANDARD==0 can + be used to revert to the old 'winsock' style behaviour) + Fixed implementation of SO_ACCEPTCONN to just look at the pcb state + + 2014-12-09: Simon Goldschmidt + * ip4.c: fixed bug #43596 IGMP queries from 0.0.0.0 are discarded + + 2014-10-21: Simon Goldschmidt (patch by Joel Cunningham and Albert Huitsing) + * sockts.c: fixed bugs #41495 Possible threading issue in select() and #43278 + event_callback() handle context switch when calling sys_sem_signal() + + 2014-10-21: Simon Goldschmidt + * api_msg.c: fixed bug #38219 Assert on TCP netconn_write with sndtimeout set + + 2014-09-16: Kevin Cernekee + * dns.c: patch #8480 Fix handling of dns_seqno wraparound + + 2014-09-16: Simon Goldschmidt + * tcp_out.c: fixed bug #43192 tcp_enqueue_flags() should not check TCP_SND_QUEUELEN + when sending FIN + + 2014-09-03: Simon Goldschmidt + * msg_in.c: fixed bug #39355 SNMP Memory Leak in case of error + + 2014-09-02: Simon Goldschmidt + * err.h/.c, sockets.c, api_msg.c: fixed bug #43110 call getpeername() before + listen() will cause a error + + 2014-09-02: Simon Goldschmidt + * sockets.c: fixed bug #42117 lwip_fcntl does not set errno + + 2014-09-02: Simon Goldschmidt + * tcp.c: fixed bug #42299 tcp_abort() leaves freed pcb on tcp_bound_pcbs list + + 2014-08-20: Simon Goldschmidt + * dns.c: fixed bug #42987 lwIP is vulnerable to DNS cache poisoning due to + non-randomized TXIDs + + 2014-06-03: Simon Goldschmidt + * tcp_impl.h, tcp_in.c: fixed bug #37969 SYN packet dropped as short packet in + tcp_input function + + 2014-05-20: Simon Goldschmidt + * tcp_out.c: fixed bug #37184 tcp_write problem for pcbs in the SYN_SENT state + + 2014-05-19: Simon Goldschmidt + * *.h: Fixed bug #35874 reserved identifier violation (removed leading underscores + from header include guards) + + 2014-04-08: Simon Goldschmidt + * tcp.c: Fixed bug #36167 tcp server crash when client closes (maximum window) + + 2014-04-06: Simon Goldschmidt + * tcp_in.c: Fixed bug #36210 lwIP does not elicit an empty ACK when received + unacceptable ACK + + 2014-04-06: Simon Goldschmidt + * dhcp.c, ip4.c/.h, ip6.c/.h, udp.c/.h, ip.h: Fixed bug #41787 DHCP Discovery + is invalid when an IP is set to thet netif. + + 2014-03-14: Simon Goldschmidt + * tcp_out.c: Fixed bug #36153 TCP Cheksum error if LWIP_CHECKSUM_ON_COPY=1 + + 2014-03-11: Simon Goldschmidt (patch by Mason) + * opt.h, sockets.c: fixed bug #35928 BSD sockets functions must set errno for + POSIX-compliance + + 2014-02-27: Simon Goldschmidt + * dhcp.c: fixed bug #40303 DHCP xid renewed when sending a DHCPREQUEST + + 2014-02-27: Simon Goldschmidt + * raw.c: fixed bug #41680 raw socket can not receive IPv6 packet when + IP_SOF_BROADCAST_RECV==1 + + 2014-02-27: Simon Goldschmidt + * api_msg.c, sockets.c: fixed bug #38404 getpeeraddr returns success on + unconnected/listening TCP sockets + + 2014-02-27: Simon Goldschmidt + * sockets.c: fixed bug #41729 Some socket functions return Exyz instead of -1 + + 2014-02-25: Simon Goldschmidt + * ip4.c: fixed bug #39514 ip_route() may return an IPv6-only interface + + 2014-02-25: Simon Goldschmidt, patch by Fatih Asici + * pbuf.c: fixed bug #39356 Wrong increment in pbuf_memfind() + + 2014-02-25: Simon Goldschmidt + * netif.c/.h, udp.c: fixed bug #39225 udp.c uses netif_matches_ip6_addr() incorrectly; + renamed function netif_matches_ip6_addr() to netif_get_ip6_addr_match() + + 2014-02-25: Simon Goldschmidt + * igmp.c: fixed bug #39145 IGMP membership report for 224.0.0.1 + + 2014-02-22: Simon Goldschmidt (patch by Amir Shalem) + * etharp.c, opt.h: fixed bug #34681 Limit ARP queue length by ARP_QUEUE_LEN (=3) + + 2014-02-22: Simon Goldschmidt (patch by Amir Shalem) + * etharp.h/.c: fixed bug #34682 Limit ARP request flood for unresolved entry + + 2014-02-20: Simon Goldschmidt + * tcp_out.c: fixed bug #39683 Assertion "seg->tcphdr not aligned" failed with + MEM_ALIGNMENT = 8 + + 2014-02-20: Simon Goldschmidt + * sockets.c: fixed bug #39882 No function shall set errno to 0 + + 2014-02-20: Simon Goldschmidt + * mib_structs.c: fixed bug #40050 SNMP problem with MIB arrays > 255 + + 2014-02-20: Simon Goldschmidt + * api.h, sockets.c: fixed bug #41499 netconn::recv_avail can overflow + + 2014-01-08: Stathis Voukelatos + * memp_std.h: patch #7928 Fixed size calculation in MALLOC memory pool + creation macro + + 2014-01-18: Brian Fahs + * tcp_out.c: patch #8237: tcp_rexmit_rto fails to update pcb->unsent_oversize + when necessary + + 2014-01-17: Grant Erickson, Jay Logue, Simon Goldschmidt + * ipv6.c, netif.c: patch #7913 Enable Support for IPv6 Loopback + + 2014-01-16: Stathis Voukelatos + * netif.c: patch #7902 Fixed netif_poll() operation when LWIP_LOOPBACK_MAX_PBUFS > 0 + + 2014-01-14: "Freddie Chopin" + * snmp.h, mib2.c: fixed constness and spelling of sysdescr + + 2014-01-14: Simon Goldschmidt (patch by Thomas Faber) + * tcpip.c: patch #8241: Fix implicit declaration of ip_input with + LWIP_TCPIP_CORE_LOCKING_INPUT disabled + + 2014-01-14: chrysn + * timers.c: patch #8244 make timeouts usable reliably from outside of the + timeout routine + + 2014-01-10: Simon Goldschmidt + * ip_frag.c, ip6_frag.c: fixed bug #41041 Potential use-after-free in IPv6 reassembly + + 2014-01-10: Simon Goldschmidt + * memp.c: fixed bug #41188 Alignment error in memp_init() when MEMP_SEPARATE_POOLS==1 + + 2014-01-10: Simon Goldschmidt + * tcp.c: fixed bug #39898 tcp_fasttmr() possible lock due to infinte queue process loop + + 2013-06-29: Simon Goldschmidt + * inet.h, sockets.h: partially fixed bug #37585: IPv6 compatibility (in socket structs) + + 2013-06-29: Simon Goldschmidt + * inet6.h: bug #37585/task #12600: fixed struct in6_addr.s6_addr to conform to spec + + 2013-04-24: patch by Liam <morepork> + * api_msg.c: patch #8008 Fix a potential null pointer dereference in assert + + 2013-04-24: Simon Goldschmidt + * igmp.c: fixed possible division by zero + + 2013-04-24: Simon Goldschmidt + * ip6.h, some ipv6 C files: fixed bug #38526 Coverity: Recursive Header Inclusion in ip6.h + + 2013-04-24: Simon Goldschmidt (patch by Emil Ljungdahl): + * netif.c: fixed bug #38586 netif_loop_output() "deadlocks" + + 2013-01-15: Simon Goldschmidt + * ip4.c: fixed bug #37665 ip_canforward operates on address in wrong byte order + + 2013-01-15: Simon Goldschmidt + * pbuf.h: fixed bug #38097 pbuf_free_ooseq() warning + + 2013-01-14: Simon Goldschmidt + * dns.c: fixed bug #37705 Possible memory corruption in DNS query + + 2013-01-11: Simon Goldschmidt + * raw.c: fixed bug #38066 Raw pcbs can alter packet without eating it + + 2012-08-22: Simon Goldschmidt + * memp.c: fixed bug #37166: memp_sanity check loops itself + + 2012-08-13: Simon Goldschmidt + * dhcp.c: fixed bug #36645: Calling dhcp_release before dhcp_start + dereferences NULL + + 2012-08-13: Simon Goldschmidt + * msg_out.c: fixed bug #36840 snmp_send_trap() NULL de-reference if traps + configured but no interfaces available + + 2012-08-13: Simon Goldschmidt + * dns.c: fixed bug #36899 DNS TTL 0 is cached for a long time + + 2012-05-11: Simon Goldschmidt (patch by Marty) + * memp.c: fixed bug #36412: memp.c does not compile when + MEMP_OVERFLOW_CHECK > zero and MEMP_SEPARATE_POOLS == 1 + + 2012-05-03: Simon Goldschmidt (patch by Sylvain Rochet) + * ppp.c: fixed bug #36283 (PPP struct used on header size computation and + not packed) + + 2012-05-03: Simon Goldschmidt (patch by David Empson) + * ppp.c: fixed bug #36388 (PPP: checksum-only in last pbuf leads to pbuf with + zero length) + + 2012-03-25: Simon Goldschmidt + * api_msg.c: Fixed bug #35817: do_connect() invalidly signals op_completed + for UDP/RAW with LWIP_TCPIP_CORE_LOCKING==1 + + 2012-03-25: Simon Goldschmidt + * api_msg.h, api_lib.c, api_msg.c, netifapi.c: fixed bug #35931: Name space + pollution in api_msg.c and netifapi.c + + 2011-08-24: Simon Goldschmidt + * inet6.h: fixed bug #34124 struct in6_addr does not conform to the standard + + + +(STABLE-1.4.1) + + ++ New features: 2012-03-25: Simon Goldschmidt (idea by Mason) * posix/*: added posix-compatibility include files posix/netdb.h and posix/sys/socket.h which are a simple wrapper to the correct lwIP include files. - + 2012-01-16: Simon Goldschmidt * opt.h, icmp.c: Added option CHECKSUM_GEN_ICMP @@ -59,12 +1355,12 @@ HISTORY * tcp.c, tcp_out.c: bug #33604: added some more asserts to check that pcb->state != LISTEN - 2011-05-14: Simon Goldschmidt (patch by St�phane Lesage) + 2011-05-14: Simon Goldschmidt (patch by Stéphane Lesage) * tcpip.c/.h: patch #7449 allow tcpip callback from interrupt with static memory message - ++ Bugfixes: + ++ Bugfixes: 2012-09-26: Simon Goldschmidt * api_msg.c: fixed bug #37405 'err_tcp()' uses already freed 'netconn' object @@ -91,10 +1387,10 @@ HISTORY 2012-03-22: Simon Goldschmidt * ip4.c: fixed bug #35927: missing refragmentaion in ip_forward - + 2012-03-20: Simon Goldschmidt (patch by Mason) * netdb.c: fixed bug #35907: lwip_gethostbyname_r returns an invalid h_addr_list - + 2012-03-12: Simon Goldschmidt (patch by Bostjan Meglic) * ppp.c: fixed bug #35809: PPP GetMask(): Compiler warning on big endian, possible bug on little endian system @@ -111,7 +1407,7 @@ HISTORY * etharp.c: fixed bug #35531: Impossible to send multicast without a gateway (introduced when fixing bug# 33551) - 2012-02-16: Simon Goldschmidt (patch by St�phane Lesage) + 2012-02-16: Simon Goldschmidt (patch by Stéphane Lesage) * msg_in.c, msg_out.c: fixed bug #35536 SNMP: error too big response is malformed 2012-02-15: Simon Goldschmidt @@ -549,7 +1845,7 @@ HISTORY 2011-03-27: Simon Goldschmidt * sockets.c: Fixed bug #32906: lwip_connect+lwip_send did not work for udp and raw pcbs with LWIP_TCPIP_CORE_LOCKING==1. - + 2011-03-27: Simon Goldschmidt * tcp_out.c: Fixed bug #32820 (Outgoing TCP connections created before route is present never times out) by starting retransmission timer before checking @@ -602,7 +1898,7 @@ HISTORY 2010-11-23: Simon Goldschmidt * tcp_in.c: Fixed bug #30577: tcp_input: don't discard ACK-only packets after refusing 'refused_data' again. - + 2010-11-22: Simon Goldschmidt * sockets.c: Fixed bug #31590: getsockopt(... SO_ERROR ...) gives EINPROGRESS after a successful nonblocking connection. @@ -647,21 +1943,21 @@ HISTORY 2010-08-01: Simon Goldschmidt (patch by Greg Renda) * ppp.c: Applied patch #7264 (PPP protocols are rejected incorrectly on big endian architectures) - + 2010-07-28: Simon Goldschmidt * api_lib.c, api_msg.c, sockets.c, mib2.c: Fixed compilation with TCP or UDP disabled. - + 2010-07-27: Simon Goldschmidt * tcp.c: Fixed bug #30565 (tcp_connect() check bound list): that check did no harm but never did anything - + 2010-07-21: Simon Goldschmidt * ip.c: Fixed invalid fix for bug #30402 (CHECKSUM_GEN_IP_INLINE does not add IP options) 2010-07-16: Kieran Mansley - * msg_in.c: Fixed SNMP ASN constant defines to not use ! operator + * msg_in.c: Fixed SNMP ASN constant defines to not use ! operator 2010-07-10: Simon Goldschmidt * ip.c: Fixed bug #30402: CHECKSUM_GEN_IP_INLINE does not add IP options @@ -765,7 +2061,7 @@ HISTORY 2010-03-05: Simon Goldschmidt * api_msg.c: Correctly set TCP_WRITE_FLAG_MORE when netconn_write is split - into multiple calls to tcp_write. + into multiple calls to tcp_write. 2010-02-21: Simon Goldschmidt * opt.h, mem.h, dns.c: task #10140: Remove DNS_USES_STATIC_BUF (keep @@ -836,11 +2132,11 @@ HISTORY * igmp.c/.h, ip.h: Moved most defines from igmp.h to igmp.c for clarity since they are not used anywhere else. - 2010-02-08: Simon Goldschmidt (St�phane Lesage) + 2010-02-08: Simon Goldschmidt (Stéphane Lesage) * igmp.c, igmp.h, stats.c, stats.h: Improved IGMP stats (patch from bug #28798) - 2010-02-08: Simon Goldschmidt (St�phane Lesage) + 2010-02-08: Simon Goldschmidt (Stéphane Lesage) * igmp.c: Fixed bug #28798 (Error in "Max Response Time" processing) and another bug when LWIP_RAND() returns zero. @@ -1077,7 +2373,7 @@ HISTORY LWIP_AUTOIP_CREATE_SEED_ADDR() returned address in host byte order instead of network byte order - 2009-10-11 Simon Goldschmidt (J�rg Kesten) + 2009-10-11 Simon Goldschmidt (Jörg Kesten) * tcp_out.c: Fixed bug #27504: tcp_enqueue wrongly concatenates segments which are not consecutive when retransmitting unacked segments @@ -1225,7 +2521,7 @@ HISTORY sent to mbox 2009-06-25 Kieran Mansley - * api_msg.c api.h: BUG26722: initialise netconn write variables + * api_msg.c api.h: BUG26722: initialise netconn write variables in netconn_alloc 2009-06-25 Kieran Mansley @@ -1233,7 +2529,7 @@ HISTORY 2009-06-25 Kieran Mansley * tcp.c, tcp_in.c, tcp_out.c, tcp.h: BUG26301 and BUG26267: correct - simultaneous close behaviour, and make snd_nxt have the same meaning + simultaneous close behaviour, and make snd_nxt have the same meaning as in the RFCs. 2009-05-12 Simon Goldschmidt @@ -1255,7 +2551,7 @@ HISTORY 2009-05-04 Simon Goldschmidt * init.c: snmp was not initialized in lwip_init() - 2009-05-04 Fr�d�ric Bernon + 2009-05-04 Frédéric Bernon * dhcp.c, netbios.c: Changes if IP_SOF_BROADCAST is enabled. 2009-05-03 Simon Goldschmidt @@ -1275,7 +2571,7 @@ HISTORY 2009-05-01 Simon Goldschmidt * ppp.c: bug #24228: Memory corruption with PPP and DHCP - 2009-04-29 Fr�d�ric Bernon + 2009-04-29 Frédéric Bernon * raw.c, udp.c, init.c, opt.h, ip.h, sockets.h: bug #26309: Implement the SO(F)_BROADCAST filter for all API layers. Avoid the unindented reception of broadcast packets even when this option wasn't set. Port maintainers @@ -1297,7 +2593,7 @@ HISTORY when debugging": memp_sizes contained the wrong sizes (including sanity regions); memp pools for MEM_USE_POOLS were too small - 2009-04-24 Simon Goldschmidt, Fr�d�ric Bernon + 2009-04-24 Simon Goldschmidt, Frédéric Bernon * inet.c: patch #6765: Fix a small problem with the last changes (incorrect behavior, with with ip address string not ended by a '\0', a space or a end of line) @@ -1369,7 +2665,7 @@ HISTORY * tcp.c, tcp_in.c, tcp.h: add tcp_abandon() to cope with dropping connections where no reset required (bug #25622) - * tcp_out.c: set TCP_ACK flag on keepalive and zero window probes + * tcp_out.c: set TCP_ACK flag on keepalive and zero window probes (bug #20779) 2009-02-18 Simon Goldschmidt (Jonathan Larmour and Bill Auerbach) @@ -1405,9 +2701,9 @@ HISTORY out of pool pbufs. 2008-12-19 Simon Goldschmidt - * many files: patch #6699: fixed some warnings on platform where sizeof(int) == 2 + * many files: patch #6699: fixed some warnings on platform where sizeof(int) == 2 - 2008-12-10 Tamas Somogyi, Fr�d�ric Bernon + 2008-12-10 Tamas Somogyi, Frédéric Bernon * sockets.c: fixed bug #25051: lwip_recvfrom problem with udp: fromaddr and port uses deleted netbuf. @@ -1441,7 +2737,7 @@ HISTORY * api_msg.c: fixed bug #23847: do_close_internal references freed memory (when tcp_close returns != ERR_OK) - 2008-07-08 Fr�d�ric Bernon + 2008-07-08 Frédéric Bernon * stats.h: Fix some build bugs introduced with patch #6483 (missing some parameters in macros, mainly if MEM_STATS=0 and MEMP_STATS=0). @@ -1489,52 +2785,52 @@ HISTORY * inet_chksum.c: Allow choice of one of the sample algorithms to be made from lwipopts.h. Fix comment on how to override LWIP_CHKSUM. - 2008-01-22 Fr�d�ric Bernon - * tcp.c, tcp_in.c, tcp.h, opt.h: Rename LWIP_CALCULATE_EFF_SEND_MSS in + 2008-01-22 Frédéric Bernon + * tcp.c, tcp_in.c, tcp.h, opt.h: Rename LWIP_CALCULATE_EFF_SEND_MSS in TCP_CALCULATE_EFF_SEND_MSS to have coherent TCP options names. - 2008-01-14 Fr�d�ric Bernon + 2008-01-14 Frédéric Bernon * rawapi.txt, api_msg.c, tcp.c, tcp_in.c, tcp.h: changes for task #7675 "Enable to refuse data on a TCP_EVENT_RECV call". Important, behavior changes for the tcp_recv callback (see rawapi.txt). - 2008-01-14 Fr�d�ric Bernon, Marc Chaland + 2008-01-14 Frédéric Bernon, Marc Chaland * ip.c: Integrate patch #6369" ip_input : checking before realloc". - - 2008-01-12 Fr�d�ric Bernon + + 2008-01-12 Frédéric Bernon * tcpip.h, tcpip.c, api.h, api_lib.c, api_msg.c, sockets.c: replace the field netconn::sem per netconn::op_completed like suggested for the task #7490 "Add return value to sys_mbox_post". - 2008-01-12 Fr�d�ric Bernon + 2008-01-12 Frédéric Bernon * api_msg.c, opt.h: replace DEFAULT_RECVMBOX_SIZE per DEFAULT_TCP_RECVMBOX_SIZE, DEFAULT_UDP_RECVMBOX_SIZE and DEFAULT_RAW_RECVMBOX_SIZE (to optimize queues sizes), like suggested for the task #7490 "Add return value to sys_mbox_post". - 2008-01-10 Fr�d�ric Bernon + 2008-01-10 Frédéric Bernon * tcpip.h, tcpip.c: add tcpip_callback_with_block function for the task #7490 "Add return value to sys_mbox_post". tcpip_callback is always defined as "blocking" ("block" parameter = 1). - 2008-01-10 Fr�d�ric Bernon + 2008-01-10 Frédéric Bernon * tcpip.h, tcpip.c, api.h, api_lib.c, api_msg.c, sockets.c: replace the field netconn::mbox (sys_mbox_t) per netconn::sem (sys_sem_t) for the task #7490 "Add return value to sys_mbox_post". - 2008-01-05 Fr�d�ric Bernon + 2008-01-05 Frédéric Bernon * sys_arch.txt, api.h, api_lib.c, api_msg.h, api_msg.c, tcpip.c, sys.h, opt.h: Introduce changes for task #7490 "Add return value to sys_mbox_post" with some modifications in the sys_mbox api: sys_mbox_new take a "size" parameters which indicate the number of pointers query by the mailbox. There is three defines - in opt.h to indicate sizes for tcpip::mbox, netconn::recvmbox, and for the - netconn::acceptmbox. Port maintainers, you can decide to just add this new + in opt.h to indicate sizes for tcpip::mbox, netconn::recvmbox, and for the + netconn::acceptmbox. Port maintainers, you can decide to just add this new parameter in your implementation, but to ignore it to keep the previous behavior. The new sys_mbox_trypost function return a value to know if the mailbox is full or if the message is posted. Take a look to sys_arch.txt for more details. This new function is used in tcpip_input (so, can be called in an interrupt context since the function is not blocking), and in recv_udp and recv_raw. - 2008-01-04 Fr�d�ric Bernon, Simon Goldschmidt, Jonathan Larmour + 2008-01-04 Frédéric Bernon, Simon Goldschmidt, Jonathan Larmour * rawapi.txt, api.h, api_lib.c, api_msg.h, api_msg.c, sockets.c, tcp.h, tcp.c, tcp_in.c, init.c, opt.h: rename backlog options with TCP_ prefix, limit the "backlog" parameter in an u8_t, 0 is interpreted as "smallest queue", add @@ -1543,31 +2839,31 @@ HISTORY 2007-12-31 Kieran Mansley (based on patch from Per-Henrik Lundbolm) * tcp.c, tcp_in.c, tcp_out.c, tcp.h: Add TCP persist timer - 2007-12-31 Fr�d�ric Bernon, Luca Ceresoli + 2007-12-31 Frédéric Bernon, Luca Ceresoli * autoip.c, etharp.c: ip_addr.h: Integrate patch #6348: "Broadcast ARP packets in autoip". The change in etharp_raw could be removed, since all calls to etharp_raw use ethbroadcast for the "ethdst_addr" parameter. But it could be wrong in the future. - 2007-12-30 Fr�d�ric Bernon, Tom Evans + 2007-12-30 Frédéric Bernon, Tom Evans * ip.c: Fix bug #21846 "LwIP doesn't appear to perform any IP Source Address Filtering" reported by Tom Evans. - 2007-12-21 Fr�d�ric Bernon, Simon Goldschmidt, Jonathan Larmour + 2007-12-21 Frédéric Bernon, Simon Goldschmidt, Jonathan Larmour * tcp.h, opt.h, api.h, api_msg.h, tcp.c, tcp_in.c, api_lib.c, api_msg.c, sockets.c, init.c: task #7252: Implement TCP listen backlog: Warning: raw API applications have to call 'tcp_accepted(pcb)' in their accept callback to keep accepting new connections. - 2007-12-13 Fr�d�ric Bernon + 2007-12-13 Frédéric Bernon * api_msg.c, err.h, err.c, sockets.c, dns.c, dns.h: replace "enum dns_result" by err_t type. Add a new err_t code "ERR_INPROGRESS". - 2007-12-12 Fr�d�ric Bernon + 2007-12-12 Frédéric Bernon * dns.h, dns.c, opt.h: move DNS options to the "right" place. Most visibles are the one which have ram usage. - 2007-12-05 Fr�d�ric Bernon + 2007-12-05 Frédéric Bernon * netdb.c: add a LWIP_DNS_API_HOSTENT_STORAGE option to decide to use a static set of variables (=0) or a local one (=1). In this last case, your port should provide a function "struct hostent* sys_thread_hostent( struct hostent* h)" @@ -1599,7 +2895,7 @@ HISTORY based on the MTU of the netif used to send. Enabled by default. Disable by setting LWIP_CALCULATE_EFF_SEND_MSS to 0. This fixes bug #21492. - 2007-11-19 Fr�d�ric Bernon + 2007-11-19 Frédéric Bernon * api_msg.c, dns.h, dns.c: Implement DNS_DOES_NAME_CHECK option (check if name received match the name query), implement DNS_USES_STATIC_BUF (the place where copy dns payload to parse the response), return an error if there is no place @@ -1616,7 +2912,7 @@ HISTORY dns resolver function for netconn api (netconn_gethostbyname) and socket api (gethostbyname/gethostbyname_r). - 2007-11-15 Jim Pettinato, Fr�d�ric Bernon + 2007-11-15 Jim Pettinato, Frédéric Bernon * opt.h, init.c, tcpip.c, dhcp.c, dns.h, dns.c: add DNS client for simple name requests with RAW api interface. Initialization is done in lwip_init() with build time options. DNS timer is added in tcpip_thread context. DHCP can set @@ -1635,7 +2931,7 @@ HISTORY core header files in api.h (ip/tcp/udp/raw.h) to hide the internal implementation from netconn api applications. - 2007-11-03 Fr�d�ric Bernon + 2007-11-03 Frédéric Bernon * api.h, api_lib.c, api_msg.c, sockets.c, opt.h: add SO_RCVBUF option for UDP & RAW netconn. You need to set LWIP_SO_RCVBUF=1 in your lwipopts.h (it's disabled by default). Netconn API users can use the netconn_recv_bufsize macro to access @@ -1643,15 +2939,15 @@ HISTORY netconn::recv_avail which need to be more "thread-safe" (note there is already the problem for FIONREAD with lwip_ioctl/ioctlsocket). - 2007-11-01 Fr�d�ric Bernon, Marc Chaland + 2007-11-01 Frédéric Bernon, Marc Chaland * sockets.h, sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c, tcp.h, tcp_out.c: Integrate "patch #6250 : MSG_MORE flag for send". MSG_MORE is used at socket api layer, NETCONN_MORE at netconn api layer, and TCP_WRITE_FLAG_MORE at raw api layer. This option enable to delayed TCP PUSH flag on multiple "write" calls. Note that previous "copy" parameter for "write" APIs is now called "apiflags". - 2007-10-24 Fr�d�ric Bernon - * api.h, api_lib.c, api_msg.c: Add macro API_EVENT in the same spirit than + 2007-10-24 Frédéric Bernon + * api.h, api_lib.c, api_msg.c: Add macro API_EVENT in the same spirit than TCP_EVENT_xxx macros to get a code more readable. It could also help to remove some code (like we have talk in "patch #5919 : Create compile switch to remove select code"), but it could be done later. @@ -1670,23 +2966,23 @@ HISTORY * tcpip.c, etharp.h, etharp.c: moved ethernet_input from tcpip.c to etharp.c so all netifs (or ports) can use it. - 2007-10-05 Fr�d�ric Bernon - * netifapi.h, netifapi.c: add function netifapi_netif_set_default. Change the + 2007-10-05 Frédéric Bernon + * netifapi.h, netifapi.c: add function netifapi_netif_set_default. Change the common function to reduce a little bit the footprint (for all functions using only the "netif" parameter). - 2007-10-03 Fr�d�ric Bernon + 2007-10-03 Frédéric Bernon * netifapi.h, netifapi.c: add functions netifapi_netif_set_up, netifapi_netif_set_down, netifapi_autoip_start and netifapi_autoip_stop. Use a common function to reduce a little bit the footprint (for all functions using only the "netif" parameter). - 2007-09-15 Fr�d�ric Bernon + 2007-09-15 Frédéric Bernon * udp.h, udp.c, sockets.c: Changes for "#20503 IGMP Improvement". Add IP_MULTICAST_IF option in socket API, and a new field "multicast_ip" in "struct udp_pcb" (for netconn and raw API users), only if LWIP_IGMP=1. Add getsockopt processing for IP_MULTICAST_TTL and IP_MULTICAST_IF. - 2007-09-10 Fr�d�ric Bernon + 2007-09-10 Frédéric Bernon * snmp.h, mib2.c: enable to remove SNMP timer (which consumne several cycles even when it's not necessary). snmp_agent.txt tell to call snmp_inc_sysuptime() each 10ms (but, it's intrusive if you use sys_timeout feature). Now, you can @@ -1695,10 +2991,10 @@ HISTORY or snmp_add_sysuptime(), and to define the SNMP_GET_SYSUPTIME(sysuptime) macro. This one is undefined by default in mib2.c. SNMP_GET_SYSUPTIME is called inside snmp_get_sysuptime(u32_t *value), and enable to change "sysuptime" value only - when it's queried (any direct call to "sysuptime" is changed by a call to + when it's queried (any direct call to "sysuptime" is changed by a call to snmp_get_sysuptime). - 2007-09-09 Fr�d�ric Bernon, Bill Florac + 2007-09-09 Frédéric Bernon, Bill Florac * igmp.h, igmp.c, netif.h, netif.c, ip.c: To enable to have interfaces with IGMP, and others without it, there is a new NETIF_FLAG_IGMP flag to set in netif->flags if you want IGMP on an interface. igmp_stop() is now called inside netif_remove(). @@ -1706,20 +3002,20 @@ HISTORY LWIP_NETIF_LINK_CALLBACK=1) to resend reports once the link is up (avoid to wait the next query message to receive the matching multicast streams). - 2007-09-08 Fr�d�ric Bernon + 2007-09-08 Frédéric Bernon * sockets.c, ip.h, api.h, tcp.h: declare a "struct ip_pcb" which only contains IP_PCB. Add in the netconn's "pcb" union a "struct ip_pcb *ip;" (no size change). Use this new field to access to common pcb fields (ttl, tos, so_options, etc...). Enable to access to these fields with LWIP_TCP=0. - 2007-09-05 Fr�d�ric Bernon + 2007-09-05 Frédéric Bernon * udp.c, ipv4/icmp.c, ipv4/ip.c, ipv6/icmp.c, ipv6/ip6.c, ipv4/icmp.h, ipv6/icmp.h, opt.h: Integrate "task #7272 : LWIP_ICMP option". The new option LWIP_ICMP enable/disable ICMP module inside the IP stack (enable per default). Be careful, disabling ICMP make your product non-compliant to RFC1122, but help to reduce footprint, and to reduce "visibility" on the Internet. - 2007-09-05 Fr�d�ric Bernon, Bill Florac + 2007-09-05 Frédéric Bernon, Bill Florac * opt.h, sys.h, tcpip.c, slipif.c, ppp.c, sys_arch.txt: Change parameters list for sys_thread_new (see "task #7252 : Create sys_thread_new_ex()"). Two new parameters have to be provided: a task name, and a task stack size. For this @@ -1728,11 +3024,11 @@ HISTORY in your sys_arch.c file, and but it's not mandatory, use them in your OS specific functions. - 2007-09-05 Fr�d�ric Bernon + 2007-09-05 Frédéric Bernon * inet.c, autoip.c, msg_in.c, msg_out.c, init.c: Move some build time checkings inside init.c for task #7142 "Sanity check user-configurable values". - 2007-09-04 Fr�d�ric Bernon, Bill Florac + 2007-09-04 Frédéric Bernon, Bill Florac * igmp.h, igmp.c, memp_std.h, memp.c, init.c, opt.h: Replace mem_malloc call by memp_malloc, and use a new MEMP_NUM_IGMP_GROUP option (see opt.h to define the value). It will avoid potential fragmentation problems, use a counter to know @@ -1740,7 +3036,7 @@ HISTORY leave it. MEMP_NUM_IGMP_GROUP got 8 as default value (and init.c got a sanity check if LWIP_IGMP!=0). - 2007-09-03 Fr�d�ric Bernon + 2007-09-03 Frédéric Bernon * igmp.h, igmp.c, sockets.c, api_msg.c: Changes for "#20503 IGMP Improvement". Initialize igmp_mac_filter to NULL in netif_add (this field should be set in the netif's "init" function). Use the "imr_interface" field (for socket layer) @@ -1748,22 +3044,22 @@ HISTORY The igmp_join/leavegroup first parameter change from a netif to an ipaddr. This field could be a netif's ipaddr, or "any" (same meaning than ip_addr_isany). - 2007-08-30 Fr�d�ric Bernon + 2007-08-30 Frédéric Bernon * Add netbuf.h, netbuf.c, Change api.h, api_lib.c: #7249 "Split netbuf functions from api/api_lib". Now netbuf API is independant of netconn, and can be used with other API (application based on raw API, or future "socket2" API). Ports maintainers just have to add src/api/netbuf.c in their makefile/projects. - 2007-08-30 Fr�d�ric Bernon, Jonathan Larmour + 2007-08-30 Frédéric Bernon, Jonathan Larmour * init.c: Add first version of lwip_sanity_check for task #7142 "Sanity check user-configurable values". - 2007-08-29 Fr�d�ric Bernon + 2007-08-29 Frédéric Bernon * igmp.h, igmp.c, tcpip.c, init.c, netif.c: change igmp_init and add igmp_start. igmp_start is call inside netif_add. Now, igmp initialization is in the same spirit than the others modules. Modify some IGMP debug traces. - 2007-08-29 Fr�d�ric Bernon + 2007-08-29 Frédéric Bernon * Add init.h, init.c, Change opt.h, tcpip.c: Task #7213 "Add a lwip_init function" Add lwip_init function to regroup all modules initializations, and to provide a place to add code for task #7142 "Sanity check user-configurable values". @@ -1776,23 +3072,23 @@ HISTORY 2007-08-26 Marc Boucher * api_msg.c: do_close_internal(): Reset the callbacks and arg (conn) to NULL since they can under certain circumstances be called with an invalid conn - pointer after the connection has been closed (and conn has been freed). + pointer after the connection has been closed (and conn has been freed). - 2007-08-25 Fr�d�ric Bernon (Artem Migaev's Patch) + 2007-08-25 Frédéric Bernon (Artem Migaev's Patch) * netif.h, netif.c: Integrate "patch #6163 : Function to check if link layer is up". Add a netif_is_link_up() function if LWIP_NETIF_LINK_CALLBACK option is set. - 2007-08-22 Fr�d�ric Bernon + 2007-08-22 Frédéric Bernon * netif.h, netif.c, opt.h: Rename LWIP_NETIF_CALLBACK in LWIP_NETIF_STATUS_CALLBACK to be coherent with new LWIP_NETIF_LINK_CALLBACK option before next release. - 2007-08-22 Fr�d�ric Bernon + 2007-08-22 Frédéric Bernon * tcpip.h, tcpip.c, ethernetif.c, opt.h: remove options ETHARP_TCPIP_INPUT & - ETHARP_TCPIP_ETHINPUT, now, only "ethinput" code is supported, even if the + ETHARP_TCPIP_ETHINPUT, now, only "ethinput" code is supported, even if the name is tcpip_input (we keep the name of 1.2.0 function). 2007-08-17 Jared Grubb - * memp_std.h, memp.h, memp.c, mem.c, stats.c: (Task #7136) Centralize mempool + * memp_std.h, memp.h, memp.c, mem.c, stats.c: (Task #7136) Centralize mempool settings into new memp_std.h and optional user file lwippools.h. This adds more dynamic mempools, and allows the user to create an arbitrary number of mempools for mem_malloc. @@ -1838,13 +3134,13 @@ HISTORY 2 * mss (instead of 1 * mss previously) to comply with some newer RFCs and other stacks. - 2007-07-13 Jared Grubb (integrated by Fr�d�ric Bernon) + 2007-07-13 Jared Grubb (integrated by Frédéric Bernon) * opt.h, netif.h, netif.c, ethernetif.c: Add new configuration option to add a link callback in the netif struct, and functions to handle it. Be carefull for port maintainers to add the NETIF_FLAG_LINK_UP flag (like in ethernetif.c) if you want to be sure to be compatible with future changes... - 2007-06-30 Fr�d�ric Bernon + 2007-06-30 Frédéric Bernon * sockets.h, sockets.c: Implement MSG_PEEK flag for recv/recvfrom functions. 2007-06-21 Simon Goldschmidt @@ -1881,7 +3177,7 @@ HISTORY * sockets.c, sockets.h: Implemented socket options SO_NO_CHECK for UDP sockets to disable UDP checksum generation on transmit. - 2007-06-13 Fr�d�ric Bernon, Simon Goldschmidt + 2007-06-13 Frédéric Bernon, Simon Goldschmidt * debug.h, api_msg.c: change LWIP_ERROR to use it to check errors like invalid pointers or parameters, and let the possibility to redefined it in cc.h. Use this macro to check "conn" parameter in api_msg.c functions. @@ -1894,7 +3190,7 @@ HISTORY by default) to switch off UDP-Lite support if not needed (reduces udp.c code size) - 2007-06-09 Dominik Spies (integrated by Fr�d�ric Bernon) + 2007-06-09 Dominik Spies (integrated by Frédéric Bernon) * autoip.h, autoip.c, dhcp.h, dhcp.c, netif.h, netif.c, etharp.h, etharp.c, opt.h: AutoIP implementation available for IPv4, with new options LWIP_AUTOIP and LWIP_DHCP_AUTOIP_COOP if you want to cooperate with DHCP. Some tips to adapt @@ -1915,11 +3211,11 @@ HISTORY (defaulting to off for now) that can be set to 0 to send fragmented packets by passing PBUF_REFs down the stack. - 2007-05-23 Fr�d�ric Bernon + 2007-05-23 Frédéric Bernon * api_lib.c: Implement SO_RCVTIMEO for accept and recv on TCP connections, such present in patch #5959. - 2007-05-23 Fr�d�ric Bernon + 2007-05-23 Frédéric Bernon * api.h, api_lib.c, api_msg.c, sockets.c: group the different NETCONN_UDPxxx code in only one part... @@ -1936,7 +3232,7 @@ HISTORY PBUF_POOL pbufs instead of the old pool implementation in pbuf.c to reduce code size. - 2007-05-11 Fr�d�ric Bernon + 2007-05-11 Frédéric Bernon * sockets.c, api_lib.c, api_msg.h, api_msg.c, netifapi.h, netifapi.c, tcpip.c: Include a function pointer instead of a table index in the message to reduce footprint. Disable some part of lwip_send and lwip_sendto if some options are @@ -1964,7 +3260,7 @@ HISTORY * etharp.c: Introduced fast one-entry-cache to speed up ARP lookup when sending multiple packets to the same host. - 2007-05-04 Fr�d�ric Bernon, Jonathan Larmour + 2007-05-04 Frédéric Bernon, Jonathan Larmour * sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c: Fix bug #19162 "lwip_sento: a possible to corrupt remote addr/port connection state". Reduce problems "not enought memory" with netbuf (if we receive lot of datagrams). Improve lwip_sendto (only one exchange between @@ -1978,12 +3274,12 @@ HISTORY with SYS_MBOX_EMPTY. sys_arch_mbox_tryfetch can be implemented as a function-like macro by the port in sys_arch.h if desired. - 2007-04-06 Fr�d�ric Bernon, Simon Goldschmidt + 2007-04-06 Frédéric Bernon, Simon Goldschmidt * opt.h, tcpip.h, tcpip.c, netifapi.h, netifapi.c: New configuration option LWIP_NETIF_API allow to use thread-safe functions to add/remove netif in list, and to start/stop dhcp clients, using new functions from netifapi.h. Disable as default (no port change to do). - 2007-04-05 Fr�d�ric Bernon + 2007-04-05 Frédéric Bernon * sockets.c: remplace ENOBUFS errors on alloc_socket by ENFILE to be more BSD compliant. 2007-04-04 Simon Goldschmidt @@ -1991,54 +3287,54 @@ HISTORY use this for and architecture-independent form to tell the compiler you intentionally are not using this variable. Can be overriden in cc.h. - 2007-03-28 Fr�d�ric Bernon + 2007-03-28 Frédéric Bernon * opt.h, netif.h, dhcp.h, dhcp.c: New configuration option LWIP_NETIF_HOSTNAME allow to define a hostname in netif struct (this is just a pointer, so, you can use a hardcoded string, point on one of your's ethernetif field, or alloc a string you will free yourself). It will be used by DHCP to register a client hostname, but can also be use when you call snmp_set_sysname. - 2007-03-28 Fr�d�ric Bernon - * netif.h, netif.c: A new NETIF_FLAG_ETHARP flag is defined in netif.h, to allow to + 2007-03-28 Frédéric Bernon + * netif.h, netif.c: A new NETIF_FLAG_ETHARP flag is defined in netif.h, to allow to initialize a network interface's flag with. It tell this interface is an ethernet device, and we can use ARP with it to do a "gratuitous ARP" (RFC 3220 "IP Mobility Support for IPv4" section 4.6) when interface is "up" with netif_set_up(). - 2007-03-26 Fr�d�ric Bernon, Jonathan Larmour + 2007-03-26 Frédéric Bernon, Jonathan Larmour * opt.h, tcpip.c: New configuration option LWIP_ARP allow to disable ARP init at build - time if you only use PPP or SLIP. The default is enable. Note we don't have to call + time if you only use PPP or SLIP. The default is enable. Note we don't have to call etharp_init in your port's initilization sequence if you use tcpip.c, because this call is done in tcpip_init function. - 2007-03-22 Fr�d�ric Bernon + 2007-03-22 Frédéric Bernon * stats.h, stats.c, msg_in.c: Stats counters can be change to u32_t if necessary with the new option LWIP_STATS_LARGE. If you need this option, define LWIP_STATS_LARGE to 1 in - your lwipopts.h. More, unused counters are not defined in the stats structs, and not + your lwipopts.h. More, unused counters are not defined in the stats structs, and not display by stats_display(). Note that some options (SYS_STATS and RAW_STATS) are defined but never used. Fix msg_in.c with the correct #if test for a stat display. 2007-03-21 Kieran Mansley - * netif.c, netif.h: Apply patch#4197 with some changes (originator: rireland(a)hmgsl.com). + * netif.c, netif.h: Apply patch#4197 with some changes (originator: rireland(a)hmgsl.com). Provides callback on netif up/down state change. - 2007-03-11 Fr�d�ric Bernon, Mace Gael, Steve Reynolds + 2007-03-11 Frédéric Bernon, Mace Gael, Steve Reynolds * sockets.h, sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c, igmp.h, igmp.c, ip.c, netif.h, tcpip.c, opt.h: - New configuration option LWIP_IGMP to enable IGMP processing. Based on only one + New configuration option LWIP_IGMP to enable IGMP processing. Based on only one filter per all network interfaces. Declare a new function in netif to enable to control the MAC filter (to reduce lwIP traffic processing). - 2007-03-11 Fr�d�ric Bernon + 2007-03-11 Frédéric Bernon * tcp.h, tcp.c, sockets.c, tcp_out.c, tcp_in.c, opt.h: Keepalive values can be configured at run time with LWIP_TCP_KEEPALIVE, but don't change this unless you know what you're doing (default are RFC1122 compliant). Note that TCP_KEEPIDLE and TCP_KEEPINTVL have to be set in seconds. - 2007-03-08 Fr�d�ric Bernon + 2007-03-08 Frédéric Bernon * tcp.h: Keepalive values can be configured at compile time, but don't change this unless you know what you're doing (default are RFC1122 compliant). - 2007-03-08 Fr�d�ric Bernon + 2007-03-08 Frédéric Bernon * sockets.c, api.h, api_lib.c, tcpip.c, sys.h, sys.c, err.c, opt.h: Implement LWIP_SO_RCVTIMEO configuration option to enable/disable SO_RCVTIMEO on UDP sockets/netconn. @@ -2046,8 +3342,8 @@ HISTORY 2007-03-08 Simon Goldschmidt * snmp_msg.h, msg_in.c: SNMP UDP ports can be configured at compile time. - 2007-03-06 Fr�d�ric Bernon - * api.h, api_lib.c, sockets.h, sockets.c, tcpip.c, sys.h, sys.c, err.h: + 2007-03-06 Frédéric Bernon + * api.h, api_lib.c, sockets.h, sockets.c, tcpip.c, sys.h, sys.c, err.h: Implement SO_RCVTIMEO on UDP sockets/netconn. 2007-02-28 Kieran Mansley (based on patch from Simon Goldschmidt) @@ -2066,19 +3362,19 @@ HISTORY ++ Bug fixes: - 2008-03-17 Fr�d�ric Bernon, Ed Kerekes + 2008-03-17 Frédéric Bernon, Ed Kerekes * igmp.h, igmp.c: Fix bug #22613 "IGMP iphdr problem" (could have some problems to fill the IP header on some targets, use now the ip.h macros to do it). - 2008-03-13 Fr�d�ric Bernon + 2008-03-13 Frédéric Bernon * sockets.c: Fix bug #22435 "lwip_recvfrom with TCP break;". Using (lwip_)recvfrom with valid "from" and "fromlen" parameters, on a TCP connection caused a crash. Note that using (lwip_)recvfrom like this is a bit slow and that using (lwip)getpeername is the good lwip way to do it (so, using recv is faster on tcp sockets). - 2008-03-12 Fr�d�ric Bernon, Jonathan Larmour + 2008-03-12 Frédéric Bernon, Jonathan Larmour * api_msg.c, contrib/apps/ping.c: Fix bug #22530 "api_msg.c's recv_raw() does not consume data", and the ping sample (with LWIP_SOCKET=1, the code did the wrong supposition that lwip_recvfrom @@ -2089,11 +3385,11 @@ HISTORY and/or warnings on some systems where mem_size_t and size_t differ. * pbuf.c, ppp.c: Fix warnings on some systems with mem_malloc. - 2008-03-04 Kieran Mansley (contributions by others) + 2008-03-04 Kieran Mansley (contributions by others) * Numerous small compiler error/warning fixes from contributions to mailing list after 1.3.0 release candidate made. - 2008-01-25 Cui hengbin (integrated by Fr�d�ric Bernon) + 2008-01-25 Cui hengbin (integrated by Frédéric Bernon) * dns.c: Fix bug #22108 "DNS problem" caused by unaligned structures. 2008-01-15 Kieran Mansley @@ -2167,7 +3463,7 @@ HISTORY Fixed the nagle algorithm; nagle now also works for all raw API applications and has to be explicitly disabled with 'tcp_pcb->flags |= TF_NODELAY' - 2007-11-12 Fr�d�ric Bernon + 2007-11-12 Frédéric Bernon * sockets.c, api.h, api_lib.c, api_msg.h, api_msg.c: Fixed bug #20900. Now, most of the netconn_peer and netconn_addr processing is done inside tcpip_thread context in do_getaddr. @@ -2199,14 +3495,14 @@ HISTORY 2007-10-08 Simon Goldschmidt * mem.c: lfree was not updated in mem_realloc! - 2007-10-07 Fr�d�ric Bernon + 2007-10-07 Frédéric Bernon * sockets.c, api.h, api_lib.c: First step to fix "bug #20900 : Potential crash error problem with netconn_peer & netconn_addr". VERY IMPORTANT: this change cause an API breakage for netconn_addr, since a parameter type change. Any compiler should cause an error without any changes in yours netconn_peer calls (so, it can't be a "silent change"). It also reduce a little bit the footprint for socket layer (lwip_getpeername & - lwip_getsockname use now a common lwip_getaddrname function since + lwip_getsockname use now a common lwip_getaddrname function since netconn_peer & netconn_addr have the same parameters). 2007-09-20 Simon Goldschmidt @@ -2219,23 +3515,23 @@ HISTORY 2007-09-15 Mike Kleshov * mem.c: Fixed bug #21077 (inaccuracy in calculation of lwip_stat.mem.used) - 2007-09-06 Fr�d�ric Bernon + 2007-09-06 Frédéric Bernon * several-files: replace some #include "arch/cc.h" by "lwip/arch.h", or simply remove it as long as "lwip/opt.h" is included before (this one include "lwip/debug.h" which already include "lwip/arch.h"). Like that, default defines are provided by "lwip/arch.h" if they are not defined in cc.h, in the same spirit than "lwip/opt.h" for lwipopts.h. - 2007-08-30 Fr�d�ric Bernon - * igmp.h, igmp.c: Some changes to remove some redundant code, add some traces, + 2007-08-30 Frédéric Bernon + * igmp.h, igmp.c: Some changes to remove some redundant code, add some traces, and fix some coding style. - 2007-08-28 Fr�d�ric Bernon + 2007-08-28 Frédéric Bernon * tcpip.c: Fix TCPIP_MSG_INPKT processing: now, tcpip_input can be used for any - kind of packets. These packets are considered like Ethernet packets (payload - pointing to ethhdr) if the netif got the NETIF_FLAG_ETHARP flag. Else, packets + kind of packets. These packets are considered like Ethernet packets (payload + pointing to ethhdr) if the netif got the NETIF_FLAG_ETHARP flag. Else, packets are considered like IP packets (payload pointing to iphdr). - 2007-08-27 Fr�d�ric Bernon + 2007-08-27 Frédéric Bernon * api.h, api_lib.c, api_msg.c: First fix for "bug #20900 : Potential crash error problem with netconn_peer & netconn_addr". Introduce NETCONN_LISTEN netconn_state and remove obsolete ones (NETCONN_RECV & NETCONN_ACCEPT). @@ -2244,19 +3540,19 @@ HISTORY * inet.c Modify (acc >> 16) test to ((acc >> 16) != 0) to help buggy compiler (Paradigm C++) - 2007-08-09 Fr�d�ric Bernon, Bill Florac + 2007-08-09 Frédéric Bernon, Bill Florac * stats.h, stats.c, igmp.h, igmp.c, opt.h: Fix for bug #20503 : IGMP Improvement. Introduce IGMP_STATS to centralize statistics management. - 2007-08-09 Fr�d�ric Bernon, Bill Florac + 2007-08-09 Frédéric Bernon, Bill Florac * udp.c: Fix for bug #20503 : IGMP Improvement. Enable to receive a multicast packet on a udp pcb binded on an netif's IP address, and not on "any". - 2007-08-09 Fr�d�ric Bernon, Bill Florac + 2007-08-09 Frédéric Bernon, Bill Florac * igmp.h, igmp.c, ip.c: Fix minor changes from bug #20503 : IGMP Improvement. This is mainly on using lookup/lookfor, and some coding styles... - 2007-07-26 Fr�d�ric Bernon (and "thedoctor") + 2007-07-26 Frédéric Bernon (and "thedoctor") * igmp.c: Fix bug #20595 to accept IGMPv3 "Query" messages. 2007-07-25 Simon Goldschmidt @@ -2280,11 +3576,11 @@ HISTORY * memp.c: Fix bug #20478: memp_malloc returned NULL+MEMP_SIZE on failed allocation. It now returns NULL. - 2007-07-13 Fr�d�ric Bernon + 2007-07-13 Frédéric Bernon * api_msg.c: Fix bug #20318: api_msg "recv" callbacks don't call pbuf_free in all error cases. - 2007-07-13 Fr�d�ric Bernon + 2007-07-13 Frédéric Bernon * api_msg.c: Fix bug #20315: possible memory leak problem if tcp_listen failed, because current code doesn't follow rawapi.txt documentation. @@ -2321,16 +3617,16 @@ HISTORY * tcp.h: Fixed bug #20287: Fixed nagle algorithm (sending was done too early if a segment contained chained pbufs) - 2007-06-28 Fr�d�ric Bernon + 2007-06-28 Frédéric Bernon * autoip.c: replace most of rand() calls by a macro LWIP_AUTOIP_RAND which compute a "pseudo-random" value based on netif's MAC and some autoip fields. It's always possible to define this macro in your own lwipopts.h to always use C library's rand(). Note that autoip_create_rand_addr doesn't use this macro. - 2007-06-28 Fr�d�ric Bernon + 2007-06-28 Frédéric Bernon * netifapi.h, netifapi.c, tcpip.h, tcpip.c: Update code to handle the option LWIP_TCPIP_CORE_LOCKING, and do some changes to be coherent with last modifications - in api_lib/api_msg (use pointers and not type with table, etc...) + in api_lib/api_msg (use pointers and not type with table, etc...) 2007-06-26 Simon Goldschmidt * udp.h: Fixed bug #20259: struct udp_hdr was lacking the packin defines. @@ -2352,11 +3648,11 @@ HISTORY -> netconn_new_..() does not allocate a new connection for unsupported protocols. - 2007-06-13 Fr�d�ric Bernon, Simon Goldschmidt + 2007-06-13 Frédéric Bernon, Simon Goldschmidt * api_lib.c: change return expression in netconn_addr and netconn_peer, because conn->err was reset to ERR_OK without any reasons (and error was lost)... - 2007-06-13 Fr�d�ric Bernon, Matthias Weisser + 2007-06-13 Frédéric Bernon, Matthias Weisser * opt.h, mem.h, mem.c, memp.c, pbuf.c, ip_frag.c, vj.c: Fix bug #20162. Rename MEM_ALIGN in LWIP_MEM_ALIGN and MEM_ALIGN_SIZE in LWIP_MEM_ALIGN_SIZE to avoid some macro names collision with some OS macros. @@ -2385,13 +3681,13 @@ HISTORY 2007-06-01 Simon Goldschmidt * sockets.c: Checked in patch #5914: Moved sockopt processing into tcpip_thread. - 2007-05-23 Fr�d�ric Bernon + 2007-05-23 Frédéric Bernon * api_lib.c, sockets.c: Fixed bug #5958 for netconn_listen (acceptmbox only allocated by do_listen if success) and netconn_accept errors handling. In most of api_lib functions, we replace some errors checkings like "if (conn==NULL)" by ASSERT, except for netconn_delete. - 2007-05-23 Fr�d�ric Bernon + 2007-05-23 Frédéric Bernon * api_lib.c: Fixed bug #5957 "Safe-thread problem inside netconn_recv" to return an error code if it's impossible to fetch a pbuf on a TCP connection (and not directly close the recvmbox). @@ -2400,13 +3696,13 @@ HISTORY * tcp.c: Fixed bug #1895 (tcp_bind not correct) by introducing a list of bound but unconnected (and non-listening) tcp_pcbs. - 2007-05-22 Fr�d�ric Bernon + 2007-05-22 Frédéric Bernon * sys.h, sys.c, api_lib.c, tcpip.c: remove sys_mbox_fetch_timeout() (was only used for LWIP_SO_RCVTIMEO option) and use sys_arch_mbox_fetch() instead of sys_mbox_fetch() in api files. Now, users SHOULD NOT use internal lwIP features like "sys_timeout" in their application threads. - 2007-05-22 Fr�d�ric Bernon + 2007-05-22 Frédéric Bernon * api.h, api_lib.c, api_msg.h, api_msg.c: change the struct api_msg_msg to see which parameters are used by which do_xxx function, and to avoid "misusing" parameters (patch #5938). @@ -2430,9 +3726,9 @@ HISTORY as the one of the netif used for sending to prevent sending from old addresses after a netif address gets changed (partly fixes bug #3168). - 2007-05-16 Fr�d�ric Bernon + 2007-05-16 Frédéric Bernon * tcpip.c, igmp.h, igmp.c: Fixed bug "#19800 : IGMP: igmp_tick() will not work - with NO_SYS=1". Note that igmp_init is always in tcpip_thread (and not in + with NO_SYS=1". Note that igmp_init is always in tcpip_thread (and not in tcpip_init) because we have to be sure that network interfaces are already added (mac filter is updated only in igmp_init for the moment). @@ -2494,24 +3790,24 @@ HISTORY "Constant is long" warnings with 16bit compilers. Contributed by avatar(a)mmlab.cse.yzu.edu.tw - 2007-04-05 Fr�d�ric Bernon, Jonathan Larmour + 2007-04-05 Frédéric Bernon, Jonathan Larmour * api_msg.c: Fix bug #16830: "err_tcp() posts to connection mailbox when no pend on the mailbox is active". Now, the post is only done during a connect, and do_send, do_write and do_join_leave_group don't do anything if a previous error was signaled. - 2007-04-03 Fr�d�ric Bernon + 2007-04-03 Frédéric Bernon * ip.c: Don't set the IP_DF ("Don't fragment") flag in the IP header in IP output packets. See patch #5834. - 2007-03-30 Fr�d�ric Bernon + 2007-03-30 Frédéric Bernon * api_msg.c: add a "pcb_new" helper function to avoid redundant code, and to add missing pcb allocations checking (in do_bind, and for each raw_new). Fix style. - 2007-03-30 Fr�d�ric Bernon + 2007-03-30 Frédéric Bernon * most of files: prefix all debug.h define with "LWIP_" to avoid any conflict with others environment defines (these were too "generic"). - 2007-03-28 Fr�d�ric Bernon + 2007-03-28 Frédéric Bernon * api.h, api_lib.c, sockets.c: netbuf_ref doesn't check its internal pbuf_alloc call result and can cause a crash. lwip_send now check netbuf_ref result. @@ -2525,19 +3821,19 @@ HISTORY * opt.h Change default PBUF_POOL_BUFSIZE (again) to accomodate default MSS + IP and TCP headers *and* physical link headers - 2007-03-26 Fr�d�ric Bernon (based on patch from Dmitry Potapov) + 2007-03-26 Frédéric Bernon (based on patch from Dmitry Potapov) * api_lib.c: patch for netconn_write(), fixes a possible race condition which cause to send some garbage. It is not a definitive solution, but the patch does solve the problem for most cases. - 2007-03-22 Fr�d�ric Bernon + 2007-03-22 Frédéric Bernon * api_msg.h, api_msg.c: Remove obsolete API_MSG_ACCEPT and do_accept (never used). - 2007-03-22 Fr�d�ric Bernon + 2007-03-22 Frédéric Bernon * api_lib.c: somes resources couldn't be freed if there was errors during netconn_new_with_proto_and_callback. - 2007-03-22 Fr�d�ric Bernon + 2007-03-22 Frédéric Bernon * ethernetif.c: update netif->input calls to check return value. In older ports, it's a good idea to upgrade them, even if before, there could be another problem (access to an uninitialized mailbox). @@ -2546,17 +3842,17 @@ HISTORY * sockets.c: fixed bug #5067 (essentialy a signed/unsigned warning fixed by casting to unsigned). - 2007-03-21 Fr�d�ric Bernon + 2007-03-21 Frédéric Bernon * api_lib.c, api_msg.c, tcpip.c: integrate sys_mbox_fetch(conn->mbox, NULL) calls from api_lib.c to tcpip.c's tcpip_apimsg(). Now, use a local variable and not a dynamic one from memp to send tcpip_msg to tcpip_thread in a synchrone call. Free tcpip_msg from tcpip_apimsg is not done in tcpip_thread. This give a faster and more reliable communication between api_lib and tcpip. - 2007-03-21 Fr�d�ric Bernon + 2007-03-21 Frédéric Bernon * opt.h: Add LWIP_NETIF_CALLBACK (to avoid compiler warning) and set it to 0. - 2007-03-21 Fr�d�ric Bernon + 2007-03-21 Frédéric Bernon * api_msg.c, igmp.c, igmp.h: Fix C++ style comments 2007-03-21 Kieran Mansley @@ -2573,24 +3869,24 @@ HISTORY * sockets.c, igmp.c, igmp.h, memp.h: Fix C++ style comments and comment out missing header include in icmp.c - 2007-03-20 Fr�d�ric Bernon + 2007-03-20 Frédéric Bernon * memp.h, stats.c: Fix stats_display function where memp_names table wasn't synchronized with memp.h. - 2007-03-20 Fr�d�ric Bernon + 2007-03-20 Frédéric Bernon * tcpip.c: Initialize tcpip's mbox, and verify if initialized in tcpip_input, - tcpip_ethinput, tcpip_callback, tcpip_apimsg, to fix a init problem with + tcpip_ethinput, tcpip_callback, tcpip_apimsg, to fix a init problem with network interfaces. Also fix a compiler warning. 2007-03-20 Kieran Mansley * udp.c: Only try and use pbuf_header() to make space for headers if not a ROM or REF pbuf. - 2007-03-19 Fr�d�ric Bernon + 2007-03-19 Frédéric Bernon * api_msg.h, api_msg.c, tcpip.h, tcpip.c: Add return types to tcpip_apimsg() and api_msg_post(). - 2007-03-19 Fr�d�ric Bernon + 2007-03-19 Frédéric Bernon * Remove unimplemented "memp_realloc" function from memp.h. 2007-03-11 Simon Goldschmidt @@ -2602,7 +3898,7 @@ HISTORY (missing `const' qualifier in socket functions), to get more compatible to standard POSIX sockets. - 2007-03-11 Fr�d�ric Bernon (based on patch from Dmitry Potapov) + 2007-03-11 Frédéric Bernon (based on patch from Dmitry Potapov) * sockets.c: Add asserts inside bind, connect and sendto to check input parameters. Remove excessive set_errno() calls after get_socket(), because errno is set inside of get_socket(). Move last sock_set_errno() inside @@ -2616,7 +3912,7 @@ HISTORY * tcpip.c: Initialize dhcp timers in tcpip_thread (if LWIP_DHCP) to protect the stack from concurrent access. - 2007-03-06 Fr�d�ric Bernon, Dmitry Potapov + 2007-03-06 Frédéric Bernon, Dmitry Potapov * tcpip.c, ip_frag.c, ethernetif.c: Fix some build problems, and a redundancy call to "lwip_stats.link.recv++;" in low_level_input() & ethernetif_input(). @@ -2624,7 +3920,7 @@ HISTORY * ip_frag.c, ip_frag.h: Reduce code size: don't include code in those files if IP_FRAG == 0 and IP_REASSEMBLY == 0 - 2007-03-06 Fr�d�ric Bernon, Simon Goldschmidt + 2007-03-06 Frédéric Bernon, Simon Goldschmidt * opt.h, ip_frag.h, tcpip.h, tcpip.c, ethernetif.c: add new configuration option named ETHARP_TCPIP_ETHINPUT, which enable the new tcpip_ethinput. Allow to do ARP processing for incoming packets inside tcpip_thread @@ -2636,15 +3932,15 @@ HISTORY * err.h, err.c: fixed compiler warning "initialization dircards qualifiers from pointer target type" - 2007-03-05 Fr�d�ric Bernon + 2007-03-05 Frédéric Bernon * opt.h, sockets.h: add new configuration options (LWIP_POSIX_SOCKETS_IO_NAMES, ETHARP_TRUST_IP_MAC, review SO_REUSE) - 2007-03-04 Fr�d�ric Bernon + 2007-03-04 Frédéric Bernon * api_msg.c: Remove some compiler warnings : parameter "pcb" was never referenced. - 2007-03-04 Fr�d�ric Bernon + 2007-03-04 Frédéric Bernon * api_lib.c: Fix "[patch #5764] api_lib.c cleanup: after patch #5687" (from Dmitry Potapov). The api_msg struct stay on the stack (not moved to netconn struct). @@ -2658,7 +3954,7 @@ HISTORY * etharp.c, etharp.h, memp.c, memp.h, opt.h: Fix BUG#11400 - don't corrupt existing pbuf chain when enqueuing multiple pbufs to a pending ARP request - 2007-03-03 Fr�d�ric Bernon + 2007-03-03 Frédéric Bernon * udp.c: remove obsolete line "static struct udp_pcb *pcb_cache = NULL;" It is static, and never used in udp.c except udp_init(). @@ -2667,17 +3963,17 @@ HISTORY tcpip_thread() to tcpip_init(). This way, raw API connections can be initialized before tcpip_thread is running (e.g. before OS is started) - 2007-03-02 Fr�d�ric Bernon + 2007-03-02 Frédéric Bernon * rawapi.txt: Fix documentation mismatch with etharp.h about etharp_tmr's call interval. - 2007-02-28 Kieran Mansley + 2007-02-28 Kieran Mansley * pbuf.c: Fix BUG#17645 - ensure pbuf payload pointer is not moved outside the region of the pbuf by pbuf_header() - 2007-02-28 Kieran Mansley + 2007-02-28 Kieran Mansley * sockets.c: Fix BUG#19161 - ensure milliseconds timeout is non-zero - when supplied timeout is also non-zero + when supplied timeout is also non-zero (STABLE-1.2.0) @@ -2761,7 +4057,7 @@ HISTORY in accept() by Kevin Lawson. 2006-05-26 Christiaan Simons - * api_lib.c: Removed conn->sem creation and destruction + * api_lib.c: Removed conn->sem creation and destruction from netconn_write() and added sys_sem_new to netconn_new_*. (STABLE-1_1_1) @@ -2831,7 +4127,7 @@ HISTORY * dhcp.c: Decline messages were not multicast but unicast. * etharp.c: ETHARP_CREATE is renamed to ETHARP_TRY_HARD. Do not try hard to insert arbitrary packet's source address, - etharp_ip_input() now calls etharp_update() without ETHARP_TRY_HARD. + etharp_ip_input() now calls etharp_update() without ETHARP_TRY_HARD. etharp_query() now always DOES call ETHARP_TRY_HARD so that users querying an address will see it appear in the cache (DHCP could suffer from this when a server invalidly gave an in-use address.) diff --git a/drivers/network/tcpip/lwip/CMakeLists.txt b/drivers/network/tcpip/lwip/CMakeLists.txt index 1a91ea1e6c7..55fc44a1349 100644 --- a/drivers/network/tcpip/lwip/CMakeLists.txt +++ b/drivers/network/tcpip/lwip/CMakeLists.txt @@ -1,56 +1,35 @@ +cmake_minimum_required(VERSION 3.10) -list(APPEND SOURCE - src/api/api_lib.c - src/api/api_msg.c - src/api/err.c - src/api/netbuf.c - src/api/netdb.c - src/api/netifapi.c - src/api/sockets.c - src/api/tcpip.c - src/core/def.c - src/core/dhcp.c - src/core/dns.c - src/core/init.c - src/core/mem.c - src/core/memp.c - src/core/netif.c - src/core/pbuf.c - src/core/raw.c - src/core/stats.c - src/core/sys.c - src/core/tcp_in.c - src/core/tcp_out.c - src/core/tcp.c - src/core/timers.c - src/core/udp.c - src/core/ipv4/autoip.c - src/core/ipv4/icmp.c - src/core/ipv4/igmp.c - src/core/ipv4/inet_chksum.c - src/core/ipv4/inet.c - src/core/ipv4/ip.c - src/core/ipv4/ip_addr.c - src/core/ipv4/ip_frag.c - #src/core/ipv6/icmp6.c - #src/core/ipv6/inet6.c - #src/core/ipv6/ip6_addr.c - #src/core/ipv6/ip6.c - src/core/snmp/asn1_dec.c - src/core/snmp/asn1_enc.c - src/core/snmp/mib_structs.c - src/core/snmp/mib2.c - src/core/snmp/msg_in.c - src/core/snmp/msg_out.c) +set (CMAKE_CONFIGURATION_TYPES "Debug;Release") -add_library(lwipcore ${SOURCE}) +project(lwIP) -target_include_directories(lwipcore - PRIVATE ${LWIP_INCLUDE_DIRS} - PUBLIC src/include/ipv4) +# Example lwIP application +set(LWIP_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -add_dependencies(lwipcore bugcodes xdk) +set (LWIP_DEFINITIONS LWIP_DEBUG=1) -if(NOT MSVC) - target_compile_options(lwipcore PRIVATE -fno-builtin-malloc -fno-builtin-free) +if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows") + add_subdirectory(${LWIP_DIR}/contrib/ports/win32/example_app) +elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + add_subdirectory(${LWIP_DIR}/contrib/ports/unix/example_app) +else() + message(WARNING "Host ${CMAKE_SYSTEM_NAME} is not supported to build example_app") +endif() + +# Source package generation +set(CPACK_SOURCE_GENERATOR "ZIP") +set(CPACK_SOURCE_PACKAGE_DESCRIPTION_SUMMARY "lwIP lightweight IP stack") +set(CPACK_PACKAGE_VERSION_MAJOR "${LWIP_VERSION_MAJOR}") +set(CPACK_PACKAGE_VERSION_MINOR "${LWIP_VERSION_MINOR}") +set(CPACK_PACKAGE_VERSION_PATCH "${LWIP_VERSION_REVISION}") +set(CPACK_SOURCE_IGNORE_FILES "/build/;${CPACK_SOURCE_IGNORE_FILES};.git") +set(CPACK_SOURCE_PACKAGE_FILE_NAME "lwip-${LWIP_VERSION_MAJOR}.${LWIP_VERSION_MINOR}.${LWIP_VERSION_REVISION}") +include(CPack) + +# Generate docs before creating source package +include(src/Filelists.cmake) +add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source) +if (TARGET lwipdocs) + add_dependencies(dist lwipdocs) endif() diff --git a/drivers/network/tcpip/lwip/COPYING b/drivers/network/tcpip/lwip/COPYING index e23898b5e8f..90465f592ce 100644 --- a/drivers/network/tcpip/lwip/COPYING +++ b/drivers/network/tcpip/lwip/COPYING @@ -1,33 +1,25 @@ -/* - * Copyright (c) 2001, 2002 Swedish Institute of Computer Science. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - * This file is part of the lwIP TCP/IP stack. - * - * Author: Adam Dunkels <adam(a)sics.se> - * - */ +Copyright (c) 2001, 2002 Swedish Institute of Computer Science. +All rights reserved. +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT +SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT +OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY +OF SUCH DAMAGE. diff --git a/drivers/network/tcpip/lwip/FEATURES b/drivers/network/tcpip/lwip/FEATURES new file mode 100644 index 00000000000..87802d13f7d --- /dev/null +++ b/drivers/network/tcpip/lwip/FEATURES @@ -0,0 +1,11 @@ +lwIP is a small independent implementation of the TCP/IP protocol suite targeted at embedded systems. + +The focus of the lwIP TCP/IP implementation is to reduce resource usage while still having a full scale TCP. This makes lwIP suitable for use in embedded systems with tens of kilobytes of free RAM and room for around 40 kilobytes of code ROM. + +Main features include: +- Protocols: IP, IPv6, ICMP, ND, MLD, UDP, TCP, IGMP, ARP, PPPoS, PPPoE, 6LowPAN (via IEEE 802.15.4, BLE or ZEP; since v2.1.0) +- DHCP client, stateless DHCPv6 (since v2.1.0), DNS client (incl. mDNS hostname resolver), AutoIP/APIPA (Zeroconf), ACD (Address Conflict Detection), SNMP agent (v1, v2c, v3 (since v2.1.0), private MIB support & MIB compiler) +- APIs: specialized APIs for enhanced performance & zero copy, optional Berkeley-alike socket API +- Extended features: IP forwarding over multiple network interfaces +- Extended TCP features: congestion control, RTT estimation and fast recovery/fast retransmit, sending SACKs (since v2.1.0), "altcp": nearly transparent TLS for any tcp pcb (since v2.1.0) +- Addon applications: HTTP server (HTTPS via altcp), HTTP(S) client (since v2.1.0), SNTP client, SMTP client (SMTPS via altcp), ping, NetBIOS nameserver, mDNS responder, MQTT client (TLS support since v2.1.0), TFTP server, iPerf2 counterpart diff --git a/drivers/network/tcpip/lwip/FILES b/drivers/network/tcpip/lwip/FILES index 66253196f92..2a7086c1022 100644 --- a/drivers/network/tcpip/lwip/FILES +++ b/drivers/network/tcpip/lwip/FILES @@ -1,4 +1,6 @@ +contrib/ - lwIP examples, ports, and small apps (formerly
http://git.savannah.gnu.org/cgit/lwip/lwip-contrib.git/
) src/ - The source code for the lwIP TCP/IP stack. doc/ - The documentation for lwIP. +test/ - Some code to test whether the sources do what they should. See also the FILES file in each subdirectory. diff --git a/drivers/network/tcpip/lwip/README b/drivers/network/tcpip/lwip/README index a62cc4f38c8..f831051b13a 100644 --- a/drivers/network/tcpip/lwip/README +++ b/drivers/network/tcpip/lwip/README @@ -1,37 +1,57 @@ INTRODUCTION -lwIP is a small independent implementation of the TCP/IP protocol -suite that has been developed by Adam Dunkels at the Computer and -Networks Architectures (CNA) lab at the Swedish Institute of Computer -Science (SICS). +lwIP is a small independent implementation of the TCP/IP protocol suite. The focus of the lwIP TCP/IP implementation is to reduce the RAM usage while still having a full scale TCP. This making lwIP suitable for use in embedded systems with tens of kilobytes of free RAM and room for around 40 kilobytes of code ROM. +lwIP was originally developed by Adam Dunkels at the Computer and Networks +Architectures (CNA) lab at the Swedish Institute of Computer Science (SICS) +and is now developed and maintained by a worldwide network of developers. + FEATURES - * IP (Internet Protocol) including packet forwarding over multiple network - interfaces + * IP (Internet Protocol, IPv4 and IPv6) including packet forwarding over + multiple network interfaces * ICMP (Internet Control Message Protocol) for network maintenance and debugging * IGMP (Internet Group Management Protocol) for multicast traffic management + * MLD (Multicast listener discovery for IPv6). Aims to be compliant with + RFC 2710. No support for MLDv2 + * ND (Neighbor discovery and stateless address autoconfiguration for IPv6). + Aims to be compliant with RFC 4861 (Neighbor discovery) and RFC 4862 + (Address autoconfiguration) + * DHCP, AutoIP/APIPA (Zeroconf), ACD (Address Conflict Detection) + and (stateless) DHCPv6 * UDP (User Datagram Protocol) including experimental UDP-lite extensions * TCP (Transmission Control Protocol) with congestion control, RTT estimation - and fast recovery/fast retransmit - * Specialized raw/native API for enhanced performance + fast recovery/fast retransmit and sending SACKs + * raw/native API for enhanced performance * Optional Berkeley-like socket API - * DNS (Domain names resolver) - * SNMP (Simple Network Management Protocol) - * DHCP (Dynamic Host Configuration Protocol) - * AUTOIP (for IPv4, conform with RFC 3927) - * PPP (Point-to-Point Protocol) - * ARP (Address Resolution Protocol) for Ethernet + * TLS: optional layered TCP ("altcp") for nearly transparent TLS for any + TCP-based protocol (ported to mbedTLS) (see changelog for more info) + * PPPoS and PPPoE (Point-to-point protocol over Serial/Ethernet) + * DNS (Domain name resolver incl. mDNS) + * 6LoWPAN (via IEEE 802.15.4, BLE or ZEP) + + +APPLICATIONS + + * HTTP server with SSI and CGI (HTTPS via altcp) + * SNMPv2c agent with MIB compiler (Simple Network Management Protocol), v3 via altcp + * SNTP (Simple network time protocol) + * NetBIOS name service responder + * MDNS (Multicast DNS) responder + * iPerf server implementation + * MQTT client (TLS support via altcp) + LICENSE lwIP is freely available under a BSD license. + DEVELOPMENT lwIP has grown into an excellent TCP/IP stack for embedded devices, @@ -40,45 +60,46 @@ and additions to the stack to further increase its usefulness. Development of lwIP is hosted on Savannah, a central point for software development, maintenance and distribution. Everyone can -help improve lwIP by use of Savannah's interface, CVS and the +help improve lwIP by use of Savannah's interface, Git and the mailing list. A core team of developers will commit changes to the -CVS source tree. +Git source tree. -The lwIP TCP/IP stack is maintained in the 'lwip' CVS module and -contributions (such as platform ports) are in the 'contrib' module. +The lwIP TCP/IP stack is maintained in the 'src' directory and +contributions (such as platform ports and applications) are in +the 'contrib' directory. -See doc/savannah.txt for details on CVS server access for users and +See doc/savannah.txt for details on Git server access for users and developers. -Last night's CVS tar ball can be downloaded from: -
http://savannah.gnu.org/cvs.backups/lwip.tar.gz
[CHANGED - NEEDS FIXING] - -The current CVS trees are web-browsable: -
http://savannah.nongnu.org/cgi-bin/viewcvs/lwip/lwip/
-
http://savannah.nongnu.org/cgi-bin/viewcvs/lwip/contrib/
+The current Git tree is web-browsable: +
https://git.savannah.gnu.org/cgit/lwip.git
Submit patches and bugs via the lwIP project page: -
http://savannah.nongnu.org/projects/lwip/
+
https://savannah.nongnu.org/projects/lwip/
+Continuous integration builds (GCC, clang): +
https://github.com/lwip-tcpip/lwip/actions
-DOCUMENTATION - -The original out-dated homepage of lwIP and Adam Dunkels' papers on -lwIP are at the official lwIP home page: -
http://www.sics.se/~adam/lwip/
-Self documentation of the source code is regularly extracted from the -current CVS sources and is available from this web page: -
http://www.nongnu.org/lwip/
+DOCUMENTATION -There is now a constantly growin wiki about lwIP at -
http://lwip.wikia.com/wiki/LwIP_Wiki
+Self documentation of the source code is regularly extracted from the current +Git sources and is available from this web page: +
https://www.nongnu.org/lwip/
Also, there are mailing lists you can subscribe at -
http://savannah.nongnu.org/mail/?group=lwip
+
https://savannah.nongnu.org/mail/?group=lwip
plus searchable archives: -
http://lists.nongnu.org/archive/html/lwip-users/
-
http://lists.nongnu.org/archive/html/lwip-devel/
+
https://lists.nongnu.org/archive/html/lwip-users/
+
https://lists.nongnu.org/archive/html/lwip-devel/
+ +There is a wiki about lwIP at +
https://lwip.wikia.com/wiki/LwIP_Wiki
+You might get questions answered there, but unfortunately, it is not as +well maintained as it should be. + +lwIP was originally written by Adam Dunkels: +
http://dunkels.com/adam/
Reading Adam's papers, the files in docs/, browsing the source code documentation and browsing the mailing list archives is a good way to @@ -86,4 +107,3 @@ become familiar with the design of lwIP. Adam Dunkels <adam(a)sics.se> Leon Woestenberg <leon.woestenberg(a)gmx.net> - diff --git a/drivers/network/tcpip/lwip/UPGRADING b/drivers/network/tcpip/lwip/UPGRADING index 6501107a7e8..0d357906c02 100644 --- a/drivers/network/tcpip/lwip/UPGRADING +++ b/drivers/network/tcpip/lwip/UPGRADING @@ -4,9 +4,153 @@ application written for an older version of lwIP to correctly work with newer versions. -(CVS HEAD) +(git master) * [Enter new changes just after this line - do not remove this line] + * The eth_addr_cmp and ip_addr_cmp set of functions have been renamed to eth_addr_eq, ip_addr_eq + and so on, since they return non-zero on equality. Macros for the old names exist. + * The sio_write function used by PPP now takes the data argument as const. + +(2.2.0) + + ++ Repository changes: + + * The contrib repository has been added into the main repository in the subdirectory 'contrib' + (the old contrib repository remains online for reference but is not used any more) + +(2.1.0) + + ++ Application changes: + + * Use the new altcp API for seamless TLS integration into existing TCP applications (see changelog) + * TCP only kills existing connections with a LOWER priority than the one currently being opened. + Previous implementations also kill existing connections of the SAME priority. + * ip4_route_src: parameter order is reversed: ip4_route_src(dest, src) -> ip4_route_src(src, dest) + to make parameter order consistent with other ip*_route*() functions. + Same also applies to LWIP_HOOK_IP4_ROUTE_SRC() parameter order. + * pbuf API: pbuf->type (an u8_t holding the enum 'pbuf_type') has changed to only hold a + description of the pbuf (e.g. data following pbuf struct, data volatile, allocation + source heap/pool/etc.). As a consequence, applications can't test pbuf->type any more. + Use pbuf_match_type(pbuf, type) instead. + * socket API: according to the standard, SO_ERROR now only returns asynchronous errors. + All other/normal/synchronous errors are (and always were) available via 'errno'. + LWIP_SOCKET_SET_ERRNO has been removed - 'errno' is always set - and required! + * httpd LWIP_HTTPD_CGI_SSI: httpd_cgi_handler() has an additional parameter "struct fs_file *" + + ++ Port changes: + + * tcpip_trycallback() was renamed to tcpip_callbackmsg_trycallback() to avoid confusion + with tcpip_try_callback() + * compatibility headers: moved from 'src/include/posix' to 'src/include/compat/posix', + 'src/include/compat/stdc' etc. + * The IPv6 implementation now supports address scopes. (See LWIP_IPV6_SCOPES documentation + and ip6_zone.h for more documentation) + * LWIP_HOOK_DHCP_APPEND_OPTIONS() has changed, see description in opt.h (options_out_len is not + available in struct dhcp any more) + * Added debug helper asserts to ensure threading/locking requirements are met (define + LWIP_MARK_TCPIP_THREAD() and LWIP_ASSERT_CORE_LOCKED()). + * Added sys_mbox_trypost_fromisr() and tcpip_callbackmsg_trycallback_fromisr() + These can be used to post preallocated messages from an ISR to the tcpip thread + (e.g. when using FreeRTOS) + +(2.0.2) + + ++ Application changes: + + * slipif: The way to pass serial port number has changed. netif->num is not + supported any more, netif->state is interpreted as an u8_t port number now + (it's not a POINTER to an u8_t any more!) + +(2.0.1) + + ++ Application changes: + + * UDP does NOT receive multicast traffic from ALL netifs on an UDP PCB bound to a specific + netif any more. Users need to bind to IP_ADDR_ANY to receive multicast traffic and compare + ip_current_netif() to the desired netif for every packet. + See bug #49662 for an explanation. + +(2.0.0) + + ++ Application changes: + + * Changed netif "up" flag handling to be an administrative flag (as opposed to the previous meaning of + "ip4-address-valid", a netif will now not be used for transmission if not up) -> even a DHCP netif + has to be set "up" before starting the DHCP client + * Added IPv6 support (dual-stack or IPv4/IPv6 only) + * Changed ip_addr_t to be a union in dual-stack mode (use ip4_addr_t where referring to IPv4 only). + * Major rewrite of SNMP (added MIB parser that creates code stubs for custom MIBs); + supports SNMPv2c (experimental v3 support) + * Moved some core applications from contrib repository to src/apps (and include/lwip/apps) + + +++ Raw API: + * Changed TCP listen backlog: removed tcp_accepted(), added the function pair tcp_backlog_delayed()/ + tcp_backlog_accepted() to explicitly delay backlog handling on a connection pcb + + +++ Socket API: + * Added an implementation for posix sendmsg() + * Added LWIP_FIONREAD_LINUXMODE that makes ioctl/FIONREAD return the size of the next pending datagram + + ++ Port changes + + +++ new files: + * MANY new and moved files! + * Added src/Filelists.mk for use in Makefile projects + * Continued moving stack-internal parts from abc.h to abc_priv.h in sub-folder "priv" + to let abc.h only contain the actual application programmer's API + + +++ sys layer: + * Made LWIP_TCPIP_CORE_LOCKING==1 the default as it usually performs better than + the traditional message passing (although with LWIP_COMPAT_MUTEX you are still + open to priority inversion, so this is not recommended any more) + * Added LWIP_NETCONN_SEM_PER_THREAD to use one "op_completed" semaphore per thread + instead of using one per netconn (these semaphores are used even with core locking + enabled as some longer lasting functions like big writes still need to delay) + * Added generalized abstraction for itoa(), strnicmp(), stricmp() and strnstr() + in def.h (to be overridden in cc.h) instead of config + options for netbiosns, httpd, dns, etc. ... + * New abstraction for hton* and ntoh* functions in def.h. + To override them, use the following in cc.h: + #define lwip_htons(x) <your_htons> + #define lwip_htonl(x) <your_htonl> + + +++ new options: + * TODO + + +++ new pools: + * Added LWIP_MEMPOOL_* (declare/init/alloc/free) to declare private memp pools + that share memp.c code but do not have to be made global via lwippools.h + * Added pools for IPv6, MPU_COMPATIBLE, dns-api, netif-api, etc. + * added hook LWIP_HOOK_MEMP_AVAILABLE() to get informed when a memp pool was empty and an item + is now available + + * Signature of LWIP_HOOK_VLAN_SET macro was changed + + * LWIP_DECLARE_MEMORY_ALIGNED() may be used to declare aligned memory buffers (mem/memp) + or to move buffers to dedicated memory using compiler attributes + + * Standard C headers are used to define sized types and printf formatters + (disable by setting LWIP_NO_STDINT_H=1 or LWIP_NO_INTTYPES_H=1 if your compiler + does not support these) + + + ++ Major bugfixes/improvements + + * Added IPv6 support (dual-stack or IPv4/IPv6 only) + * Major rewrite of PPP (incl. keep-up with apache pppd) + see doc/ppp.txt for an upgrading how-to + * Major rewrite of SNMP (incl. MIB parser) + * Fixed timing issues that might have lead to losing a DHCP lease + * Made rx processing path more robust against crafted errors + * TCP window scaling support + * modification of api modules to support FreeRTOS-MPU (don't pass stack-pointers to other threads) + * made DNS client more robust + * support PBUF_REF for RX packets + * LWIP_NETCONN_FULLDUPLEX allows netconn/sockets to be used for reading/writing from separate + threads each (needs LWIP_NETCONN_SEM_PER_THREAD) + * Moved and reordered stats (mainly memp/mib2) + +(1.4.0) ++ Application changes: diff --git a/drivers/network/tcpip/lwip/codespell_changed_files.sh b/drivers/network/tcpip/lwip/codespell_changed_files.sh new file mode 100644 index 00000000000..638a18e2019 --- /dev/null +++ b/drivers/network/tcpip/lwip/codespell_changed_files.sh @@ -0,0 +1,26 @@ +# Copyright 2017 Kaspar Schleiser <kaspar(a)schleiser.de> +# Copyright 2014 Ludwig Knüpfer <ludwig.knuepfer(a)fu-berlin.de> +# Copyright 2014 Hinnerk van Bruinehsen <h.v.bruinehsen(a)fu-berlin.de> +# Copyright 2020 Jonathan Demeyer <jona.dem(a)gmail.com> +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. + +changed_files() { + : ${FILEREGEX:='\.([CcHh])$'} + : ${EXCLUDE:=''} + : ${DIFFFILTER:='ACMR'} + + DIFFFILTER="--diff-filter=${DIFFFILTER}" + + # select either all or only touched-in-branch files, filter through FILEREGEX + if [ -z "${BASE_BRANCH}" ]; then + FILES="$(git ls-tree -r --full-tree --name-only HEAD | grep -E ${FILEREGEX})" + else + FILES="$(git diff ${DIFFFILTER} --name-only ${BASE_BRANCH} | grep -E ${FILEREGEX})" + fi + + # filter out negatives + echo "${FILES}" | grep -v -E ${EXCLUDE} +} diff --git a/drivers/network/tcpip/lwip/codespell_check.sh b/drivers/network/tcpip/lwip/codespell_check.sh new file mode 100755 index 00000000000..7d8d0dfb75a --- /dev/null +++ b/drivers/network/tcpip/lwip/codespell_check.sh @@ -0,0 +1,57 @@ +#!/usr/bin/env bash + +# Copyright 2019 Alexandre Abadie <alexandre.abadie(a)inria.fr> +# +# This file is subject to the terms and conditions of the GNU Lesser +# General Public License v2.1. See the file LICENSE in the top level +# directory for more details. + +CODESPELL_CMD="codespell" + +if tput colors &> /dev/null && [ "$(tput colors)" -ge 8 ]; then + CERROR=$'\033[1;31m' + CRESET=$'\033[0m' +else + CERROR= + CRESET= +fi + +: "${LWIPBASE:=$(cd $(dirname $0)/; pwd)}" +cd $LWIPBASE + +: "${LWIPTOOLS:=${LWIPBASE}}" +. "${LWIPTOOLS}"/codespell_changed_files.sh + +FILEREGEX='\.([CcHh]|sh|py|md|txt)$' +EXCLUDE='^(./contrib/apps/LwipMibCompiler/Mibs)' +FILES=$(FILEREGEX=${FILEREGEX} EXCLUDE=${EXCLUDE} changed_files) + +if [ -z "${FILES}" ]; then + exit 0 +fi + +${CODESPELL_CMD} --version &> /dev/null || { + printf "%s%s: cannot execute \"%s\"!%s\n" "${CERROR}" "$0" "${CODESPELL_CMD}" "${CRESET}" + exit 1 +} + +CODESPELL_OPTS="-q 2" # Disable "WARNING: Binary file" +CODESPELL_OPTS+=" --check-hidden" +# Disable false positives "nd => and, 2nd", "ans => and", "tolen => token", +# "ofo => of", "WAN => WANT", "mut => must, mutt, moot" +CODESPELL_OPTS+=" --ignore-words-list=nd,ans,tolen,ofo,wan,mut " +# propagate all options to codespell -> pass "-w" to this script to write changes +CODESPELL_OPTS+="$@" + +# Filter-out all false positive raising "disabled due to" messages. +ERRORS=$(${CODESPELL_CMD} ${CODESPELL_OPTS} ${FILES} | grep -ve "disabled due to") + +if [ -n "${ERRORS}" ] +then + printf "%sThere are typos in the following files:%s\n\n" "${CERROR}" "${CRESET}" + printf "%s\n" "${ERRORS}" + # TODO: return 1 when all typos are fixed + exit 0 +else + exit 0 +fi diff --git a/drivers/network/tcpip/lwip/doc/FILES b/drivers/network/tcpip/lwip/doc/FILES index 05d356f4f9e..155a82cb336 100644 --- a/drivers/network/tcpip/lwip/doc/FILES +++ b/drivers/network/tcpip/lwip/doc/FILES @@ -1,6 +1,6 @@ +doxygen/ - Configuration files and scripts to create the lwIP doxygen source + documentation (found at
http://www.nongnu.org/lwip/
) + savannah.txt - How to obtain the current development source code. contrib.txt - How to contribute to lwIP as a developer. -rawapi.txt - The documentation for the core API of lwIP. - Also provides an overview about the other APIs and multithreading. -snmp_agent.txt - The documentation for the lwIP SNMP agent. -sys_arch.txt - The documentation for a system abstraction layer of lwIP. +ppp.txt - Documentation of the PPP interface for lwIP. diff --git a/drivers/network/tcpip/lwip/doc/NO_SYS_SampleCode.c b/drivers/network/tcpip/lwip/doc/NO_SYS_SampleCode.c new file mode 100644 index 00000000000..b263420c68d --- /dev/null +++ b/drivers/network/tcpip/lwip/doc/NO_SYS_SampleCode.c @@ -0,0 +1,121 @@ +void +eth_mac_irq() +{ + /* Service MAC IRQ here */ + + /* Allocate pbuf from pool (avoid using heap in interrupts) */ + struct pbuf* p = pbuf_alloc(PBUF_RAW, eth_data_count, PBUF_POOL); + + if(p != NULL) { + /* Copy ethernet frame into pbuf */ + pbuf_take(p, eth_data, eth_data_count); + + /* Put in a queue which is processed in main loop */ + if(!queue_try_put(&queue, p)) { + /* queue is full -> packet loss */ + pbuf_free(p); + } + } +} + +static err_t +netif_output(struct netif *netif, struct pbuf *p) +{ + LINK_STATS_INC(link.xmit); + + /* Update SNMP stats (only if you use SNMP) */ + MIB2_STATS_NETIF_ADD(netif, ifoutoctets, p->tot_len); + int unicast = ((p->payload[0] & 0x01) == 0); + if (unicast) { + MIB2_STATS_NETIF_INC(netif, ifoutucastpkts); + } else { + MIB2_STATS_NETIF_INC(netif, ifoutnucastpkts); + } + + lock_interrupts(); + pbuf_copy_partial(p, mac_send_buffer, p->tot_len, 0); + /* Start MAC transmit here */ + unlock_interrupts(); + + return ERR_OK; +} + +static void +netif_status_callback(struct netif *netif) +{ + printf("netif status changed %s\n", ip4addr_ntoa(netif_ip4_addr(netif))); +} + +static err_t +netif_init(struct netif *netif) +{ + netif->linkoutput = netif_output; + netif->output = etharp_output; + netif->output_ip6 = ethip6_output; + netif->mtu = ETHERNET_MTU; + netif->flags = NETIF_FLAG_BROADCAST | NETIF_FLAG_ETHARP | NETIF_FLAG_ETHERNET | NETIF_FLAG_IGMP | NETIF_FLAG_MLD6; + MIB2_INIT_NETIF(netif, snmp_ifType_ethernet_csmacd, 100000000); + + SMEMCPY(netif->hwaddr, your_mac_address_goes_here, ETH_HWADDR_LEN); + netif->hwaddr_len = ETH_HWADDR_LEN; + + return ERR_OK; +} + +void +main(void) +{ + struct netif netif; + + lwip_init(); + + netif_add(&netif, IP4_ADDR_ANY, IP4_ADDR_ANY, IP4_ADDR_ANY, NULL, netif_init, netif_input); + netif.name[0] = 'e'; + netif.name[1] = '0'; + netif_create_ip6_linklocal_address(&netif, 1); + netif_set_status_callback(&netif, netif_status_callback); + netif_set_default(&netif); + netif_set_up(&netif); + + /* Start DHCP and HTTPD */ + dhcp_start(&netif ); + httpd_init(); + + while(1) { + /* Check link state, e.g. via MDIO communication with PHY */ + if(link_state_changed()) { + if(link_is_up()) { + netif_set_link_up(&netif); + } else { + netif_set_link_down(&netif); + } + } + + /* Check for received frames, feed them to lwIP */ + lock_interrupts(); + struct pbuf* p = queue_try_get(&queue); + unlock_interrupts(); + + if(p != NULL) { + LINK_STATS_INC(link.recv); + + /* Update SNMP stats (only if you use SNMP) */ + MIB2_STATS_NETIF_ADD(netif, ifinoctets, p->tot_len); + int unicast = ((p->payload[0] & 0x01) == 0); + if (unicast) { + MIB2_STATS_NETIF_INC(netif, ifinucastpkts); + } else { + MIB2_STATS_NETIF_INC(netif, ifinnucastpkts); + } + + if(netif.input(p, &netif) != ERR_OK) { + pbuf_free(p); + } + } + + /* Cyclic lwIP timers check */ + sys_check_timeouts(); + + /* your application goes here */ + } +} diff --git a/drivers/network/tcpip/lwip/doc/ZeroCopyRx.c b/drivers/network/tcpip/lwip/doc/ZeroCopyRx.c new file mode 100644 index 00000000000..600b13a0f3f --- /dev/null +++ b/drivers/network/tcpip/lwip/doc/ZeroCopyRx.c @@ -0,0 +1,45 @@ +typedef struct my_custom_pbuf +{ + struct pbuf_custom p; + void* dma_descriptor; +} my_custom_pbuf_t; + +LWIP_MEMPOOL_DECLARE(RX_POOL, 10, sizeof(my_custom_pbuf_t), "Zero-copy RX PBUF pool"); + +void my_pbuf_free_custom(void* p) +{ + SYS_ARCH_DECL_PROTECT(old_level); + + my_custom_pbuf_t* my_puf = (my_custom_pbuf_t*)p; + + // invalidate data cache here - lwIP and/or application may have written into buffer! + // (invalidate is faster than flushing, and no one needs the correct data in the buffer) + invalidate_cpu_cache(p->payload, p->tot_len); + + SYS_ARCH_PROTECT(old_level); + free_rx_dma_descriptor(my_pbuf->dma_descriptor); + LWIP_MEMPOOL_FREE(RX_POOL, my_pbuf); + SYS_ARCH_UNPROTECT(old_level); +} + +void eth_rx_irq() +{ + dma_descriptor* dma_desc = get_RX_DMA_descriptor_from_ethernet(); + my_custom_pbuf_t* my_pbuf = (my_custom_pbuf_t*)LWIP_MEMPOOL_ALLOC(RX_POOL); + + my_pbuf->p.custom_free_function = my_pbuf_free_custom; + my_pbuf->dma_descriptor = dma_desc; + + invalidate_cpu_cache(dma_desc->rx_data, dma_desc->rx_length); + + struct pbuf* p = pbuf_alloced_custom(PBUF_RAW, + dma_desc->rx_length, + PBUF_REF, + &my_pbuf->p, + dma_desc->rx_data, + dma_desc->max_buffer_size); + + if(netif->input(p, netif) != ERR_OK) { + pbuf_free(p); + } +} diff --git a/drivers/network/tcpip/lwip/doc/contrib.txt b/drivers/network/tcpip/lwip/doc/contrib.txt index 39596fca335..2a44857e4ba 100644 --- a/drivers/network/tcpip/lwip/doc/contrib.txt +++ b/drivers/network/tcpip/lwip/doc/contrib.txt @@ -34,30 +34,25 @@ features of Savannah help us not lose users' input. 2.3 Bug reports and patches: 1. Make sure you are reporting bugs or send patches against the latest - sources. (From the latest release and/or the current CVS sources.) + sources. (From the latest release and/or the current Git sources.) 2. If you think you found a bug make sure it's not already filed in the bugtracker at Savannah. 3. If you have a fix put the patch on Savannah. If it is a patch that affects both core and arch specific stuff please separate them so that the core can - be applied separately while leaving the other patch 'open'. The prefered way + be applied separately while leaving the other patch 'open'. The preferred way is to NOT touch archs you can't test and let maintainers take care of them. This is a good way to see if they are used at all - the same goes for unix netifs except tapif. 4. Do not file a bug and post a fix to it to the patch area. Either a bug report or a patch will be enough. If you correct an existing bug then attach the patch to the bug rather than creating a new entry in the patch area. -5. Trivial patches (compiler warning, indentation and spelling fixes or anything obvious which takes a line or two) - can go to the lwip-users list. This is still the fastest way of interaction and the list is not so crowded - as to allow for loss of fixes. Putting bugs on Savannah and subsequently closing them is too much an overhead - for reporting a compiler warning fix. -6. Patches should be specific to a single change or to related changes.Do not mix bugfixes with spelling and other - trivial fixes unless the bugfix is trivial too.Do not reorganize code and rename identifiers in the same patch you - change behaviour if not necessary.A patch is easier to read and understand if it's to the point and short than +5. Patches should be specific to a single change or to related changes. Do not mix bugfixes with spelling and other + trivial fixes unless the bugfix is trivial too. Do not reorganize code and rename identifiers in the same patch you + change behaviour if not necessary. A patch is easier to read and understand if it's to the point and short than if it's not to the point and long :) so the chances for it to be applied are greater. 2.4 Platform porters: 1. If you have ported lwIP to a platform (an OS, a uC/processor or a combination of these) and you think it could benefit others[1] you might want discuss this on the mailing list. You - can also ask for CVS access to submit and maintain your port in the contrib CVS module. - \ No newline at end of file + can also ask for Git access to submit and maintain your port in the lwIP/contrib subdir. diff --git a/drivers/network/tcpip/lwip/doc/doxygen/generate.bat b/drivers/network/tcpip/lwip/doc/doxygen/generate.bat new file mode 100644 index 00000000000..99afb124bec --- /dev/null +++ b/drivers/network/tcpip/lwip/doc/doxygen/generate.bat @@ -0,0 +1 @@ +doxygen lwip.Doxyfile diff --git a/drivers/network/tcpip/lwip/doc/doxygen/generate.sh b/drivers/network/tcpip/lwip/doc/doxygen/generate.sh new file mode 100755 index 00000000000..89344b0e812 --- /dev/null +++ b/drivers/network/tcpip/lwip/doc/doxygen/generate.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +doxygen lwip.Doxyfile diff --git a/drivers/network/tcpip/lwip/doc/doxygen/lwip.Doxyfile b/drivers/network/tcpip/lwip/doc/doxygen/lwip.Doxyfile new file mode 100644 index 00000000000..4b4d2ec5b1d --- /dev/null +++ b/drivers/network/tcpip/lwip/doc/doxygen/lwip.Doxyfile @@ -0,0 +1,2516 @@ +# Doxyfile 1.8.13 + +# This file describes the settings to be used by the documentation system +# doxygen (
www.doxygen.org
) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See
http://www.gnu.org/software/libiconv
+# for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = "lwIP" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = "2.2.0" + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = "Lightweight IP stack" + +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = "output" + +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. + +CREATE_SUBDIRS = NO + +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = "The $name class " \ + "The $name widget " \ + "The $name file " \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = YES + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = ../../ + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = NO + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = NO + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 8 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. + +ALIASES = + +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = YES + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See
http://daringfireball.net/projects/markdown/
for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up +# to that level are automatically included in the table of contents, even if +# they do not have an id attribute. +# Note: This feature currently applies only to Markdown headings. +# Minimum value: 0, maximum value: 99, default value: 0. +# This tag requires that the tag MARKDOWN_SUPPORT is set to YES. + +TOC_INCLUDE_HEADINGS = 0 + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = NO + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +#
http://www.riverbankcomputing.co.uk/software/sip/intro
) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# If one adds a struct or class to a group and this option is enabled, then also +# any nested class or struct is added to the same group. By default this option +# is disabled and one has to add nested compounds explicitly via \ingroup. +# The default value is: NO. + +GROUP_NESTED_COMPOUNDS = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = NO + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. If set to YES, local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO, only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = YES + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = YES + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO, these declarations will be +# included in the documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES, upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. +# The default value is: system dependent. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = NO + +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = YES + +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. +# The default value is: YES. + +GENERATE_TODOLIST = NO + +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if <section_label> ... \endif and \cond <section_label> +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also
http://en.wikipedia.org/wiki/BibTeX
for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when +# a warning is encountered. +# The default value is: NO. + +WARN_AS_ERROR = YES + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text " + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING +# Note: If this tag is empty the current directory is searched. + +INPUT = main_page.h \ + ../../src + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see:
http://www.gnu.org/software/libiconv
) for the list of +# possible encodings. +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# read by doxygen. +# +# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp, +# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, +# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, +# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08, +# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf. + +FILE_PATTERNS = *.c \ + *.cc \ + *.cxx \ + *.cpp \ + *.c++ \ + *.java \ + *.ii \ + *.ixx \ + *.ipp \ + *.i++ \ + *.inl \ + *.h \ + *.hh \ + *.hxx \ + *.hpp \ + *.h++ \ + *.idl \ + *.odl \ + *.inc \ + *.m \ + *.mm \ + *.dox + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = ../../src/include/netif/ppp/polarssl + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = ../ \ + ../../ + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# <filter> <input-file> +# +# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. +# +# Note that for custom extensions or not directly supported extensions you also +# need to set EXTENSION_MAPPING for the extension otherwise the files are not +# properly processed by doxygen. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and ... 188526 lines suppressed ...
7Â months, 4Â weeks
1
0
0
0
[reactos] 02/03: [TCPIP] Add ip_addr_t typedef
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc94df7288bfb1a607052…
commit bc94df7288bfb1a607052bd543af53d574edbefa Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Apr 20 19:22:54 2024 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Nov 3 22:49:45 2024 +0100 [TCPIP] Add ip_addr_t typedef ip_addr_t is used in later versions of LWIP. --- drivers/network/tcpip/ip/lwip_glue/lwip_glue.h | 15 ++++++++------- drivers/network/tcpip/ip/lwip_glue/tcp.c | 10 +++++----- drivers/network/tcpip/ip/transport/tcp/accept.c | 4 ++-- drivers/network/tcpip/ip/transport/tcp/if.c | 14 +++++++------- drivers/network/tcpip/ip/transport/tcp/tcp.c | 4 ++-- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/drivers/network/tcpip/ip/lwip_glue/lwip_glue.h b/drivers/network/tcpip/ip/lwip_glue/lwip_glue.h index 5fdd5b73446..ac7ab13e01f 100644 --- a/drivers/network/tcpip/ip/lwip_glue/lwip_glue.h +++ b/drivers/network/tcpip/ip/lwip_glue/lwip_glue.h @@ -13,6 +13,7 @@ #endif typedef struct tcp_pcb* PTCP_PCB; +typedef struct ip_addr ip4_addr_t; typedef struct _QUEUE_ENTRY { @@ -36,7 +37,7 @@ struct lwip_callback_msg } FreeSocket; struct { PCONNECTION_ENDPOINT Connection; - struct ip_addr *IpAddress; + ip_addr_t *IpAddress; u16_t Port; } Bind; struct { @@ -50,7 +51,7 @@ struct lwip_callback_msg } Send; struct { PCONNECTION_ENDPOINT Connection; - struct ip_addr *IpAddress; + ip_addr_t *IpAddress; u16_t Port; } Connect; struct { @@ -103,15 +104,15 @@ extern void TCPRecvEventHandler(void *arg); /* TCP functions */ PTCP_PCB LibTCPSocket(void *arg); VOID LibTCPFreeSocket(PTCP_PCB pcb); -err_t LibTCPBind(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port); +err_t LibTCPBind(PCONNECTION_ENDPOINT Connection, ip4_addr_t *const ipaddr, const u16_t port); PTCP_PCB LibTCPListen(PCONNECTION_ENDPOINT Connection, const u8_t backlog); -err_t LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, u32_t *sent, const int safe); -err_t LibTCPConnect(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port); +err_t LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, ULONG *sent, const int safe); +err_t LibTCPConnect(PCONNECTION_ENDPOINT Connection, ip4_addr_t *const ipaddr, const u16_t port); err_t LibTCPShutdown(PCONNECTION_ENDPOINT Connection, const int shut_rx, const int shut_tx); err_t LibTCPClose(PCONNECTION_ENDPOINT Connection, const int safe, const int callback); -err_t LibTCPGetPeerName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t *const port); -err_t LibTCPGetHostName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t *const port); +err_t LibTCPGetPeerName(PTCP_PCB pcb, ip4_addr_t *const ipaddr, u16_t *const port); +err_t LibTCPGetHostName(PTCP_PCB pcb, ip4_addr_t *const ipaddr, u16_t *const port); void LibTCPAccept(PTCP_PCB pcb, struct tcp_pcb *listen_pcb, void *arg); void LibTCPSetNoDelay(PTCP_PCB pcb, BOOLEAN Set); void LibTCPGetSocketStatus(PTCP_PCB pcb, PULONG State); diff --git a/drivers/network/tcpip/ip/lwip_glue/tcp.c b/drivers/network/tcpip/ip/lwip_glue/tcp.c index 4b04d1d4073..4ac40594d06 100644 --- a/drivers/network/tcpip/ip/lwip_glue/tcp.c +++ b/drivers/network/tcpip/ip/lwip_glue/tcp.c @@ -412,7 +412,7 @@ done: } err_t -LibTCPBind(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port) +LibTCPBind(PCONNECTION_ENDPOINT Connection, ip4_addr_t *const ipaddr, const u16_t port) { struct lwip_callback_msg *msg; err_t ret; @@ -554,7 +554,7 @@ done: } err_t -LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, u32_t *sent, const int safe) +LibTCPSend(PCONNECTION_ENDPOINT Connection, void *const dataptr, const u16_t len, ULONG *sent, const int safe) { err_t ret; struct lwip_callback_msg *msg; @@ -619,7 +619,7 @@ done: } err_t -LibTCPConnect(PCONNECTION_ENDPOINT Connection, struct ip_addr *const ipaddr, const u16_t port) +LibTCPConnect(PCONNECTION_ENDPOINT Connection, ip_addr_t *const ipaddr, const u16_t port) { struct lwip_callback_msg *msg; err_t ret; @@ -841,7 +841,7 @@ LibTCPAccept(PTCP_PCB pcb, struct tcp_pcb *listen_pcb, void *arg) } err_t -LibTCPGetHostName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t *const port) +LibTCPGetHostName(PTCP_PCB pcb, ip_addr_t *const ipaddr, u16_t *const port) { if (!pcb) return ERR_CLSD; @@ -853,7 +853,7 @@ LibTCPGetHostName(PTCP_PCB pcb, struct ip_addr *const ipaddr, u16_t *const port) } err_t -LibTCPGetPeerName(PTCP_PCB pcb, struct ip_addr * const ipaddr, u16_t * const port) +LibTCPGetPeerName(PTCP_PCB pcb, ip_addr_t * const ipaddr, u16_t * const port) { if (!pcb) return ERR_CLSD; diff --git a/drivers/network/tcpip/ip/transport/tcp/accept.c b/drivers/network/tcpip/ip/transport/tcp/accept.c index cfab933003d..a6c41627fea 100644 --- a/drivers/network/tcpip/ip/transport/tcp/accept.c +++ b/drivers/network/tcpip/ip/transport/tcp/accept.c @@ -21,7 +21,7 @@ NTSTATUS TCPCheckPeerForAccept(PVOID Context, NTSTATUS Status; PTDI_CONNECTION_INFORMATION WhoIsConnecting; PTA_IP_ADDRESS RemoteAddress; - struct ip_addr ipaddr; + ip_addr_t ipaddr; if (Request->RequestFlags & TDI_QUERY_ACCEPT) DbgPrint("TDI_QUERY_ACCEPT NOT SUPPORTED!!!\n"); @@ -47,7 +47,7 @@ NTSTATUS TCPCheckPeerForAccept(PVOID Context, NTSTATUS TCPListen(PCONNECTION_ENDPOINT Connection, UINT Backlog) { NTSTATUS Status = STATUS_SUCCESS; - struct ip_addr AddressToBind; + ip_addr_t AddressToBind; TA_IP_ADDRESS LocalAddress; ASSERT(Connection); diff --git a/drivers/network/tcpip/ip/transport/tcp/if.c b/drivers/network/tcpip/ip/transport/tcp/if.c index e69c3667fc3..2e57532ca53 100644 --- a/drivers/network/tcpip/ip/transport/tcp/if.c +++ b/drivers/network/tcpip/ip/transport/tcp/if.c @@ -9,7 +9,7 @@ #include <ipifcons.h> err_t -TCPSendDataCallback(struct netif *netif, struct pbuf *p, struct ip_addr *dest) +TCPSendDataCallback(struct netif *netif, struct pbuf *p, ip4_addr_t *dest) { NDIS_STATUS NdisStatus; PNEIGHBOR_CACHE_ENTRY NCE; @@ -117,9 +117,9 @@ TCPInterfaceInit(struct netif *netif) VOID TCPRegisterInterface(PIP_INTERFACE IF) { - struct ip_addr ipaddr; - struct ip_addr netmask; - struct ip_addr gw; + ip_addr_t ipaddr; + ip_addr_t netmask; + ip_addr_t gw; gw.addr = 0; ipaddr.addr = 0; @@ -143,9 +143,9 @@ TCPUnregisterInterface(PIP_INTERFACE IF) VOID TCPUpdateInterfaceIPInformation(PIP_INTERFACE IF) { - struct ip_addr ipaddr; - struct ip_addr netmask; - struct ip_addr gw; + ip_addr_t ipaddr; + ip_addr_t netmask; + ip_addr_t gw; gw.addr = 0; diff --git a/drivers/network/tcpip/ip/transport/tcp/tcp.c b/drivers/network/tcpip/ip/transport/tcp/tcp.c index 89b9184fdca..394cc0510ad 100644 --- a/drivers/network/tcpip/ip/transport/tcp/tcp.c +++ b/drivers/network/tcpip/ip/transport/tcp/tcp.c @@ -306,7 +306,7 @@ NTSTATUS TCPConnect PVOID Context ) { NTSTATUS Status; - struct ip_addr bindaddr, connaddr; + ip_addr_t bindaddr, connaddr; IP_ADDRESS RemoteAddress; USHORT RemotePort; TA_IP_ADDRESS LocalAddress; @@ -660,7 +660,7 @@ NTSTATUS TCPGetSockAddress BOOLEAN GetRemote ) { PTA_IP_ADDRESS AddressIP = (PTA_IP_ADDRESS)Address; - struct ip_addr ipaddr; + ip_addr_t ipaddr; NTSTATUS Status; AddressIP->TAAddressCount = 1;
7Â months, 4Â weeks
1
0
0
0
[reactos] 01/03: [TCPIP] Remove options in lwipopts.h having default values
by Hervé Poussineau
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5e5b31ecbdc32c4146fa5…
commit 5e5b31ecbdc32c4146fa5579ff73b78696bd9c67 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sat Apr 20 18:44:23 2024 +0200 Commit: Hervé Poussineau <hpoussin(a)reactos.org> CommitDate: Sun Nov 3 22:49:45 2024 +0100 [TCPIP] Remove options in lwipopts.h having default values If lwipopts.h doesn't provide a define, a default value is taken from lwip/src/include/lwip/opt.h --- drivers/network/tcpip/include/lwip/lwipopts.h | 130 -------------------------- 1 file changed, 130 deletions(-) diff --git a/drivers/network/tcpip/include/lwip/lwipopts.h b/drivers/network/tcpip/include/lwip/lwipopts.h index a0310a31b04..d6109f4b178 100644 --- a/drivers/network/tcpip/include/lwip/lwipopts.h +++ b/drivers/network/tcpip/include/lwip/lwipopts.h @@ -16,12 +16,8 @@ #define LWIP_ARP 0 -#define ARP_QUEUEING 0 - #define ETH_PAD_SIZE 2 -#define IP_FORWARD 0 - #define IP_REASS_MAX_PBUFS 0xFFFFFFFF #define IP_DEFAULT_TTL 128 @@ -34,24 +30,8 @@ #define LWIP_RAW 0 -#define LWIP_DHCP 0 - -#define LWIP_AUTOIP 0 - -#define LWIP_SNMP 0 - -#define LWIP_IGMP 0 - -#define LWIP_DNS 0 - #define LWIP_UDP 0 -#define LWIP_UDPLITE 0 - -#define LWIP_TCP 1 - -#define TCP_QUEUE_OOSEQ 1 - #define SO_REUSE 1 #define SO_REUSE_RXTOALL 1 @@ -76,131 +56,21 @@ #define LWIP_TCP_TIMESTAMPS 1 -#define LWIP_CALLBACK_API 1 - -#define LWIP_NETIF_API 1 - #define LWIP_SOCKET 0 #define LWIP_NETCONN 0 -#define LWIP_NETIF_HWADDRHINT 0 - #define LWIP_STATS 0 #define ICMP_STATS 0 -#define PPP_SUPPORT 0 - -#define PPPOE_SUPPORT 0 - -#define PPPOS_SUPPORT 0 - /* --------------------------------------- ---------- Debugging options ---------- --------------------------------------- */ -/** - * LWIP_DBG_MIN_LEVEL: After masking, the value of the debug is - * compared against this value. If it is smaller, then debugging - * messages are written. - */ -#define LWIP_DBG_MIN_LEVEL LWIP_DBG_LEVEL_ALL - -/** - * LWIP_DBG_TYPES_ON: A mask that can be used to globally enable/disable - * debug messages of certain types. - */ -#define LWIP_DBG_TYPES_ON LWIP_DBG_ON - -/** - * NETIF_DEBUG: Enable debugging in netif.c. - */ -#define NETIF_DEBUG LWIP_DBG_OFF - -/** - * PBUF_DEBUG: Enable debugging in pbuf.c. - */ -#define PBUF_DEBUG LWIP_DBG_OFF - -/** - * INET_DEBUG: Enable debugging in inet.c. - */ -#define INET_DEBUG LWIP_DBG_OFF - -/** - * IP_DEBUG: Enable debugging for IP. - */ -#define IP_DEBUG LWIP_DBG_OFF - -/** - * IP_REASS_DEBUG: Enable debugging in ip_frag.c for both frag & reass. - */ -#define IP_REASS_DEBUG LWIP_DBG_OFF - -/** - * MEM_DEBUG: Enable debugging in mem.c. - */ -#define MEM_DEBUG LWIP_DBG_OFF - -/** - * MEMP_DEBUG: Enable debugging in memp.c. - */ -#define MEMP_DEBUG LWIP_DBG_OFF - -/** - * SYS_DEBUG: Enable debugging in sys.c. - */ -#define SYS_DEBUG LWIP_DBG_OFF /** * TCP_DEBUG: Enable debugging for TCP. */ #define TCP_DEBUG LWIP_DBG_ON - -/** - * TCP_INPUT_DEBUG: Enable debugging in tcp_in.c for incoming debug. - */ -#define TCP_INPUT_DEBUG LWIP_DBG_OFF - -/** - * TCP_FR_DEBUG: Enable debugging in tcp_in.c for fast retransmit. - */ -#define TCP_FR_DEBUG LWIP_DBG_OFF - -/** - * TCP_RTO_DEBUG: Enable debugging in TCP for retransmit - * timeout. - */ -#define TCP_RTO_DEBUG LWIP_DBG_OFF - -/** - * TCP_CWND_DEBUG: Enable debugging for TCP congestion window. - */ -#define TCP_CWND_DEBUG LWIP_DBG_OFF - -/** - * TCP_WND_DEBUG: Enable debugging in tcp_in.c for window updating. - */ -#define TCP_WND_DEBUG LWIP_DBG_OFF - -/** - * TCP_OUTPUT_DEBUG: Enable debugging in tcp_out.c output functions. - */ -#define TCP_OUTPUT_DEBUG LWIP_DBG_OFF - -/** - * TCP_RST_DEBUG: Enable debugging for TCP with the RST message. - */ -#define TCP_RST_DEBUG LWIP_DBG_OFF - -/** - * TCP_QLEN_DEBUG: Enable debugging for TCP queue lengths. - */ -#define TCP_QLEN_DEBUG LWIP_DBG_OFF - -/** - * TCPIP_DEBUG: Enable debugging in tcpip.c. - */ -#define TCPIP_DEBUG LWIP_DBG_OFF
7Â months, 4Â weeks
1
0
0
0
[reactos] 01/01: [MSCONFIG] Update Romanian (ro-RO) translation (#7353)
by Andrei Miloiu
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b8a47c3f7c3161af8f0c…
commit 0b8a47c3f7c3161af8f0c5df72291aae334c2f34 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Nov 3 21:39:20 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 3 20:39:20 2024 +0100 [MSCONFIG] Update Romanian (ro-RO) translation (#7353) --- base/applications/msconfig/lang/ro-RO.rc | 36 ++++++++++++++++---------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/base/applications/msconfig/lang/ro-RO.rc b/base/applications/msconfig/lang/ro-RO.rc index 7510e26d92e..3bd1c3cce1e 100644 --- a/base/applications/msconfig/lang/ro-RO.rc +++ b/base/applications/msconfig/lang/ro-RO.rc @@ -11,12 +11,12 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL IDD_MSCONFIG_DIALOG DIALOGEX 0, 0, 378, 220 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -CAPTION "Program de configurare sistem" +CAPTION "Program de configurare a sistemului" FONT 8, "MS Shell Dlg" BEGIN CONTROL "Tab1", IDC_TAB, "SysTabControl32", WS_TABSTOP, 2, 2, 374, 195 DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Manual…", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ajutor", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Revocare", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "Aplicare", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END @@ -73,13 +73,13 @@ IDD_GENERAL_PAGE DIALOGEX 0, 0, 362, 175 STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Moduri de pornire sistem", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT + GROUPBOX "Moduri de pornire a sistemului", -1, 10, 10, 340, 150, 0, WS_EX_TRANSPARENT CONTROL "Pornire n&ormală - încarcă toate serviciile și driverele", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 260, 10 CONTROL "Pornire de &diagnostic - încarcă doar driverele de bază", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 CONTROL "Pornire s&electivă", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 260, 10 - AUTOCHECKBOX "&Procesare fișier SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 - AUTOCHECKBOX "Încărcare se&rvicii de sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 - AUTOCHECKBOX "Încărcare ele&mente autolansate", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 + AUTOCHECKBOX "&Procesare a fișierului SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 260, 10 + AUTOCHECKBOX "Încărcare a se&rviciilor de sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 260, 10 + AUTOCHECKBOX "Încărcare a ele&mentelor autolansate", IDC_CBX_STARTUP_ITEM, 30, 110, 260, 10 END IDD_FREELDR_PAGE DIALOGEX 0, 0, 362, 175 @@ -90,14 +90,14 @@ BEGIN LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_HSCROLL PUSHBUTTON "Verificare a tuturor &căilor de pornire", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 145, 12 PUSHBUTTON "I&mplicite", IDC_BTN_SET_DEFAULT_BOOT, 165, 65, 55, 12 - PUSHBUTTON "Mutare s&us", IDC_BTN_MOVE_UP_BOOT_OPTION, 230, 65, 55, 12 - PUSHBUTTON "Mutare j&os", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 295, 65, 55, 12 + PUSHBUTTON "Mutare &sus", IDC_BTN_MOVE_UP_BOOT_OPTION, 230, 65, 55, 12 + PUSHBUTTON "Mutare &jos", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 295, 65, 55, 12 GROUPBOX "Parametri de pornire", -1, 10, 80, 250, 90, 0, WS_EX_TRANSPARENT CHECKBOX "/SAFE&BOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 CHECKBOX "/NO&GUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 CHECKBOX "/BOOT&LOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 CHECKBOX "/BASEVI&DEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 - CHECKBOX "/&SOS", IDC_CBX_SOS, 15, 150, 50, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 PUSHBUTTON "Opțiuni a&vansate…", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 80, 12 LTEXT "&Expirare:", -1, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT @@ -131,19 +131,19 @@ END STRINGTABLE BEGIN - IDS_MSCONFIG "Configuratorul de sistem" - IDS_TAB_GENERAL "Generale" + IDS_MSCONFIG "Programul de configurare a sistemului" + IDS_TAB_GENERAL "General" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" IDS_TAB_SERVICES "Servicii" - IDS_TAB_STARTUP "Autolansate" + IDS_TAB_STARTUP "Pornire" IDS_TAB_TOOLS "Instrumente" END STRINGTABLE BEGIN - IDS_SERVICES_COLUMN_SERVICE "Servicii" - IDS_SERVICES_COLUMN_REQ "De bază" + IDS_SERVICES_COLUMN_SERVICE "Serviciu" + IDS_SERVICES_COLUMN_REQ "Necesare" IDS_SERVICES_COLUMN_VENDOR "Furnizor" IDS_SERVICES_COLUMN_STATUS "Stare" END @@ -156,13 +156,13 @@ BEGIN IDS_TOOLS_CMD_DESCR "" IDS_TOOLS_CMD_CMD "cmd.exe" IDS_TOOLS_INFO_NAME "Versiune" - IDS_TOOLS_INFO_DESCR "Afișare informații despre versiune" + IDS_TOOLS_INFO_DESCR "Afișează informații despre versiune." IDS_TOOLS_INFO_CMD "winver.exe" IDS_TOOLS_REGEDIT_NAME "Editor de registru" - IDS_TOOLS_REGEDIT_DESCR "Deschide editorul de registru." + IDS_TOOLS_REGEDIT_DESCR "Deschide Editorul de registru." IDS_TOOLS_REGEDIT_CMD "regedit.exe" IDS_TOOLS_SYSDM_NAME "Proprietăți de sistem" - IDS_TOOLS_SYSDM_DESCR "Prezintă informații despre calculator" + IDS_TOOLS_SYSDM_DESCR "Prezintă informații despre calculator." IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" IDS_STARTUP_COLUMN_ELEMENT "Element" @@ -172,7 +172,7 @@ END STRINGTABLE BEGIN - IDS_SERVICES_STATUS_RUNNING "Pornit" + IDS_SERVICES_STATUS_RUNNING "Rulează" IDS_SERVICES_STATUS_STOPPED "Oprit" IDS_SERVICES_YES "Da" IDS_SERVICES_UNKNOWN "Nespecificat"
7Â months, 4Â weeks
1
0
0
0
[reactos] 01/01: [3DTEXT] Update Romanian (ro-RO) translation (#7361)
by Andrei Miloiu
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=baa89e9c2556957eb141a…
commit baa89e9c2556957eb141a14510fd232d83c885c8 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Nov 3 21:34:26 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 3 20:34:26 2024 +0100 [3DTEXT] Update Romanian (ro-RO) translation (#7361) --- base/applications/screensavers/3dtext/lang/ro-RO.rc | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/base/applications/screensavers/3dtext/lang/ro-RO.rc b/base/applications/screensavers/3dtext/lang/ro-RO.rc index 5ed9c5c83e6..d036b39b526 100644 --- a/base/applications/screensavers/3dtext/lang/ro-RO.rc +++ b/base/applications/screensavers/3dtext/lang/ro-RO.rc @@ -1,24 +1,25 @@ /* - * FILE: base/applications/screensavers/3dtext/lang/ro-RO.rc - * ReactOS Project (
https://reactos.org
) - * TRANSLATOR: Fulea Ștefan (PM on ReactOS Forum at fulea.stefan) - * CHANGE LOG: 2011-08-24 initial translation + * PROJECT: OpenGL 3DText ScreenSaver + * LICENSE: LGPL-2.1-or-later (
https://spdx.org/licenses/LGPL-2.1-or-later
) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2011-2018 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2023-2024 Andrei Miloiu <miloiuandrei(a)gmail.com> */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL DLG_SCRNSAVECONFIGURE DIALOGEX 0, 0, 245, 40 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Preferințe" +CAPTION "Setări pentru economizorul de ecran Text 3D" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - DEFPUSHBUTTON "Con&firmă", IDOK, 175, 4, 65, 14 - PUSHBUTTON "A&nulează", IDCANCEL, 175, 21, 65, 14 + DEFPUSHBUTTON "OK", IDOK, 175, 4, 65, 14 + PUSHBUTTON "Revocare", IDCANCEL, 175, 21, 65, 14 EDITTEXT IDC_MESSAGE_TEXT, 6, 21, 160, 14, ES_AUTOHSCROLL - LTEXT "Text afișat:", IDC_STATIC, 7, 7, 120, 8 + LTEXT "Text personalizat", IDC_STATIC, 7, 7, 120, 8 END STRINGTABLE BEGIN - IDS_DESCRIPTION "Text 3D" + IDS_DESCRIPTION "Economizorul de ecran Text 3D" END
7Â months, 4Â weeks
1
0
0
0
[reactos] 01/01: [FONTSUB] Update Romanian (ro-RO) translation (#7355)
by Andrei Miloiu
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e7f676aa75601131f881…
commit 0e7f676aa75601131f881282ff12ae81f5f56bd9 Author: Andrei Miloiu <miloiuandrei(a)gmail.com> AuthorDate: Sun Nov 3 21:22:18 2024 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Nov 3 20:22:18 2024 +0100 [FONTSUB] Update Romanian (ro-RO) translation (#7355) --- .../applications/sysutils/fontsub/lang/ro-RO.rc | 60 ++++++++++++---------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/modules/rosapps/applications/sysutils/fontsub/lang/ro-RO.rc b/modules/rosapps/applications/sysutils/fontsub/lang/ro-RO.rc index e8381377cc6..f40ca08fb16 100644 --- a/modules/rosapps/applications/sysutils/fontsub/lang/ro-RO.rc +++ b/modules/rosapps/applications/sysutils/fontsub/lang/ro-RO.rc @@ -1,4 +1,10 @@ -/* Translator: Ștefan Fulea (stefan dot fulea at mail dot com) */ +/* + * PROJECT: ReactOS Font Substitute Editor + * LICENSE: CC0-1.0 (
https://spdx.org/licenses/CC0-1.0
) + * PURPOSE: Romanian resource file + * TRANSLATORS: Copyright 2019 Ștefan Fulea <stefan.fulea(a)mail.com> + * Copyright 2024 Andrei Miloiu <miloiuandrei(a)gmail.com> + */ LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT @@ -9,10 +15,10 @@ BEGIN MENUITEM "I&mportare din…\tCtrl+O", ID_IMPORT MENUITEM "E&xportare în…\tCtrl+S", ID_EXPORT MENUITEM SEPARATOR - MENUITEM "&Reîncarcă din registru\tCtrl+L", ID_RELOAD - MENUITEM "&Actualizează registru\tCtrl+U", ID_UPDATE_REGISTRY + MENUITEM "&Reîncărcare din registru\tCtrl+L", ID_RELOAD + MENUITEM "&Actualizare a registrului\tCtrl+U", ID_UPDATE_REGISTRY MENUITEM SEPARATOR - MENUITEM "&Deschide în Regedit", ID_OPEN_REGKEY + MENUITEM "&Deschidere în Edistorul de registru", ID_OPEN_REGKEY MENUITEM SEPARATOR MENUITEM "I&eșire\tAlt+F4", ID_EXIT END @@ -20,9 +26,9 @@ BEGIN BEGIN MENUITEM "Element &nou\tCtrl+N", ID_NEW MENUITEM SEPARATOR - MENUITEM "E&ditează element\tEnter", ID_EDIT + MENUITEM "E&ditare a elementului\tEnter", ID_EDIT MENUITEM SEPARATOR - MENUITEM "Ște&rge element\tDel", ID_DELETE + MENUITEM "Ște&rgere a elementului\tDel", ID_DELETE END POPUP "&Ajutor" BEGIN @@ -36,60 +42,60 @@ BEGIN BEGIN MENUITEM "Element &nou\tCtrl+N", ID_NEW MENUITEM SEPARATOR - MENUITEM "E&ditează element\tEnter", ID_EDIT + MENUITEM "E&ditare a elementului\tEnter", ID_EDIT MENUITEM SEPARATOR - MENUITEM "Ște&rge element\tDel", ID_DELETE + MENUITEM "Ște&rgere a elementului\tDel", ID_DELETE END END STRINGTABLE BEGIN - IDS_TITLE, "Editor de substituție font" - IDS_FONTNAME, "Nume font" + IDS_TITLE, "Editor de substituție a fonturilor" + IDS_FONTNAME, "Numele fontului" IDS_SUBSTITUTE, "Substitut" - IDS_ENTERNAME, "(introduceți un nume de font…)" + IDS_ENTERNAME, "(Introduceți un nume pentru font…)" IDS_IMPORT, "Importare" IDS_EXPORT, "Exportare" - IDS_CANTIMPORT, "Eșec la importare." - IDS_CANTEXPORT, "Eșec la exportare." + IDS_CANTIMPORT, "Imposibil de importat." + IDS_CANTEXPORT, "Imposibil de exportat." IDS_INPFILTER, "Fișiere de registru (*.reg)|*.reg|Orice fișier (*.*)|*.*|" IDS_OUTFILTER, "Fișiere de registru (*.reg)|*.reg|" - IDS_QUERYUPDATE, "Informația de substituție a fost alterată. Doriți actualizarea registrului?" + IDS_QUERYUPDATE, "Informațiile pentru înlocuitori au fost modificate. Actualizați registrul acum?" IDS_ALREADYEXISTS, "Acest nume există deja." - IDS_ENTERNAME2, "Introduceți un nume de font." - IDS_QUERYDELETE, "Confirmați ștergerea acestui element?" - IDS_CANTOPENKEY, "Eșec la deschiderea cheii de registru." + IDS_ENTERNAME2, "Introduceți un nume pentru font." + IDS_QUERYDELETE, "Chiar doriți să ștergeți acest articol?" + IDS_CANTOPENKEY, "Imposibil de deschis cheia de registru." IDS_REBOOTNOW, "Registrul a fost actualizat. Reporniți sistemul?" - IDS_ABOUT, "FontSub (Editor de substituție font) Versiune 0.5\r\nde Katayama Hirofumi MZ și Echipa ReactOS\r\n\r\nAcost program a fost publicat sub licența CC0 1.0." + IDS_ABOUT, "FontSub (Editor pentru substitutul fontului) Versiunea 0.5\r\nde Katayama Hirofumi MZ și Echipa ReactOS\r\n\r\nAcest software a fost publicat sub licența CC0 1.0." END IDD_ADD DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU -CAPTION "Adăugare element de substituție" +CAPTION "Adăugare a unui element de substituție" FONT 10, "MS Shell Dlg" BEGIN - CONTROL "N&ume de font:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "&Numele fontului:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 CONTROL "", cmb1, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 6, 120, 120 CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 CONTROL "Su&bstitut:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 - CONTROL "Con&firmă", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 - CONTROL "A&nulează", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "Revocare", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 END IDD_EDIT DIALOGEX 0, 0, 315, 65 STYLE DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_CAPTION | WS_SYSMENU -CAPTION "Editare element de substituție" +CAPTION "Editare a elementului de substituție" FONT 10, "MS Shell Dlg" BEGIN - CONTROL "N&ume de font:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 + CONTROL "&Numele fontului:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 5, 55, 15 CONTROL "", edt1, "EDIT", ES_LEFT | ES_AUTOHSCROLL | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_BORDER | WS_TABSTOP, 70, 6, 120, 14 CONTROL "", cmb3, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 6, 115, 120 CONTROL "Su&bstitut:", -1, "STATIC", SS_RIGHT | SS_CENTERIMAGE | WS_CHILD | WS_VISIBLE | WS_GROUP, 5, 25, 55, 15 CONTROL "", cmb2, "ComboBoxEx32", CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 70, 26, 120, 120 CONTROL "", cmb4, "ComboBoxEx32", CBS_DROPDOWNLIST | WS_HSCROLL | WS_VSCROLL | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 195, 26, 115, 120 - CONTROL "Con&firmă", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 - CONTROL "A&nulează", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 - CONTROL "&Elimină", psh1, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 45, 60, 14 + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 175, 45, 60, 14 + CONTROL "Revocare", IDCANCEL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 45, 60, 14 + CONTROL "&Eliminare", psh1, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 5, 45, 60, 14 END
7Â months, 4Â weeks
1
0
0
0
← Newer
1
...
57
58
59
60
61
62
63
...
8139
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
2056
2057
2058
2059
2060
2061
2062
2063
2064
2065
2066
2067
2068
2069
2070
2071
2072
2073
2074
2075
2076
2077
2078
2079
2080
2081
2082
2083
2084
2085
2086
2087
2088
2089
2090
2091
2092
2093
2094
2095
2096
2097
2098
2099
2100
2101
2102
2103
2104
2105
2106
2107
2108
2109
2110
2111
2112
2113
2114
2115
2116
2117
2118
2119
2120
2121
2122
2123
2124
2125
2126
2127
2128
2129
2130
2131
2132
2133
2134
2135
2136
2137
2138
2139
2140
2141
2142
2143
2144
2145
2146
2147
2148
2149
2150
2151
2152
2153
2154
2155
2156
2157
2158
2159
2160
2161
2162
2163
2164
2165
2166
2167
2168
2169
2170
2171
2172
2173
2174
2175
2176
2177
2178
2179
2180
2181
2182
2183
2184
2185
2186
2187
2188
2189
2190
2191
2192
2193
2194
2195
2196
2197
2198
2199
2200
2201
2202
2203
2204
2205
2206
2207
2208
2209
2210
2211
2212
2213
2214
2215
2216
2217
2218
2219
2220
2221
2222
2223
2224
2225
2226
2227
2228
2229
2230
2231
2232
2233
2234
2235
2236
2237
2238
2239
2240
2241
2242
2243
2244
2245
2246
2247
2248
2249
2250
2251
2252
2253
2254
2255
2256
2257
2258
2259
2260
2261
2262
2263
2264
2265
2266
2267
2268
2269
2270
2271
2272
2273
2274
2275
2276
2277
2278
2279
2280
2281
2282
2283
2284
2285
2286
2287
2288
2289
2290
2291
2292
2293
2294
2295
2296
2297
2298
2299
2300
2301
2302
2303
2304
2305
2306
2307
2308
2309
2310
2311
2312
2313
2314
2315
2316
2317
2318
2319
2320
2321
2322
2323
2324
2325
2326
2327
2328
2329
2330
2331
2332
2333
2334
2335
2336
2337
2338
2339
2340
2341
2342
2343
2344
2345
2346
2347
2348
2349
2350
2351
2352
2353
2354
2355
2356
2357
2358
2359
2360
2361
2362
2363
2364
2365
2366
2367
2368
2369
2370
2371
2372
2373
2374
2375
2376
2377
2378
2379
2380
2381
2382
2383
2384
2385
2386
2387
2388
2389
2390
2391
2392
2393
2394
2395
2396
2397
2398
2399
2400
2401
2402
2403
2404
2405
2406
2407
2408
2409
2410
2411
2412
2413
2414
2415
2416
2417
2418
2419
2420
2421
2422
2423
2424
2425
2426
2427
2428
2429
2430
2431
2432
2433
2434
2435
2436
2437
2438
2439
2440
2441
2442
2443
2444
2445
2446
2447
2448
2449
2450
2451
2452
2453
2454
2455
2456
2457
2458
2459
2460
2461
2462
2463
2464
2465
2466
2467
2468
2469
2470
2471
2472
2473
2474
2475
2476
2477
2478
2479
2480
2481
2482
2483
2484
2485
2486
2487
2488
2489
2490
2491
2492
2493
2494
2495
2496
2497
2498
2499
2500
2501
2502
2503
2504
2505
2506
2507
2508
2509
2510
2511
2512
2513
2514
2515
2516
2517
2518
2519
2520
2521
2522
2523
2524
2525
2526
2527
2528
2529
2530
2531
2532
2533
2534
2535
2536
2537
2538
2539
2540
2541
2542
2543
2544
2545
2546
2547
2548
2549
2550
2551
2552
2553
2554
2555
2556
2557
2558
2559
2560
2561
2562
2563
2564
2565
2566
2567
2568
2569
2570
2571
2572
2573
2574
2575
2576
2577
2578
2579
2580
2581
2582
2583
2584
2585
2586
2587
2588
2589
2590
2591
2592
2593
2594
2595
2596
2597
2598
2599
2600
2601
2602
2603
2604
2605
2606
2607
2608
2609
2610
2611
2612
2613
2614
2615
2616
2617
2618
2619
2620
2621
2622
2623
2624
2625
2626
2627
2628
2629
2630
2631
2632
2633
2634
2635
2636
2637
2638
2639
2640
2641
2642
2643
2644
2645
2646
2647
2648
2649
2650
2651
2652
2653
2654
2655
2656
2657
2658
2659
2660
2661
2662
2663
2664
2665
2666
2667
2668
2669
2670
2671
2672
2673
2674
2675
2676
2677
2678
2679
2680
2681
2682
2683
2684
2685
2686
2687
2688
2689
2690
2691
2692
2693
2694
2695
2696
2697
2698
2699
2700
2701
2702
2703
2704
2705
2706
2707
2708
2709
2710
2711
2712
2713
2714
2715
2716
2717
2718
2719
2720
2721
2722
2723
2724
2725
2726
2727
2728
2729
2730
2731
2732
2733
2734
2735
2736
2737
2738
2739
2740
2741
2742
2743
2744
2745
2746
2747
2748
2749
2750
2751
2752
2753
2754
2755
2756
2757
2758
2759
2760
2761
2762
2763
2764
2765
2766
2767
2768
2769
2770
2771
2772
2773
2774
2775
2776
2777
2778
2779
2780
2781
2782
2783
2784
2785
2786
2787
2788
2789
2790
2791
2792
2793
2794
2795
2796
2797
2798
2799
2800
2801
2802
2803
2804
2805
2806
2807
2808
2809
2810
2811
2812
2813
2814
2815
2816
2817
2818
2819
2820
2821
2822
2823
2824
2825
2826
2827
2828
2829
2830
2831
2832
2833
2834
2835
2836
2837
2838
2839
2840
2841
2842
2843
2844
2845
2846
2847
2848
2849
2850
2851
2852
2853
2854
2855
2856
2857
2858
2859
2860
2861
2862
2863
2864
2865
2866
2867
2868
2869
2870
2871
2872
2873
2874
2875
2876
2877
2878
2879
2880
2881
2882
2883
2884
2885
2886
2887
2888
2889
2890
2891
2892
2893
2894
2895
2896
2897
2898
2899
2900
2901
2902
2903
2904
2905
2906
2907
2908
2909
2910
2911
2912
2913
2914
2915
2916
2917
2918
2919
2920
2921
2922
2923
2924
2925
2926
2927
2928
2929
2930
2931
2932
2933
2934
2935
2936
2937
2938
2939
2940
2941
2942
2943
2944
2945
2946
2947
2948
2949
2950
2951
2952
2953
2954
2955
2956
2957
2958
2959
2960
2961
2962
2963
2964
2965
2966
2967
2968
2969
2970
2971
2972
2973
2974
2975
2976
2977
2978
2979
2980
2981
2982
2983
2984
2985
2986
2987
2988
2989
2990
2991
2992
2993
2994
2995
2996
2997
2998
2999
3000
3001
3002
3003
3004
3005
3006
3007
3008
3009
3010
3011
3012
3013
3014
3015
3016
3017
3018
3019
3020
3021
3022
3023
3024
3025
3026
3027
3028
3029
3030
3031
3032
3033
3034
3035
3036
3037
3038
3039
3040
3041
3042
3043
3044
3045
3046
3047
3048
3049
3050
3051
3052
3053
3054
3055
3056
3057
3058
3059
3060
3061
3062
3063
3064
3065
3066
3067
3068
3069
3070
3071
3072
3073
3074
3075
3076
3077
3078
3079
3080
3081
3082
3083
3084
3085
3086
3087
3088
3089
3090
3091
3092
3093
3094
3095
3096
3097
3098
3099
3100
3101
3102
3103
3104
3105
3106
3107
3108
3109
3110
3111
3112
3113
3114
3115
3116
3117
3118
3119
3120
3121
3122
3123
3124
3125
3126
3127
3128
3129
3130
3131
3132
3133
3134
3135
3136
3137
3138
3139
3140
3141
3142
3143
3144
3145
3146
3147
3148
3149
3150
3151
3152
3153
3154
3155
3156
3157
3158
3159
3160
3161
3162
3163
3164
3165
3166
3167
3168
3169
3170
3171
3172
3173
3174
3175
3176
3177
3178
3179
3180
3181
3182
3183
3184
3185
3186
3187
3188
3189
3190
3191
3192
3193
3194
3195
3196
3197
3198
3199
3200
3201
3202
3203
3204
3205
3206
3207
3208
3209
3210
3211
3212
3213
3214
3215
3216
3217
3218
3219
3220
3221
3222
3223
3224
3225
3226
3227
3228
3229
3230
3231
3232
3233
3234
3235
3236
3237
3238
3239
3240
3241
3242
3243
3244
3245
3246
3247
3248
3249
3250
3251
3252
3253
3254
3255
3256
3257
3258
3259
3260
3261
3262
3263
3264
3265
3266
3267
3268
3269
3270
3271
3272
3273
3274
3275
3276
3277
3278
3279
3280
3281
3282
3283
3284
3285
3286
3287
3288
3289
3290
3291
3292
3293
3294
3295
3296
3297
3298
3299
3300
3301
3302
3303
3304
3305
3306
3307
3308
3309
3310
3311
3312
3313
3314
3315
3316
3317
3318
3319
3320
3321
3322
3323
3324
3325
3326
3327
3328
3329
3330
3331
3332
3333
3334
3335
3336
3337
3338
3339
3340
3341
3342
3343
3344
3345
3346
3347
3348
3349
3350
3351
3352
3353
3354
3355
3356
3357
3358
3359
3360
3361
3362
3363
3364
3365
3366
3367
3368
3369
3370
3371
3372
3373
3374
3375
3376
3377
3378
3379
3380
3381
3382
3383
3384
3385
3386
3387
3388
3389
3390
3391
3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414
3415
3416
3417
3418
3419
3420
3421
3422
3423
3424
3425
3426
3427
3428
3429
3430
3431
3432
3433
3434
3435
3436
3437
3438
3439
3440
3441
3442
3443
3444
3445
3446
3447
3448
3449
3450
3451
3452
3453
3454
3455
3456
3457
3458
3459
3460
3461
3462
3463
3464
3465
3466
3467
3468
3469
3470
3471
3472
3473
3474
3475
3476
3477
3478
3479
3480
3481
3482
3483
3484
3485
3486
3487
3488
3489
3490
3491
3492
3493
3494
3495
3496
3497
3498
3499
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
3522
3523
3524
3525
3526
3527
3528
3529
3530
3531
3532
3533
3534
3535
3536
3537
3538
3539
3540
3541
3542
3543
3544
3545
3546
3547
3548
3549
3550
3551
3552
3553
3554
3555
3556
3557
3558
3559
3560
3561
3562
3563
3564
3565
3566
3567
3568
3569
3570
3571
3572
3573
3574
3575
3576
3577
3578
3579
3580
3581
3582
3583
3584
3585
3586
3587
3588
3589
3590
3591
3592
3593
3594
3595
3596
3597
3598
3599
3600
3601
3602
3603
3604
3605
3606
3607
3608
3609
3610
3611
3612
3613
3614
3615
3616
3617
3618
3619
3620
3621
3622
3623
3624
3625
3626
3627
3628
3629
3630
3631
3632
3633
3634
3635
3636
3637
3638
3639
3640
3641
3642
3643
3644
3645
3646
3647
3648
3649
3650
3651
3652
3653
3654
3655
3656
3657
3658
3659
3660
3661
3662
3663
3664
3665
3666
3667
3668
3669
3670
3671
3672
3673
3674
3675
3676
3677
3678
3679
3680
3681
3682
3683
3684
3685
3686
3687
3688
3689
3690
3691
3692
3693
3694
3695
3696
3697
3698
3699
3700
3701
3702
3703
3704
3705
3706
3707
3708
3709
3710
3711
3712
3713
3714
3715
3716
3717
3718
3719
3720
3721
3722
3723
3724
3725
3726
3727
3728
3729
3730
3731
3732
3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
3751
3752
3753
3754
3755
3756
3757
3758
3759
3760
3761
3762
3763
3764
3765
3766
3767
3768
3769
3770
3771
3772
3773
3774
3775
3776
3777
3778
3779
3780
3781
3782
3783
3784
3785
3786
3787
3788
3789
3790
3791
3792
3793
3794
3795
3796
3797
3798
3799
3800
3801
3802
3803
3804
3805
3806
3807
3808
3809
3810
3811
3812
3813
3814
3815
3816
3817
3818
3819
3820
3821
3822
3823
3824
3825
3826
3827
3828
3829
3830
3831
3832
3833
3834
3835
3836
3837
3838
3839
3840
3841
3842
3843
3844
3845
3846
3847
3848
3849
3850
3851
3852
3853
3854
3855
3856
3857
3858
3859
3860
3861
3862
3863
3864
3865
3866
3867
3868
3869
3870
3871
3872
3873
3874
3875
3876
3877
3878
3879
3880
3881
3882
3883
3884
3885
3886
3887
3888
3889
3890
3891
3892
3893
3894
3895
3896
3897
3898
3899
3900
3901
3902
3903
3904
3905
3906
3907
3908
3909
3910
3911
3912
3913
3914
3915
3916
3917
3918
3919
3920
3921
3922
3923
3924
3925
3926
3927
3928
3929
3930
3931
3932
3933
3934
3935
3936
3937
3938
3939
3940
3941
3942
3943
3944
3945
3946
3947
3948
3949
3950
3951
3952
3953
3954
3955
3956
3957
3958
3959
3960
3961
3962
3963
3964
3965
3966
3967
3968
3969
3970
3971
3972
3973
3974
3975
3976
3977
3978
3979
3980
3981
3982
3983
3984
3985
3986
3987
3988
3989
3990
3991
3992
3993
3994
3995
3996
3997
3998
3999
4000
4001
4002
4003
4004
4005
4006
4007
4008
4009
4010
4011
4012
4013
4014
4015
4016
4017
4018
4019
4020
4021
4022
4023
4024
4025
4026
4027
4028
4029
4030
4031
4032
4033
4034
4035
4036
4037
4038
4039
4040
4041
4042
4043
4044
4045
4046
4047
4048
4049
4050
4051
4052
4053
4054
4055
4056
4057
4058
4059
4060
4061
4062
4063
4064
4065
4066
4067
4068
4069
4070
4071
4072
4073
4074
4075
4076
4077
4078
4079
4080
4081
4082
4083
4084
4085
4086
4087
4088
4089
4090
4091
4092
4093
4094
4095
4096
4097
4098
4099
4100
4101
4102
4103
4104
4105
4106
4107
4108
4109
4110
4111
4112
4113
4114
4115
4116
4117
4118
4119
4120
4121
4122
4123
4124
4125
4126
4127
4128
4129
4130
4131
4132
4133
4134
4135
4136
4137
4138
4139
4140
4141
4142
4143
4144
4145
4146
4147
4148
4149
4150
4151
4152
4153
4154
4155
4156
4157
4158
4159
4160
4161
4162
4163
4164
4165
4166
4167
4168
4169
4170
4171
4172
4173
4174
4175
4176
4177
4178
4179
4180
4181
4182
4183
4184
4185
4186
4187
4188
4189
4190
4191
4192
4193
4194
4195
4196
4197
4198
4199
4200
4201
4202
4203
4204
4205
4206
4207
4208
4209
4210
4211
4212
4213
4214
4215
4216
4217
4218
4219
4220
4221
4222
4223
4224
4225
4226
4227
4228
4229
4230
4231
4232
4233
4234
4235
4236
4237
4238
4239
4240
4241
4242
4243
4244
4245
4246
4247
4248
4249
4250
4251
4252
4253
4254
4255
4256
4257
4258
4259
4260
4261
4262
4263
4264
4265
4266
4267
4268
4269
4270
4271
4272
4273
4274
4275
4276
4277
4278
4279
4280
4281
4282
4283
4284
4285
4286
4287
4288
4289
4290
4291
4292
4293
4294
4295
4296
4297
4298
4299
4300
4301
4302
4303
4304
4305
4306
4307
4308
4309
4310
4311
4312
4313
4314
4315
4316
4317
4318
4319
4320
4321
4322
4323
4324
4325
4326
4327
4328
4329
4330
4331
4332
4333
4334
4335
4336
4337
4338
4339
4340
4341
4342
4343
4344
4345
4346
4347
4348
4349
4350
4351
4352
4353
4354
4355
4356
4357
4358
4359
4360
4361
4362
4363
4364
4365
4366
4367
4368
4369
4370
4371
4372
4373
4374
4375
4376
4377
4378
4379
4380
4381
4382
4383
4384
4385
4386
4387
4388
4389
4390
4391
4392
4393
4394
4395
4396
4397
4398
4399
4400
4401
4402
4403
4404
4405
4406
4407
4408
4409
4410
4411
4412
4413
4414
4415
4416
4417
4418
4419
4420
4421
4422
4423
4424
4425
4426
4427
4428
4429
4430
4431
4432
4433
4434
4435
4436
4437
4438
4439
4440
4441
4442
4443
4444
4445
4446
4447
4448
4449
4450
4451
4452
4453
4454
4455
4456
4457
4458
4459
4460
4461
4462
4463
4464
4465
4466
4467
4468
4469
4470
4471
4472
4473
4474
4475
4476
4477
4478
4479
4480
4481
4482
4483
4484
4485
4486
4487
4488
4489
4490
4491
4492
4493
4494
4495
4496
4497
4498
4499
4500
4501
4502
4503
4504
4505
4506
4507
4508
4509
4510
4511
4512
4513
4514
4515
4516
4517
4518
4519
4520
4521
4522
4523
4524
4525
4526
4527
4528
4529
4530
4531
4532
4533
4534
4535
4536
4537
4538
4539
4540
4541
4542
4543
4544
4545
4546
4547
4548
4549
4550
4551
4552
4553
4554
4555
4556
4557
4558
4559
4560
4561
4562
4563
4564
4565
4566
4567
4568
4569
4570
4571
4572
4573
4574
4575
4576
4577
4578
4579
4580
4581
4582
4583
4584
4585
4586
4587
4588
4589
4590
4591
4592
4593
4594
4595
4596
4597
4598
4599
4600
4601
4602
4603
4604
4605
4606
4607
4608
4609
4610
4611
4612
4613
4614
4615
4616
4617
4618
4619
4620
4621
4622
4623
4624
4625
4626
4627
4628
4629
4630
4631
4632
4633
4634
4635
4636
4637
4638
4639
4640
4641
4642
4643
4644
4645
4646
4647
4648
4649
4650
4651
4652
4653
4654
4655
4656
4657
4658
4659
4660
4661
4662
4663
4664
4665
4666
4667
4668
4669
4670
4671
4672
4673
4674
4675
4676
4677
4678
4679
4680
4681
4682
4683
4684
4685
4686
4687
4688
4689
4690
4691
4692
4693
4694
4695
4696
4697
4698
4699
4700
4701
4702
4703
4704
4705
4706
4707
4708
4709
4710
4711
4712
4713
4714
4715
4716
4717
4718
4719
4720
4721
4722
4723
4724
4725
4726
4727
4728
4729
4730
4731
4732
4733
4734
4735
4736
4737
4738
4739
4740
4741
4742
4743
4744
4745
4746
4747
4748
4749
4750
4751
4752
4753
4754
4755
4756
4757
4758
4759
4760
4761
4762
4763
4764
4765
4766
4767
4768
4769
4770
4771
4772
4773
4774
4775
4776
4777
4778
4779
4780
4781
4782
4783
4784
4785
4786
4787
4788
4789
4790
4791
4792
4793
4794
4795
4796
4797
4798
4799
4800
4801
4802
4803
4804
4805
4806
4807
4808
4809
4810
4811
4812
4813
4814
4815
4816
4817
4818
4819
4820
4821
4822
4823
4824
4825
4826
4827
4828
4829
4830
4831
4832
4833
4834
4835
4836
4837
4838
4839
4840
4841
4842
4843
4844
4845
4846
4847
4848
4849
4850
4851
4852
4853
4854
4855
4856
4857
4858
4859
4860
4861
4862
4863
4864
4865
4866
4867
4868
4869
4870
4871
4872
4873
4874
4875
4876
4877
4878
4879
4880
4881
4882
4883
4884
4885
4886
4887
4888
4889
4890
4891
4892
4893
4894
4895
4896
4897
4898
4899
4900
4901
4902
4903
4904
4905
4906
4907
4908
4909
4910
4911
4912
4913
4914
4915
4916
4917
4918
4919
4920
4921
4922
4923
4924
4925
4926
4927
4928
4929
4930
4931
4932
4933
4934
4935
4936
4937
4938
4939
4940
4941
4942
4943
4944
4945
4946
4947
4948
4949
4950
4951
4952
4953
4954
4955
4956
4957
4958
4959
4960
4961
4962
4963
4964
4965
4966
4967
4968
4969
4970
4971
4972
4973
4974
4975
4976
4977
4978
4979
4980
4981
4982
4983
4984
4985
4986
4987
4988
4989
4990
4991
4992
4993
4994
4995
4996
4997
4998
4999
5000
5001
5002
5003
5004
5005
5006
5007
5008
5009
5010
5011
5012
5013
5014
5015
5016
5017
5018
5019
5020
5021
5022
5023
5024
5025
5026
5027
5028
5029
5030
5031
5032
5033
5034
5035
5036
5037
5038
5039
5040
5041
5042
5043
5044
5045
5046
5047
5048
5049
5050
5051
5052
5053
5054
5055
5056
5057
5058
5059
5060
5061
5062
5063
5064
5065
5066
5067
5068
5069
5070
5071
5072
5073
5074
5075
5076
5077
5078
5079
5080
5081
5082
5083
5084
5085
5086
5087
5088
5089
5090
5091
5092
5093
5094
5095
5096
5097
5098
5099
5100
5101
5102
5103
5104
5105
5106
5107
5108
5109
5110
5111
5112
5113
5114
5115
5116
5117
5118
5119
5120
5121
5122
5123
5124
5125
5126
5127
5128
5129
5130
5131
5132
5133
5134
5135
5136
5137
5138
5139
5140
5141
5142
5143
5144
5145
5146
5147
5148
5149
5150
5151
5152
5153
5154
5155
5156
5157
5158
5159
5160
5161
5162
5163
5164
5165
5166
5167
5168
5169
5170
5171
5172
5173
5174
5175
5176
5177
5178
5179
5180
5181
5182
5183
5184
5185
5186
5187
5188
5189
5190
5191
5192
5193
5194
5195
5196
5197
5198
5199
5200
5201
5202
5203
5204
5205
5206
5207
5208
5209
5210
5211
5212
5213
5214
5215
5216
5217
5218
5219
5220
5221
5222
5223
5224
5225
5226
5227
5228
5229
5230
5231
5232
5233
5234
5235
5236
5237
5238
5239
5240
5241
5242
5243
5244
5245
5246
5247
5248
5249
5250
5251
5252
5253
5254
5255
5256
5257
5258
5259
5260
5261
5262
5263
5264
5265
5266
5267
5268
5269
5270
5271
5272
5273
5274
5275
5276
5277
5278
5279
5280
5281
5282
5283
5284
5285
5286
5287
5288
5289
5290
5291
5292
5293
5294
5295
5296
5297
5298
5299
5300
5301
5302
5303
5304
5305
5306
5307
5308
5309
5310
5311
5312
5313
5314
5315
5316
5317
5318
5319
5320
5321
5322
5323
5324
5325
5326
5327
5328
5329
5330
5331
5332
5333
5334
5335
5336
5337
5338
5339
5340
5341
5342
5343
5344
5345
5346
5347
5348
5349
5350
5351
5352
5353
5354
5355
5356
5357
5358
5359
5360
5361
5362
5363
5364
5365
5366
5367
5368
5369
5370
5371
5372
5373
5374
5375
5376
5377
5378
5379
5380
5381
5382
5383
5384
5385
5386
5387
5388
5389
5390
5391
5392
5393
5394
5395
5396
5397
5398
5399
5400
5401
5402
5403
5404
5405
5406
5407
5408
5409
5410
5411
5412
5413
5414
5415
5416
5417
5418
5419
5420
5421
5422
5423
5424
5425
5426
5427
5428
5429
5430
5431
5432
5433
5434
5435
5436
5437
5438
5439
5440
5441
5442
5443
5444
5445
5446
5447
5448
5449
5450
5451
5452
5453
5454
5455
5456
5457
5458
5459
5460
5461
5462
5463
5464
5465
5466
5467
5468
5469
5470
5471
5472
5473
5474
5475
5476
5477
5478
5479
5480
5481
5482
5483
5484
5485
5486
5487
5488
5489
5490
5491
5492
5493
5494
5495
5496
5497
5498
5499
5500
5501
5502
5503
5504
5505
5506
5507
5508
5509
5510
5511
5512
5513
5514
5515
5516
5517
5518
5519
5520
5521
5522
5523
5524
5525
5526
5527
5528
5529
5530
5531
5532
5533
5534
5535
5536
5537
5538
5539
5540
5541
5542
5543
5544
5545
5546
5547
5548
5549
5550
5551
5552
5553
5554
5555
5556
5557
5558
5559
5560
5561
5562
5563
5564
5565
5566
5567
5568
5569
5570
5571
5572
5573
5574
5575
5576
5577
5578
5579
5580
5581
5582
5583
5584
5585
5586
5587
5588
5589
5590
5591
5592
5593
5594
5595
5596
5597
5598
5599
5600
5601
5602
5603
5604
5605
5606
5607
5608
5609
5610
5611
5612
5613
5614
5615
5616
5617
5618
5619
5620
5621
5622
5623
5624
5625
5626
5627
5628
5629
5630
5631
5632
5633
5634
5635
5636
5637
5638
5639
5640
5641
5642
5643
5644
5645
5646
5647
5648
5649
5650
5651
5652
5653
5654
5655
5656
5657
5658
5659
5660
5661
5662
5663
5664
5665
5666
5667
5668
5669
5670
5671
5672
5673
5674
5675
5676
5677
5678
5679
5680
5681
5682
5683
5684
5685
5686
5687
5688
5689
5690
5691
5692
5693
5694
5695
5696
5697
5698
5699
5700
5701
5702
5703
5704
5705
5706
5707
5708
5709
5710
5711
5712
5713
5714
5715
5716
5717
5718
5719
5720
5721
5722
5723
5724
5725
5726
5727
5728
5729
5730
5731
5732
5733
5734
5735
5736
5737
5738
5739
5740
5741
5742
5743
5744
5745
5746
5747
5748
5749
5750
5751
5752
5753
5754
5755
5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
6522
6523
6524
6525
6526
6527
6528
6529
6530
6531
6532
6533
6534
6535
6536
6537
6538
6539
6540
6541
6542
6543
6544
6545
6546
6547
6548
6549
6550
6551
6552
6553
6554
6555
6556
6557
6558
6559
6560
6561
6562
6563
6564
6565
6566
6567
6568
6569
6570
6571
6572
6573
6574
6575
6576
6577
6578
6579
6580
6581
6582
6583
6584
6585
6586
6587
6588
6589
6590
6591
6592
6593
6594
6595
6596
6597
6598
6599
6600
6601
6602
6603
6604
6605
6606
6607
6608
6609
6610
6611
6612
6613
6614
6615
6616
6617
6618
6619
6620
6621
6622
6623
6624
6625
6626
6627
6628
6629
6630
6631
6632
6633
6634
6635
6636
6637
6638
6639
6640
6641
6642
6643
6644
6645
6646
6647
6648
6649
6650
6651
6652
6653
6654
6655
6656
6657
6658
6659
6660
6661
6662
6663
6664
6665
6666
6667
6668
6669
6670
6671
6672
6673
6674
6675
6676
6677
6678
6679
6680
6681
6682
6683
6684
6685
6686
6687
6688
6689
6690
6691
6692
6693
6694
6695
6696
6697
6698
6699
6700
6701
6702
6703
6704
6705
6706
6707
6708
6709
6710
6711
6712
6713
6714
6715
6716
6717
6718
6719
6720
6721
6722
6723
6724
6725
6726
6727
6728
6729
6730
6731
6732
6733
6734
6735
6736
6737
6738
6739
6740
6741
6742
6743
6744
6745
6746
6747
6748
6749
6750
6751
6752
6753
6754
6755
6756
6757
6758
6759
6760
6761
6762
6763
6764
6765
6766
6767
6768
6769
6770
6771
6772
6773
6774
6775
6776
6777
6778
6779
6780
6781
6782
6783
6784
6785
6786
6787
6788
6789
6790
6791
6792
6793
6794
6795
6796
6797
6798
6799
6800
6801
6802
6803
6804
6805
6806
6807
6808
6809
6810
6811
6812
6813
6814
6815
6816
6817
6818
6819
6820
6821
6822
6823
6824
6825
6826
6827
6828
6829
6830
6831
6832
6833
6834
6835
6836
6837
6838
6839
6840
6841
6842
6843
6844
6845
6846
6847
6848
6849
6850
6851
6852
6853
6854
6855
6856
6857
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
6873
6874
6875
6876
6877
6878
6879
6880
6881
6882
6883
6884
6885
6886
6887
6888
6889
6890
6891
6892
6893
6894
6895
6896
6897
6898
6899
6900
6901
6902
6903
6904
6905
6906
6907
6908
6909
6910
6911
6912
6913
6914
6915
6916
6917
6918
6919
6920
6921
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
6937
6938
6939
6940
6941
6942
6943
6944
6945
6946
6947
6948
6949
6950
6951
6952
6953
6954
6955
6956
6957
6958
6959
6960
6961
6962
6963
6964
6965
6966
6967
6968
6969
6970
6971
6972
6973
6974
6975
6976
6977
6978
6979
6980
6981
6982
6983
6984
6985
6986
6987
6988
6989
6990
6991
6992
6993
6994
6995
6996
6997
6998
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
7501
7502
7503
7504
7505
7506
7507
7508
7509
7510
7511
7512
7513
7514
7515
7516
7517
7518
7519
7520
7521
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
7611
7612
7613
7614
7615
7616
7617
7618
7619
7620
7621
7622
7623
7624
7625
7626
7627
7628
7629
7630
7631
7632
7633
7634
7635
7636
7637
7638
7639
7640
7641
7642
7643
7644
7645
7646
7647
7648
7649
7650
7651
7652
7653
7654
7655
7656
7657
7658
7659
7660
7661
7662
7663
7664
7665
7666
7667
7668
7669
7670
7671
7672
7673
7674
7675
7676
7677
7678
7679
7680
7681
7682
7683
7684
7685
7686
7687
7688
7689
7690
7691
7692
7693
7694
7695
7696
7697
7698
7699
7700
7701
7702
7703
7704
7705
7706
7707
7708
7709
7710
7711
7712
7713
7714
7715
7716
7717
7718
7719
7720
7721
7722
7723
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
7759
7760
7761
7762
7763
7764
7765
7766
7767
7768
7769
7770
7771
7772
7773
7774
7775
7776
7777
7778
7779
7780
7781
7782
7783
7784
7785
7786
7787
7788
7789
7790
7791
7792
7793
7794
7795
7796
7797
7798
7799
7800
7801
7802
7803
7804
7805
7806
7807
7808
7809
7810
7811
7812
7813
7814
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
7828
7829
7830
7831
7832
7833
7834
7835
7836
7837
7838
7839
7840
7841
7842
7843
7844
7845
7846
7847
7848
7849
7850
7851
7852
7853
7854
7855
7856
7857
7858
7859
7860
7861
7862
7863
7864
7865
7866
7867
7868
7869
7870
7871
7872
7873
7874
7875
7876
7877
7878
7879
7880
7881
7882
7883
7884
7885
7886
7887
7888
7889
7890
7891
7892
7893
7894
7895
7896
7897
7898
7899
7900
7901
7902
7903
7904
7905
7906
7907
7908
7909
7910
7911
7912
7913
7914
7915
7916
7917
7918
7919
7920
7921
7922
7923
7924
7925
7926
7927
7928
7929
7930
7931
7932
7933
7934
7935
7936
7937
7938
7939
7940
7941
7942
7943
7944
7945
7946
7947
7948
7949
7950
7951
7952
7953
7954
7955
7956
7957
7958
7959
7960
7961
7962
7963
7964
7965
7966
7967
7968
7969
7970
7971
7972
7973
7974
7975
7976
7977
7978
7979
7980
7981
7982
7983
7984
7985
7986
7987
7988
7989
7990
7991
7992
7993
7994
7995
7996
7997
7998
7999
8000
8001
8002
8003
8004
8005
8006
8007
8008
8009
8010
8011
8012
8013
8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
8051
8052
8053
8054
8055
8056
8057
8058
8059
8060
8061
8062
8063
8064
8065
8066
8067
8068
8069
8070
8071
8072
8073
8074
8075
8076
8077
8078
8079
8080
8081
8082
8083
8084
8085
8086
8087
8088
8089
8090
8091
8092
8093
8094
8095
8096
8097
8098
8099
8100
8101
8102
8103
8104
8105
8106
8107
8108
8109
8110
8111
8112
8113
8114
8115
8116
8117
8118
8119
8120
8121
8122
8123
8124
8125
8126
8127
8128
8129
8130
8131
8132
8133
8134
8135
8136
8137
8138
8139
Results per page:
10
25
50
100
200