technology: Add bridge name to the tethering hook

diff --git a/include/technology.h b/include/technology.h
index e45474d..dcab267 100644 (file)
--- a/include/technology.h
+++ b/include/technology.h
@@ -48,7 +48,7 @@ struct connman_technology_driver {
        void (*remove_interface) (struct connman_technology *technology,
                                                                int index);
        int (*set_tethering) (struct connman_technology *technology,
-                                               connman_bool_t enabled);
+                               const char *bridge, connman_bool_t enabled);
 };
 
 int connman_technology_driver_register(struct connman_technology_driver *driver);

diff --git a/plugins/bluetooth.c b/plugins/bluetooth.c
index bf89b98..b34ca1c 100644 (file)
--- a/plugins/bluetooth.c
+++ b/plugins/bluetooth.c
@@ -943,7 +943,7 @@ static void tech_remove(struct connman_technology *technology)
 }
 
 static int tech_set_tethering(struct connman_technology *technology,
-                                               connman_bool_t enabled)
+                               const char *bridge, connman_bool_t enabled)
 {
        return 0;
 }

diff --git a/src/connman.h b/src/connman.h
index 27a5b36..8cb4754 100644 (file)
--- a/src/connman.h
+++ b/src/connman.h
@@ -316,8 +316,8 @@ void __connman_technology_add_interface(enum connman_service_type type,
                                int index, const char *name, const char *ident);
 void __connman_technology_remove_interface(enum connman_service_type type,
                                int index, const char *name, const char *ident);
-int __connman_technology_enable_tethering(void);
-int __connman_technology_disable_tethering(void);
+int __connman_technology_enable_tethering(const char *bridge);
+int __connman_technology_disable_tethering(const char *bridge);
 
 connman_bool_t __connman_technology_get_blocked(enum connman_service_type type);
 

diff --git a/src/technology.c b/src/technology.c
index 1626f83..37d3974 100644 (file)
--- a/src/technology.c
+++ b/src/technology.c
@@ -177,7 +177,7 @@ void __connman_technology_remove_interface(enum connman_service_type type,
        }
 }
 
-static int set_tethering(connman_bool_t enabled)
+static int set_tethering(const char *bridge, connman_bool_t enabled)
 {
        GSList *list;
 
@@ -188,20 +188,20 @@ static int set_tethering(connman_bool_t enabled)
                        continue;
 
                if (technology->driver->set_tethering)
-                       technology->driver->set_tethering(technology, enabled);
+                       technology->driver->set_tethering(technology, bridge, enabled);
        }
 
        return 0;
 }
 
-int __connman_technology_enable_tethering(void)
+int __connman_technology_enable_tethering(const char *bridge)
 {
-       return set_tethering(TRUE);
+       return set_tethering(bridge, TRUE);
 }
 
-int __connman_technology_disable_tethering(void)
+int __connman_technology_disable_tethering(const char *bridge)
 {
-       return set_tethering(FALSE);
+       return set_tethering(bridge, FALSE);
 }
 
 static void free_rfkill(gpointer data)

diff --git a/src/tethering.c b/src/tethering.c
index 040d199..864f22c 100644 (file)
--- a/src/tethering.c
+++ b/src/tethering.c
@@ -86,9 +86,9 @@ int __connman_tethering_set_status(connman_bool_t status)
 
        if (status == TRUE) {
                create_bridge(BRIDGE_NAME);
-               __connman_technology_enable_tethering();
+               __connman_technology_enable_tethering(BRIDGE_NAME);
        } else {
-               __connman_technology_disable_tethering();
+               __connman_technology_disable_tethering(BRIDGE_NAME);
                remove_bridge(BRIDGE_NAME);
        }