Merge Official Source

This commit is contained in:
Xiaokailnol
2026-01-17 12:19:06 +08:00
parent e984438c7c
commit fa49ef851b
7 changed files with 0 additions and 176 deletions

View File

@@ -1,25 +0,0 @@
From 0e8c68d2ac4097d50fa93368e15dd7c972123e74 Mon Sep 17 00:00:00 2001
From: QiuSimons <45143996+QiuSimons@users.noreply.github.com>
Date: Thu, 30 Nov 2023 11:50:58 +0800
Subject: [PATCH] Update upnpevents.c
---
miniupnpd/upnpevents.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/upnpevents.c b/upnpevents.c
index 2e1b22f90..0b05e4b67 100644
--- a/upnpevents.c
+++ b/upnpevents.c
@@ -384,9 +384,9 @@ upnp_event_notify_connect(struct upnp_event_notify * obj)
obj->state = EConnecting;
if(connect(obj->s, (struct sockaddr *)&addr, addrlen) < 0) {
if(errno != EINPROGRESS && errno != EWOULDBLOCK) {
- syslog(LOG_ERR, "%s: connect(%d, %s, %u): %m",
+ /* syslog(LOG_ERR, "%s: connect(%d, %s, %u): %m",
"upnp_event_notify_connect", obj->s,
- obj->addrstr, addrlen);
+ obj->addrstr, addrlen); */
obj->state = EError;
}
}

View File

@@ -1,25 +0,0 @@
From 21541fc2e6b6bbc3c0e2a9e2c3e4393495d0b4cf Mon Sep 17 00:00:00 2001
From: QiuSimons <45143996+QiuSimons@users.noreply.github.com>
Date: Thu, 19 Oct 2023 10:50:50 +0800
Subject: [PATCH] Update asyncsendto.c
---
miniupnpd/asyncsendto.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/asyncsendto.c b/asyncsendto.c
index b76d0db56..25ad28ec7 100644
--- a/asyncsendto.c
+++ b/asyncsendto.c
@@ -254,9 +254,9 @@ int try_sendto(fd_set * writefds)
/* uncatched error */
if(sockaddr_to_string(elt->dest_addr, addr_str, sizeof(addr_str)) <= 0)
addr_str[0] = '\0';
- syslog(LOG_ERR, "%s(sock=%d, len=%u, dest=%s): sendto: %m",
+ /* syslog(LOG_ERR, "%s(sock=%d, len=%u, dest=%s): sendto: %m",
"try_sendto", elt->sockfd, (unsigned)elt->len,
- addr_str);
+ addr_str); */
ret--;
}
} else if((int)n != (int)elt->len) {

View File

@@ -1,24 +0,0 @@
From 3f3582be627ac6bdfded8789cb512aff00c6853b Mon Sep 17 00:00:00 2001
From: QiuSimons <45143996+QiuSimons@users.noreply.github.com>
Date: Wed, 24 Jan 2024 20:59:01 +0800
Subject: [PATCH] Update minissdp.c
---
miniupnpd/minissdp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/minissdp.c b/minissdp.c
index b50b7b9a3..27f563231 100644
--- a/minissdp.c
+++ b/minissdp.c
@@ -1037,8 +1037,8 @@ ProcessSSDPData(int s, const char *bufr, int n,
}
if(lan_addr == NULL)
{
- syslog(LOG_WARNING, "SSDP packet sender %s (if_index=%d) not from a LAN, ignoring",
- sender_str, source_if);
+ /* syslog(LOG_WARNING, "SSDP packet sender %s (if_index=%d) not from a LAN, ignoring",
+ sender_str, source_if); */
return;
}

View File

@@ -1,22 +0,0 @@
From 60f5705a3927d0b0ee96a6a4d4157006ad82fa08 Mon Sep 17 00:00:00 2001
From: QiuSimons <45143996+QiuSimons@users.noreply.github.com>
Date: Thu, 30 Nov 2023 11:24:17 +0800
Subject: [PATCH] Update miniupnpd.c
---
miniupnpd/miniupnpd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/miniupnpd.c b/miniupnpd.c
index 61ff4e06a..d5c9038e1 100644
--- a/miniupnpd.c
+++ b/miniupnpd.c
@@ -2875,7 +2875,7 @@ main(int argc, char * * argv)
}
i = try_sendto(&writeset);
if(i < 0) {
- syslog(LOG_ERR, "try_sendto failed to send %d packets", -i);
+ /*syslog(LOG_ERR, "try_sendto failed to send %d packets", -i);*/
}
#ifdef USE_MINIUPNPDCTL
for(ectl = ctllisthead.lh_first; ectl;)

