-from http://blueman.tuxfamily.org
[packages/bluez-utils.git] / bluez-utils-nap_bridge_fix.patch
1 --- network/bridge.c.orig       2008-05-05 14:37:28.000000000 +0300
2 +++ network/bridge.c    2008-05-05 14:31:39.000000000 +0300
3 @@ -53,7 +53,7 @@
4         if (stat("/sys/module/bridge", &st) < 0)
5                 return -EOPNOTSUPP;
6  #endif
7 -
8 +       info("bridge init");
9         bridge_socket = socket(AF_INET, SOCK_STREAM, 0);
10         if (bridge_socket < 0)
11                 return -errno;
12 @@ -74,7 +74,7 @@
13  {
14         int err;
15         const char *name = bridge_get_name(id);
16 -
17 +       info("bridge create %s", name);
18         err = ioctl(bridge_socket, SIOCBRADDBR, name);
19         if (err < 0)
20                 return -errno;
21 @@ -86,7 +86,7 @@
22  {
23         int err;
24         const char *name = bridge_get_name(id);
25 -
26 +       info("remove from bridge");
27         err = bnep_if_down(name);
28         if (err < 0)
29                 return err;
30 @@ -118,9 +118,7 @@
31         if (err < 0)
32                 return err;
33  
34 -       /* Only run scripts in GN bridges */
35 -       if (id != BNEP_SVC_GN)
36 -               return 0;
37 +       info("bridge_add_interface %s", dev);
38  
39         err = bnep_if_up(name, id);
40         if (err < 0)
41 --- network/server.c.orig       2008-05-05 14:37:17.000000000 +0300
42 +++ network/server.c    2008-05-03 11:57:39.000000000 +0300
43 @@ -665,6 +665,9 @@
44  
45         if (bridge_create(BNEP_SVC_GN) < 0)
46                 error("Can't create GN bridge");
47 +               
48 +       if (bridge_create(BNEP_SVC_NAP) < 0)
49 +               error("Can't create NAP bridge");
50  
51         return 0;
52  fail:
53 @@ -690,6 +693,9 @@
54  
55         if (bridge_remove(BNEP_SVC_GN) < 0)
56                 error("Can't remove GN bridge");
57 +               
58 +       if (bridge_remove(BNEP_SVC_NAP) < 0)
59 +               error("Can't remove NAP bridge");
60  
61         dbus_connection_unref(connection);
62         connection = NULL;
This page took 0.039718 seconds and 3 git commands to generate.