diff options
author | Szymon Janc <szymon.janc@tieto.com> | 2014-02-06 16:28:37 +0100 |
---|---|---|
committer | Luiz Augusto von Dentz <luiz.von.dentz@intel.com> | 2014-02-07 11:21:22 +0200 |
commit | 29bf1a3aab5429d382848d4159d869c72ae1cb0a (patch) | |
tree | 236522331352907258469a4b5e9b01846828dfcb /android/pan.c | |
parent | 800c6b667868c58320a9f488daf8058af05d7f41 (diff) | |
download | bluez-29bf1a3aab5429d382848d4159d869c72ae1cb0a.tar.gz |
android/pan: Move functions up to avoid forward declarations
Diffstat (limited to 'android/pan.c')
-rw-r--r-- | android/pan.c | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/android/pan.c b/android/pan.c index b8d740469..d010e091a 100644 --- a/android/pan.c +++ b/android/pan.c @@ -77,6 +77,72 @@ static struct { .io = NULL, }; +static int set_forward_delay(void) +{ + int fd, ret; + + fd = open(FORWARD_DELAY_PATH, O_RDWR); + if (fd < 0) { + int err = -errno; + + error("pan: open forward delay file failed: %d (%s)", + -err, strerror(-err)); + + return err; + } + + ret = write(fd, "0", sizeof("0")); + close(fd); + + return ret; +} + +static int nap_create_bridge(void) +{ + int sk, err; + + DBG("%s", BNEP_BRIDGE); + + sk = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0); + if (sk < 0) + return -EOPNOTSUPP; + + if (ioctl(sk, SIOCBRADDBR, BNEP_BRIDGE) < 0) { + err = -errno; + if (err != -EEXIST) { + close(sk); + return -EOPNOTSUPP; + } + } + + err = set_forward_delay(); + if (err < 0) + ioctl(sk, SIOCBRDELBR, BNEP_BRIDGE); + + close(sk); + + return err; +} + +static int nap_remove_bridge(void) +{ + int sk, err; + + DBG("%s", BNEP_BRIDGE); + + sk = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0); + if (sk < 0) + return -EOPNOTSUPP; + + err = ioctl(sk, SIOCBRDELBR, BNEP_BRIDGE); + close(sk); + + if (err < 0) + return -EOPNOTSUPP; + + return 0; +} + static int device_cmp(gconstpointer s, gconstpointer user_data) { const struct pan_device *dev = s; @@ -475,72 +541,6 @@ failed: bt_pan_notify_conn_state(dev, HAL_PAN_STATE_DISCONNECTED); } -static int set_forward_delay(void) -{ - int fd, ret; - - fd = open(FORWARD_DELAY_PATH, O_RDWR); - if (fd < 0) { - int err = -errno; - - error("pan: open forward delay file failed: %d (%s)", - -err, strerror(-err)); - - return err; - } - - ret = write(fd, "0", sizeof("0")); - close(fd); - - return ret; -} - -static int nap_create_bridge(void) -{ - int sk, err; - - DBG("%s", BNEP_BRIDGE); - - sk = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0); - if (sk < 0) - return -EOPNOTSUPP; - - if (ioctl(sk, SIOCBRADDBR, BNEP_BRIDGE) < 0) { - err = -errno; - if (err != -EEXIST) { - close(sk); - return -EOPNOTSUPP; - } - } - - err = set_forward_delay(); - if (err < 0) - ioctl(sk, SIOCBRDELBR, BNEP_BRIDGE); - - close(sk); - - return err; -} - -static int nap_remove_bridge(void) -{ - int sk, err; - - DBG("%s", BNEP_BRIDGE); - - sk = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0); - if (sk < 0) - return -EOPNOTSUPP; - - err = ioctl(sk, SIOCBRDELBR, BNEP_BRIDGE); - close(sk); - - if (err < 0) - return -EOPNOTSUPP; - - return 0; -} - static void destroy_nap_device(void) { DBG(""); |