From 780077d1187ff632bdcbf33d65207a084027aba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D0=BE=D0=B1=D0=B1=D0=B8?= <lsm@cesanta.com>
Date: Sun, 18 Feb 2018 16:34:48 +0000
Subject: [PATCH] Fix mg_socketpair for lwip + UDP
CL: Fix mg_socketpair for lwip + UDP
PUBLISHED_FROM=6dd09136b3837016026523fb34acb5cc893cadbe
---
mongoose.c | 12 +++++++-----
mongoose.h | 4 ++--
src/mg_http_server.h | 4 ++--
src/mg_net_if_socket.c | 12 +++++++-----
4 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/mongoose.c b/mongoose.c
index 14a9218fa..4deea5c4a 100644
--- a/mongoose.c
+++ b/mongoose.c
@@ -3910,7 +3910,7 @@ mg_socketpair_accept(sock_t sock, union socket_address *sa, socklen_t sa_len) {
}
int mg_socketpair(sock_t sp[2], int sock_type) {
- union socket_address sa;
+ union socket_address sa, sa2;
sock_t sock;
socklen_t len = sizeof(sa.sin);
int ret = 0;
@@ -3919,18 +3919,20 @@ int mg_socketpair(sock_t sp[2], int sock_type) {
(void) memset(&sa, 0, sizeof(sa));
sa.sin.sin_family = AF_INET;
- sa.sin.sin_port = htons(0);
sa.sin.sin_addr.s_addr = htonl(0x7f000001); /* 127.0.0.1 */
+ sa2 = sa;
if ((sock = socket(AF_INET, sock_type, 0)) == INVALID_SOCKET) {
} else if (bind(sock, &sa.sa, len) != 0) {
} else if (sock_type == SOCK_STREAM && listen(sock, 1) != 0) {
} else if (getsockname(sock, &sa.sa, &len) != 0) {
} else if ((sp[0] = socket(AF_INET, sock_type, 0)) == INVALID_SOCKET) {
- } else if (connect(sp[0], &sa.sa, len) != 0) {
+ } else if (sock_type == SOCK_STREAM && connect(sp[0], &sa.sa, len) != 0) {
} else if (sock_type == SOCK_DGRAM &&
- (getsockname(sp[0], &sa.sa, &len) != 0 ||
- connect(sock, &sa.sa, len) != 0)) {
+ (bind(sp[0], &sa2.sa, len) != 0 ||
+ getsockname(sp[0], &sa2.sa, &len) != 0 ||
+ connect(sp[0], &sa.sa, len) != 0 ||
+ connect(sock, &sa2.sa, len) != 0)) {
} else if ((sp[1] = (sock_type == SOCK_DGRAM ? sock : mg_socketpair_accept(
sock, &sa, len))) ==
INVALID_SOCKET) {
diff --git a/mongoose.h b/mongoose.h
index eecbbeff1..f8030d52a 100644
--- a/mongoose.h
+++ b/mongoose.h
@@ -4680,9 +4680,9 @@ int mg_http_parse_header2(struct mg_str *hdr, const char *var_name, char **buf,
int mg_http_parse_header(struct mg_str *hdr, const char *var_name, char *buf,
size_t buf_size)
#ifdef __GNUC__
- __attribute__((deprecated));
+ __attribute__((deprecated))
#endif
-;
+ ;
/*
* Gets and parses the Authorization: Basic header
diff --git a/src/mg_http_server.h b/src/mg_http_server.h
index c4dfee4da..eacc5721d 100644
--- a/src/mg_http_server.h
+++ b/src/mg_http_server.h
@@ -64,9 +64,9 @@ int mg_http_parse_header2(struct mg_str *hdr, const char *var_name, char **buf,
int mg_http_parse_header(struct mg_str *hdr, const char *var_name, char *buf,
size_t buf_size)
#ifdef __GNUC__
- __attribute__((deprecated));
+ __attribute__((deprecated))
#endif
-;
+ ;
/*
* Gets and parses the Authorization: Basic header
diff --git a/src/mg_net_if_socket.c b/src/mg_net_if_socket.c
index 0d15764c5..c13c300a4 100644
--- a/src/mg_net_if_socket.c
+++ b/src/mg_net_if_socket.c
@@ -652,7 +652,7 @@ mg_socketpair_accept(sock_t sock, union socket_address *sa, socklen_t sa_len) {
}
int mg_socketpair(sock_t sp[2], int sock_type) {
- union socket_address sa;
+ union socket_address sa, sa2;
sock_t sock;
socklen_t len = sizeof(sa.sin);
int ret = 0;
@@ -661,18 +661,20 @@ int mg_socketpair(sock_t sp[2], int sock_type) {
(void) memset(&sa, 0, sizeof(sa));
sa.sin.sin_family = AF_INET;
- sa.sin.sin_port = htons(0);
sa.sin.sin_addr.s_addr = htonl(0x7f000001); /* 127.0.0.1 */
+ sa2 = sa;
if ((sock = socket(AF_INET, sock_type, 0)) == INVALID_SOCKET) {
} else if (bind(sock, &sa.sa, len) != 0) {
} else if (sock_type == SOCK_STREAM && listen(sock, 1) != 0) {
} else if (getsockname(sock, &sa.sa, &len) != 0) {
} else if ((sp[0] = socket(AF_INET, sock_type, 0)) == INVALID_SOCKET) {
- } else if (connect(sp[0], &sa.sa, len) != 0) {
+ } else if (sock_type == SOCK_STREAM && connect(sp[0], &sa.sa, len) != 0) {
} else if (sock_type == SOCK_DGRAM &&
- (getsockname(sp[0], &sa.sa, &len) != 0 ||
- connect(sock, &sa.sa, len) != 0)) {
+ (bind(sp[0], &sa2.sa, len) != 0 ||
+ getsockname(sp[0], &sa2.sa, &len) != 0 ||
+ connect(sp[0], &sa.sa, len) != 0 ||
+ connect(sock, &sa2.sa, len) != 0)) {
} else if ((sp[1] = (sock_type == SOCK_DGRAM ? sock : mg_socketpair_accept(
sock, &sa, len))) ==
INVALID_SOCKET) {
--
GitLab