mirror of
https://github.com/lwip-tcpip/lwip.git
synced 2024-09-28 23:00:50 +00:00
make tcp apps depend on LWIP_CALLBACK_API, too
This commit is contained in:
parent
563932b888
commit
f0975b3c59
@ -102,7 +102,7 @@
|
|||||||
#include <stdlib.h> /* atoi */
|
#include <stdlib.h> /* atoi */
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
#if LWIP_TCP
|
#if LWIP_TCP && LWIP_CALLBACK_API
|
||||||
|
|
||||||
/** Minimum length for a valid HTTP/0.9 request: "GET /\r\n" -> 7 bytes */
|
/** Minimum length for a valid HTTP/0.9 request: "GET /\r\n" -> 7 bytes */
|
||||||
#define MIN_REQ_LEN 7
|
#define MIN_REQ_LEN 7
|
||||||
@ -2619,4 +2619,4 @@ http_set_cgi_handlers(const tCGI *cgis, int num_handlers)
|
|||||||
}
|
}
|
||||||
#endif /* LWIP_HTTPD_CGI */
|
#endif /* LWIP_HTTPD_CGI */
|
||||||
|
|
||||||
#endif /* LWIP_TCP */
|
#endif /* LWIP_TCP && LWIP_CALLBACK_API */
|
||||||
|
@ -53,7 +53,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
/* Currently, only TCP-over-IPv4 is implemented (does iperf support IPv6 anyway?) */
|
/* Currently, only TCP-over-IPv4 is implemented (does iperf support IPv6 anyway?) */
|
||||||
#if LWIP_IPV4 && LWIP_TCP
|
#if LWIP_IPV4 && LWIP_TCP && LWIP_CALLBACK_API
|
||||||
|
|
||||||
/** Specify the idle timeout (in seconds) after that the test fails */
|
/** Specify the idle timeout (in seconds) after that the test fails */
|
||||||
#ifndef LWIPERF_TCP_MAX_IDLE_SEC
|
#ifndef LWIPERF_TCP_MAX_IDLE_SEC
|
||||||
@ -658,4 +658,4 @@ lwiperf_abort(void* lwiperf_session)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* LWIP_IPV4 && LWIP_TCP */
|
#endif /* LWIP_IPV4 && LWIP_TCP && LWIP_CALLBACK_API */
|
||||||
|
@ -47,14 +47,16 @@
|
|||||||
* Erik Andersson <erian747@gmail.com>
|
* Erik Andersson <erian747@gmail.com>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include <string.h>
|
#include "lwip/apps/mqtt.h"
|
||||||
#include "lwip/timeouts.h"
|
#include "lwip/timeouts.h"
|
||||||
#include "lwip/ip_addr.h"
|
#include "lwip/ip_addr.h"
|
||||||
#include "lwip/mem.h"
|
#include "lwip/mem.h"
|
||||||
#include "lwip/err.h"
|
#include "lwip/err.h"
|
||||||
#include "lwip/pbuf.h"
|
#include "lwip/pbuf.h"
|
||||||
#include "lwip/tcp.h"
|
#include "lwip/tcp.h"
|
||||||
#include "lwip/apps/mqtt.h"
|
#include <string.h>
|
||||||
|
|
||||||
|
#if LWIP_TCP && LWIP_CALLBACK_API
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* MQTT_DEBUG: Default is off.
|
* MQTT_DEBUG: Default is off.
|
||||||
@ -1335,3 +1337,5 @@ mqtt_client_is_connected(mqtt_client_t *client)
|
|||||||
LWIP_ASSERT("mqtt_client_is_connected: client != NULL", client);
|
LWIP_ASSERT("mqtt_client_is_connected: client != NULL", client);
|
||||||
return client->conn_state == MQTT_CONNECTED;
|
return client->conn_state == MQTT_CONNECTED;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* LWIP_TCP && LWIP_CALLBACK_API */
|
||||||
|
@ -39,8 +39,9 @@
|
|||||||
|
|
||||||
#include "lwip/apps/mqtt_opts.h"
|
#include "lwip/apps/mqtt_opts.h"
|
||||||
#include "lwip/err.h"
|
#include "lwip/err.h"
|
||||||
|
#include "lwip/ip_addr.h"
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -236,7 +237,7 @@ err_t mqtt_sub_unsub(mqtt_client_t *client, const char *topic, u8_t qos, mqtt_re
|
|||||||
err_t mqtt_publish(mqtt_client_t *client, const char *topic, const void *payload, u16_t payload_length, u8_t qos, u8_t retain,
|
err_t mqtt_publish(mqtt_client_t *client, const char *topic, const void *payload, u16_t payload_length, u8_t qos, u8_t retain,
|
||||||
mqtt_request_cb_t cb, void *arg);
|
mqtt_request_cb_t cb, void *arg);
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user