mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 19:26:50 +00:00
connman: update to 1.44
This commit is contained in:
parent
56ea394eeb
commit
36d0569e5e
@ -3,8 +3,8 @@
|
|||||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="connman"
|
PKG_NAME="connman"
|
||||||
PKG_VERSION="1.43"
|
PKG_VERSION="1.44"
|
||||||
PKG_SHA256="22acfe9d5958d7983090232334a692eee66a12f3077e09e4f360276608156738"
|
PKG_SHA256="d751da9858a6e3dfe70d6c98e71ea4f5896e1c92c5e1b17f10d055eaeae0e452"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.connman.net"
|
PKG_SITE="http://www.connman.net"
|
||||||
PKG_URL="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${PKG_VERSION}.tar.gz"
|
PKG_URL="https://git.kernel.org/pub/scm/network/connman/connman.git/snapshot/connman-${PKG_VERSION}.tar.gz"
|
||||||
|
@ -1,63 +0,0 @@
|
|||||||
From a6346cd08b5b83a60395e611c6193d7f78f6caaa Mon Sep 17 00:00:00 2001
|
|
||||||
From: Christian Hewitt <christianshewitt@gmail.com>
|
|
||||||
Date: Wed, 22 Nov 2023 14:29:48 +0000
|
|
||||||
Subject: [PATCH] Revert "Don't add route for invalid dst and gateway address
|
|
||||||
combinations"
|
|
||||||
|
|
||||||
This reverts commit 9eb1772d31b6fcf78e8711976696491aec9ff5df.
|
|
||||||
---
|
|
||||||
src/inet.c | 24 ------------------------
|
|
||||||
1 file changed, 24 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/inet.c b/src/inet.c
|
|
||||||
index 3465d50c..4039a73c 100644
|
|
||||||
--- a/src/inet.c
|
|
||||||
+++ b/src/inet.c
|
|
||||||
@@ -611,16 +611,6 @@ int connman_inet_add_network_route(int index, const char *host,
|
|
||||||
addr.sin_addr.s_addr = inet_addr(host);
|
|
||||||
memcpy(&rt.rt_dst, &addr, sizeof(rt.rt_dst));
|
|
||||||
|
|
||||||
- /*
|
|
||||||
- * Don't add a routes for link-local or unspecified
|
|
||||||
- * destination address coupled with unspecified gateway.
|
|
||||||
- */
|
|
||||||
- if ((!host || is_addr_ll(AF_INET, (struct sockaddr *)&addr) || __connman_inet_is_any_addr(host, AF_INET))
|
|
||||||
- && (!gateway || __connman_inet_is_any_addr(gateway, AF_INET))) {
|
|
||||||
- close(sk);
|
|
||||||
- return -EINVAL;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
memset(&addr, 0, sizeof(addr));
|
|
||||||
addr.sin_family = AF_INET;
|
|
||||||
if (gateway)
|
|
||||||
@@ -755,7 +745,6 @@ int connman_inet_add_ipv6_network_route(int index, const char *host,
|
|
||||||
const char *gateway,
|
|
||||||
unsigned char prefix_len)
|
|
||||||
{
|
|
||||||
- struct sockaddr_in6 addr;
|
|
||||||
struct in6_rtmsg rt;
|
|
||||||
int sk, err = 0;
|
|
||||||
|
|
||||||
@@ -764,19 +753,6 @@ int connman_inet_add_ipv6_network_route(int index, const char *host,
|
|
||||||
if (!host)
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
- if (inet_pton(AF_INET6, host, &addr.sin6_addr) != 1) {
|
|
||||||
- err = -errno;
|
|
||||||
- goto out;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- /*
|
|
||||||
- * Don't add a route for link-local or unspecified
|
|
||||||
- * destination address coupled with unspecified gateway.
|
|
||||||
- */
|
|
||||||
- if ((!host || is_addr_ll(AF_INET6, (struct sockaddr *)&addr) || __connman_inet_is_any_addr(host, AF_INET6))
|
|
||||||
- && (!gateway || __connman_inet_is_any_addr(gateway, AF_INET6)))
|
|
||||||
- return -EINVAL;
|
|
||||||
-
|
|
||||||
memset(&rt, 0, sizeof(rt));
|
|
||||||
|
|
||||||
rt.rtmsg_dst_len = prefix_len;
|
|
||||||
--
|
|
||||||
2.34.1
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
|||||||
From b1ed80a459ec31ae217897b7a3347d123e08d379 Mon Sep 17 00:00:00 2001
|
|
||||||
From: mglae <mglmail@arcor.de>
|
|
||||||
Date: Sat, 14 Sep 2024 19:46:08 +0200
|
|
||||||
Subject: __connman_gateway_add(): fix calculation of is_vpn6
|
|
||||||
|
|
||||||
Fix commit 823d5a2 "connection: Refactor '__connman_connection_gateway_add'"
|
|
||||||
---
|
|
||||||
src/gateway.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/gateway.c b/src/gateway.c
|
|
||||||
index 16c87f83..b2c211e2 100644
|
|
||||||
--- a/src/gateway.c
|
|
||||||
+++ b/src/gateway.c
|
|
||||||
@@ -3704,10 +3704,10 @@ int __connman_gateway_add(struct connman_service *service,
|
|
||||||
is_gateway_config_vpn(
|
|
||||||
new_gateway->ipv4_config);
|
|
||||||
|
|
||||||
- is_vpn6 = do_ipv4 &&
|
|
||||||
- new_gateway->ipv4_config &&
|
|
||||||
+ is_vpn6 = do_ipv6 &&
|
|
||||||
+ new_gateway->ipv6_config &&
|
|
||||||
is_gateway_config_vpn(
|
|
||||||
- new_gateway->ipv4_config);
|
|
||||||
+ new_gateway->ipv6_config);
|
|
||||||
|
|
||||||
} else {
|
|
||||||
if (do_ipv4 && new_gateway->ipv4_config)
|
|
||||||
--
|
|
||||||
2.40.0
|
|
Loading…
x
Reference in New Issue
Block a user