diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-02 02:28:33 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-02 02:28:33 +0200 |
| commit | 0c05dd3dc5a18d64734a9f091d5285612e41107b (patch) | |
| tree | 57de979b0fdef6c07329d0aae06235730a2fb4cb /network/server.c | |
| parent | 4f946e36897fc67a28a56fb3102994da6857a038 (diff) | |
| parent | 3f498e694e39756890db475f1f1edb528b378ee2 (diff) | |
Merge branch 'for-upstream' of git://gitorious.org/bluez/cktakahasis-clone
Diffstat (limited to 'network/server.c')
| -rw-r--r-- | network/server.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/network/server.c b/network/server.c index 3fa99d25..00e8f0aa 100644 --- a/network/server.c +++ b/network/server.c @@ -29,18 +29,13 @@ #include <unistd.h> #include <stdlib.h> #include <errno.h> -#include <sys/stat.h> -#include <sys/param.h> -#include <net/if.h> #include <bluetooth/bluetooth.h> #include <bluetooth/hci.h> -#include <bluetooth/hci_lib.h> #include <bluetooth/bnep.h> #include <bluetooth/l2cap.h> #include <bluetooth/sdp.h> #include <bluetooth/sdp_lib.h> - #include <netinet/in.h> #include <glib.h> @@ -51,19 +46,16 @@ #include "logging.h" #include "error.h" -#include "textfile.h" #include "sdpd.h" #include "glib-helper.h" +#include "bridge.h" +#include "common.h" + #define NETWORK_PEER_INTERFACE "org.bluez.network.Peer" #define NETWORK_HUB_INTERFACE "org.bluez.network.Hub" #define NETWORK_ROUTER_INTERFACE "org.bluez.network.Router" #define SETUP_TIMEOUT 1000 -#define MAX_SETUP_ATTEMPTS 3 - -#include "bridge.h" -#include "common.h" -#include "manager.h" /* Pending Authorization */ struct setup_session { |