ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed random and tcp_isn modules header dependencies to lwip conf

pull/4911/head
Mika Leppänen 2017-07-28 10:52:20 +03:00
parent 5fdd7239d9
commit 23f8ac903e
6 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
features/FEATURE_LWIP/lwip-interface/lwip-sys/lwip_random.c
View File

@ -14,6 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
#include "lwip/opt.h"
#include "lwip/debug.h"
#include "lwip/def.h"
#include "lwip_random.h" #include "lwip_random.h"
#if FEATURE_COMMON_PAL #if FEATURE_COMMON_PAL

4
features/FEATURE_LWIP/lwip-interface/lwip-sys/lwip_random.h
View File

@ -17,10 +17,6 @@
#ifndef LWIP_HDR_RANDOM_H #ifndef LWIP_HDR_RANDOM_H
#define LWIP_HDR_RANDOM_H #define LWIP_HDR_RANDOM_H
#include "lwip/opt.h"
#include "lwip/debug.h"
#include "lwip/def.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif

9
features/FEATURE_LWIP/lwip-interface/lwip-sys/lwip_tcp_isn.c
View File

@ -70,7 +70,7 @@
* Author: David van Moolenbroek <david@minix3.org> * Author: David van Moolenbroek <david@minix3.org>
*/ */
#include "lwip_tcp_isn.h" #include "lwip/opt.h"
#include "lwip/ip_addr.h" #include "lwip/ip_addr.h"
#include "lwip/sys.h" #include "lwip/sys.h"
#include <string.h> #include <string.h>
@ -122,13 +122,16 @@ lwip_init_tcp_isn(u32_t boot_time, const u8_t *secret_16_bytes)
* @param remote_port The remote port number, in host-byte order. * @param remote_port The remote port number, in host-byte order.
* @return The ISN to use for the new TCP connection. * @return The ISN to use for the new TCP connection.
*/ */
u32_t u32_t
lwip_hook_tcp_isn(const ip_addr_t *local_ip, u16_t local_port, lwip_hook_tcp_isn(const void *local_ip_ptr, u16_t local_port,
const ip_addr_t *remote_ip, u16_t remote_port) const void *remote_ip_ptr, u16_t remote_port)
{ {
lwip_md5_context ctx; lwip_md5_context ctx;
u8_t output[16]; u8_t output[16];
u32_t isn; u32_t isn;
const ip_addr_t *local_ip = local_ip_ptr;
const ip_addr_t *remote_ip = remote_ip_ptr;
#if LWIP_IPV4 && LWIP_IPV6 #if LWIP_IPV4 && LWIP_IPV6
if (IP_IS_V6(local_ip)) if (IP_IS_V6(local_ip))

10
features/FEATURE_LWIP/lwip-interface/lwip-sys/lwip_tcp_isn.h
View File

@ -30,16 +30,14 @@
#ifndef LWIP_HDR_CONTRIB_ADDONS_TCP_ISN_H #ifndef LWIP_HDR_CONTRIB_ADDONS_TCP_ISN_H
#define LWIP_HDR_CONTRIB_ADDONS_TCP_ISN_H #define LWIP_HDR_CONTRIB_ADDONS_TCP_ISN_H
#include "lwip/opt.h"
#include "lwip/ip_addr.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void lwip_init_tcp_isn(u32_t boot_time, const u8_t *secret_16_bytes); void lwip_init_tcp_isn(uint32_t boot_time, const uint8_t *secret_16_bytes);
u32_t lwip_hook_tcp_isn(const ip_addr_t *local_ip, u16_t local_port, uint32_t lwip_hook_tcp_isn(const void *local_ip, uint16_t local_port,
const ip_addr_t *remote_ip, u16_t remote_port); const void *remote_ip, uint16_t remote_port);
#ifdef __cplusplus #ifdef __cplusplus
} }

1
features/FEATURE_LWIP/lwip-interface/lwip_stack.c
View File

@ -37,7 +37,6 @@
#include "netif/lwip_ethernet.h" #include "netif/lwip_ethernet.h"
#include "emac_api.h" #include "emac_api.h"
#include "ppp_lwip.h" #include "ppp_lwip.h"
#include "lwip_tcp_isn.h"
static nsapi_error_t mbed_lwip_err_remap(err_t err); static nsapi_error_t mbed_lwip_err_remap(err_t err);

1
features/FEATURE_LWIP/lwip-interface/lwipopts.h
View File

@ -309,7 +309,6 @@
#define DNS_TABLE_SIZE 2 #define DNS_TABLE_SIZE 2
#define DNS_MAX_NAME_LENGTH 128 #define DNS_MAX_NAME_LENGTH 128
#include <lwip/arch.h>
#include "lwip_random.h" #include "lwip_random.h"
#include "lwip_tcp_isn.h" #include "lwip_tcp_isn.h"
#define LWIP_HOOK_TCP_ISN lwip_hook_tcp_isn #define LWIP_HOOK_TCP_ISN lwip_hook_tcp_isn