mirror of
https://github.com/cesanta/mongoose.git
synced 2024-11-27 20:59:00 +08:00
mip_test.c http fetch (#1851)
* Update mip_test.c * Adding mip_free() function. * Adding mip_free() function. * Added MIP free. * Fixed C++ builds. * Proper C/C++ struct initialization. * Squashed commit of the following: commit7ba68dd20d
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Wed Nov 16 16:19:50 2022 +0100 Proper C/C++ struct initialization. commitaeab3ef7ac
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 17:09:29 2022 +0100 Fixed C++ builds. commit2afd529107
Merge:14710b81
f8445a4c
Author: jfsimon1981 <jfsimon1981@gmail.com> Date: Tue Nov 15 11:33:56 2022 +0100 Merge branch 'cesanta:master' into master commit14710b81e4
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 11:07:15 2022 +0100 Added MIP free. commit6393cd149d
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 11:06:44 2022 +0100 Adding mip_free() function. commitfeee81b733
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 11:05:55 2022 +0100 Adding mip_free() function. commitf8445a4c85
Merge:a39b7ddb
71f5be01
Author: Sergio R. Caprile <scaprile@users.noreply.github.com> Date: Fri Nov 11 20:42:38 2022 -0300 Merge pull request #1853 from cesanta/tibaremetaltest Update test.yml commit71f5be011b
Author: Sergio R. Caprile <scaprile@users.noreply.github.com> Date: Fri Nov 11 20:15:01 2022 -0300 Update test.yml commitb53d3cf032
Merge:7a71038a
a39b7ddb
Author: jfsimon1981 <jfsimon1981@gmail.com> Date: Fri Nov 11 16:10:53 2022 +0100 Merge branch 'cesanta:master' into master commit7a71038a27
Author: jfsimon1981 <jfsimon1981@gmail.com> Date: Fri Nov 11 16:09:22 2022 +0100 Update mip_test.c commita39b7ddbac
Author: cpq <valenok@gmail.com> Date: Fri Nov 11 15:03:48 2022 +0000 Fix fuzzer use-after-poison READ 1 * Squashed commit of the following: commit192ae56ece
Merge:7b0509c8
7ba68dd2
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Wed Nov 16 17:44:03 2022 +0100 Merge branch 'master' of https://github.com/jfsimon1981/mongoose commit7b0509c878
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Wed Nov 16 17:43:33 2022 +0100 Squashed commit of the following: commit7ba68dd20d
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Wed Nov 16 16:19:50 2022 +0100 Proper C/C++ struct initialization. commitaeab3ef7ac
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 17:09:29 2022 +0100 Fixed C++ builds. commit2afd529107
Merge:14710b81
f8445a4c
Author: jfsimon1981 <jfsimon1981@gmail.com> Date: Tue Nov 15 11:33:56 2022 +0100 Merge branch 'cesanta:master' into master commit14710b81e4
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 11:07:15 2022 +0100 Added MIP free. commit6393cd149d
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 11:06:44 2022 +0100 Adding mip_free() function. commitfeee81b733
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 11:05:55 2022 +0100 Adding mip_free() function. commitf8445a4c85
Merge:a39b7ddb
71f5be01
Author: Sergio R. Caprile <scaprile@users.noreply.github.com> Date: Fri Nov 11 20:42:38 2022 -0300 Merge pull request #1853 from cesanta/tibaremetaltest Update test.yml commit71f5be011b
Author: Sergio R. Caprile <scaprile@users.noreply.github.com> Date: Fri Nov 11 20:15:01 2022 -0300 Update test.yml commitb53d3cf032
Merge:7a71038a
a39b7ddb
Author: jfsimon1981 <jfsimon1981@gmail.com> Date: Fri Nov 11 16:10:53 2022 +0100 Merge branch 'cesanta:master' into master commit7a71038a27
Author: jfsimon1981 <jfsimon1981@gmail.com> Date: Fri Nov 11 16:09:22 2022 +0100 Update mip_test.c commita39b7ddbac
Author: cpq <valenok@gmail.com> Date: Fri Nov 11 15:03:48 2022 +0000 Fix fuzzer use-after-poison READ 1 commit7ba68dd20d
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Wed Nov 16 16:19:50 2022 +0100 Proper C/C++ struct initialization. commitaeab3ef7ac
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 17:09:29 2022 +0100 Fixed C++ builds. commit2afd529107
Merge:14710b81
f8445a4c
Author: jfsimon1981 <jfsimon1981@gmail.com> Date: Tue Nov 15 11:33:56 2022 +0100 Merge branch 'cesanta:master' into master commit14710b81e4
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 11:07:15 2022 +0100 Added MIP free. commit6393cd149d
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 11:06:44 2022 +0100 Adding mip_free() function. commitfeee81b733
Author: Jean-Francois Simon <jfsimon@startmail.com> Date: Tue Nov 15 11:05:55 2022 +0100 Adding mip_free() function. commitf8445a4c85
Merge:a39b7ddb
71f5be01
Author: Sergio R. Caprile <scaprile@users.noreply.github.com> Date: Fri Nov 11 20:42:38 2022 -0300 Merge pull request #1853 from cesanta/tibaremetaltest Update test.yml commit71f5be011b
Author: Sergio R. Caprile <scaprile@users.noreply.github.com> Date: Fri Nov 11 20:15:01 2022 -0300 Update test.yml commitb53d3cf032
Merge:7a71038a
a39b7ddb
Author: jfsimon1981 <jfsimon1981@gmail.com> Date: Fri Nov 11 16:10:53 2022 +0100 Merge branch 'cesanta:master' into master commita39b7ddbac
Author: cpq <valenok@gmail.com> Date: Fri Nov 11 15:03:48 2022 +0000 Fix fuzzer use-after-poison READ 1 Co-authored-by: Jean-Francois Simon <jfsimon@startmail.com>
This commit is contained in:
parent
f8445a4c85
commit
07aac8e6e9
@ -478,7 +478,7 @@ static size_t tx_tcp(struct mip_if *ifp, uint32_t dst_ip, uint8_t flags,
|
|||||||
struct ip *ip = tx_ip(ifp, 6, ifp->ip, dst_ip, sizeof(struct tcp) + len);
|
struct ip *ip = tx_ip(ifp, 6, ifp->ip, dst_ip, sizeof(struct tcp) + len);
|
||||||
struct tcp *tcp = (struct tcp *) (ip + 1);
|
struct tcp *tcp = (struct tcp *) (ip + 1);
|
||||||
memset(tcp, 0, sizeof(*tcp));
|
memset(tcp, 0, sizeof(*tcp));
|
||||||
memmove(tcp + 1, buf, len);
|
if (buf != NULL && len) memmove(tcp + 1, buf, len);
|
||||||
tcp->sport = sport;
|
tcp->sport = sport;
|
||||||
tcp->dport = dport;
|
tcp->dport = dport;
|
||||||
tcp->seq = seq;
|
tcp->seq = seq;
|
||||||
@ -845,6 +845,11 @@ void mip_init(struct mg_mgr *mgr, struct mip_if *ifp) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void mip_free(struct mip_if * ifp) {
|
||||||
|
free((char *)ifp->rx.ptr);
|
||||||
|
free((char *)ifp->tx.ptr);
|
||||||
|
}
|
||||||
|
|
||||||
int mg_mkpipe(struct mg_mgr *m, mg_event_handler_t fn, void *d, bool udp) {
|
int mg_mkpipe(struct mg_mgr *m, mg_event_handler_t fn, void *d, bool udp) {
|
||||||
(void) m, (void) fn, (void) d, (void) udp;
|
(void) m, (void) fn, (void) d, (void) udp;
|
||||||
MG_ERROR(("Not implemented"));
|
MG_ERROR(("Not implemented"));
|
||||||
|
@ -50,6 +50,7 @@ struct mip_if {
|
|||||||
};
|
};
|
||||||
|
|
||||||
void mip_init(struct mg_mgr *, struct mip_if *);
|
void mip_init(struct mg_mgr *, struct mip_if *);
|
||||||
|
void mip_free(struct mip_if *);
|
||||||
|
|
||||||
extern struct mip_driver mip_driver_stm32;
|
extern struct mip_driver mip_driver_stm32;
|
||||||
extern struct mip_driver mip_driver_enc28j60;
|
extern struct mip_driver mip_driver_enc28j60;
|
||||||
|
@ -7007,7 +7007,7 @@ static size_t tx_tcp(struct mip_if *ifp, uint32_t dst_ip, uint8_t flags,
|
|||||||
struct ip *ip = tx_ip(ifp, 6, ifp->ip, dst_ip, sizeof(struct tcp) + len);
|
struct ip *ip = tx_ip(ifp, 6, ifp->ip, dst_ip, sizeof(struct tcp) + len);
|
||||||
struct tcp *tcp = (struct tcp *) (ip + 1);
|
struct tcp *tcp = (struct tcp *) (ip + 1);
|
||||||
memset(tcp, 0, sizeof(*tcp));
|
memset(tcp, 0, sizeof(*tcp));
|
||||||
memmove(tcp + 1, buf, len);
|
if (buf != NULL && len) memmove(tcp + 1, buf, len);
|
||||||
tcp->sport = sport;
|
tcp->sport = sport;
|
||||||
tcp->dport = dport;
|
tcp->dport = dport;
|
||||||
tcp->seq = seq;
|
tcp->seq = seq;
|
||||||
@ -7374,6 +7374,11 @@ void mip_init(struct mg_mgr *mgr, struct mip_if *ifp) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void mip_free(struct mip_if * ifp) {
|
||||||
|
free((char *)ifp->rx.ptr);
|
||||||
|
free((char *)ifp->tx.ptr);
|
||||||
|
}
|
||||||
|
|
||||||
int mg_mkpipe(struct mg_mgr *m, mg_event_handler_t fn, void *d, bool udp) {
|
int mg_mkpipe(struct mg_mgr *m, mg_event_handler_t fn, void *d, bool udp) {
|
||||||
(void) m, (void) fn, (void) d, (void) udp;
|
(void) m, (void) fn, (void) d, (void) udp;
|
||||||
MG_ERROR(("Not implemented"));
|
MG_ERROR(("Not implemented"));
|
||||||
|
@ -1467,6 +1467,7 @@ struct mip_if {
|
|||||||
};
|
};
|
||||||
|
|
||||||
void mip_init(struct mg_mgr *, struct mip_if *);
|
void mip_init(struct mg_mgr *, struct mip_if *);
|
||||||
|
void mip_free(struct mip_if *);
|
||||||
|
|
||||||
extern struct mip_driver mip_driver_stm32;
|
extern struct mip_driver mip_driver_stm32;
|
||||||
extern struct mip_driver mip_driver_enc28j60;
|
extern struct mip_driver mip_driver_enc28j60;
|
||||||
|
200
test/mip_test.c
200
test/mip_test.c
@ -4,9 +4,25 @@
|
|||||||
#define MG_ENABLE_PACKED_FS 0
|
#define MG_ENABLE_PACKED_FS 0
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <linux/if.h>
|
||||||
|
#include <linux/if_tun.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
#include "mongoose.c"
|
#include "mongoose.c"
|
||||||
|
|
||||||
#include "driver_mock.c"
|
#include "driver_mock.c"
|
||||||
|
|
||||||
|
static int s_num_tests = 0;
|
||||||
|
|
||||||
|
#define ASSERT(expr) \
|
||||||
|
do { \
|
||||||
|
s_num_tests++; \
|
||||||
|
if (!(expr)) { \
|
||||||
|
printf("FAILURE %s:%d: %s\n", __FILE__, __LINE__, #expr); \
|
||||||
|
abort(); \
|
||||||
|
} \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void test_queue(void) {
|
static void test_queue(void) {
|
||||||
static uint8_t
|
static uint8_t
|
||||||
@ -49,9 +65,191 @@ static void test_statechange(void) {
|
|||||||
onstatechange(&iface);
|
onstatechange(&iface);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MIP TUNTAP driver
|
||||||
|
static size_t tap_rx(void *buf, size_t len, void *userdata) {
|
||||||
|
ssize_t received = read(*(int *) userdata, buf, len);
|
||||||
|
usleep(1); // This is to avoid 100% CPU
|
||||||
|
if (received < 0) return 0;
|
||||||
|
return (size_t) received;
|
||||||
|
}
|
||||||
|
|
||||||
|
static size_t tap_tx(const void *buf, size_t len, void *userdata) {
|
||||||
|
ssize_t res = write(*(int *) userdata, buf, len);
|
||||||
|
if (res < 0) {
|
||||||
|
MG_ERROR(("tap_tx failed: %d", errno));
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
return (size_t) res;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool tap_up(void *userdata) {
|
||||||
|
return userdata ? true : false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// HTTP fetches IOs
|
||||||
|
struct Post_reply {
|
||||||
|
char* post; // HTTP POST data
|
||||||
|
void* http_response; // Server response(s)
|
||||||
|
unsigned int http_responses_received; // Number responses received
|
||||||
|
};
|
||||||
|
|
||||||
|
char *fetch(struct mg_mgr *mgr, const char *url, const char *post_data);
|
||||||
|
static void f_http_fetch_query(struct mg_connection *c, int ev, void *ev_data, void *fn_data);
|
||||||
|
int get_response_code(char *); // Returns HTTP status code from full char* msg
|
||||||
|
|
||||||
|
static void f_http_fetch_query(struct mg_connection *c, int ev, void *ev_data, void *fn_data) {
|
||||||
|
static char* http_response = 0;
|
||||||
|
static bool http_response_allocated = 0; // So that we will update out parameter
|
||||||
|
unsigned int http_responses_received = 0;
|
||||||
|
struct Post_reply *post_reply_l;
|
||||||
|
post_reply_l = (struct Post_reply*)fn_data;
|
||||||
|
|
||||||
|
if (ev == MG_EV_CONNECT) {
|
||||||
|
mg_printf(c, post_reply_l->post);
|
||||||
|
} else if (ev == MG_EV_HTTP_MSG) {
|
||||||
|
struct mg_http_message *hm = (struct mg_http_message *) ev_data;
|
||||||
|
http_responses_received++;
|
||||||
|
if (!http_response_allocated) {
|
||||||
|
http_response = (char*)mg_strdup(hm->message).ptr;
|
||||||
|
http_response_allocated = 1;
|
||||||
|
}
|
||||||
|
if (http_responses_received > 0) {
|
||||||
|
post_reply_l->http_response = http_response;
|
||||||
|
post_reply_l->http_responses_received = http_responses_received;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch utility returns message from fetch(..., URL, POST)
|
||||||
|
char *fetch(struct mg_mgr *mgr, const char *url, const char *fn_data) {
|
||||||
|
struct Post_reply post_reply;
|
||||||
|
{
|
||||||
|
post_reply.post=(char*)fn_data;
|
||||||
|
post_reply.http_response=0;
|
||||||
|
post_reply.http_responses_received=0;
|
||||||
|
}
|
||||||
|
struct mg_connection *conn;
|
||||||
|
conn = mg_http_connect(mgr, url, f_http_fetch_query, &post_reply);
|
||||||
|
ASSERT(conn != NULL); // Assertion on initialisation
|
||||||
|
for (int i = 0; i < 500 && !post_reply.http_responses_received; i++) {
|
||||||
|
mg_mgr_poll(mgr, 100);
|
||||||
|
usleep(10000); // 10 ms. Slow down poll loop to ensure packets transit
|
||||||
|
}
|
||||||
|
conn->is_closing = 1;
|
||||||
|
mg_mgr_poll(mgr, 0);
|
||||||
|
if (!post_reply.http_responses_received)
|
||||||
|
return 0;
|
||||||
|
else
|
||||||
|
return (char*)post_reply.http_response;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns server's HTTP response code
|
||||||
|
int get_response_code(char * http_msg_raw) {
|
||||||
|
int http_status = 0;
|
||||||
|
struct mg_http_message http_msg_parsed;
|
||||||
|
if (mg_http_parse(http_msg_raw, strlen(http_msg_raw), &http_msg_parsed)) {
|
||||||
|
http_status = mg_http_status(&http_msg_parsed);
|
||||||
|
} else {
|
||||||
|
printf("Error: mg_http_parse()\n");
|
||||||
|
ASSERT(http_status != 0); // Couldn't parse.
|
||||||
|
}
|
||||||
|
return http_status;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void test_http_fetch(void) {
|
||||||
|
// Setup interface
|
||||||
|
const char *iface = "tap0"; // Network iface
|
||||||
|
const char *mac = "00:00:01:02:03:78"; // MAC address
|
||||||
|
int fd = open("/dev/net/tun", O_RDWR); // Open network interface
|
||||||
|
|
||||||
|
struct ifreq ifr;
|
||||||
|
memset(&ifr, 0, sizeof(ifr));
|
||||||
|
strncpy(ifr.ifr_name, iface, IFNAMSIZ);
|
||||||
|
ifr.ifr_flags = IFF_TAP | IFF_NO_PI;
|
||||||
|
if (ioctl(fd, TUNSETIFF, (void *) &ifr) < 0) {
|
||||||
|
MG_ERROR(("Failed to setup TAP interface: %s", ifr.ifr_name));
|
||||||
|
abort(); // return EXIT_FAILURE;
|
||||||
|
}
|
||||||
|
fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK); // Non-blocking mode
|
||||||
|
|
||||||
|
MG_INFO(("Opened TAP interface: %s", iface));
|
||||||
|
|
||||||
|
// Events
|
||||||
|
struct mg_mgr mgr; // Event manager
|
||||||
|
mg_mgr_init(&mgr); // Initialise event manager
|
||||||
|
|
||||||
|
// MIP driver
|
||||||
|
|
||||||
|
// Zero init fields required (C/C++ style diverge)
|
||||||
|
#ifndef __cplusplus
|
||||||
|
struct mip_driver driver = {.tx = tap_tx, .up = tap_up, .rx = tap_rx};
|
||||||
|
struct mip_if mif = {.use_dhcp = true, .driver = &driver, .driver_data = &fd};
|
||||||
|
#else
|
||||||
|
struct mip_driver driver {};
|
||||||
|
driver.tx = tap_tx;
|
||||||
|
driver.up = tap_up;
|
||||||
|
driver.rx = tap_rx;
|
||||||
|
struct mip_if mif {};
|
||||||
|
mif.use_dhcp = true;
|
||||||
|
mif.driver = &driver;
|
||||||
|
mif.driver_data = &fd;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
sscanf(mac, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &mif.mac[0], &mif.mac[1], &mif.mac[2],
|
||||||
|
&mif.mac[3], &mif.mac[4], &mif.mac[5]);
|
||||||
|
|
||||||
|
mip_init(&mgr, &mif);
|
||||||
|
MG_INFO(("Init done, starting main loop"));
|
||||||
|
|
||||||
|
// DHCP lease
|
||||||
|
{
|
||||||
|
if (mif.ip) printf("MIF configuration error: not configured for DHCP\n");
|
||||||
|
ASSERT(!mif.ip); // Check we are set for DHCP
|
||||||
|
int pc = 500; // Timout on DHCP lease 500 ~ approx 5s (typical delay <1s)
|
||||||
|
while (((pc--)>0)/* & !mif.ip*/) {
|
||||||
|
mg_mgr_poll(&mgr, 100);
|
||||||
|
usleep(10000); // 10 ms
|
||||||
|
}
|
||||||
|
if (!mif.ip) printf("DHCP lease failed.\n");
|
||||||
|
ASSERT(mif.ip); // We have a received lease
|
||||||
|
}
|
||||||
|
|
||||||
|
// Simple HTTP fetch
|
||||||
|
{
|
||||||
|
char* http_feedback = (char*)"";
|
||||||
|
const bool ipv6 = 0;
|
||||||
|
if (ipv6) {
|
||||||
|
http_feedback = fetch (&mgr, "ipv6.google.com",\
|
||||||
|
"GET/ HTTP/1.0\r\nHost: ipv6.google.com\r\n\r\n");
|
||||||
|
} else {
|
||||||
|
http_feedback = fetch (&mgr, "http://cesanta.com",\
|
||||||
|
"GET //robots.txt HTTP/1.0\r\nHost: cesanta.com\r\n\r\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
ASSERT(*http_feedback != '\0'); // Received HTTP response ?
|
||||||
|
|
||||||
|
int http_status = get_response_code(http_feedback);
|
||||||
|
// printf("Server response HTTP status code: %d\n",http_status);
|
||||||
|
ASSERT(http_status != 0);
|
||||||
|
ASSERT(http_status == 301); // OK: Permanently moved (HTTP->HTTPS redirect)
|
||||||
|
|
||||||
|
if (http_feedback) {
|
||||||
|
free(http_feedback);
|
||||||
|
http_feedback = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clear
|
||||||
|
mip_free(&mif);
|
||||||
|
mg_mgr_free(&mgr);
|
||||||
|
ASSERT(mgr.conns == NULL); // Deconstruction OK
|
||||||
|
close(fd);
|
||||||
|
}
|
||||||
|
|
||||||
int main(void) {
|
int main(void) {
|
||||||
test_queue();
|
test_queue();
|
||||||
test_statechange();
|
test_statechange();
|
||||||
|
test_http_fetch();
|
||||||
printf("SUCCESS\n");
|
printf("SUCCESS\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user