diff options
| author | Monika Singh <108652024+moninom1@users.noreply.github.com> | 2023-04-21 16:57:40 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-21 16:57:40 +0530 |
| commit | 8e4a03ca189f76fee936a3c349ef68d946d36405 (patch) | |
| tree | cb70c2cdba9cfd6720d329b784e4b3e3ad2eed3e | |
| parent | 6c9e5e8f88ed14e9c374d5d004ec02bfb9fe9cc6 (diff) | |
| download | freertos-git-8e4a03ca189f76fee936a3c349ef68d946d36405.tar.gz | |
Update xApplicationDHCPHook for backward compatibility (#999)
* Update xApplicationDHCPHook for backward compatability
* Update IPv6
* Update VisualStudio Static Project files
3 files changed, 25 insertions, 11 deletions
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo/main.c index 1f6a21cb5..2dad26110 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo/main.c +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo/main.c @@ -910,11 +910,13 @@ void vOutputChar( const char cChar, #endif #if ( ipconfigUSE_DHCP_HOOK != 0 ) - eDHCPCallbackAnswer_t xApplicationDHCPHook( eDHCPCallbackPhase_t eDHCPPhase, - uint32_t ulIPAddress ) + eDHCPCallbackAnswer_t xApplicationDHCPHook_Multi( eDHCPCallbackPhase_t eDHCPPhase, + struct xNetworkEndPoint * pxEndPoint, + IP_Address_t * pxIPAddress ) { ( void ) eDHCPPhase; - ( void ) ulIPAddress; + ( void ) pxEndPoint + ( void ) pxIPAddress; return eDHCPContinue; } #endif diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c index cda76b6de..893321269 100644 --- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c +++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Minimal_Windows_Simulator/main.c @@ -411,8 +411,14 @@ BaseType_t xApplicationGetRandomNumber( uint32_t * pulNumber ) #if ( ( ipconfigUSE_TCP == 1 ) && ( ipconfigUSE_DHCP_HOOK != 0 ) )
-eDHCPCallbackAnswer_t xApplicationDHCPHook( eDHCPCallbackPhase_t eDHCPPhase,
- uint32_t ulIPAddress )
+ #if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 )
+ eDHCPCallbackAnswer_t xApplicationDHCPHook( eDHCPCallbackPhase_t eDHCPPhase,
+ uint32_t ulIPAddress )
+ #else /* ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 ) */
+ eDHCPCallbackAnswer_t xApplicationDHCPHook_Multi( eDHCPCallbackPhase_t eDHCPPhase,
+ struct xNetworkEndPoint * pxEndPoint,
+ IP_Address_t * pxIPAddress )
+ #endif /* ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 ) */
{
/* Provide a stub for this function. */
return eDHCPContinue;
diff --git a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c index c224b34eb..93ceaf1d3 100644 --- a/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c +++ b/FreeRTOS-Plus/VisualStudio_StaticProjects/FreeRTOS+TCP/plus_tcp_hooks_winsim.c @@ -235,12 +235,18 @@ BaseType_t xPlatformIsNetworkUp( void ) #if ( ( ipconfigUSE_TCP == 1 ) && ( ipconfigUSE_DHCP_HOOK != 0 ) ) -eDHCPCallbackAnswer_t xApplicationDHCPHook( eDHCPCallbackPhase_t eDHCPPhase, - uint32_t ulIPAddress ) -{ - /* Provide a stub for this function. */ - return eDHCPContinue; -} + #if ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 ) + eDHCPCallbackAnswer_t xApplicationDHCPHook( eDHCPCallbackPhase_t eDHCPPhase, + uint32_t ulIPAddress ) + #else /* ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 ) */ + eDHCPCallbackAnswer_t xApplicationDHCPHook_Multi( eDHCPCallbackPhase_t eDHCPPhase, + struct xNetworkEndPoint * pxEndPoint, + IP_Address_t * pxIPAddress ) + #endif /* ( ipconfigIPv4_BACKWARD_COMPATIBLE == 1 ) */ + { + /* Provide a stub for this function. */ + return eDHCPContinue; + } #endif /*-----------------------------------------------------------*/ |