connman: update to connman-8b952da

This commit is contained in:
Stefan Saraev 2013-07-09 19:22:53 +03:00
parent ebce4a0fa3
commit 79a16bd417
2 changed files with 8 additions and 8 deletions

View File

@ -19,7 +19,7 @@
################################################################################ ################################################################################
PKG_NAME="connman" PKG_NAME="connman"
PKG_VERSION="df37290" PKG_VERSION="8b952da"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -1,16 +1,16 @@
commit 0f41818097e3ada58c21a3a84af86ec3762294ce commit f5f3c66721ca595976def1a43195d6a64525e6ed
Author: Stefan Saraev <stefan@saraev.ca> Author: Stefan Saraev <stefan@saraev.ca>
Date: Thu Jul 4 18:42:29 2013 +0300 Date: Tue Jul 9 19:06:36 2013 +0300
do not touch nat table before enabling tethering do not touch nat table before enabling tethering
TODO: remove when upstream does a better fix TODO: remove when upstream does a better fix
diff --git a/src/connman.h b/src/connman.h diff --git a/src/connman.h b/src/connman.h
index 96f8466..c94d854 100644 index 6846b92..6cd24e2 100644
--- a/src/connman.h --- a/src/connman.h
+++ b/src/connman.h +++ b/src/connman.h
@@ -910,6 +910,8 @@ int __connman_nat_enable(const char *name, const char *address, @@ -912,6 +912,8 @@ int __connman_nat_enable(const char *name, const char *address,
unsigned char prefixlen); unsigned char prefixlen);
void __connman_nat_disable(const char *name); void __connman_nat_disable(const char *name);
@ -34,15 +34,15 @@ index c235d86..1e7dfa9 100644
int __connman_firewall_init(void) int __connman_firewall_init(void)
diff --git a/src/nat.c b/src/nat.c diff --git a/src/nat.c b/src/nat.c
index 5447eb7..d5ceffd 100644 index 9308059..b198cf5 100644
--- a/src/nat.c --- a/src/nat.c
+++ b/src/nat.c +++ b/src/nat.c
@@ -78,6 +78,8 @@ static int enable_nat(struct connman_nat *nat) @@ -81,6 +81,8 @@ static int enable_nat(struct connman_nat *nat)
if (err < 0) if (err < 0)
return err; return err;
+ nat_enabled = TRUE; + nat_enabled = TRUE;
+ +
return __connman_iptables_commit("nat"); return __connman_firewall_enable(nat->fw);
} }