View File

@@ -1,31 +0,0 @@
From 6aefa9a1796954b3ac1babbd15ed49d79e4200f5 Mon Sep 17 00:00:00 2001
From: QiuSimons <45143996+QiuSimons@users.noreply.github.com>
Date: Wed, 24 Dec 2025 12:31:20 +0800
Subject: [PATCH] Increase listen backlog to 128
---
miniupnpd/miniupnpd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/miniupnpd.c b/miniupnpd.c
index 4c96c77e..624845b6 100644
--- a/miniupnpd.c
+++ b/miniupnpd.c
@@ -425,7 +425,7 @@ OpenAndConfHTTPSocket(unsigned short * port)
return -1;
}
- if(listen(s, 5) < 0)
+ if(listen(s, 128) < 0)
{
syslog(LOG_ERR, "listen(http): %m");
close(s);
@@ -705,7 +705,7 @@ OpenAndConfCtlUnixSocket(const char * path)
close(s);
s = -1;
}
- else if(listen(s, 5) < 0)
+ else if(listen(s, 128) < 0)
{
syslog(LOG_ERR, "listen(sctl): %m");
close(s);

View File

@@ -1,25 +0,0 @@
From 8f2f392c86472a19a447383e56cf1e797d105852 Mon Sep 17 00:00:00 2001
From: QiuSimons <45143996+QiuSimons@users.noreply.github.com>
Date: Thu, 30 Nov 2023 11:53:12 +0800
Subject: [PATCH] Update upnpevents.c
---
miniupnpd/upnpevents.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/upnpevents.c b/upnpevents.c
index 2e1b22f90..5730a0c7d 100644
--- a/upnpevents.c
+++ b/upnpevents.c
@@ -547,9 +547,9 @@ upnp_event_process_notify(struct upnp_event_notify * obj)
}
if(err != 0) {
errno = err;
- syslog(LOG_WARNING, "%s: connect(%s%s): %m",
+ /* syslog(LOG_WARNING, "%s: connect(%s%s): %m",
"upnp_event_process_notify",
- obj->addrstr, obj->portstr);
+ obj->addrstr, obj->portstr); */
obj->state = EError;
break;
}

View File

@@ -1,24 +0,0 @@
From b78a3634a51a2a786a56b9ca629dc58a5c1a0491 Mon Sep 17 00:00:00 2001
From: QiuSimons <45143996+QiuSimons@users.noreply.github.com>
Date: Thu, 19 Oct 2023 10:52:51 +0800
Subject: [PATCH] Update minissdp.c
---
miniupnpd/minissdp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/minissdp.c b/minissdp.c
index d71b6e016..42947304b 100644
--- a/minissdp.c
+++ b/minissdp.c
@@ -712,8 +712,8 @@ SendSSDPNotify(int s, const struct sockaddr * dest, socklen_t dest_len,
}
n = sendto_or_schedule(s, bufr, l, 0, dest, dest_len);
if(n < 0) {
- syslog(LOG_ERR, "sendto(udp_notify=%d, %s): %m", s,
- host ? host : "NULL");
+ /* syslog(LOG_ERR, "sendto(udp_notify=%d, %s): %m", s,
+ host ? host : "NULL"); */
} else if(n != l) {
syslog(LOG_NOTICE, "sendto() sent %d out of %d bytes", n, l);
}