diff options
| author | Szymon Janc <szymon.janc@tieto.com> | 2014-02-06 16:28:35 +0100 |
|---|---|---|
| committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-02-07 11:21:22 +0200 |
| commit | 92cdd7a646414d3d3edff42dd9e05699bc7a870f (patch) | |
| tree | b48e29f3a4320b4e3db3a11e718bdebbed18dba4 /profiles/network | |
| parent | 7498648468133f6a490f020b8e36f1c696c71d5e (diff) | |
| download | bluez-92cdd7a646414d3d3edff42dd9e05699bc7a870f.tar.gz | |
profiles/network: Use interface name passed to bnep_connadd
Diffstat (limited to 'profiles/network')
| -rw-r--r-- | profiles/network/bnep.c | 5 | ||||
| -rw-r--r-- | profiles/network/server.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/profiles/network/bnep.c b/profiles/network/bnep.c index 0d57056c1..82d0d99df 100644 --- a/profiles/network/bnep.c +++ b/profiles/network/bnep.c @@ -174,9 +174,10 @@ static int bnep_connadd(int sk, uint16_t role, char *dev) { struct bnep_connadd_req req; - memset(dev, 0, 16); memset(&req, 0, sizeof(req)); - strcpy(req.device, "bnep%d"); + strncpy(req.device, dev, 16); + req.device[15] = '\0'; + req.sock = sk; req.role = role; if (ioctl(ctl, BNEPCONNADD, &req) < 0) { diff --git a/profiles/network/server.c b/profiles/network/server.c index f14d68854..3fb031fa3 100644 --- a/profiles/network/server.c +++ b/profiles/network/server.c @@ -51,6 +51,7 @@ #include "server.h" #define NETWORK_SERVER_INTERFACE "org.bluez.NetworkServer1" +#define BNEP_INTERFACE "bnep%d" #define SETUP_TIMEOUT 1 /* Pending Authorization */ @@ -347,6 +348,9 @@ static gboolean bnep_setup(GIOChannel *chan, goto reply; } + strncpy(na->setup->dev, BNEP_INTERFACE, 16); + na->setup->dev[15] = '\0'; + if (bnep_server_add(sk, dst_role, ns->bridge, na->setup->dev, &na->setup->dst) < 0) goto reply; |