Diffstat (limited to 'noncore/settings/networksettings2/bluetooth') (more/less context) (ignore whitespace changes)
4 files changed, 30 insertions, 30 deletions
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp index 5c937a1..5c71a0a 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp +++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.cpp | |||
@@ -6,6 +6,6 @@ | |||
6 | 6 | ||
7 | using Opietooth2::OTGateway; | 7 | using Opietooth2::OTGateway; |
8 | using Opietooth2::OTPANConnection; | 8 | using Opietooth2::OTPANNetworkSetup; |
9 | using Opietooth2::PANConnectionVector; | 9 | using Opietooth2::PANNetworkSetupVector; |
10 | 10 | ||
11 | BluetoothBNEPRun::BluetoothBNEPRun( ANetNodeInstance * NNI, | 11 | BluetoothBNEPRun::BluetoothBNEPRun( ANetNodeInstance * NNI, |
@@ -29,18 +29,18 @@ State_t BluetoothBNEPRun::detectState( void ) { | |||
29 | need to detect | 29 | need to detect |
30 | 30 | ||
31 | 1. for any PAN connection that is found if that | 31 | 1. for any PAN NetworkSetup that is found if that |
32 | PAN is connected. | 32 | PAN is connected. |
33 | 33 | ||
34 | if it is connected it is not available (since we do | 34 | if it is connected it is not available (since we do |
35 | not manage IP settings and we are called to detect | 35 | not manage IP settings and we are called to detect |
36 | the state we knwo that we do not have an UP connection) | 36 | the state we knwo that we do not have an UP NetworkSetup) |
37 | 37 | ||
38 | 2. if it not connected and we allow any connection we | 38 | 2. if it not connected and we allow any NetworkSetup we |
39 | are available or if that PAN connection is to a device | 39 | are available or if that PAN NetworkSetup is to a device |
40 | with a correct address | 40 | with a correct address |
41 | 41 | ||
42 | 3. if it is not connected and the address do not match or | 42 | 3. if it is not connected and the address do not match or |
43 | we do not accept any address, we are Unavailable but | 43 | we do not accept any address, we are Unavailable but |
44 | not DOWN. I.e a new connection could perhaps be created | 44 | not DOWN. I.e a new NetworkSetup could perhaps be created |
45 | 45 | ||
46 | */ | 46 | */ |
@@ -54,13 +54,13 @@ State_t BluetoothBNEPRun::detectState( void ) { | |||
54 | } | 54 | } |
55 | 55 | ||
56 | // if there is a PAN connection that is UP but not | 56 | // if there is a PAN NetworkSetup that is UP but not |
57 | // yet configured (no ifup) the we are available | 57 | // yet configured (no ifup) the we are available |
58 | return ( hasFreePANConnection() ) ? Available : Unknown; | 58 | return ( hasFreePANNetworkSetup() ) ? Available : Unknown; |
59 | } | 59 | } |
60 | 60 | ||
61 | QString BluetoothBNEPRun::setMyState( NodeCollection * NC, Action_t A, bool ) { | 61 | QString BluetoothBNEPRun::setMyState( NetworkSetup * NC, Action_t A, bool ) { |
62 | 62 | ||
63 | if( A == Activate ) { | 63 | if( A == Activate ) { |
64 | if( hasFreePANConnection( 1 ) ) { | 64 | if( hasFreePANNetworkSetup( 1 ) ) { |
65 | // we have now an assignedinterface | 65 | // we have now an assignedinterface |
66 | } else { | 66 | } else { |
@@ -90,5 +90,5 @@ bool BluetoothBNEPRun::handlesInterface( InterfaceInfo * I ) { | |||
90 | } | 90 | } |
91 | 91 | ||
92 | bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) { | 92 | bool BluetoothBNEPRun::hasFreePANNetworkSetup( bool Grab ) { |
93 | 93 | ||
94 | if( ! OT ) { | 94 | if( ! OT ) { |
@@ -96,9 +96,9 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) { | |||
96 | } | 96 | } |
97 | 97 | ||
98 | // load PAN connections | 98 | // load PAN NetworkSetups |
99 | OTPANConnection * C; | 99 | OTPANNetworkSetup * C; |
100 | InterfaceInfo * Run; | 100 | InterfaceInfo * Run; |
101 | InterfaceInfo * Candidate = 0; // reuse this interface | 101 | InterfaceInfo * Candidate = 0; // reuse this interface |
102 | PANConnectionVector Conns = OT->getPANConnections(); | 102 | PANNetworkSetupVector Conns = OT->getPANNetworkSetups(); |
103 | System & Sys = NSResources->system(); | 103 | System & Sys = NSResources->system(); |
104 | bool IsValid; | 104 | bool IsValid; |
@@ -113,5 +113,5 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) { | |||
113 | IsValid = 1; | 113 | IsValid = 1; |
114 | } else { | 114 | } else { |
115 | // is this PAN connection connecting to a Peer | 115 | // is this PAN NetworkSetup connecting to a Peer |
116 | // we allow ? | 116 | // we allow ? |
117 | IsValid = 0; | 117 | IsValid = 0; |
@@ -120,5 +120,5 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) { | |||
120 | ++ it ) { | 120 | ++ it ) { |
121 | if( C->ConnectedTo == (*it) ) { | 121 | if( C->ConnectedTo == (*it) ) { |
122 | // this is a connection we could accept | 122 | // this is a NetworkSetup we could accept |
123 | IsValid = 1; | 123 | IsValid = 1; |
124 | break; | 124 | break; |
@@ -136,9 +136,9 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) { | |||
136 | } | 136 | } |
137 | 137 | ||
138 | // is this PAN connection available to us ? | 138 | // is this PAN NetworkSetup available to us ? |
139 | Run = Sys.findInterface( C->Device ); | 139 | Run = Sys.findInterface( C->Device ); |
140 | 140 | ||
141 | if( Run && Run->IsUp ) { | 141 | if( Run && Run->IsUp ) { |
142 | // this PAN connection is up | 142 | // this PAN NetworkSetup is up |
143 | Log(("%s acceptable but unavailable\n", | 143 | Log(("%s acceptable but unavailable\n", |
144 | C->Device.latin1() )); | 144 | C->Device.latin1() )); |
@@ -155,5 +155,5 @@ bool BluetoothBNEPRun::hasFreePANConnection( bool Grab ) { | |||
155 | if( Candidate ) { | 155 | if( Candidate ) { |
156 | if ( Grab ) { | 156 | if ( Grab ) { |
157 | netNode()->connection()->assignInterface( Candidate ); | 157 | netNode()->networkSetup()->assignInterface( Candidate ); |
158 | } | 158 | } |
159 | return 1; | 159 | return 1; |
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h index 8551a2e..7346a8d 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h +++ b/noncore/settings/networksettings2/bluetooth/bluetoothBNEPrun.h | |||
@@ -23,9 +23,9 @@ public : | |||
23 | protected : | 23 | protected : |
24 | 24 | ||
25 | QString setMyState( NodeCollection * , Action_t, bool ); | 25 | QString setMyState( NetworkSetup * , Action_t, bool ); |
26 | 26 | ||
27 | private : | 27 | private : |
28 | 28 | ||
29 | bool hasFreePANConnection( bool Grab = 0 ); | 29 | bool hasFreePANNetworkSetup( bool Grab = 0 ); |
30 | 30 | ||
31 | BluetoothBNEPData & Data; | 31 | BluetoothBNEPData & Data; |
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp index 3df7f5c..cd7bb4a 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp +++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.cpp | |||
@@ -21,5 +21,5 @@ State_t BluetoothRFCOMMRun::detectState( void ) { | |||
21 | } | 21 | } |
22 | 22 | ||
23 | if( deviceNrOfConnection() >= 0 ) { | 23 | if( deviceNrOfNetworkSetup() >= 0 ) { |
24 | return Available; | 24 | return Available; |
25 | } | 25 | } |
@@ -32,5 +32,5 @@ State_t BluetoothRFCOMMRun::detectState( void ) { | |||
32 | } | 32 | } |
33 | 33 | ||
34 | QString BluetoothRFCOMMRun::setMyState( NodeCollection *, | 34 | QString BluetoothRFCOMMRun::setMyState( NetworkSetup *, |
35 | Action_t A, | 35 | Action_t A, |
36 | bool ) { | 36 | bool ) { |
@@ -71,5 +71,5 @@ QString BluetoothRFCOMMRun::setMyState( NodeCollection *, | |||
71 | if( DeviceNr >= 0 ) { | 71 | if( DeviceNr >= 0 ) { |
72 | if( OT->releaseRFCommDevice( DeviceNr ) ) { | 72 | if( OT->releaseRFCommDevice( DeviceNr ) ) { |
73 | return QString( "Cannot release RFCOMM connection" ); | 73 | return QString( "Cannot release RFCOMM NetworkSetup" ); |
74 | } | 74 | } |
75 | DeviceNr = -1; | 75 | DeviceNr = -1; |
@@ -132,7 +132,7 @@ RFCOMMChannel * BluetoothRFCOMMRun::getChannel( void ) { | |||
132 | 132 | ||
133 | QString BluetoothRFCOMMRun::deviceFile( void ) { | 133 | QString BluetoothRFCOMMRun::deviceFile( void ) { |
134 | if( deviceNrOfConnection() >= 0 ) { | 134 | if( deviceNrOfNetworkSetup() >= 0 ) { |
135 | OTDevice * OTD = OT->getOTDevice(); | 135 | OTDevice * OTD = OT->getOTDevice(); |
136 | // there is a connection | 136 | // there is a NetworkSetup |
137 | return OTD->getRFCommDevicePattern().arg(DeviceNr); | 137 | return OTD->getRFCommDevicePattern().arg(DeviceNr); |
138 | } | 138 | } |
@@ -140,5 +140,5 @@ QString BluetoothRFCOMMRun::deviceFile( void ) { | |||
140 | } | 140 | } |
141 | 141 | ||
142 | int BluetoothRFCOMMRun::deviceNrOfConnection( void ) { | 142 | int BluetoothRFCOMMRun::deviceNrOfNetworkSetup( void ) { |
143 | 143 | ||
144 | if( ! OT ) { | 144 | if( ! OT ) { |
diff --git a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h index 5a31a94..32986d3 100644 --- a/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h +++ b/noncore/settings/networksettings2/bluetooth/bluetoothRFCOMMrun.h | |||
@@ -21,9 +21,9 @@ public : | |||
21 | protected : | 21 | protected : |
22 | 22 | ||
23 | QString setMyState( NodeCollection * , Action_t, bool ); | 23 | QString setMyState( NetworkSetup * , Action_t, bool ); |
24 | 24 | ||
25 | private : | 25 | private : |
26 | 26 | ||
27 | int deviceNrOfConnection( void ); | 27 | int deviceNrOfNetworkSetup( void ); |
28 | RFCOMMChannel * getChannel( void ); | 28 | RFCOMMChannel * getChannel( void ); |
29 | BluetoothRFCOMMData * Data; | 29 | BluetoothRFCOMMData * Data; |